diff --git a/cura/Arranging/ArrangeObjectsJob.py b/cura/Arranging/ArrangeObjectsJob.py
index ce11556b5b..aef051c838 100644
--- a/cura/Arranging/ArrangeObjectsJob.py
+++ b/cura/Arranging/ArrangeObjectsJob.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Ultimaker B.V.
+# Copyright (c) 2019 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
 from UM.Application import Application
@@ -39,10 +39,17 @@ class ArrangeObjectsJob(Job):
 
         arranger = Arrange.create(x = machine_width, y = machine_depth, fixed_nodes = self._fixed_nodes, min_offset = self._min_offset)
 
+        # Build set to exclude children (those get arranged together with the parents).
+        included_as_child = set()
+        for node in self._nodes:
+            included_as_child.update(node.getAllChildren())
+
         # Collect nodes to be placed
         nodes_arr = []  # fill with (size, node, offset_shape_arr, hull_shape_arr)
         for node in self._nodes:
-            offset_shape_arr, hull_shape_arr = ShapeArray.fromNode(node, min_offset = self._min_offset)
+            if node in included_as_child:
+                continue
+            offset_shape_arr, hull_shape_arr = ShapeArray.fromNode(node, min_offset = self._min_offset, include_children = True)
             if offset_shape_arr is None:
                 Logger.log("w", "Node [%s] could not be converted to an array for arranging...", str(node))
                 continue
diff --git a/cura/Arranging/ShapeArray.py b/cura/Arranging/ShapeArray.py
index ab785cc3e1..64b78d6f17 100644
--- a/cura/Arranging/ShapeArray.py
+++ b/cura/Arranging/ShapeArray.py
@@ -42,7 +42,7 @@ class ShapeArray:
     #   \param min_offset offset for the offset ShapeArray
     #   \param scale scale the coordinates
     @classmethod
-    def fromNode(cls, node, min_offset, scale = 0.5):
+    def fromNode(cls, node, min_offset, scale = 0.5, include_children = False):
         transform = node._transformation
         transform_x = transform._data[0][3]
         transform_y = transform._data[2][3]
@@ -52,6 +52,21 @@ class ShapeArray:
             return None, None
         # For one_at_a_time printing you need the convex hull head.
         hull_head_verts = node.callDecoration("getConvexHullHead") or hull_verts
+        if hull_head_verts is None:
+            hull_head_verts = Polygon()
+
+        # If the child-nodes are included, adjust convex hulls as well:
+        if include_children:
+            children = node.getAllChildren()
+            if not children is None:
+                for child in children:
+                    # 'Inefficient' combination of convex hulls through known code rather than mess it up:
+                    child_hull = child.callDecoration("getConvexHull")
+                    if not child_hull is None:
+                        hull_verts = hull_verts.unionConvexHulls(child_hull)
+                    child_hull_head = child.callDecoration("getConvexHullHead") or child_hull
+                    if not child_hull_head is None:
+                        hull_head_verts = hull_head_verts.unionConvexHulls(child_hull_head)
 
         offset_verts = hull_head_verts.getMinkowskiHull(Polygon.approximatedCircle(min_offset))
         offset_points = copy.deepcopy(offset_verts._points)  # x, y
diff --git a/cura/PrinterOutput/PrinterOutputModel.py b/cura/PrinterOutput/PrinterOutputModel.py
index 006f76a385..2261742406 100644
--- a/cura/PrinterOutput/PrinterOutputModel.py
+++ b/cura/PrinterOutput/PrinterOutputModel.py
@@ -44,7 +44,7 @@ class PrinterOutputModel(QObject):
         self._printer_state = "unknown"
         self._is_preheating = False
         self._printer_type = ""
-        self._buildplate_name = ""
+        self._buildplate = ""
 
         self._printer_configuration.extruderConfigurations = [extruder.extruderConfiguration for extruder in
                                                               self._extruders]
@@ -86,12 +86,12 @@ class PrinterOutputModel(QObject):
 
     @pyqtProperty(str, notify = buildplateChanged)
     def buildplate(self) -> str:
