diff --git a/core/icons/comment_icon.ts b/core/icons/comment_icon.ts
index d99588fe6..364ef67d1 100644
--- a/core/icons/comment_icon.ts
+++ b/core/icons/comment_icon.ts
@@ -110,6 +110,7 @@ export class CommentIcon extends Icon implements IHasBubble, ISerializable {
       },
       this.svgRoot,
     );
+    dom.addClass(this.svgRoot!, 'blockly-icon-comment');
   }
 
   override dispose() {
diff --git a/core/icons/mutator_icon.ts b/core/icons/mutator_icon.ts
index b86ef19c2..c53d58f8a 100644
--- a/core/icons/mutator_icon.ts
+++ b/core/icons/mutator_icon.ts
@@ -118,6 +118,7 @@ export class MutatorIcon extends Icon implements IHasBubble {
       {'class': 'blocklyIconShape', 'r': '2.7', 'cx': '8', 'cy': '8'},
       this.svgRoot,
     );
+    dom.addClass(this.svgRoot!, 'blockly-icon-mutator');
   }
 
   override dispose(): void {
diff --git a/core/icons/warning_icon.ts b/core/icons/warning_icon.ts
index edb763f82..7c44d0d34 100644
--- a/core/icons/warning_icon.ts
+++ b/core/icons/warning_icon.ts
@@ -88,6 +88,7 @@ export class WarningIcon extends Icon implements IHasBubble {
       },
       this.svgRoot,
     );
+    dom.addClass(this.svgRoot!, 'blockly-icon-warning');
   }
 
   override dispose() {