diff --git a/packages/mermaid/src/rendering-util/rendering-elements/shapes/iconCircle.ts b/packages/mermaid/src/rendering-util/rendering-elements/shapes/iconCircle.ts
index 9e4bd9ac0..b28ef0908 100644
--- a/packages/mermaid/src/rendering-util/rendering-elements/shapes/iconCircle.ts
+++ b/packages/mermaid/src/rendering-util/rendering-elements/shapes/iconCircle.ts
@@ -106,6 +106,8 @@ export const iconCircle = async (
     iconShape.selectAll('path').attr('style', `stroke: ${stylesMap.get('fill')}`);
   }
 
+  iconShape.attr('class', 'icon-neo');
+
   updateNodeBounds(node, iconShape);
 
   node.intersect = function (point) {
diff --git a/packages/mermaid/src/rendering-util/rendering-elements/shapes/iconRounded.ts b/packages/mermaid/src/rendering-util/rendering-elements/shapes/iconRounded.ts
index ded887905..a89ffe40e 100644
--- a/packages/mermaid/src/rendering-util/rendering-elements/shapes/iconRounded.ts
+++ b/packages/mermaid/src/rendering-util/rendering-elements/shapes/iconRounded.ts
@@ -115,6 +115,8 @@ export const iconRounded = async (
     iconShape.selectAll('path').attr('style', `stroke: ${stylesMap.get('fill')}`);
   }
 
+  iconShape.attr('class', 'icon-neo');
+
   updateNodeBounds(node, iconShape);
 
   node.intersect = function (point) {
diff --git a/packages/mermaid/src/rendering-util/rendering-elements/shapes/iconSquare.ts b/packages/mermaid/src/rendering-util/rendering-elements/shapes/iconSquare.ts
index 5a2a74d6e..c4c9f9a55 100644
--- a/packages/mermaid/src/rendering-util/rendering-elements/shapes/iconSquare.ts
+++ b/packages/mermaid/src/rendering-util/rendering-elements/shapes/iconSquare.ts
@@ -127,6 +127,8 @@ export const iconSquare = async (
     iconShape.selectAll('path').attr('style', `stroke: ${stylesMap.get('fill')}`);
   }
 
+  iconShape.attr('class', 'icon-neo');
+
   updateNodeBounds(node, iconShape);
 
   node.intersect = function (point) {
diff --git a/packages/mermaid/src/styles.ts b/packages/mermaid/src/styles.ts
index 107f7dcbb..98bf19ab0 100644
--- a/packages/mermaid/src/styles.ts
+++ b/packages/mermaid/src/styles.ts
@@ -120,7 +120,7 @@ const getStyles = (
     filter: ${options.dropShadow};
   }
 
-    [data-look="neo"].icon-shape path {
+    [data-look="neo"].icon-shape .icon-neo path {
     stroke: ${options.useGradient ? 'url(' + svgId + '-gradient)' : options.nodeBorder};
     filter: ${options.dropShadow};
   }