-        return self._buildplate_name
+        return self._buildplate
 
-    def updateBuildplateName(self, buildplate_name: str) -> None:
-        if self._buildplate_name != buildplate_name:
-            self._buildplate_name = buildplate_name
-            self._printer_configuration.buildplateConfiguration = self._buildplate_name
+    def updateBuildplate(self, buildplate: str) -> None:
+        if self._buildplate != buildplate:
+            self._buildplate = buildplate
+            self._printer_configuration.buildplateConfiguration = self._buildplate
             self.buildplateChanged.emit()
             self.configurationChanged.emit()
 
diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py
index 202224dd64..03b04cc3bb 100755
--- a/cura/Settings/MachineManager.py
+++ b/cura/Settings/MachineManager.py
@@ -1429,6 +1429,8 @@ class MachineManager(QObject):
                     self._global_container_stack.extruders[position].setEnabled(True)
                     self.updateMaterialWithVariant(position)
 
+            self.updateNumberExtrudersEnabled()
+
             if configuration.buildplateConfiguration is not None:
                 global_variant_container_node = self._variant_manager.getBuildplateVariantNode(self._global_container_stack.definition.getId(), configuration.buildplateConfiguration)
                 if global_variant_container_node:
diff --git a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py b/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py
index a8165ff69c..bd3e482bde 100644
--- a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py
+++ b/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py
@@ -65,6 +65,7 @@ class CloudClusterPrinterStatus(BaseCloudModel):
         model.updateName(self.friendly_name)
         model.updateType(self.machine_variant)
         model.updateState(self.status if self.enabled else "disabled")
+        model.updateBuildplate(self.build_plate.type if self.build_plate else "glass")
 
         for configuration, extruder_output, extruder_config in \
                 zip(self.configuration, model.extruders, model.printerConfiguration.extruderConfigurations):
diff --git a/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py b/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py
index 3307ca2384..c1a6362455 100644
--- a/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py
+++ b/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py
@@ -627,7 +627,7 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
 
         # Do not store the build plate information that comes from connect if the current printer has not build plate information
         if "build_plate" in data and machine_definition.getMetaDataEntry("has_variant_buildplates", False):
-            printer.updateBuildplateName(data["build_plate"]["type"])
+            printer.updateBuildplate(data["build_plate"]["type"])
         if not data["enabled"]:
             printer.updateState("disabled")
         else:
