diff --git a/packages/bpmn-editor/src/diagram/nodes/NodeIcons.tsx b/packages/bpmn-editor/src/diagram/nodes/NodeIcons.tsx
index 317e8e95cac..5346e2b872a 100644
--- a/packages/bpmn-editor/src/diagram/nodes/NodeIcons.tsx
+++ b/packages/bpmn-editor/src/diagram/nodes/NodeIcons.tsx
@@ -118,10 +118,10 @@ export function EndEventIcon({ variant }: { variant?: EventVariant }) {
   );
 }
 
-export function TaskIcon({ variant }: { variant?: TaskVariant }) {
+export function TaskIcon({ variant, isIcon }: { variant?: TaskVariant; isIcon?: boolean }) {
   return (
     <RoundSvg>
-      <TaskNodeSvg {...nodeSvgProps} variant={variant ?? "none"} isIcon={true} />
+      <TaskNodeSvg {...nodeSvgProps} variant={variant ?? "none"} isIcon={isIcon ?? false} />
     </RoundSvg>
   );
 }
@@ -134,10 +134,10 @@ export function CallActivityIcon() {
   );
 }
 
-export function GatewayIcon({ variant }: { variant?: GatewayVariant }) {
+export function GatewayIcon({ variant, isIcon }: { variant?: GatewayVariant; isIcon?: boolean }) {
   return (
     <RoundSvg>
-      <GatewayNodeSvg {...nodeSvgProps} width={200} height={200} variant={variant ?? "none"} isIcon={true} />
+      <GatewayNodeSvg {...nodeSvgProps} width={200} height={200} variant={variant ?? "none"} isIcon={isIcon ?? false} />
     </RoundSvg>
   );
 }
diff --git a/packages/bpmn-editor/src/diagram/nodes/NodeSvgs.tsx b/packages/bpmn-editor/src/diagram/nodes/NodeSvgs.tsx
index 2e9e216afce..fd09c0a30ff 100644
--- a/packages/bpmn-editor/src/diagram/nodes/NodeSvgs.tsx
+++ b/packages/bpmn-editor/src/diagram/nodes/NodeSvgs.tsx
@@ -352,12 +352,11 @@ export function TaskNodeSvg(
     width,
     height,
     strokeWidth,
-    props: { isIcon: _isIcon, ..._props },
+    props: { ..._props },
   } = normalize(__props);
 
-  const { variant } = { ..._props };
+  const { variant, isIcon } = { ..._props };
   const { markers: _markers, variant: _variant, ...props } = { ..._props };
-  const isIcon = _isIcon ?? false;
 
   const markers = useMemo(() => new Set(_markers), [_markers]);
   const iconSize = 200;
@@ -698,11 +697,10 @@ export function GatewayNodeSvg(__props: NodeSvgProps & { variant: GatewayVariant
     width,
     height,
     strokeWidth,
-    props: { isIcon: _isIcon, ..._props },
+    props: { ..._props },
   } = normalize(__props);
 
-  const { variant, ...props } = { ..._props };
-  const isIcon = _isIcon ?? false;
+  const { variant, isIcon, ...props } = { ..._props };
   const iconOffset = isIcon ? 25 : 0;
 
   return (
diff --git a/packages/bpmn-editor/src/diagram/nodes/morphing/useGatewayNodeMorphingActions.tsx b/packages/bpmn-editor/src/diagram/nodes/morphing/useGatewayNodeMorphingActions.tsx
index dc4fc963c2b..6d79ef0e08b 100644
--- a/packages/bpmn-editor/src/diagram/nodes/morphing/useGatewayNodeMorphingActions.tsx
+++ b/packages/bpmn-editor/src/diagram/nodes/morphing/useGatewayNodeMorphingActions.tsx
@@ -67,35 +67,35 @@ export function useGatewayNodeMorphingActions(gateway: Gateway) {
   const morphingActions = useMemo(() => {
     return [
       {
-        icon: <GatewayIcon variant={"parallelGateway"} />,
+        icon: <GatewayIcon variant={"parallelGateway"} isIcon={true} />,
         key: "1",
         title: "Parallel",
         id: "parallelGateway",
         action: () => morphGateway("parallelGateway"),
       } as const,
       {
-        icon: <GatewayIcon variant={"exclusiveGateway"} />,
+        icon: <GatewayIcon variant={"exclusiveGateway"} isIcon={true} />,
         key: "2",
         title: "Exclusive",
         id: "exclusiveGateway",
         action: () => morphGateway("exclusiveGateway"),
       } as const,
       {
-        icon: <GatewayIcon variant={"inclusiveGateway"} />,
+        icon: <GatewayIcon variant={"inclusiveGateway"} isIcon={true} />,
         key: "3",
         title: "Inclusive",
         id: "inclusiveGateway",
         action: () => morphGateway("inclusiveGateway"),
       } as const,
       {
-        icon: <GatewayIcon variant={"eventBasedGateway"} />,
+        icon: <GatewayIcon variant={"eventBasedGateway"} isIcon={true} />,
         key: "4",
         title: "Event",
         id: "eventBasedGateway",
         action: () => morphGateway("eventBasedGateway"),
       } as const,
       {
-        icon: <GatewayIcon variant={"complexGateway"} />,
+        icon: <GatewayIcon variant={"complexGateway"} isIcon={true} />,
         key: "5",
         title: "Complex",
         id: "complexGateway",
diff --git a/packages/bpmn-editor/src/diagram/nodes/morphing/useTaskNodeMorphingActions.tsx b/packages/bpmn-editor/src/diagram/nodes/morphing/useTaskNodeMorphingActions.tsx
index b172067e73b..685e24225b0 100644
--- a/packages/bpmn-editor/src/diagram/nodes/morphing/useTaskNodeMorphingActions.tsx
+++ b/packages/bpmn-editor/src/diagram/nodes/morphing/useTaskNodeMorphingActions.tsx
@@ -68,28 +68,28 @@ export function useTaskNodeMorphingActions(task: Task) {
   const morphingActions = useMemo(() => {
     return [
       {
-        icon: <TaskIcon variant={"userTask"} />,
+        icon: <TaskIcon variant={"userTask"} isIcon={true} />,
         key: "1",
         title: "User task",
         id: "userTask",
         action: () => morphTask("userTask"),
       } as const,
       {
-        icon: <TaskIcon variant={"businessRuleTask"} />,
+        icon: <TaskIcon variant={"businessRuleTask"} isIcon={true} />,
         key: "2",
         title: "Business Rule task",
         id: "businessRuleTask",
         action: () => morphTask("businessRuleTask"),
       } as const,
       {
-        icon: <TaskIcon variant={"serviceTask"} />,
+        icon: <TaskIcon variant={"serviceTask"} isIcon={true} />,
         key: "3",
         title: "Service task",
         id: "serviceTask",
         action: () => morphTask("serviceTask"),
       } as const,
       {
-        icon: <TaskIcon variant={"scriptTask"} />,
+        icon: <TaskIcon variant={"scriptTask"} isIcon={true} />,
         key: "4",
         title: "Script task",
         id: "scriptTask",
diff --git a/packages/bpmn-editor/src/propertiesPanel/singleNodeProperties/BusinessRuleTaskProperties.tsx b/packages/bpmn-editor/src/propertiesPanel/singleNodeProperties/BusinessRuleTaskProperties.tsx
index 78c11704f94..c30802c0296 100644
--- a/packages/bpmn-editor/src/propertiesPanel/singleNodeProperties/BusinessRuleTaskProperties.tsx
+++ b/packages/bpmn-editor/src/propertiesPanel/singleNodeProperties/BusinessRuleTaskProperties.tsx
@@ -52,7 +52,7 @@ export function BusinessRuleTaskProperties({
     <>
       <PropertiesPanelHeaderFormSection
         title={businessRuleTask["@_name"] || "Business rule task"}
-        icon={<TaskIcon variant={businessRuleTask.__$$element} />}
+        icon={<TaskIcon variant={businessRuleTask.__$$element} isIcon={true} />}
       >
         <NameDocumentationAndId element={businessRuleTask} />
         <Divider inset={{ default: "insetXs" }} />
diff --git a/packages/bpmn-editor/src/propertiesPanel/singleNodeProperties/ComplexGatewayProperties.tsx b/packages/bpmn-editor/src/propertiesPanel/singleNodeProperties/ComplexGatewayProperties.tsx
index bf95459b428..30f2b305662 100644
--- a/packages/bpmn-editor/src/propertiesPanel/singleNodeProperties/ComplexGatewayProperties.tsx
+++ b/packages/bpmn-editor/src/propertiesPanel/singleNodeProperties/ComplexGatewayProperties.tsx
@@ -32,7 +32,7 @@ export function ComplexGatewayProperties({
   return (
     <PropertiesPanelHeaderFormSection
       title={complexGateway["@_name"] || "Complex gateway"}
-      icon={<GatewayIcon variant={"complexGateway"} />}
+      icon={<GatewayIcon variant={"complexGateway"} isIcon={true} />}
     >
       <NameDocumentationAndId element={complexGateway} />
     </PropertiesPanelHeaderFormSection>
diff --git a/packages/bpmn-editor/src/propertiesPanel/singleNodeProperties/EventBasedGatewayProperties.tsx b/packages/bpmn-editor/src/propertiesPanel/singleNodeProperties/EventBasedGatewayProperties.tsx
index adaf97a7c3c..fd0e73801f0 100644
--- a/packages/bpmn-editor/src/propertiesPanel/singleNodeProperties/EventBasedGatewayProperties.tsx
+++ b/packages/bpmn-editor/src/propertiesPanel/singleNodeProperties/EventBasedGatewayProperties.tsx
@@ -33,7 +33,7 @@ export function EventBasedGatewayProperties({
   return (
     <PropertiesPanelHeaderFormSection
       title={eventBasedGateway["@_name"] || "Event-based gateway"}
-      icon={<GatewayIcon variant={eventBasedGateway.__$$element} />}
+      icon={<GatewayIcon variant={eventBasedGateway.__$$element} isIcon={true} />}
     >
       <NameDocumentationAndId element={eventBasedGateway} />
     </PropertiesPanelHeaderFormSection>
diff --git a/packages/bpmn-editor/src/propertiesPanel/singleNodeProperties/ExclusiveGatewayProperties.tsx b/packages/bpmn-editor/src/propertiesPanel/singleNodeProperties/ExclusiveGatewayProperties.tsx
index 64c6f6e4956..84653dc5ead 100644
--- a/packages/bpmn-editor/src/propertiesPanel/singleNodeProperties/ExclusiveGatewayProperties.tsx
+++ b/packages/bpmn-editor/src/propertiesPanel/singleNodeProperties/ExclusiveGatewayProperties.tsx
@@ -34,7 +34,7 @@ export function ExclusiveGatewayProperties({
   return (
     <PropertiesPanelHeaderFormSection
       title={exclusiveGateway["@_name"] || "Exclusive gateway"}
-      icon={<GatewayIcon variant={exclusiveGateway.__$$element} />}
+      icon={<GatewayIcon variant={exclusiveGateway.__$$element} isIcon={true} />}
     >
       <NameDocumentationAndId element={exclusiveGateway} />
 
diff --git a/packages/bpmn-editor/src/propertiesPanel/singleNodeProperties/InclusiveGatewayProperties.tsx b/packages/bpmn-editor/src/propertiesPanel/singleNodeProperties/InclusiveGatewayProperties.tsx
index 7bc6dd6f2e2..4744db7e283 100644
--- a/packages/bpmn-editor/src/propertiesPanel/singleNodeProperties/InclusiveGatewayProperties.tsx
+++ b/packages/bpmn-editor/src/propertiesPanel/singleNodeProperties/InclusiveGatewayProperties.tsx
@@ -34,7 +34,7 @@ export function InclusiveGatewayProperties({
   return (
     <PropertiesPanelHeaderFormSection
       title={inclusiveGateway["@_name"] || "Inclusive gateway"}
-      icon={<GatewayIcon variant={inclusiveGateway.__$$element} />}
+      icon={<GatewayIcon variant={inclusiveGateway.__$$element} isIcon={true} />}
     >
       <NameDocumentationAndId element={inclusiveGateway} />
 
diff --git a/packages/bpmn-editor/src/propertiesPanel/singleNodeProperties/ParallelGatewayProperties.tsx b/packages/bpmn-editor/src/propertiesPanel/singleNodeProperties/ParallelGatewayProperties.tsx
index b0cd7ab3784..db50350b4aa 100644
--- a/packages/bpmn-editor/src/propertiesPanel/singleNodeProperties/ParallelGatewayProperties.tsx
+++ b/packages/bpmn-editor/src/propertiesPanel/singleNodeProperties/ParallelGatewayProperties.tsx
@@ -33,7 +33,7 @@ export function ParallelGatewayProperties({
   return (
     <PropertiesPanelHeaderFormSection
       title={parallelGateway["@_name"] || "Parallel gateway"}
-      icon={<GatewayIcon variant={parallelGateway.__$$element} />}
+      icon={<GatewayIcon variant={parallelGateway.__$$element} isIcon={true} />}
     >
       <NameDocumentationAndId element={parallelGateway} />
     </PropertiesPanelHeaderFormSection>
diff --git a/packages/bpmn-editor/src/propertiesPanel/singleNodeProperties/ScriptTaskProperties.tsx b/packages/bpmn-editor/src/propertiesPanel/singleNodeProperties/ScriptTaskProperties.tsx
index f5f3b7f44e7..0ed700639e4 100644
--- a/packages/bpmn-editor/src/propertiesPanel/singleNodeProperties/ScriptTaskProperties.tsx
+++ b/packages/bpmn-editor/src/propertiesPanel/singleNodeProperties/ScriptTaskProperties.tsx
@@ -39,7 +39,7 @@ export function ScriptTaskProperties({
     <>
       <PropertiesPanelHeaderFormSection
         title={scriptTask["@_name"] || "Script task"}
-        icon={<TaskIcon variant={scriptTask.__$$element} />}
+        icon={<TaskIcon variant={scriptTask.__$$element} isIcon={true} />}
       >
         <NameDocumentationAndId element={scriptTask} />
 
diff --git a/packages/bpmn-editor/src/propertiesPanel/singleNodeProperties/ServiceTaskProperties.tsx b/packages/bpmn-editor/src/propertiesPanel/singleNodeProperties/ServiceTaskProperties.tsx
index 87fd3e198c0..d9c355d1bcc 100644
--- a/packages/bpmn-editor/src/propertiesPanel/singleNodeProperties/ServiceTaskProperties.tsx
+++ b/packages/bpmn-editor/src/propertiesPanel/singleNodeProperties/ServiceTaskProperties.tsx
@@ -54,7 +54,7 @@ export function ServiceTaskProperties({
     <>
       <PropertiesPanelHeaderFormSection
         title={serviceTask["@_name"] || "Service task"}
-        icon={<TaskIcon variant={serviceTask.__$$element} />}
+        icon={<TaskIcon variant={serviceTask.__$$element} isIcon={true} />}
       >
         <NameDocumentationAndId element={serviceTask} />
 
diff --git a/packages/bpmn-editor/src/propertiesPanel/singleNodeProperties/UserTaskProperties.tsx b/packages/bpmn-editor/src/propertiesPanel/singleNodeProperties/UserTaskProperties.tsx
index 8413765f57a..1ee7d223e16 100644
--- a/packages/bpmn-editor/src/propertiesPanel/singleNodeProperties/UserTaskProperties.tsx
+++ b/packages/bpmn-editor/src/propertiesPanel/singleNodeProperties/UserTaskProperties.tsx
@@ -42,7 +42,7 @@ export function UserTaskProperties({
     <>
       <PropertiesPanelHeaderFormSection
         title={userTask["@_name"] || "User task"}
-        icon={<TaskIcon variant={userTask.__$$element} />}
+        icon={<TaskIcon variant={userTask.__$$element} isIcon={true} />}
       >
         <NameDocumentationAndId element={userTask} />