diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml
index a73cd3b46c..862e1475a9 100644
--- a/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml
+++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml
@@ -36,9 +36,9 @@ Button
             anchors
             {
                 left: parent.left
-                leftMargin: 2 * parent.padding
+                leftMargin: UM.Theme.getSize("wide_margin").width
                 right: parent.right
-                rightMargin: 2 * parent.padding
+                rightMargin: UM.Theme.getSize("wide_margin").width
             }
 
             spacing: UM.Theme.getSize("default_margin").width
@@ -64,9 +64,9 @@ Button
             anchors
             {
                 left: parent.left
-                leftMargin: 2 * parent.padding
+                leftMargin: UM.Theme.getSize("wide_margin").width
                 right: parent.right
-                rightMargin: 2 * parent.padding
+                rightMargin: UM.Theme.getSize("wide_margin").width
             }
             height: visible ? Math.round(UM.Theme.getSize("default_lining").height / 2) : 0
             color: UM.Theme.getColor("lining")
@@ -79,9 +79,9 @@ Button
             anchors
             {
                 left: parent.left
-                leftMargin: 2 * parent.padding
+                leftMargin: UM.Theme.getSize("wide_margin").width
                 right: parent.right
-                rightMargin: 2 * parent.padding
+                rightMargin: UM.Theme.getSize("wide_margin").width
             }
             height: childrenRect.height
             visible: configuration.buildplateConfiguration != ""
@@ -101,7 +101,7 @@ Button
                 id: buildplateLabel
                 anchors.left: buildplateIcon.right
                 anchors.verticalCenter: buildplateIcon.verticalCenter
-                anchors.leftMargin: Math.round(UM.Theme.getSize("default_margin").height / 2)
+                anchors.leftMargin: UM.Theme.getSize("narrow_margin").height
                 text: configuration.buildplateConfiguration
                 renderType: Text.NativeRendering
                 color: UM.Theme.getColor("text")
@@ -127,4 +127,4 @@ Button
     {
         Cura.MachineManager.applyRemoteConfiguration(configuration)
     }
-}
\ No newline at end of file
+}
diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml
index 3ddbb49fe8..684e575bfd 100644
--- a/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml
+++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml
@@ -28,7 +28,7 @@ Item
     {
         width: parent.width
         visible: configurationList.model.length == 0
-        height: label.height + 2 * UM.Theme.getSize("default_margin").height
+        height: label.height + UM.Theme.getSize("wide_margin").height
         anchors.top: parent.top
         anchors.topMargin: UM.Theme.getSize("default_margin").height
 
@@ -134,4 +134,4 @@ Item
             forceModelUpdate()
         }
     }
-}
\ No newline at end of file
+}