diff --git a/resources/images/Ultimaker2ExtendedPlusbackplate.png b/resources/images/Ultimaker2ExtendedPlusbackplate.png
new file mode 100644
index 0000000000..264e95b698
Binary files /dev/null and b/resources/images/Ultimaker2ExtendedPlusbackplate.png differ
diff --git a/resources/images/Ultimaker2Extendedbackplate.png b/resources/images/Ultimaker2Extendedbackplate.png
index a9c65585d3..e4590a9db4 100644
Binary files a/resources/images/Ultimaker2Extendedbackplate.png and b/resources/images/Ultimaker2Extendedbackplate.png differ
diff --git a/resources/images/Ultimaker2Plusbackplate.png b/resources/images/Ultimaker2Plusbackplate.png
new file mode 100644
index 0000000000..ee5e41153a
Binary files /dev/null and b/resources/images/Ultimaker2Plusbackplate.png differ
diff --git a/resources/images/ultimaker2plus_backplate.png b/resources/images/ultimaker2plus_backplate.png
deleted file mode 100644
index bb431c316a..0000000000
Binary files a/resources/images/ultimaker2plus_backplate.png and /dev/null differ
diff --git a/resources/machines/ultimaker2_extended_plus.json b/resources/machines/ultimaker2_extended_plus.json
index 5f74df23c7..89efeddabe 100644
--- a/resources/machines/ultimaker2_extended_plus.json
+++ b/resources/machines/ultimaker2_extended_plus.json
@@ -5,7 +5,7 @@
     "manufacturer": "Ultimaker",
     "author": "Ultimaker",
     "platform": "ultimaker2_platform.obj",
-    "platform_texture": "ultimaker2plus_backplate.png",
+    "platform_texture": "Ultimaker2ExtendedPlusbackplate.png",
     "visible": false,
     "file_formats": "text/x-gcode",
     "inherits": "ultimaker2plus.json",
