diff --git a/package-lock.json b/package-lock.json
index 6d2fdbfdca14abfe4830a60c62a2383f44de06ef..23865d19e08bd2cb6fc52afa156cf98847752843 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
         "@ahooksjs/use-url-state": "^3.5.0",
         "@emotion/react": "^11.11.1",
         "@emotion/styled": "^11.11.0",
-        "@ess-ics/ce-ui-common": "^3.2.0",
+        "@ess-ics/ce-ui-common": "^4.0.0",
         "@fontsource/roboto": "^4.1.0",
         "@mui/icons-material": "^5.14.1",
         "@mui/material": "^5.14.1",
@@ -2026,11 +2026,11 @@
       "dev": true
     },
     "node_modules/@babel/runtime": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.6.tgz",
-      "integrity": "sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.5.tgz",
+      "integrity": "sha512-NdUTHcPe4C99WxPub+K9l9tK5/lV4UXIoaHSYgzco9BCyjKAAwzdBI+wWtYqHt7LJdbo74ZjRPJgzVweq1sz0w==",
       "dependencies": {
-        "regenerator-runtime": "^0.13.11"
+        "regenerator-runtime": "^0.14.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2048,6 +2048,11 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@babel/runtime/node_modules/regenerator-runtime": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
+      "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="
+    },
     "node_modules/@babel/template": {
       "version": "7.20.7",
       "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz",
@@ -2656,9 +2661,9 @@
       }
     },
     "node_modules/@ess-ics/ce-ui-common": {
-      "version": "3.2.0",
-      "resolved": "https://artifactory.esss.lu.se/artifactory/api/npm/ics-npm/@ess-ics/ce-ui-common/-/ce-ui-common-3.2.0.tgz",
-      "integrity": "sha1-3RANHrN15+IfL+Z/J/W+M5YGk+8=",
+      "version": "4.0.0",
+      "resolved": "https://artifactory.esss.lu.se/artifactory/api/npm/ics-npm/@ess-ics/ce-ui-common/-/ce-ui-common-4.0.0.tgz",
+      "integrity": "sha1-YnesIrN73spxgZvW93B5aGvQS6s=",
       "dependencies": {
         "@fontsource/titillium-web": "^4.5.9",
         "@mui/x-data-grid-pro": "^6.5.0",
@@ -4308,13 +4313,12 @@
       }
     },
     "node_modules/@mui/utils": {
-      "version": "5.14.1",
-      "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.14.1.tgz",
-      "integrity": "sha512-39KHKK2JeqRmuUcLDLwM+c2XfVC136C5/yUyQXmO2PVbOb2Bol4KxtkssEqCbTwg87PSCG3f1Tb0keRsK7cVGw==",
+      "version": "5.14.20",
+      "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.14.20.tgz",
+      "integrity": "sha512-Y6yL5MoFmtQml20DZnaaK1znrCEwG6/vRSzW8PKOTrzhyqKIql0FazZRUR7sA5EPASgiyKZfq0FPwISRXm5NdA==",
       "dependencies": {
-        "@babel/runtime": "^7.22.6",
-        "@types/prop-types": "^15.7.5",
-        "@types/react-is": "^18.2.1",
+        "@babel/runtime": "^7.23.4",
+        "@types/prop-types": "^15.7.11",
         "prop-types": "^15.8.1",
         "react-is": "^18.2.0"
       },
@@ -4323,10 +4327,16 @@
       },
       "funding": {
         "type": "opencollective",
-        "url": "https://opencollective.com/mui"
+        "url": "https://opencollective.com/mui-org"
       },
       "peerDependencies": {
+        "@types/react": "^17.0.0 || ^18.0.0",
         "react": "^17.0.0 || ^18.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
       }
     },
     "node_modules/@mui/utils/node_modules/react-is": {
@@ -4335,13 +4345,13 @@
       "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
     },
     "node_modules/@mui/x-data-grid": {
-      "version": "6.10.2",
-      "resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-6.10.2.tgz",
-      "integrity": "sha512-s4+DF1RstnnOcxWyFdjKJoLdhAhbmb+4ode5t9q9mdl1imbrmD2BNXmG/OZS4nlwYsanvK8d6qQ8w/cT/5eLiw==",
+      "version": "6.18.4",
+      "resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-6.18.4.tgz",
+      "integrity": "sha512-uiinfqioCRoesUlJF3gvh67Ja3TrJJvPRTu4Gkf/RQBjr0BDNQ8BJrnuffqD8D/0SVUiqRZvcrjtgG1BIyjKRw==",
       "dependencies": {
-        "@babel/runtime": "^7.22.6",
-        "@mui/utils": "^5.13.7",
-        "clsx": "^1.2.1",
+        "@babel/runtime": "^7.23.2",
+        "@mui/utils": "^5.14.16",
+        "clsx": "^2.0.0",
         "prop-types": "^15.8.1",
         "reselect": "^4.1.8"
       },
@@ -4360,16 +4370,16 @@
       }
     },
     "node_modules/@mui/x-data-grid-pro": {
-      "version": "6.10.2",
-      "resolved": "https://registry.npmjs.org/@mui/x-data-grid-pro/-/x-data-grid-pro-6.10.2.tgz",
-      "integrity": "sha512-9xB68J9mnvaH0kJyjOaIFiIxvvCZPQUlTmb7LpxsW5WsOOzpgbLJURVFITJ8GTDPfiwIlFGce624+HcDFHZN8Q==",
+      "version": "6.18.4",
+      "resolved": "https://registry.npmjs.org/@mui/x-data-grid-pro/-/x-data-grid-pro-6.18.4.tgz",
+      "integrity": "sha512-xcQFNvf8p8EU6K05uDd9k83nfRm4UkffxXvXH9RRvV2B4rfcfsGlRZRpmt0+LeGh8jSdMNnAfSGLMgzbCXJ08A==",
       "dependencies": {
-        "@babel/runtime": "^7.22.6",
-        "@mui/utils": "^5.13.7",
-        "@mui/x-data-grid": "6.10.2",
+        "@babel/runtime": "^7.23.2",
+        "@mui/utils": "^5.14.16",
+        "@mui/x-data-grid": "6.18.4",
         "@mui/x-license-pro": "6.10.2",
-        "@types/format-util": "^1.0.2",
-        "clsx": "^1.2.1",
+        "@types/format-util": "^1.0.3",
+        "clsx": "^2.0.0",
         "prop-types": "^15.8.1",
         "reselect": "^4.1.8"
       },
@@ -4383,6 +4393,22 @@
         "react-dom": "^17.0.0 || ^18.0.0"
       }
     },
