diff --git a/core/blockly.ts b/core/blockly.ts
index 71db6e3aa..bd24c2c6f 100644
--- a/core/blockly.ts
+++ b/core/blockly.ts
@@ -121,7 +121,6 @@ import {VerticalFlyout} from './flyout_vertical.js';
 import {CodeGenerator} from './generator.js';
 import {Gesture} from './gesture.js';
 import {Grid} from './grid.js';
-import {Icon} from './icons/icon.js';
 import * as icons from './icons.js';
 import {inject} from './inject.js';
 import {Align, Input} from './inputs/input.js';
@@ -582,7 +581,6 @@ export {ICollapsibleToolboxItem};
 export {IComponent};
 export {IConnectionChecker};
 export {IContextMenu};
-export {Icon};
 export {icons};
 export {ICopyable};
 export {IDeletable};
diff --git a/core/icons.ts b/core/icons.ts
index df5f2d56e..61d1594b8 100644
--- a/core/icons.ts
+++ b/core/icons.ts
@@ -4,10 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {CommentIcon} from './icons/comment_icon.js';
+import {Icon} from './icons/icon.js';
+import {CommentIcon, CommentState} from './icons/comment_icon.js';
+import {MutatorIcon} from './icons/mutator_icon.js';
+import {WarningIcon} from './icons/warning_icon.js';
+import {IconType} from './icons/icon_types.js';
 import * as exceptions from './icons/exceptions.js';
 import * as registry from './icons/registry.js';
-import {MutatorIcon} from './icons/mutator_icon.js';
-import {IconType} from './icons/icon_types.js';
 
-export {CommentIcon, exceptions, registry, MutatorIcon, IconType};
+export {
+  Icon,
+  CommentIcon,
+  CommentState,
+  MutatorIcon,
+  WarningIcon,
+  IconType,
+  exceptions,
+  registry,
+};
diff --git a/scripts/migration/renamings.json5 b/scripts/migration/renamings.json5
index 758c7318f..156f17018 100644
--- a/scripts/migration/renamings.json5
+++ b/scripts/migration/renamings.json5
@@ -1478,5 +1478,9 @@
         },
       },
     },
+    {
+      oldName: 'Blockly.Icon',
+      newName: 'Blockly.icons.Icon',
+    },
   ],
 }