diff --git a/resources/qml/ProfileSetup.qml b/resources/qml/ProfileSetup.qml
index 5c6b299054..1cf3910417 100644
--- a/resources/qml/ProfileSetup.qml
+++ b/resources/qml/ProfileSetup.qml
@@ -69,6 +69,7 @@ Item{
     Rectangle{
         id: globalProfileRow;
         anchors.top: UM.MachineManager.hasVariants ? variantRow.bottom : base.top
+        anchors.topMargin: UM.MachineManager.hasVariants ? UM.Theme.sizes.default_lining.height : 0
         //anchors.top: variantRow.bottom
         height: UM.Theme.sizes.sidebar_setup.height
         width: base.width
diff --git a/resources/qml/SaveButton.qml b/resources/qml/SaveButton.qml
index 7db1121012..195298072c 100644
--- a/resources/qml/SaveButton.qml
+++ b/resources/qml/SaveButton.qml
@@ -131,6 +131,7 @@ Rectangle {
             style: ButtonStyle {
                 background: Rectangle {
                     id: deviceSelectionIcon
+                    border.width: UM.Theme.sizes.default_lining.width
                     border.color: !control.enabled ? UM.Theme.colors.action_button_disabled_border : 
                                       control.pressed ? UM.Theme.colors.action_button_active_border :
                                       control.hovered ? UM.Theme.colors.action_button_hovered_border : UM.Theme.colors.action_button_border
diff --git a/resources/qml/Sidebar.qml b/resources/qml/Sidebar.qml
index 570dc8e5fe..60549117f5 100644
--- a/resources/qml/Sidebar.qml
+++ b/resources/qml/Sidebar.qml
@@ -120,6 +120,7 @@ Rectangle
 
                 style: ButtonStyle {
                     background: Rectangle {
+                        border.width: UM.Theme.sizes.default_lining.width
                         border.color: control.checked ? UM.Theme.colors.toggle_checked_border : 
                                           control.pressed ? UM.Theme.colors.toggle_active_border :
                                           control.hovered ? UM.Theme.colors.toggle_hovered_border : UM.Theme.colors.toggle_unchecked_border