diff --git a/resources/qml/Account/AvatarImage.qml b/resources/qml/Account/AvatarImage.qml
index bcbc9f0542..a4f922a10d 100644
--- a/resources/qml/Account/AvatarImage.qml
+++ b/resources/qml/Account/AvatarImage.qml
@@ -22,7 +22,6 @@ Item
     {
         id: profileImage
         anchors.fill: parent
-        source: UM.Theme.getImage("avatar_default")
         fillMode: Image.PreserveAspectCrop
         visible: false
         mipmap: true
diff --git a/resources/qml/ActionPanel/OutputDevicesActionButton.qml b/resources/qml/ActionPanel/OutputDevicesActionButton.qml
index 3bfaab0fc1..866b8cc627 100644
--- a/resources/qml/ActionPanel/OutputDevicesActionButton.qml
+++ b/resources/qml/ActionPanel/OutputDevicesActionButton.qml
@@ -90,6 +90,10 @@ Item
                         cornerRadius: 0
                         hoverColor: UM.Theme.getColor("primary")
                         Layout.fillWidth: true
+                        // The total width of the popup should be defined by the largest button. By stating that each
+                        // button should be minimally the size of it's content (aka; implicitWidth) we can ensure that.
+                        Layout.minimumWidth: implicitWidth
+                        Layout.preferredHeight: widget.height
                         onClicked:
                         {
                             UM.OutputDeviceManager.setActiveDevice(model.id)
diff --git a/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg
index 059a58e699..544deae3a2 100644
--- a/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg
@@ -15,7 +15,6 @@ variant = 0.25 mm
 cool_min_layer_time = 5
 cool_min_speed = 10
 infill_sparse_density = 22
-layer_height = 0.06
 speed_layer_0 = =round(speed_print * 30 / 30)
 speed_print = 30
 top_bottom_thickness = 0.72
diff --git a/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg
index 59a714708f..f32deec07a 100644
--- a/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg
@@ -15,7 +15,6 @@ variant = 0.4 mm
 cool_min_layer_time = 5
 cool_min_speed = 10
 infill_sparse_density = 18
-layer_height = 0.15
 speed_layer_0 = =round(speed_print * 30 / 60)
 speed_print = 60
 speed_topbottom = =math.ceil(speed_print * 30 / 60)
diff --git a/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg
index daf244cc5d..8c50d00108 100644
--- a/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg
@@ -15,7 +15,6 @@ variant = 0.4 mm
 cool_min_layer_time = 5
 cool_min_speed = 10
 infill_sparse_density = 22
-layer_height = 0.06
 speed_layer_0 = =round(speed_print * 30 / 50)
 speed_print = 50
 speed_topbottom = =math.ceil(speed_print * 20 / 50)
diff --git a/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg
index 1bb29fdf5c..e2edba3039 100644
--- a/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg
@@ -15,7 +15,6 @@ variant = 0.4 mm
 cool_min_layer_time = 5
 cool_min_speed = 10
 infill_sparse_density = 20
-layer_height = 0.1
 speed_layer_0 = =round(speed_print * 30 / 50)
 speed_print = 50
 speed_topbottom = =math.ceil(speed_print * 20 / 50)
diff --git a/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg
index 910933b73e..170ccb06b2 100644
--- a/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = normal
+quality_type = fast
 weight = 0
 material = generic_pla
 variant = 0.6 mm
@@ -15,7 +15,6 @@ variant = 0.6 mm
 cool_min_layer_time = 5
 cool_min_speed = 10
 infill_sparse_density = 20
-layer_height = 0.15
 speed_layer_0 = =round(speed_print * 30 / 55)
 speed_print = 55
 speed_topbottom = =math.ceil(speed_print * 20 / 55)
diff --git a/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg
index 8be245a49e..1b5bb17054 100644
--- a/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = fast
+quality_type = draft
 weight = -1
 material = generic_pla
 variant = 0.8 mm
@@ -15,7 +15,6 @@ variant = 0.8 mm
 cool_min_layer_time = 5
 cool_min_speed = 10
 infill_sparse_density = 20
-layer_height = 0.2
 speed_layer_0 = =round(speed_print * 30 / 40)
 speed_print = 40
 speed_wall_0 = =math.ceil(speed_print * 25 / 40)
diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg
index dc9e0bfd87..b2e7e246d5 100644
--- a/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg
@@ -17,7 +17,6 @@ cool_min_layer_time = 3
 cool_min_layer_time_fan_speed_max = 15
 cool_min_speed = 10
 infill_sparse_density = 22
-layer_height = 0.06
 speed_layer_0 = =round(speed_print * 30 / 30)
 speed_print = 30
 top_bottom_thickness = 0.72
diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg
index 31f14b6d5a..13d2593e5f 100644
--- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg
@@ -17,7 +17,6 @@ cool_min_layer_time = 3
 cool_min_layer_time_fan_speed_max = 15
 cool_min_speed = 10
 infill_sparse_density = 18
-layer_height = 0.15
 speed_layer_0 = =round(speed_print * 30 / 55)
 speed_print = 55
 speed_topbottom = =math.ceil(speed_print * 30 / 55)
diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg
index 2dc95a860b..03e21b62cf 100644
--- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg
@@ -17,7 +17,6 @@ cool_min_layer_time = 3
 cool_min_layer_time_fan_speed_max = 15
 cool_min_speed = 10
 infill_sparse_density = 22
-layer_height = 0.06
 speed_layer_0 = =round(speed_print * 30 / 45)
 speed_print = 45
 speed_wall = =math.ceil(speed_print * 30 / 45)
diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg
index a995cc8c57..5713c9202f 100644
--- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg
@@ -17,7 +17,6 @@ cool_min_layer_time = 3
 cool_min_layer_time_fan_speed_max = 15
 cool_min_speed = 10
 infill_sparse_density = 20
-layer_height = 0.1
 speed_layer_0 = =round(speed_print * 30 / 45)
 speed_print = 45
 speed_wall = =math.ceil(speed_print * 30 / 45)
diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg
index 491f041130..7ccbadb29d 100644
--- a/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = normal
+quality_type = fast
 weight = 0
 material = generic_abs
 variant = 0.6 mm
@@ -17,7 +17,6 @@ cool_min_layer_time = 3
 cool_min_layer_time_fan_speed_max = 20
 cool_min_speed = 20
 infill_sparse_density = 20
-layer_height = 0.15
 speed_infill = =math.ceil(speed_print * 55 / 40)
 speed_layer_0 = =round(speed_print * 30 / 40)
 speed_print = 40
diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg
index 057eb1d657..0c961f2dc3 100644
--- a/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = fast
+quality_type = draft
 weight = -1
 material = generic_abs
 variant = 0.8 mm
@@ -17,7 +17,6 @@ cool_min_layer_time = 3
 cool_min_layer_time_fan_speed_max = 25
 cool_min_speed = 15
 infill_sparse_density = 20
-layer_height = 0.2
 speed_layer_0 = =round(speed_print * 30 / 40)
 speed_print = 40
 top_bottom_thickness = 1.2
diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg
index aa6662ba58..590e2c4ff0 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg
@@ -17,7 +17,6 @@ cool_min_layer_time = 2
 cool_min_layer_time_fan_speed_max = 15
 cool_min_speed = 15
 infill_sparse_density = 22
-layer_height = 0.06
 speed_layer_0 = =round(speed_print * 30 / 30)
 speed_print = 30
 top_bottom_thickness = 0.72
diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg
index 01763c1e2c..ee65c14ac3 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg
@@ -17,7 +17,6 @@ cool_min_layer_time = 3
 cool_min_layer_time_fan_speed_max = 15
 cool_min_speed = 10
 infill_sparse_density = 18
-layer_height = 0.15
 speed_layer_0 = =round(speed_print * 30 / 45)
 speed_print = 45
 speed_travel = 150
diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg
index 298cbb2068..26f8b4ba24 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg
@@ -17,7 +17,6 @@ cool_min_layer_time = 2
 cool_min_layer_time_fan_speed_max = 15
 cool_min_speed = 15
 infill_sparse_density = 22
-layer_height = 0.06
 speed_layer_0 = =round(speed_print * 30 / 45)
 speed_print = 45
 speed_wall = =math.ceil(speed_print * 30 / 45)
diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg
index 5be1ac399d..79eb50c3fa 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg
@@ -17,7 +17,6 @@ cool_min_layer_time = 3
 cool_min_layer_time_fan_speed_max = 15
 cool_min_speed = 10
 infill_sparse_density = 20
-layer_height = 0.1
 speed_layer_0 = =round(speed_print * 30 / 45)
 speed_print = 45
 speed_wall = =math.ceil(speed_print * 30 / 45)
diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg
index 55f167a046..35e6644a07 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = normal
+quality_type = fast
 weight = 0
 material = generic_cpe
 variant = 0.6 mm
@@ -17,7 +17,6 @@ cool_min_layer_time = 5
 cool_min_layer_time_fan_speed_max = 20
 cool_min_speed = 8
 infill_sparse_density = 20
-layer_height = 0.15
 speed_layer_0 = =round(speed_print * 30 / 40)
 speed_print = 40
 top_bottom_thickness = 1.2
diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg
index ba99eaacc2..ec300d3aad 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = fast
+quality_type = draft
 weight = -1
 material = generic_cpe
 variant = 0.8 mm
@@ -17,7 +17,6 @@ cool_min_layer_time = 3
 cool_min_layer_time_fan_speed_max = 25
 cool_min_speed = 8
 infill_sparse_density = 20
-layer_height = 0.2
 speed_layer_0 = =round(speed_print * 30 / 40)
 speed_print = 40
 top_bottom_thickness = 1.2
diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg
index 73ef52e511..6147f5d138 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg
@@ -20,7 +20,6 @@ cool_min_speed = 8
 infill_overlap = 5
 infill_sparse_density = 30
 layer_0_z_overlap = 0.22
-layer_height = 0.2
 line_width = 0.38
 raft_airgap = 0.37
 raft_base_line_spacing = 1.6
diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg
index 2fc95502e7..fa54b0f89e 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = normal
+quality_type = fast
 weight = 0
 material = generic_cpe_plus
 variant = 0.4 mm
@@ -20,7 +20,6 @@ cool_min_speed = 8
 infill_overlap = 5
 infill_sparse_density = 30
 layer_0_z_overlap = 0.22
-layer_height = 0.15
 line_width = 0.38
 raft_airgap = 0.37
 raft_base_line_spacing = 1.6
diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg
index 89ce35628e..f795f07013 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = draft
+quality_type = slightlycoarse
 weight = -2
 material = generic_cpe_plus
 variant = 0.6 mm
@@ -20,7 +20,6 @@ cool_min_speed = 8
 infill_overlap = 5
 infill_sparse_density = 35
 layer_0_z_overlap = 0.22
-layer_height = 0.3
 line_width = 0.57
 raft_airgap = 0.37
 raft_base_line_spacing = 2.4
diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg
index 94c542e793..faf1b2d18d 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = normal
+quality_type = draft
 weight = 0
 material = generic_cpe_plus
 variant = 0.6 mm
@@ -20,7 +20,6 @@ cool_min_speed = 8
 infill_overlap = 5
 infill_sparse_density = 35
 layer_0_z_overlap = 0.22
-layer_height = 0.22
 line_width = 0.57
 raft_airgap = 0.37
 raft_base_line_spacing = 2.4
diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg
index 98abf00ebf..5edd73eeba 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = draft
+quality_type = slightlycoarse
 weight = -2
 material = generic_cpe_plus
 variant = 0.8 mm
@@ -20,7 +20,6 @@ cool_min_layer_time = 3
 infill_overlap = 5
 infill_sparse_density = 40
 layer_0_z_overlap = 0.22
-layer_height = 0.3
 raft_airgap = 0.37
 raft_base_line_width = 1.6
 raft_interface_line_spacing = 1.8
diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg
index 2091a22f80..7772ba72d6 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = normal
+quality_type = draft
 weight = 0
 material = generic_cpe_plus
 variant = 0.8 mm
@@ -20,7 +20,6 @@ cool_min_layer_time = 3
 infill_overlap = 5
 infill_sparse_density = 40
 layer_0_z_overlap = 0.22
-layer_height = 0.2
 raft_airgap = 0.37
 raft_base_line_width = 1.6
 raft_interface_line_spacing = 1.8
diff --git a/resources/quality/ultimaker2_plus/um2p_global_Extra_Coarse_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_Extra_Coarse_Quality.inst.cfg
index 7d4483d9ff..0aba820d7e 100644
--- a/resources/quality/ultimaker2_plus/um2p_global_Extra_Coarse_Quality.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_global_Extra_Coarse_Quality.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = extra coarse
+quality_type = extracoarse
 weight = -3
 global_quality = True
 
diff --git a/resources/quality/ultimaker2_plus/um2p_global_Slightly_Coarse_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_Slightly_Coarse_Quality.inst.cfg
new file mode 100644
index 0000000000..35dbbeedd7
--- /dev/null
+++ b/resources/quality/ultimaker2_plus/um2p_global_Slightly_Coarse_Quality.inst.cfg
@@ -0,0 +1,14 @@
+[general]
+version = 4
+name = Coarse Quality
+definition = ultimaker2_plus
+
+[metadata]
+setting_version = 6
+type = quality
+quality_type = slightlycoarse
+weight = -4
+global_quality = True
+
+[values]
+layer_height = 0.3
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg
index 176e8b1e13..0389a8fec3 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg
@@ -20,7 +20,6 @@ cool_min_speed = 15
 infill_overlap = 5
 infill_sparse_density = 25
 layer_0_z_overlap = 0.1
-layer_height = 0.06
 raft_airgap = 0.15
 raft_base_line_width = 0.5
 raft_interface_line_spacing = 0.7
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg
index a4a380f615..f227afc3e9 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg
@@ -20,7 +20,6 @@ cool_min_speed = 15
 infill_overlap = 5
 infill_sparse_density = 25
 layer_0_z_overlap = 0.1
-layer_height = 0.1
 raft_airgap = 0.15
 raft_base_line_width = 0.5
 raft_interface_line_spacing = 0.7
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg
index 74251f21a6..c903c03394 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = fast
+quality_type = draft
 weight = -1
 material = generic_nylon
 variant = 0.4 mm
@@ -19,7 +19,6 @@ cool_min_speed = 15
 infill_overlap = 5
 infill_sparse_density = 30
 layer_0_z_overlap = 0.22
-layer_height = 0.2
 raft_airgap = 0.57
 raft_base_line_spacing = 1.6
 raft_base_line_width = 0.8
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg
index f0ad7bf95a..fd4f6c0513 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = normal
+quality_type = fast
 weight = 0
 material = generic_nylon
 variant = 0.4 mm
@@ -19,7 +19,6 @@ cool_min_speed = 15
 infill_overlap = 5
 infill_sparse_density = 30
 layer_0_z_overlap = 0.22
-layer_height = 0.15
 raft_airgap = 0.57
 raft_base_line_spacing = 1.6
 raft_base_line_width = 0.8
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg
index ce9f0f5c53..3aaa8f9485 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = fast
+quality_type = slightlycoarse
 weight = -1
 material = generic_nylon
 variant = 0.6 mm
@@ -19,7 +19,6 @@ cool_min_speed = 15
 infill_overlap = 5
 infill_sparse_density = 35
 layer_0_z_overlap = 0.22
-layer_height = 0.3
 raft_airgap = 0.44
 raft_base_line_spacing = 2.4
 raft_base_line_width = 1.2
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg
index d197511fc6..d863dda7d9 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = normal
+quality_type = fast
 weight = 0
 material = generic_nylon
 variant = 0.6 mm
@@ -19,7 +19,6 @@ cool_min_speed = 15
 infill_overlap = 5
 infill_sparse_density = 35
 layer_0_z_overlap = 0.22
-layer_height = 0.15
 raft_airgap = 0.44
 raft_base_line_spacing = 2.4
 raft_base_line_width = 1.2
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg
index 33dfe9f029..4b039087e8 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = draft
+quality_type = slightlycoarse
 weight = -2
 material = generic_nylon
 variant = 0.8 mm
@@ -19,7 +19,6 @@ cool_min_speed = 15
 infill_overlap = 5
 infill_sparse_density = 40
 layer_0_z_overlap = 0.25
-layer_height = 0.3
 raft_airgap = 0.44
 raft_base_line_width = 1.6
 raft_interface_line_spacing = 1.8
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg
index 42a7225914..0cd87ce0e2 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = normal
+quality_type = draft
 weight = 0
 material = generic_nylon
 variant = 0.8 mm
@@ -19,7 +19,6 @@ cool_min_speed = 15
 infill_overlap = 5
 infill_sparse_density = 40
 layer_0_z_overlap = 0.25
-layer_height = 0.2
 raft_airgap = 0.44
 raft_base_line_width = 1.6
 raft_interface_line_spacing = 1.8
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg
index f3f1cba3c4..b95d11ea6f 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg
@@ -21,7 +21,6 @@ cool_min_speed = 15
 infill_overlap = 5
 infill_sparse_density = 25
 layer_0_z_overlap = 0.2
-layer_height = 0.06
 raft_airgap = 0.25
 raft_base_line_spacing = 1
 raft_base_line_width = 0.5
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg
index 4ae2ba1e59..90c0987ddf 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg
@@ -21,7 +21,6 @@ cool_min_speed = 15
 infill_overlap = 5
 infill_sparse_density = 25
 layer_0_z_overlap = 0.2
-layer_height = 0.1
 raft_airgap = 0.25
 raft_base_line_spacing = 1
 raft_base_line_width = 0.5
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg
index 23aa742baf..d530103a1c 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = fast
+quality_type = draft
 weight = -1
 material = generic_pc
 variant = 0.4 mm
@@ -20,7 +20,6 @@ cool_min_speed = 8
 infill_overlap = 5
 infill_sparse_density = 30
 layer_0_z_overlap = 0.3
-layer_height = 0.2
 raft_airgap = 0.35
 raft_base_line_spacing = 1.6
 raft_base_line_width = 0.8
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg
index 4ca6511cce..43b6363236 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg
@@ -20,7 +20,6 @@ cool_min_speed = 8
 infill_overlap = 5
 infill_sparse_density = 30
 layer_0_z_overlap = 0.3
-layer_height = 0.1
 raft_airgap = 0.35
 raft_base_line_spacing = 1.6
 raft_base_line_width = 0.8
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg
index 3f87070307..577180dfcb 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = fast
+quality_type = slightlycoarse
 weight = -1
 material = generic_pc
 variant = 0.6 mm
@@ -20,7 +20,6 @@ cool_min_speed = 8
 infill_overlap = 5
 infill_sparse_density = 35
 layer_0_z_overlap = 0.22
-layer_height = 0.3
 raft_airgap = 0.52
 raft_base_line_spacing = 2.4
 raft_base_line_width = 1.2
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg
index 251541d530..dce492e90b 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = normal
+quality_type = fast
 weight = 0
 material = generic_pc
 variant = 0.6 mm
@@ -20,7 +20,6 @@ cool_min_speed = 8
 infill_overlap = 5
 infill_sparse_density = 35
 layer_0_z_overlap = 0.22
-layer_height = 0.15
 raft_airgap = 0.52
 raft_base_line_spacing = 2.4
 raft_base_line_width = 1.2
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg
index 0cc384c87f..dcd83b8679 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = draft
+quality_type = extracoarse
 weight = -2
 material = generic_pc
 variant = 0.8 mm
@@ -20,7 +20,6 @@ cool_min_layer_time = 3
 infill_overlap = 5
 infill_sparse_density = 40
 layer_0_z_overlap = 0.22
-layer_height = 0.5
 raft_airgap = 0.47
 raft_base_line_width = 1.6
 raft_interface_line_spacing = 1.8
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg
index 7ac3e3a6be..43f35b62f0 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = normal
+quality_type = draft
 weight = 0
 material = generic_pc
 variant = 0.8 mm
@@ -20,7 +20,6 @@ cool_min_layer_time = 3
 infill_overlap = 5
 infill_sparse_density = 40
 layer_0_z_overlap = 0.22
-layer_height = 0.2
 raft_airgap = 0.47
 raft_base_line_width = 1.6
 raft_interface_line_spacing = 1.8
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg
index a6073c15de..4f80772074 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg
@@ -39,7 +39,6 @@ jerk_support_interface = =jerk_topbottom
 jerk_topbottom = =math.ceil(jerk_print * 5 / 25)
 jerk_wall = =math.ceil(jerk_print * 10 / 25)
 jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10)
-layer_height = 0.15
 line_width = =machine_nozzle_size * 0.95
 multiple_mesh_overlap = 0
 retraction_count_max = 12
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg
index 9f70dc9605..7cec6b1bd1 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg
@@ -39,7 +39,6 @@ jerk_support_interface = =jerk_topbottom
 jerk_topbottom = =math.ceil(jerk_print * 5 / 25)
 jerk_wall = =math.ceil(jerk_print * 10 / 25)
 jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10)
