diff --git a/integrations/standalone/package.json b/integrations/standalone/package.json
index 674993f2..7e5d54c3 100644
--- a/integrations/standalone/package.json
+++ b/integrations/standalone/package.json
@@ -5,8 +5,8 @@
   "dependencies": {
     "@axonivy/variable-editor": "*",
     "@axonivy/variable-editor-protocol": "*",
-    "@axonivy/ui-components": "~12.0.1-next.384",
-    "@axonivy/ui-icons": "~12.0.1-next.384",
+    "@axonivy/ui-components": "~12.0.1-next.390",
+    "@axonivy/ui-icons": "~12.0.1-next.390",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   },
diff --git a/package-lock.json b/package-lock.json
index dd699e67..d7f57762 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -33,8 +33,8 @@
       "name": "@axonivy/config-editor-standalone",
       "version": "12.0.1-next",
       "dependencies": {
-        "@axonivy/ui-components": "~12.0.1-next.384",
-        "@axonivy/ui-icons": "~12.0.1-next.384",
+        "@axonivy/ui-components": "~12.0.1-next.390",
+        "@axonivy/ui-icons": "~12.0.1-next.390",
         "@axonivy/variable-editor": "*",
         "@axonivy/variable-editor-protocol": "*",
         "react": "^18.3.1",
@@ -78,18 +78,18 @@
       "link": true
     },
     "node_modules/@axonivy/jsonrpc": {
-      "version": "12.0.1-next.384",
-      "resolved": "https://npmjs-registry.ivyteam.ch/@axonivy/jsonrpc/-/jsonrpc-12.0.1-next.384.tgz",
-      "integrity": "sha512-PFM4Lnnm4YYn6mCF4mjwUS0oyarTM2FgJrOQ925jhBee1Z2LHJksME9q6Pv8YlYYupD5dbV2LGh0goMlj2Zxqw==",
+      "version": "12.0.1-next.390",
+      "resolved": "https://npmjs-registry.ivyteam.ch/@axonivy/jsonrpc/-/jsonrpc-12.0.1-next.390.tgz",
+      "integrity": "sha512-c+pA8Gta+IRPdH6smx0wQQl8l50JPMn5lCtWThfbZMdQ5f9eY7J7AcTSTzPQE/HtWt+bwZ6ppnha+go3jSWSag==",
       "license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
       "dependencies": {
         "vscode-jsonrpc": "^8.2.0"
       }
     },
     "node_modules/@axonivy/ui-components": {
-      "version": "12.0.1-next.384",
-      "resolved": "https://npmjs-registry.ivyteam.ch/@axonivy/ui-components/-/ui-components-12.0.1-next.384.tgz",
-      "integrity": "sha512-t7G4vXQtK73XvyBhb53rAloQnKy34cN2IGgvQ/ucvEjicc5RipLpV+cO4oC7zqZaBYrRTIC9rTRr1Nk87EMV8Q==",
+      "version": "12.0.1-next.390",
+      "resolved": "https://npmjs-registry.ivyteam.ch/@axonivy/ui-components/-/ui-components-12.0.1-next.390.tgz",
+      "integrity": "sha512-AuoG8Drj3wiYN+oZkTaxSZmb/ZVWFUrNI/vxWmbtsDxBnWvVbvSdaMSmZPuanTySuojq4m57RB3SyJztzNaSeg==",
       "license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
       "dependencies": {
         "@radix-ui/react-accordion": "1.2.1",
@@ -119,9 +119,9 @@
       }
     },
     "node_modules/@axonivy/ui-icons": {
-      "version": "12.0.1-next.384",
-      "resolved": "https://npmjs-registry.ivyteam.ch/@axonivy/ui-icons/-/ui-icons-12.0.1-next.384.tgz",
-      "integrity": "sha512-DnWRFCI5vdkUobqtt0ZltB/b7dzR/a5TSJDgHFtR5MJf5Et7e0pVbRHio4+QnAIPX91mD7vuoY9lIgYKiWMRmQ==",
+      "version": "12.0.1-next.390",
+      "resolved": "https://npmjs-registry.ivyteam.ch/@axonivy/ui-icons/-/ui-icons-12.0.1-next.390.tgz",
+      "integrity": "sha512-32nSB27HM+l11iUfGh54mJbuK2K0b1H6/t62F3aRP8MDhhhnP+i95THjsULDBVQBwpa7XUp+qX/2XNxnEe/VSw==",
       "license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)"
     },
     "node_modules/@axonivy/variable-editor": {
@@ -15959,10 +15959,10 @@
       "version": "12.0.1-next",
       "license": "Apache-2.0",
       "dependencies": {
-        "@axonivy/jsonrpc": "~12.0.1-next.384",
-        "@axonivy/ui-components": "~12.0.1-next.384",
-        "@axonivy/ui-icons": "~12.0.1-next.384",
-        "@axonivy/variable-editor-protocol": "~12.0.1-next",
+        "@axonivy/jsonrpc": "~12.0.1-next.390",
+        "@axonivy/ui-components": "~12.0.1-next.390",
+        "@axonivy/ui-icons": "~12.0.1-next.390",
+        "@axonivy/variable-editor-protocol": "12.0.1-next",
         "@tanstack/react-query": "5.32.1",
         "@tanstack/react-query-devtools": "5.32.1",
         "react": "^18.3.1",
diff --git a/packages/variable-editor/package.json b/packages/variable-editor/package.json
index 7679a3e5..1512e35d 100644
--- a/packages/variable-editor/package.json
+++ b/packages/variable-editor/package.json
@@ -17,10 +17,10 @@
   "types": "lib/index.d.ts",
   "main": "lib/editor.js",
   "dependencies": {
-    "@axonivy/jsonrpc": "~12.0.1-next.384",
-    "@axonivy/ui-components": "~12.0.1-next.384",
-    "@axonivy/ui-icons": "~12.0.1-next.384",
-    "@axonivy/variable-editor-protocol": "~12.0.1-next",
+    "@axonivy/jsonrpc": "~12.0.1-next.390",
+    "@axonivy/ui-components": "~12.0.1-next.390",
+    "@axonivy/ui-icons": "~12.0.1-next.390",
+    "@axonivy/variable-editor-protocol": "12.0.1-next",
     "@tanstack/react-query": "5.32.1",
     "@tanstack/react-query-devtools": "5.32.1",
     "react": "^18.3.1",
diff --git a/packages/variable-editor/src/components/variables/master/VariablesMasterToolbar.tsx b/packages/variable-editor/src/components/variables/master/VariablesMasterToolbar.tsx
index dfd6f7ba..81fcc7fb 100644
--- a/packages/variable-editor/src/components/variables/master/VariablesMasterToolbar.tsx
+++ b/packages/variable-editor/src/components/variables/master/VariablesMasterToolbar.tsx
@@ -23,13 +23,13 @@ type VariablesMasterToolbarProps = {
 
 export const VariablesMasterToolbar = ({ title }: VariablesMasterToolbarProps) => {
   const { detail, setDetail } = useAppContext();
-  const { theme, setTheme } = useTheme();
+  const { theme, setTheme, disabled } = useTheme();
 
   return (
     <Toolbar className='master-toolbar'>
       <ToolbarTitle>{title}</ToolbarTitle>
       <Flex gap={1}>
-        {theme !== 'system' && (
+        {!disabled && (
           <Popover>
             <PopoverTrigger asChild>
               <Button icon={IvyIcons.Settings} size='large' title='Settings' aria-label='Settings' />