+    "node_modules/@mui/x-data-grid-pro/node_modules/clsx": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.0.0.tgz",
+      "integrity": "sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@mui/x-data-grid/node_modules/clsx": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.0.0.tgz",
+      "integrity": "sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/@mui/x-license-pro": {
       "version": "6.10.2",
       "resolved": "https://registry.npmjs.org/@mui/x-license-pro/-/x-license-pro-6.10.2.tgz",
@@ -8143,9 +8169,9 @@
       "dev": true
     },
     "node_modules/@types/format-util": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@types/format-util/-/format-util-1.0.2.tgz",
-      "integrity": "sha512-9SrLCpgzWo2yHHhiMOX0WwgDh37nSbDbWUsRc1ss++o8O97E3tB6SJiyUQM21UeUsKvZNuhDCmkRaINZ4uJAfg=="
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@types/format-util/-/format-util-1.0.4.tgz",
+      "integrity": "sha512-xrCYOdHh5zA3LUrn6CvspYwlzSWxPso11Lx32WnAG6KvLCRecKZ/Rh21PLXUkzUFsQmrGcx/traJAFjR6dVS5Q=="
     },
     "node_modules/@types/glob": {
       "version": "8.1.0",
@@ -8358,9 +8384,9 @@
       "dev": true
     },
     "node_modules/@types/prop-types": {
-      "version": "15.7.5",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
-      "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
+      "version": "15.7.11",
+      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.11.tgz",
+      "integrity": "sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng=="
     },
     "node_modules/@types/q": {
       "version": "1.5.5",
@@ -8384,14 +8410,6 @@
         "csstype": "^3.0.2"
       }
     },
