diff --git a/plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml b/plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml
index eb47163d5c..24d4cbfade 100644
--- a/plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml
+++ b/plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml
@@ -49,7 +49,6 @@ Item
             id: searchBar
             Layout.fillWidth: true
             implicitHeight: createNewProjectButton.height
-            leftPadding: searchIcon.width + UM.Theme.getSize("default_margin").width * 2
             focus: true
             onTextEdited: manager.projectFilter = text //Update the search filter when editing this text field.
         }
diff --git a/plugins/PerObjectSettingsTool/SettingPickDialog.qml b/plugins/PerObjectSettingsTool/SettingPickDialog.qml
index 5d8e1c332a..0b03ef5008 100644
--- a/plugins/PerObjectSettingsTool/SettingPickDialog.qml
+++ b/plugins/PerObjectSettingsTool/SettingPickDialog.qml
@@ -64,6 +64,7 @@ UM.Dialog
         {
             top: parent.top
             right: parent.right
+            verticalCenter: filterInput.verticalCenter
         }
         text: catalog.i18nc("@label:checkbox", "Show all")
     }
diff --git a/resources/qml/Settings/SettingCheckBox.qml b/resources/qml/Settings/SettingCheckBox.qml
index 1204c6dfe5..1b4e4ac143 100644
--- a/resources/qml/Settings/SettingCheckBox.qml
+++ b/resources/qml/Settings/SettingCheckBox.qml
@@ -91,14 +91,14 @@ SettingItem
             width: UM.Theme.getSize("checkbox").width
             height: width
 
-            radius: UM.Theme.getSize("setting_control_radius").width
+            radius: UM.Theme.getSize("checkbox_radius").width
             border.width: UM.Theme.getSize("default_lining").width
 
             border.color:
             {
                 if(!enabled)
                 {
-                    return UM.Theme.getColor("setting_control_disabled_border")
+                    return UM.Theme.getColor("checkbox_border")
                 }
                 switch (propertyProvider.properties.validationState)
                 {
@@ -114,7 +114,7 @@ SettingItem
                 // Validation is OK.
                 if (control.containsMouse || control.activeFocus || hovered)
                 {
-                    return UM.Theme.getColor("setting_control_border_highlight")
+                    return UM.Theme.getColor("checkbox_border_hover")
                 }
                 return UM.Theme.getColor("setting_control_border")
             }
@@ -122,7 +122,7 @@ SettingItem
             color: {
                 if (!enabled)
                 {
-                    return UM.Theme.getColor("setting_control_disabled")
+                    return UM.Theme.getColor("checkbox_disabled")
                 }
                 switch (propertyProvider.properties.validationState)
                 {
@@ -140,7 +140,7 @@ SettingItem
                 {
                     return UM.Theme.getColor("setting_control_highlight")
                 }
-                return UM.Theme.getColor("setting_control")
+                return UM.Theme.getColor("checkbox")
             }
 
             UM.RecolorImage