diff --git a/dev/tools/update_icons.dart b/dev/tools/update_icons.dart
index 7f09f45aef..9ab1f1655f 100644
--- a/dev/tools/update_icons.dart
+++ b/dev/tools/update_icons.dart
@@ -83,9 +83,6 @@ const Map<String, String> identifierRewrites = <String, String>{
   '23mp': 'twenty_three_mp',
   '24mp': 'twenty_four_mp',
   'class': 'class_',
-  // TODO(guidezpl): will clean these up in g3 b/153556862
-  'door_back': 'door_back_door',
-  'door_front': 'door_front_door',
   'try': 'try_sms_star',
 };
 
diff --git a/packages/flutter/lib/src/material/icons.dart b/packages/flutter/lib/src/material/icons.dart
index f3e2e1028b..239b60edf0 100644
--- a/packages/flutter/lib/src/material/icons.dart
+++ b/packages/flutter/lib/src/material/icons.dart
@@ -91,7 +91,8 @@ class _PlatformAdaptiveIcons {
 ///
 /// Use with the [Icon] class to show specific icons.
 ///
-/// Icons are identified by their name as listed below.
+/// Icons are identified by their name as listed below. **Do not use codepoints
+/// directly, as they are subject to change.**
 ///
 /// To use this class, make sure you set `uses-material-design: true` in your
 /// project's `pubspec.yaml` file in the `flutter` section. This ensures that