-    "node_modules/@types/react-is": {
-      "version": "18.2.1",
-      "resolved": "https://registry.npmjs.org/@types/react-is/-/react-is-18.2.1.tgz",
-      "integrity": "sha512-wyUkmaaSZEzFZivD8F2ftSyAfk6L+DfFliVj/mYdOXbVjRcS87fQJLTnhk6dRZPuJjI+9g6RZJO4PNCngUrmyw==",
-      "dependencies": {
-        "@types/react": "*"
-      }
-    },
     "node_modules/@types/react-transition-group": {
       "version": "4.4.6",
       "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.6.tgz",
@@ -9099,9 +9117,9 @@
       }
     },
     "node_modules/ace-builds": {
-      "version": "1.23.4",
-      "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.23.4.tgz",
-      "integrity": "sha512-a4hKAT2T7KNUQC4LQPW2peuoEsZmLYTn4Dwjkh26A3Z+fQ8/fA2JZNs3V6CqvivhbyMQXQJD1u/0qTCoSS6deA=="
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.32.0.tgz",
+      "integrity": "sha512-5EFblRIaqjwumglq1o7hF9/rA9WZBqwn6eyfYB6ZiQbf036gF5CW3HqFk+7pRx3+1A4KsNMZUnN2NEfYrJTfDA=="
     },
     "node_modules/acorn": {
       "version": "7.4.1",
@@ -41218,11 +41236,18 @@
       "dev": true
     },
     "@babel/runtime": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.6.tgz",
-      "integrity": "sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.5.tgz",
+      "integrity": "sha512-NdUTHcPe4C99WxPub+K9l9tK5/lV4UXIoaHSYgzco9BCyjKAAwzdBI+wWtYqHt7LJdbo74ZjRPJgzVweq1sz0w==",
       "requires": {
-        "regenerator-runtime": "^0.13.11"
+        "regenerator-runtime": "^0.14.0"
+      },
+      "dependencies": {
+        "regenerator-runtime": {
+          "version": "0.14.0",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
+          "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="
+        }
       }
     },
     "@babel/runtime-corejs3": {
@@ -41737,9 +41762,9 @@
       "dev": true
     },
     "@ess-ics/ce-ui-common": {
-      "version": "3.2.0",
-      "resolved": "https://artifactory.esss.lu.se/artifactory/api/npm/ics-npm/@ess-ics/ce-ui-common/-/ce-ui-common-3.2.0.tgz",
-      "integrity": "sha1-3RANHrN15+IfL+Z/J/W+M5YGk+8=",
+      "version": "4.0.0",
+      "resolved": "https://artifactory.esss.lu.se/artifactory/api/npm/ics-npm/@ess-ics/ce-ui-common/-/ce-ui-common-4.0.0.tgz",
+      "integrity": "sha1-YnesIrN73spxgZvW93B5aGvQS6s=",
       "requires": {
         "@fontsource/titillium-web": "^4.5.9",
         "@mui/x-data-grid-pro": "^6.5.0",
@@ -42960,13 +42985,12 @@
       "requires": {}
     },
     "@mui/utils": {
-      "version": "5.14.1",
-      "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.14.1.tgz",
-      "integrity": "sha512-39KHKK2JeqRmuUcLDLwM+c2XfVC136C5/yUyQXmO2PVbOb2Bol4KxtkssEqCbTwg87PSCG3f1Tb0keRsK7cVGw==",
+      "version": "5.14.20",
+      "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.14.20.tgz",
+      "integrity": "sha512-Y6yL5MoFmtQml20DZnaaK1znrCEwG6/vRSzW8PKOTrzhyqKIql0FazZRUR7sA5EPASgiyKZfq0FPwISRXm5NdA==",
       "requires": {
-        "@babel/runtime": "^7.22.6",
-        "@types/prop-types": "^15.7.5",
-        "@types/react-is": "^18.2.1",
+        "@babel/runtime": "^7.23.4",
+        "@types/prop-types": "^15.7.11",
         "prop-types": "^15.8.1",
         "react-is": "^18.2.0"
       },
@@ -42979,30 +43003,44 @@
       }
     },
     "@mui/x-data-grid": {
-      "version": "6.10.2",
-      "resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-6.10.2.tgz",
-      "integrity": "sha512-s4+DF1RstnnOcxWyFdjKJoLdhAhbmb+4ode5t9q9mdl1imbrmD2BNXmG/OZS4nlwYsanvK8d6qQ8w/cT/5eLiw==",
+      "version": "6.18.4",
+      "resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-6.18.4.tgz",
+      "integrity": "sha512-uiinfqioCRoesUlJF3gvh67Ja3TrJJvPRTu4Gkf/RQBjr0BDNQ8BJrnuffqD8D/0SVUiqRZvcrjtgG1BIyjKRw==",
       "requires": {
-        "@babel/runtime": "^7.22.6",
-        "@mui/utils": "^5.13.7",
-        "clsx": "^1.2.1",
+        "@babel/runtime": "^7.23.2",
+        "@mui/utils": "^5.14.16",
+        "clsx": "^2.0.0",
         "prop-types": "^15.8.1",
         "reselect": "^4.1.8"
+      },
+      "dependencies": {
+        "clsx": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.0.0.tgz",
+          "integrity": "sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q=="
+        }
       }
     },
     "@mui/x-data-grid-pro": {
-      "version": "6.10.2",
-      "resolved": "https://registry.npmjs.org/@mui/x-data-grid-pro/-/x-data-grid-pro-6.10.2.tgz",
-      "integrity": "sha512-9xB68J9mnvaH0kJyjOaIFiIxvvCZPQUlTmb7LpxsW5WsOOzpgbLJURVFITJ8GTDPfiwIlFGce624+HcDFHZN8Q==",
+      "version": "6.18.4",
+      "resolved": "https://registry.npmjs.org/@mui/x-data-grid-pro/-/x-data-grid-pro-6.18.4.tgz",
+      "integrity": "sha512-xcQFNvf8p8EU6K05uDd9k83nfRm4UkffxXvXH9RRvV2B4rfcfsGlRZRpmt0+LeGh8jSdMNnAfSGLMgzbCXJ08A==",
       "requires": {
-        "@babel/runtime": "^7.22.6",
-        "@mui/utils": "^5.13.7",
-        "@mui/x-data-grid": "6.10.2",
+        "@babel/runtime": "^7.23.2",
+        "@mui/utils": "^5.14.16",
+        "@mui/x-data-grid": "6.18.4",
         "@mui/x-license-pro": "6.10.2",
-        "@types/format-util": "^1.0.2",
-        "clsx": "^1.2.1",
+        "@types/format-util": "^1.0.3",
+        "clsx": "^2.0.0",
         "prop-types": "^15.8.1",
         "reselect": "^4.1.8"
+      },
+      "dependencies": {
+        "clsx": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.0.0.tgz",
+          "integrity": "sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q=="
+        }
       }
     },
     "@mui/x-license-pro": {
@@ -45660,9 +45698,9 @@
       "dev": true
     },
     "@types/format-util": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@types/format-util/-/format-util-1.0.2.tgz",
