diff --git a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml
index 94d55d563d..440c9e4e78 100644
--- a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml
+++ b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml
@@ -126,13 +126,10 @@ Item
                 }
             }
 
-            background: Rectangle
+            background: UM.UnderlineBackground
             {
                 id: backgroundItem
-                border.color: intentSelection.hovered ? UM.Theme.getColor("setting_control_border_highlight") : UM.Theme.getColor("setting_control_border")
-                border.width: UM.Theme.getSize("default_lining").width
-                radius: UM.Theme.getSize("default_radius").width
-                color: UM.Theme.getColor("main_background")
+                liningColor: intentSelection.hovered ? UM.Theme.getColor("border_main_light") : UM.Theme.getColor("border_field_light")
             }
 
             UM.SimpleButton
diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json
index c111ccf350..106290c71f 100644
--- a/resources/themes/cura-dark/theme.json
+++ b/resources/themes/cura-dark/theme.json
@@ -28,7 +28,7 @@
 
     "colors": {
         "main_background": "background_1",
-        "detail_background": [63, 63, 63, 255],
+        "detail_background": "background_2",
         "message_background": "background_1",
         "wide_lining": [31, 36, 39, 255],
         "thick_lining": [255, 255, 255, 60],
diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json
index a959a17d0c..405d40f070 100644
--- a/resources/themes/cura-light/theme.json
+++ b/resources/themes/cura-light/theme.json
@@ -293,8 +293,8 @@
         "setting_category_disabled_text": [24, 41, 77, 101],
         "setting_category_active_text": [35, 35, 35, 255],
 
-        "setting_control": [255, 255, 255, 255],
-        "setting_control_highlight": [255, 255, 255, 255],
+        "setting_control": "background_2",
+        "setting_control_highlight": "background_2",
         "setting_control_border": [199, 199, 199, 255],
         "setting_control_border_highlight": [50, 130, 255, 255],
         "setting_control_text": [35, 35, 35, 255],
@@ -308,7 +308,7 @@
         "setting_validation_error": [127, 127, 127, 255],
         "setting_validation_warning_background": [255, 145, 62, 255],
         "setting_validation_warning": [127, 127, 127, 255],
-        "setting_validation_ok": [255, 255, 255, 255],
+        "setting_validation_ok": "background_2",
 
         "material_compatibility_warning": [243, 166, 59, 255],