diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml
index 296ae62366..5229d021f8 100644
--- a/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml
+++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml
@@ -52,7 +52,7 @@ Button
             anchors
             {
                 left: parent.left
-                leftMargin: UM.Theme.getSize("wide_margin").width
+                leftMargin: UM.Theme.getSize("default_margin").width
                 right: parent.right
                 rightMargin: UM.Theme.getSize("wide_margin").width
             }
@@ -63,10 +63,10 @@ Button
             {
                 id: repeater
                 model: configuration.extruderConfigurations
-
+                width: parent.width
                 delegate: PrintCoreConfiguration
                 {
-                    width: Math.round(parent.width / 2)
+                    width: Math.round(parent.width / configuration.extruderConfigurations.length)
                     printCoreConfiguration: modelData
                     visible: configurationItem.isValidMaterial
                 }
diff --git a/resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml b/resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml
index db6a97aa65..3a4dae425f 100644
--- a/resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml
+++ b/resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml
@@ -7,17 +7,17 @@ import QtQuick.Controls 2.0
 import UM 1.2 as UM
 import Cura 1.0 as Cura
 
-Row
+Item
 {
     id: extruderInfo
     property var printCoreConfiguration
 
     height: information.height
-    spacing: UM.Theme.getSize("default_margin").width
 
     //Extruder icon.
     Cura.ExtruderIcon
     {
+        id: icon
         materialColor: printCoreConfiguration.material.color
         anchors.verticalCenter: parent.verticalCenter
         extruderEnabled: printCoreConfiguration.material.brand !== "" && printCoreConfiguration.hotendID !== ""
@@ -26,6 +26,13 @@ Row
     Column
     {
         id: information
+        anchors
+        {
+            left: icon.right
+            right: parent.right
+            margins: UM.Theme.getSize("default_margin").width
+        }
+
         Label
         {
             text: printCoreConfiguration.material.brand ? printCoreConfiguration.material.brand : " " //Use space so that the height is still correct.
@@ -33,6 +40,7 @@ Row
             elide: Text.ElideRight
             font: UM.Theme.getFont("default")
             color: UM.Theme.getColor("text_inactive")
+            width: parent.width
         }
         Label
         {
@@ -41,6 +49,7 @@ Row
             elide: Text.ElideRight
             font: UM.Theme.getFont("medium")
             color: UM.Theme.getColor("text")
+            width: parent.width
         }
         Label
         {
@@ -49,6 +58,7 @@ Row
             elide: Text.ElideRight
             font: UM.Theme.getFont("default")
             color: UM.Theme.getColor("text_inactive")
+            width: parent.width
         }
     }
 }