diff --git a/resources/qml/PrinterSelector/MachineSelector.qml b/resources/qml/PrinterSelector/MachineSelector.qml
index b6657f112e..d721ed5b83 100644
--- a/resources/qml/PrinterSelector/MachineSelector.qml
+++ b/resources/qml/PrinterSelector/MachineSelector.qml
@@ -48,8 +48,12 @@ Cura.ExpandableComponent
         {
             id: icon
 
-            anchors.bottom: parent.bottom
-            x: UM.Theme.getSize("thick_margin").width
+            anchors
+            {
+                bottom: parent.bottom
+                left: parent.left
+                leftMargin: UM.Theme.getSize("thick_margin").width
+            }
 
             source: UM.Theme.getIcon("printer_connected")
             width: UM.Theme.getSize("printer_status_icon").width
diff --git a/resources/qml/PrinterSelector/MachineSelectorButton.qml b/resources/qml/PrinterSelector/MachineSelectorButton.qml
index e7b44a4447..fef6867e35 100644
--- a/resources/qml/PrinterSelector/MachineSelectorButton.qml
+++ b/resources/qml/PrinterSelector/MachineSelectorButton.qml
@@ -13,8 +13,8 @@ Button
 
     width: parent.width
     height: UM.Theme.getSize("action_button").height
-    leftPadding: Math.round(1.5 * UM.Theme.getSize("default_margin").width)
-    rightPadding: Math.round(1.5 * UM.Theme.getSize("default_margin").width)
+    leftPadding: UM.Theme.getSize("thick_margin").width
+    rightPadding: UM.Theme.getSize("thick_margin").width
     checkable: true
 
     property var outputDevice: null