diff --git a/plugins/PerObjectSettingsTool/PerObjectCategory.qml b/plugins/PerObjectSettingsTool/PerObjectCategory.qml
index eae74eeb4c..2a0f028d1c 100644
--- a/plugins/PerObjectSettingsTool/PerObjectCategory.qml
+++ b/plugins/PerObjectSettingsTool/PerObjectCategory.qml
@@ -11,7 +11,9 @@ import ".."
 Button {
     id: base;
 
-    background: Item {}
+    background: Rectangle {
+        color: UM.Theme.getColor("background_3")
+    }
 
     contentItem: Row
     {
diff --git a/plugins/PerObjectSettingsTool/SettingPickDialog.qml b/plugins/PerObjectSettingsTool/SettingPickDialog.qml
index 0eb75676eb..d7d8091121 100644
--- a/plugins/PerObjectSettingsTool/SettingPickDialog.qml
+++ b/plugins/PerObjectSettingsTool/SettingPickDialog.qml
@@ -14,6 +14,7 @@ UM.Dialog
 
     title: catalog.i18nc("@title:window", "Select Settings to Customize for this model")
     width: UM.Theme.getSize("small_popup_dialog").width
+    backgroundColor: UM.Theme.getColor("background_1")
 
     property var additional_excluded_settings
 
@@ -78,12 +79,13 @@ UM.Dialog
         anchors
         {
             top: filterInput.bottom
+            topMargin: UM.Theme.getSize("default_margin").height
             left: parent.left
             right: parent.right
             bottom: parent.bottom
         }
 
-        ScrollBar.vertical: UM.ScrollBar {}
+        ScrollBar.vertical: UM.ScrollBar { id: scrollBar }
         clip: true
 
         model: UM.SettingDefinitionsModel
@@ -104,7 +106,7 @@ UM.Dialog
         {
             id: loader
 
-            width: listview.width
+            width: listview.width - scrollBar.width
             height: model.type != undefined ? UM.Theme.getSize("section").height : 0
 
             property var definition: model
diff --git a/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml b/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml
index 23859e40ec..0e1f296cfa 100644
--- a/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml
+++ b/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml
@@ -83,13 +83,12 @@ UM.TooltipArea
         height: numericTextFieldWithUnit.controlHeight
 
         // Background is a rounded-cornered box with filled color as state indication (normal, warning, error, etc.)
-        background: Rectangle
+        background: UM.UnderlineBackground
         {
             anchors.fill: parent
             anchors.margins: Math.round(UM.Theme.getSize("default_lining").width)
-            radius: UM.Theme.getSize("setting_control_radius").width
 
-            border.color:
+            liningColor:
             {
                 if (!textFieldWithUnit.enabled)
                 {
@@ -108,9 +107,9 @@ UM.TooltipArea
                 // Validation is OK.
                 if (textFieldWithUnit.hovered || textFieldWithUnit.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")
             }
 
             color:
diff --git a/resources/qml/Settings/SettingTextField.qml b/resources/qml/Settings/SettingTextField.qml
index e6afb9e8e3..83b5d2a987 100644
--- a/resources/qml/Settings/SettingTextField.qml
+++ b/resources/qml/Settings/SettingTextField.qml
@@ -26,15 +26,13 @@ SettingItem
         }
     }
 
-    contents: Rectangle
+    contents: UM.UnderlineBackground
     {
         id: control
 
         anchors.fill: parent
 
-        radius: UM.Theme.getSize("setting_control_radius").width
-        border.width: UM.Theme.getSize("default_lining").width
-        border.color:
+        liningColor:
         {
             if(!enabled)
             {
@@ -54,9 +52,9 @@ SettingItem
             //Validation is OK.
             if(hovered || input.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")
         }
 
         color: {
diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json
index 28b977db83..a0ac828b20 100644
--- a/resources/themes/cura-dark/theme.json
+++ b/resources/themes/cura-dark/theme.json
@@ -29,7 +29,7 @@
     "colors": {
         "main_background": "background_1",
         "detail_background": [63, 63, 63, 255],
-        "message_background": [39, 44, 48, 255],
+        "message_background": "background_1",
         "wide_lining": [31, 36, 39, 255],
         "thick_lining": [255, 255, 255, 60],
         "lining": "border_main",