-layer_height = 0.2
 line_width = =machine_nozzle_size * 0.95
 multiple_mesh_overlap = 0
 retraction_count_max = 12
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg
index 1dffcbf795..9d8d10cd11 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg
@@ -39,7 +39,6 @@ jerk_support_interface = =jerk_topbottom
 jerk_topbottom = =math.ceil(jerk_print * 5 / 25)
 jerk_wall = =math.ceil(jerk_print * 10 / 25)
 jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10)
-layer_height = 0.15
 line_width = =machine_nozzle_size * 0.95
 multiple_mesh_overlap = 0
 retraction_count_max = 12
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg
index eac5de0f53..c76e73990b 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg
@@ -6,8 +6,8 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = fast
-weight = -1
+quality_type = draft
+weight = -2
 material = generic_pp
 variant = 0.8 mm
 
@@ -39,7 +39,6 @@ jerk_support_interface = =jerk_topbottom
 jerk_topbottom = =math.ceil(jerk_print * 5 / 25)
 jerk_wall = =math.ceil(jerk_print * 10 / 25)
 jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10)
-layer_height = 0.2
 line_width = =machine_nozzle_size * 0.95
 multiple_mesh_overlap = 0
 retraction_count_max = 12
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg
index 9ec9c819f4..e570aafe07 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg
@@ -6,8 +6,8 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = draft
-weight = -2
+quality_type = slightlycoarse
+weight = -3
 material = generic_pp
 variant = 0.8 mm
 
