diff --git a/resources/qml/PrintSetupHeaderButton.qml b/resources/qml/PrintSetupHeaderButton.qml
index 2583c6b84e..e41f95f778 100644
--- a/resources/qml/PrintSetupHeaderButton.qml
+++ b/resources/qml/PrintSetupHeaderButton.qml
@@ -36,7 +36,7 @@ ToolButton
             {
                 target: background
                 color: UM.Theme.getColor("setting_control_disabled")
-                border.color: UM.Theme.getColor("setting_control_disabled_border")
+                liningColor: UM.Theme.getColor("setting_control_disabled_border")
             }
         },
         State
@@ -47,7 +47,7 @@ ToolButton
             {
                 target: background
                 color: UM.Theme.getColor("setting_validation_error_background")
-                border.color: UM.Theme.getColor("setting_validation_error")
+                liningColor: UM.Theme.getColor("setting_validation_error")
             }
         },
         State
@@ -58,7 +58,7 @@ ToolButton
             {
                 target: background
                 color: UM.Theme.getColor("setting_validation_warning_background")
-                border.color: UM.Theme.getColor("setting_validation_warning")
+                liningColor: UM.Theme.getColor("setting_validation_warning")
             }
         },
         State
@@ -69,7 +69,7 @@ ToolButton
             {
                 target: background
                 color: UM.Theme.getColor("setting_control")
-                border.color: UM.Theme.getColor("setting_control_border_highlight")
+                liningColor: UM.Theme.getColor("border_main_light")
             }
         },
         State
@@ -80,20 +80,15 @@ ToolButton
             {
                 target: background
                 color: UM.Theme.getColor("setting_control")
-                border.color: UM.Theme.getColor("setting_control_border")
+                liningColor: UM.Theme.getColor("border_field_light")
             }
         }
     ]
 
-    background: Rectangle
+    background: UM.UnderlineBackground
     {
         id: background
 
-        radius: UM.Theme.getSize("setting_control_radius").width
-        border.width: UM.Theme.getSize("default_lining").width
-        color: UM.Theme.getColor("setting_control")
-        border.color: UM.Theme.getColor("setting_control_border")
-
         UM.RecolorImage
         {
             id: downArrow
diff --git a/resources/qml/Settings/SettingExtruder.qml b/resources/qml/Settings/SettingExtruder.qml
index a7aaa99fb2..d3a50a7eb3 100644
--- a/resources/qml/Settings/SettingExtruder.qml
+++ b/resources/qml/Settings/SettingExtruder.qml
@@ -5,14 +5,14 @@ import QtQuick 2.7
 import QtQuick.Controls 2.0
 
 import UM 1.5 as UM
-import Cura 1.0 as Cura
+import Cura 1.5 as Cura
 
 SettingItem
 {
     id: base
     property var focusItem: control
 
-    contents: ComboBox
+    contents: Cura.ComboBox
     {
         id: control
         anchors.fill: parent
@@ -113,7 +113,7 @@ SettingItem
             color: UM.Theme.getColor("setting_control_button");
         }
 
-        background: Rectangle
+        background: UM.UnderlineBackground
         {
             color:
             {
@@ -127,9 +127,7 @@ SettingItem
                 }
                 return UM.Theme.getColor("setting_control")
             }
-            radius: UM.Theme.getSize("setting_control_radius").width
-            border.width: UM.Theme.getSize("default_lining").width
-            border.color:
+            liningColor:
             {
                 if (!enabled)
                 {
@@ -137,9 +135,9 @@ SettingItem
                 }
                 if (control.hovered || control.activeFocus)
                 {
-                    return UM.Theme.getColor("setting_control_border_highlight")
+                    return UM.Theme.getColor("border_main_light")
                 }
-                return UM.Theme.getColor("setting_control_border")
+                return UM.Theme.getColor("border_field_light")
             }
         }
 
diff --git a/resources/qml/Settings/SettingOptionalExtruder.qml b/resources/qml/Settings/SettingOptionalExtruder.qml
index 1f4a021009..5cde1c0ae9 100644
--- a/resources/qml/Settings/SettingOptionalExtruder.qml
+++ b/resources/qml/Settings/SettingOptionalExtruder.qml
@@ -5,7 +5,7 @@ import QtQuick 2.7
 import QtQuick.Controls 2.0
 
 import UM 1.5 as UM
-import Cura 1.0 as Cura
+import Cura 1.5 as Cura
 
 SettingItem
 {
@@ -19,7 +19,7 @@ SettingItem
     // this extra property to keep the ExtrudersModel and use this in the rest of the code.
     property var extrudersWithOptionalModel: CuraApplication.getExtrudersModelWithOptional()
 
-    contents: ComboBox
+    contents: Cura.ComboBox
     {
         id: control
         anchors.fill: parent
@@ -111,26 +111,24 @@ SettingItem
             sourceSize.width: width + 5 * screenScaleFactor
             sourceSize.height: width + 5 * screenScaleFactor
 
-            color: UM.Theme.getColor("setting_control_button");
+            color: UM.Theme.getColor("setting_control_button")
         }
 
-        background: Rectangle
+        background: UM.UnderlineBackground
         {
             color:
             {
                 if (!enabled)
                 {
-                    return UM.Theme.getColor("setting_control_disabled");
+                    return UM.Theme.getColor("setting_control_disabled")
                 }
-                if (control.hovered || control.activeFocus)
+                if (control.hovered || base.activeFocus)
                 {
-                    return UM.Theme.getColor("setting_control_highlight");
+                    return UM.Theme.getColor("setting_control_highlight")
                 }
-                return UM.Theme.getColor("setting_control");
+                return UM.Theme.getColor("setting_control")
             }
-            radius: UM.Theme.getSize("setting_control_radius").width
-            border.width: UM.Theme.getSize("default_lining").width
-            border.color:
+            liningColor:
             {
                 if (!enabled)
                 {
@@ -138,9 +136,9 @@ SettingItem
                 }
                 if (control.hovered || control.activeFocus)
                 {
-                    return UM.Theme.getColor("setting_control_border_highlight")
+                    return UM.Theme.getColor("border_main_light")
                 }
-                return UM.Theme.getColor("setting_control_border")
+                return UM.Theme.getColor("border_field_light")
             }
         }
 
@@ -214,7 +212,7 @@ SettingItem
                     if (model.enabled) {
                         UM.Theme.getColor("setting_control_text")
                     } else {
-                        UM.Theme.getColor("action_button_disabled_text");
+                        UM.Theme.getColor("action_button_disabled_text")
                     }
                 }
                 elide: Text.ElideRight
diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json
index a0ac828b20..31803bbddb 100644
--- a/resources/themes/cura-dark/theme.json
+++ b/resources/themes/cura-dark/theme.json
@@ -118,15 +118,13 @@
         "scrollbar_handle_hover": [255, 255, 255, 255],
         "scrollbar_handle_down": [255, 255, 255, 255],
 
-        "setting_category": [75, 80, 83, 255],
+        "setting_category": "background_3",
         "setting_category_disabled": [75, 80, 83, 255],
-        "setting_category_hover": [75, 80, 83, 255],
+        "setting_category_hover": "background_3",
         "setting_category_text": [255, 255, 255, 152],
         "setting_category_disabled_text": [255, 255, 255, 101],
         "setting_category_active_text": [255, 255, 255, 204],
 
-        "setting_control": [43, 48, 52, 255],
-        "setting_control_highlight": [43, 48, 52, 255],
         "setting_control": "background_2",
         "setting_control_selected": [34, 39, 42, 38],
         "setting_control_highlight": "background_2",