diff --git a/components/bpmn-q/modeler-component/extensions/quantme/modeling/QuantMEReplaceOptions.js b/components/bpmn-q/modeler-component/extensions/quantme/modeling/QuantMEReplaceOptions.js
index 49856715..3c406a6b 100644
--- a/components/bpmn-q/modeler-component/extensions/quantme/modeling/QuantMEReplaceOptions.js
+++ b/components/bpmn-q/modeler-component/extensions/quantme/modeling/QuantMEReplaceOptions.js
@@ -146,7 +146,7 @@ export var SUBPROCESS = [
   {
     label: 'Quantum Hardware Selection Subprocess',
     actionName: 'replace-with-hardware-selection-subprocess',
-    className: 'qwm quantme-tasks-icon-hardware-selection',
+    className: 'qwm bpmn-quantme-tasks-icon-hardware-selection',
     target: {
       type: consts.QUANTUM_HARDWARE_SELECTION_SUBPROCESS
     }
@@ -154,7 +154,7 @@ export var SUBPROCESS = [
   {
     label: 'Circuit Cutting Subprocess',
     actionName: 'replace-with-circuit-cutting-subprocess',
-    className: 'qwm quantme-tasks-icon-cutting',
+    className: 'qwm bpmn-quantme-tasks-icon-cutting',
     target: {
       type: consts.CIRCUIT_CUTTING_SUBPROCESS
     }
diff --git a/components/bpmn-q/modeler-component/extensions/quantme/styling/quantme.css b/components/bpmn-q/modeler-component/extensions/quantme/styling/quantme.css
index a8bdf001..b7fc749a 100644
--- a/components/bpmn-q/modeler-component/extensions/quantme/styling/quantme.css
+++ b/components/bpmn-q/modeler-component/extensions/quantme/styling/quantme.css
@@ -422,10 +422,34 @@
     margin-top: 3px;
 }
 
+.qwm .bpmn-quantme-tasks-icon-hardware-selection:before {
+    content: "";
+    height: 15px;
+    background-size: contain;
+    background-image: url("../resources/QuantumHardwareSelectionSubprocess_Menu_Icon.svg");
+    background-repeat: no-repeat;
+    display: inline-block;
+    margin-top: 3px;
+}
+
+.qwm .bpmn-quantme-tasks-icon-cutting:before {
+    content: "";
+    height: 15px;
+    background-size: contain;
+    background-image: url("../resources/CuttingSubprocess_Icon.svg");
+    background-repeat: no-repeat;
+    display: inline-block;
+    margin-top: 3px;
+}
+
 .djs-popup-label {
     margin-top: -2px;
 }
 
 .djs-popup-entry-name .qwm .quantme-tasks-icon-result-evaluation {
     margin-top: 5px;
-}
\ No newline at end of file
+}
+
+.djs-popup-results .djs-popup-group .entry[data-id="replace-with-hardware-selection-subprocess"] .djs-popup-label {
+    margin-left: 10px; /* Adjust the value as per your requirements */
+  }
diff --git a/components/bpmn-q/package-lock.json b/components/bpmn-q/package-lock.json
index ddcbc459..91a545e7 100644
--- a/components/bpmn-q/package-lock.json
+++ b/components/bpmn-q/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@planqk/quantum-workflow-modeler",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@planqk/quantum-workflow-modeler",
-      "version": "0.1.7",
+      "version": "0.1.8",
       "license": "Apache-2.0",
       "dependencies": {
         "@bpmn-io/properties-panel": "^1.3.1",