diff --git a/resources/qml/Settings/SettingCheckBox.qml b/resources/qml/Settings/SettingCheckBox.qml
index 1b4e4ac143..3f8f1de89d 100644
--- a/resources/qml/Settings/SettingCheckBox.qml
+++ b/resources/qml/Settings/SettingCheckBox.qml
@@ -11,7 +11,7 @@ SettingItem
 {
     id: base
     property var focusItem: control
-
+    enabled: false
     contents: MouseArea
     {
         id: control
@@ -98,7 +98,7 @@ SettingItem
             {
                 if(!enabled)
                 {
-                    return UM.Theme.getColor("checkbox_border")
+                    return UM.Theme.getColor("checkbox_border_disabled")
                 }
                 switch (propertyProvider.properties.validationState)
                 {
@@ -116,7 +116,7 @@ SettingItem
                 {
                     return UM.Theme.getColor("checkbox_border_hover")
                 }
-                return UM.Theme.getColor("setting_control_border")
+                return UM.Theme.getColor("checkbox_border")
             }
 
             color: {
@@ -138,7 +138,7 @@ SettingItem
                 // Validation is OK.
                 if (control.containsMouse || control.activeFocus)
                 {
-                    return UM.Theme.getColor("setting_control_highlight")
+                    return UM.Theme.getColor("checkbox_hover")
                 }
                 return UM.Theme.getColor("checkbox")
             }
@@ -150,7 +150,7 @@ SettingItem
                 height: UM.Theme.getSize("checkbox_mark").height
                 width: UM.Theme.getSize("checkbox_mark").width
                 sourceSize.height: width
-                color: !enabled ? UM.Theme.getColor("setting_control_disabled_text") : UM.Theme.getColor("setting_control_text");
+                color: !enabled ? UM.Theme.getColor("checkbox_mark_disabled") : UM.Theme.getColor("checkbox_mark");
                 source: UM.Theme.getIcon("Check", "low")
                 opacity: control.checked ? 1 : 0
                 Behavior on opacity { NumberAnimation { duration: 100; } }
diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json
index 7b2c19ff01..bc1f6e3b9f 100644
--- a/resources/themes/cura-dark/theme.json
+++ b/resources/themes/cura-dark/theme.json
@@ -155,15 +155,6 @@
         "slider_handle": [255, 255, 255, 255],
         "slider_handle_active": [68, 192, 255, 255],
 
-        "checkbox": "background_1",
-        "checkbox_hover": [43, 48, 52, 255],
-        "checkbox_border": "text_disabled",
-        "checkbox_border_hover": "border_main",
-        "checkbox_mark": "text_default",
-        "checkbox_square": "text_disabled",
-        "checkbox_text": "text_default",
-        "checkbox_disabled": "background_2",
-
         "category_background": "background_3",
 
         "tooltip": "background_2",
diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json
index ba18e5d0d2..b71d6c0167 100644
--- a/resources/themes/cura-light/theme.json
+++ b/resources/themes/cura-light/theme.json
@@ -324,13 +324,16 @@
         "quality_slider_unavailable": [179, 179, 179, 255],
         "quality_slider_available": [0, 0, 0, 255],
 
-        "checkbox": [255, 255, 255, 255],
-        "checkbox_hover": "border_main",
-        "checkbox_border": [180, 180, 180, 255],
-        "checkbox_border_hover": [25, 110, 240, 255],
-        "checkbox_mark": [35, 35, 35, 255],
+        "checkbox": "background_1",
+        "checkbox_hover": "background_1",
         "checkbox_disabled": "background_2",
-        "checkbox_text": [0, 12, 26, 255],
+        "checkbox_border": [180, 180, 180, 255],
+        "checkbox_border_hover": "border_main",
+        "checkbox_border_disabled": "text_disabled",
+        "checkbox_mark": "text_default",
+        "checkbox_mark_disabled": "text_disabled",
+        "checkbox_text": "text_default",
+        "checkbox_text_disabled": "text_disabled",
 
         "category_background": "background_2",