-      "integrity": "sha512-9SrLCpgzWo2yHHhiMOX0WwgDh37nSbDbWUsRc1ss++o8O97E3tB6SJiyUQM21UeUsKvZNuhDCmkRaINZ4uJAfg=="
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@types/format-util/-/format-util-1.0.4.tgz",
+      "integrity": "sha512-xrCYOdHh5zA3LUrn6CvspYwlzSWxPso11Lx32WnAG6KvLCRecKZ/Rh21PLXUkzUFsQmrGcx/traJAFjR6dVS5Q=="
     },
     "@types/glob": {
       "version": "8.1.0",
@@ -45868,9 +45906,9 @@
       "dev": true
     },
     "@types/prop-types": {
-      "version": "15.7.5",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
-      "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
+      "version": "15.7.11",
+      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.11.tgz",
+      "integrity": "sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng=="
     },
     "@types/q": {
       "version": "1.5.5",
@@ -45894,14 +45932,6 @@
         "csstype": "^3.0.2"
       }
     },
-    "@types/react-is": {
-      "version": "18.2.1",
-      "resolved": "https://registry.npmjs.org/@types/react-is/-/react-is-18.2.1.tgz",
-      "integrity": "sha512-wyUkmaaSZEzFZivD8F2ftSyAfk6L+DfFliVj/mYdOXbVjRcS87fQJLTnhk6dRZPuJjI+9g6RZJO4PNCngUrmyw==",
-      "requires": {
-        "@types/react": "*"
-      }
-    },
     "@types/react-transition-group": {
       "version": "4.4.6",
       "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.6.tgz",
@@ -46476,9 +46506,9 @@
       }
     },
     "ace-builds": {
-      "version": "1.23.4",
-      "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.23.4.tgz",
-      "integrity": "sha512-a4hKAT2T7KNUQC4LQPW2peuoEsZmLYTn4Dwjkh26A3Z+fQ8/fA2JZNs3V6CqvivhbyMQXQJD1u/0qTCoSS6deA=="
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.32.0.tgz",
+      "integrity": "sha512-5EFblRIaqjwumglq1o7hF9/rA9WZBqwn6eyfYB6ZiQbf036gF5CW3HqFk+7pRx3+1A4KsNMZUnN2NEfYrJTfDA=="
     },
     "acorn": {
       "version": "7.4.1",
diff --git a/package.json b/package.json
index d7861dfe7ee597b63c12e3b71b308ff0ceef8c90..e0d090e6e17f61b7d0b310edc02915ba5fa299aa 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "@ahooksjs/use-url-state": "^3.5.0",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
-    "@ess-ics/ce-ui-common": "^3.2.0",
+    "@ess-ics/ce-ui-common": "^4.0.0",
     "@fontsource/roboto": "^4.1.0",
     "@mui/icons-material": "^5.14.1",
     "@mui/material": "^5.14.1",
diff --git a/src/components/IOC/IOCIcons/IOCIcons.js b/src/components/IOC/IOCIcons/IOCIcons.js
index 40781b5753337aa73191cba531f2d52070a17aca..65a7e98d4cf06dc1010fd4115f8e006a84d9e304 100644
--- a/src/components/IOC/IOCIcons/IOCIcons.js
+++ b/src/components/IOC/IOCIcons/IOCIcons.js
@@ -173,8 +173,8 @@ export function CommandTypeIcon({
   const theme = useTheme();
 
   const commandTypeColors = {
-    start: theme.palette.status.ok,
-    stop: theme.palette.status.fail
+    start: theme.palette.status.ok.main,
+    stop: theme.palette.status.fail.main
   };
 
   const commandTypeBlack = {
diff --git a/src/components/Job/JobStatus.js b/src/components/Job/JobStatus.js
index eca307f5ec533e05684f12edf422bad2b80571ca..ed7aa1d40215086c6495acde8a7d30ca3158e957 100644
--- a/src/components/Job/JobStatus.js
+++ b/src/components/Job/JobStatus.js
@@ -14,19 +14,19 @@ const STEPPER_STATUS = {
     label: "Queued",
     alertType: "info",
     icon: RotateRightOutlined,
-    color: theme.palette.status.progress
+    color: theme.palette.status.progress.main
   },
   running: {
     label: "Running",
     alertType: "info",
     icon: RotateRightOutlined,
-    color: theme.palette.status.progress
+    color: theme.palette.status.progress.main
   },
   successful: {
     label: "Completed",
     alertType: "success",
     icon: CheckCircleOutline,
-    color: theme.palette.status.ok
+    color: theme.palette.status.ok.main
   }
 };
 
@@ -36,13 +36,13 @@ const STATUS = {
     label: "Error",
     alertType: "error",
     icon: ErrorOutline,
-    color: theme.palette.status.fail
+    color: theme.palette.status.fail.main
   },
   unknown: {
     label: "Unknown",
     alertType: "info",
     icon: HelpOutline,
-    color: theme.palette.disabled
+    color: theme.palette.status.disabled.main
   }
 };
 
diff --git a/src/components/deployments/DeploymentIcons.js b/src/components/deployments/DeploymentIcons.js
index b7794ff07b7bfdd892d79a119fa04c88752d509d..8f846303f5bd06277721d7d5e26d8ab4fa894b9f 100644
--- a/src/components/deployments/DeploymentIcons.js
+++ b/src/components/deployments/DeploymentIcons.js
@@ -31,10 +31,10 @@ export function DeploymentStatusIcon({ status }) {
   };
 
   const deploymentStatusColors = {
-    successful: theme.palette.status.ok,
-    failed: theme.palette.status.fail,
-    running: theme.palette.status.progress,
-    queued: theme.palette.status.progress
+    successful: theme.palette.status.ok.main,
+    failed: theme.palette.status.fail.main,
+    running: theme.palette.status.progress.main,
+    queued: theme.palette.status.progress.main
   };
 
   const state = status.toLowerCase();