@@ -39,7 +39,6 @@ jerk_support_interface = =jerk_topbottom
 jerk_topbottom = =math.ceil(jerk_print * 5 / 25)
 jerk_wall = =math.ceil(jerk_print * 10 / 25)
 jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10)
-layer_height = 0.3
 line_width = =machine_nozzle_size * 0.95
 multiple_mesh_overlap = 0
 retraction_count_max = 12
diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg
index 91cba55809..86da345cb9 100644
--- a/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg
@@ -20,7 +20,6 @@ cool_min_layer_time = 7
 cool_min_speed = 15
 infill_sparse_density = 10
 layer_0_z_overlap = 0.1
-layer_height = 0.06
 raft_airgap = 0.2
 raft_base_line_spacing = 1
 raft_interface_line_spacing = 1
diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg
index 4fcdc9579c..9a13f180ce 100644
--- a/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg
@@ -19,7 +19,6 @@ cool_fan_speed_min = =cool_fan_speed * 35 / 60
 cool_min_speed = 15
 infill_sparse_density = 10
 layer_0_z_overlap = 0.12
-layer_height = 0.12
 line_width = 0.57
 raft_airgap = 0.24
 raft_base_line_spacing = 1.2
diff --git a/resources/themes/cura-light/images/avatar_default.svg b/resources/themes/cura-light/images/avatar_default.svg
deleted file mode 100644
index 7ec704bc8c..0000000000
--- a/resources/themes/cura-light/images/avatar_default.svg
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="500"
-   height="500"
-   viewBox="0 0 132.29167 132.29167"
-   version="1.1"
-   id="svg8"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
-   sodipodi:docname="avatar_default.svg">
-  <defs
-     id="defs2" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.98994949"
-     inkscape:cx="264.32988"
-     inkscape:cy="275.53798"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:pagecheckerboard="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1137"
-     inkscape:window-x="2872"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-164.70834)">
-    <g
-       id="g819"
-       transform="matrix(2.4332992,0,0,2.4332992,27.213046,191.79972)"
-       style="fill:#098cbc;fill-opacity:1">
-      <path
-         id="path815"
-         d="m 16,15.7 c 3.6,0 6.4,-3.5 6.4,-7.8 C 22.4,3.6 21.5,0 16,0 10.5,0 9.6,3.5 9.6,7.8 c 0,4.4 2.8,7.9 6.4,7.9 z"
-         inkscape:connector-curvature="0"
-         style="fill:#098cbc;fill-opacity:1" />
-      <path
-         id="path817"
-         d="m 28.2,27.3 c -0.1,-7.5 -1.1,-9.7 -8.6,-11 -0.9,0.9 -2.2,1.4 -3.5,1.3 -1.3,0.1 -2.6,-0.4 -3.5,-1.3 C 5,17.6 4,19.7 3.8,27 c 0,0.2 0,0.4 0,0.6 v 0.8 c 0,0 1.8,3.7 12.2,3.7 10.4,0 12.2,-3.6 12.2,-3.6 v -0.6 c 0,-0.3 -0.1,-0.4 0,-0.6 z"
-         inkscape:connector-curvature="0"
-         style="fill:#098cbc;fill-opacity:1" />
-    </g>
-  </g>
-</svg>