diff --git a/resources/qml/ActionButton.qml b/resources/qml/ActionButton.qml
index 2a8b894867..ff8ee4b149 100644
--- a/resources/qml/ActionButton.qml
+++ b/resources/qml/ActionButton.qml
@@ -3,7 +3,6 @@
 
 import QtQuick 2.7
 import QtQuick.Controls 2.1
-import QtQuick.Layouts 1.3
 
 import UM 1.1 as UM
 
diff --git a/resources/qml/PrinterSelector/MachineSelectorButton.qml b/resources/qml/PrinterSelector/MachineSelectorButton.qml
index 44b162d00d..e98036dbc8 100644
--- a/resources/qml/PrinterSelector/MachineSelectorButton.qml
+++ b/resources/qml/PrinterSelector/MachineSelectorButton.qml
@@ -3,7 +3,6 @@
 
 import QtQuick 2.7
 import QtQuick.Controls 2.1
-import QtQuick.Layouts 1.3
 
 import UM 1.1 as UM
 import Cura 1.0 as Cura
@@ -15,6 +14,7 @@ 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)
     checkable: true
 
     property var outputDevice: null
@@ -63,27 +63,9 @@ Button
             Repeater
             {
                 model: printerTypesList
-                delegate: Item
+                delegate: Cura.PrinterTypeLabel
                 {
-                    width: UM.Theme.getSize("printer_type_label").width
-                    height: UM.Theme.getSize("printer_type_label").height
-
-                    Rectangle
-                    {
-                        anchors.fill: parent
-                        color: UM.Theme.getColor("printer_type_label_background")
-                    }
-
-                    Label
-                    {
-                        id: printerTypeLabel
-                        text: modelData
-                        anchors.verticalCenter: parent.verticalCenter
-                        anchors.horizontalCenter: parent.horizontalCenter
-                        renderType: Text.NativeRendering
-                        font: UM.Theme.getFont("very_small")
-                        color: UM.Theme.getColor("text")
-                    }
+                    text: modelData
                 }
             }
         }
diff --git a/resources/qml/PrinterSelector/PrinterTypeLabel.qml b/resources/qml/PrinterSelector/PrinterTypeLabel.qml
new file mode 100644
index 0000000000..cd9f3b9743
--- /dev/null
+++ b/resources/qml/PrinterSelector/PrinterTypeLabel.qml
@@ -0,0 +1,34 @@
+// Copyright (c) 2018 Ultimaker B.V.
+// Cura is released under the terms of the LGPLv3 or higher.
+
+import QtQuick 2.7
+import QtQuick.Controls 2.1
+
+import UM 1.1 as UM
+
+// This component creates a label with the abbreviated name of a printer, with a rectangle surrounding the label.
+// It is created in a separated place in order to be reused whenever needed.
+Item
+{
+    property alias text: printerTypeLabel.text
+
+    width: UM.Theme.getSize("printer_type_label").width
+    height: UM.Theme.getSize("printer_type_label").height
+
+    Rectangle
+    {
+        anchors.fill: parent
+        color: UM.Theme.getColor("printer_type_label_background")
+    }
+
+    Label
+    {
+        id: printerTypeLabel
+        text: "CFFFP" // As an abbreviated name of the Custom FFF Printer
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.horizontalCenter: parent.horizontalCenter
+        renderType: Text.NativeRendering
+        font: UM.Theme.getFont("very_small")
+        color: UM.Theme.getColor("text")
+    }
+}
\ No newline at end of file
diff --git a/resources/qml/qmldir b/resources/qml/qmldir
index 458338c78a..67388100ca 100644
--- a/resources/qml/qmldir
+++ b/resources/qml/qmldir
@@ -10,4 +10,5 @@ NozzleMenu 1.0 NozzleMenu.qml
 ActionPanelWidget 1.0 ActionPanelWidget.qml
 IconLabel 1.0 IconLabel.qml
 OutputDevicesActionButton 1.0 OutputDevicesActionButton.qml
-ExpandableComponent 1.0 ExpandableComponent.qml
\ No newline at end of file
+ExpandableComponent 1.0 ExpandableComponent.qml
+PrinterTypeLabel 1.0 PrinterTypeLabel.qml
\ No newline at end of file