diff --git a/resources/machines/ultimaker2_extended_plus_025.json b/resources/machines/ultimaker2_extended_plus_025.json
index b73d923bb3..06c98a2c95 100644
--- a/resources/machines/ultimaker2_extended_plus_025.json
+++ b/resources/machines/ultimaker2_extended_plus_025.json
@@ -1,11 +1,11 @@
 {
     "id": "ultimaker2_extended_plus",
-    "version": 1, 
+    "version": 1,
     "name": "Ultimaker 2 Extended+",
     "manufacturer": "Ultimaker",
     "author": "Ultimaker",
     "platform": "ultimaker2_platform.obj",
-    "platform_texture": "ultimaker2plus_backplate.png",
+    "platform_texture": "Ultimaker2ExtendedPlusbackplate.png",
     "file_formats": "text/x-gcode",
     "inherits": "ultimaker2_extended_plus.json",
     "variant": "0.25 mm",
diff --git a/resources/machines/ultimaker2_extended_plus_040.json b/resources/machines/ultimaker2_extended_plus_040.json
index e0b652b702..6ad7be488e 100644
--- a/resources/machines/ultimaker2_extended_plus_040.json
+++ b/resources/machines/ultimaker2_extended_plus_040.json
@@ -1,11 +1,11 @@
 {
     "id": "ultimaker2_extended_plus",
-    "version": 1, 
+    "version": 1,
     "name": "Ultimaker 2 Extended+",
     "manufacturer": "Ultimaker",
     "author": "Ultimaker",
     "platform": "ultimaker2_platform.obj",
-    "platform_texture": "ultimaker2plus_backplate.png",
+    "platform_texture": "Ultimaker2ExtendedPlusbackplate.png",
     "file_formats": "text/x-gcode",
     "inherits": "ultimaker2_extended_plus.json",
     "variant": "0.4 mm",
diff --git a/resources/machines/ultimaker2_extended_plus_060.json b/resources/machines/ultimaker2_extended_plus_060.json
index 93d1409701..490a68e89c 100644
--- a/resources/machines/ultimaker2_extended_plus_060.json
+++ b/resources/machines/ultimaker2_extended_plus_060.json
@@ -1,11 +1,11 @@
 {
     "id": "ultimaker2_extended_plus",
-    "version": 1, 
+    "version": 1,
     "name": "Ultimaker 2 Extended+",
     "manufacturer": "Ultimaker",
     "author": "Ultimaker",
     "platform": "ultimaker2_platform.obj",
-    "platform_texture": "ultimaker2plus_backplate.png",
+    "platform_texture": "Ultimaker2ExtendedPlusbackplate.png",
     "file_formats": "text/x-gcode",
     "inherits": "ultimaker2_extended_plus.json",
     "variant": "0.6 mm",
diff --git a/resources/machines/ultimaker2_extended_plus_080.json b/resources/machines/ultimaker2_extended_plus_080.json
index 0e4d815d98..e92064a54b 100644
--- a/resources/machines/ultimaker2_extended_plus_080.json
+++ b/resources/machines/ultimaker2_extended_plus_080.json
@@ -1,11 +1,11 @@
 {
     "id": "ultimaker2_extended_plus",
-    "version": 1, 
+    "version": 1,
     "name": "Ultimaker 2 Extended+",
     "manufacturer": "Ultimaker",
     "author": "Ultimaker",
     "platform": "ultimaker2_platform.obj",
-    "platform_texture": "ultimaker2plus_backplate.png",
+    "platform_texture": "Ultimaker2ExtendedPlusbackplate.png",
     "file_formats": "text/x-gcode",
     "inherits": "ultimaker2_extended_plus.json",
     "variant": "0.8 mm",
diff --git a/resources/machines/ultimaker2plus.json b/resources/machines/ultimaker2plus.json
index 7e158b8a84..e3acccad6f 100644
--- a/resources/machines/ultimaker2plus.json
+++ b/resources/machines/ultimaker2plus.json
@@ -5,7 +5,7 @@
     "manufacturer": "Ultimaker",
     "author": "Ultimaker",
     "platform": "ultimaker2_platform.obj",
-    "platform_texture": "ultimaker2plus_backplate.png",
+    "platform_texture": "Ultimaker2Plusbackplate.png",
     "visible": false,
     "file_formats": "text/x-gcode",
     "inherits": "ultimaker2.json",
diff --git a/resources/machines/ultimaker2plus_025.json b/resources/machines/ultimaker2plus_025.json
index d4ce8c9b4f..0e13d8c34d 100644
--- a/resources/machines/ultimaker2plus_025.json
+++ b/resources/machines/ultimaker2plus_025.json
@@ -5,7 +5,7 @@
     "manufacturer": "Ultimaker",
     "author": "Ultimaker",
     "platform": "ultimaker2_platform.obj",
-    "platform_texture": "ultimaker2plus_backplate.png",
+    "platform_texture": "Ultimaker2Plusbackplate.png",
     "file_formats": "text/x-gcode",
     "inherits": "ultimaker2plus.json",
 
diff --git a/resources/machines/ultimaker2plus_040.json b/resources/machines/ultimaker2plus_040.json
index 33afefed12..c98bde63d3 100644
--- a/resources/machines/ultimaker2plus_040.json
+++ b/resources/machines/ultimaker2plus_040.json
@@ -5,7 +5,7 @@
     "manufacturer": "Ultimaker",
     "author": "Ultimaker",
     "platform": "ultimaker2_platform.obj",
-    "platform_texture": "ultimaker2plus_backplate.png",
+    "platform_texture": "Ultimaker2Plusbackplate.png",
     "file_formats": "text/x-gcode",
     "inherits": "ultimaker2plus.json",
 
diff --git a/resources/machines/ultimaker2plus_060.json b/resources/machines/ultimaker2plus_060.json
index 4a4c8c8dd1..243241cb4c 100644
--- a/resources/machines/ultimaker2plus_060.json
+++ b/resources/machines/ultimaker2plus_060.json
@@ -5,7 +5,7 @@
     "manufacturer": "Ultimaker",
     "author": "Ultimaker",
     "platform": "ultimaker2_platform.obj",
-    "platform_texture": "ultimaker2plus_backplate.png",
+    "platform_texture": "Ultimaker2Plusbackplate.png",
     "file_formats": "text/x-gcode",
     "inherits": "ultimaker2plus.json",
 
diff --git a/resources/machines/ultimaker2plus_080.json b/resources/machines/ultimaker2plus_080.json
index 48a0f75d02..be08f5c5a3 100644
--- a/resources/machines/ultimaker2plus_080.json
+++ b/resources/machines/ultimaker2plus_080.json
@@ -5,7 +5,7 @@
     "manufacturer": "Ultimaker",
     "author": "Ultimaker",
     "platform": "ultimaker2_platform.obj",
-    "platform_texture": "ultimaker2plus_backplate.png",
+    "platform_texture": "Ultimaker2Plusbackplate.png",
     "file_formats": "text/x-gcode",
     "inherits": "ultimaker2plus.json",
 
diff --git a/resources/qml/SaveButton.qml b/resources/qml/SaveButton.qml
index f08fe6bab6..acdb43d67b 100644
--- a/resources/qml/SaveButton.qml
+++ b/resources/qml/SaveButton.qml
@@ -79,8 +79,9 @@ Rectangle {
             enabled: base.backendState == 2 && base.activity == true
             height: UM.Theme.getSize("save_button_save_to_button").height
 
-            anchors.top:parent.top
+            anchors.top: parent.top
             anchors.right: deviceSelectionMenu.left;
+            anchors.rightMargin: -3 * UM.Theme.getSize("default_lining").width;
 
             text: UM.OutputDeviceManager.activeDeviceShortDescription
             onClicked:
@@ -120,7 +121,7 @@ Rectangle {
         Button {
             id: deviceSelectionMenu
             tooltip: catalog.i18nc("@info:tooltip","Select the active output device");
-            anchors.top:parent.top
+            anchors.top: parent.top
             anchors.right: parent.right
 
             anchors.rightMargin: UM.Theme.getSize("default_margin").width