diff --git a/src/frontend/src/CustomNodes/GenericNode/index.tsx b/src/frontend/src/CustomNodes/GenericNode/index.tsx
index afa2558f7..9a6f818f2 100644
--- a/src/frontend/src/CustomNodes/GenericNode/index.tsx
+++ b/src/frontend/src/CustomNodes/GenericNode/index.tsx
@@ -176,7 +176,7 @@ export default function GenericNode({
               <IconComponent
                 name={data.node?.flow ? "Ungroup" : name}
                 className={
-                  "generic-node-icon " +
+                  "generic-node-icon" +
                   (!showNode && "absolute inset-x-6 h-12 w-12")
                 }
                 iconColor={`${nodeColors[types[data.type]]}`}
diff --git a/src/frontend/src/components/genericIconComponent/index.tsx b/src/frontend/src/components/genericIconComponent/index.tsx
index db415ed5b..d040cbe7e 100644
--- a/src/frontend/src/components/genericIconComponent/index.tsx
+++ b/src/frontend/src/components/genericIconComponent/index.tsx
@@ -8,14 +8,19 @@ const ForwardedIconComponent = forwardRef(
     ref
   ) => {
     const TargetIcon = nodeIconsLucide[name] ?? nodeIconsLucide["unknown"];
+
+    const style = {
+      strokeWidth: 1.5,
+      className: className,
+      ...(stroke && { stroke: stroke }),
+      ...(iconColor && { color: iconColor, stroke: stroke }),
+    };
+
     return (
       <TargetIcon
-        strokeWidth={1.5}
-        className={className}
-        style={iconColor ? { color: iconColor } : {}}
+        style={style}
         ref={ref}
-        stroke={stroke ? stroke : "currentColor"}
-        data-testid={id ? `${id}-${name}` : "icon-" + name}
+        data-testid={id ? `${id}-${name}` : `icon-${name}`}
       />
     );
   }