diff --git a/resources/qml/MachineSelection.qml b/resources/qml/MachineSelection.qml
index 5ca6cda406..cce2bbea7b 100644
--- a/resources/qml/MachineSelection.qml
+++ b/resources/qml/MachineSelection.qml
@@ -46,12 +46,13 @@ ToolButton {
             }
 
             PrinterStatusIcon {
+                id: printerStatusIcon
                 visible: isNetworkPrinter
                 status: printerStatus
                 anchors {
                     verticalCenter: parent.verticalCenter
                     left: parent.left
-                    leftMargin: UM.Theme.getSize("default_margin").width
+                    leftMargin: UM.Theme.getSize("sidebar_margin").width
                 }
             }
 
@@ -60,8 +61,8 @@ ToolButton {
                 color: UM.Theme.getColor("sidebar_header_text_active")
                 text: control.text;
                 elide: Text.ElideRight;
-                anchors.left: parent.left;
-                anchors.leftMargin: isNetworkPrinter ? UM.Theme.getSize("default_margin").width * 3 : UM.Theme.getSize("default_margin").width * 2
+                anchors.left: isNetworkPrinter ? printerStatusIcon.right : parent.left;
+                anchors.leftMargin: isNetworkPrinter ? UM.Theme.getSize("sidebar_lining").width : UM.Theme.getSize("sidebar_margin").width
                 anchors.right: downArrow.left;
                 anchors.rightMargin: control.rightMargin;
                 anchors.verticalCenter: parent.verticalCenter;
diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json
index 1e3f9ce79a..4cdff3c296 100644
--- a/resources/themes/cura-light/theme.json
+++ b/resources/themes/cura-light/theme.json
@@ -367,7 +367,7 @@
         "small_button": [2, 2],
         "small_button_icon": [1.5, 1.5],
 
-        "printer_status_icon": [1.0, 1.0],
+        "printer_status_icon": [1.2, 1.2],
 
         "topbar_logo_right_margin": [3, 0],
         "topbar_button": [8, 4],