diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index bb94435c69..a3746a557b 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -159,7 +159,7 @@ UM.MainWindow
                 }
 
                 height: 50
-                source: UM.Controller.activeStage.stageMenuComponent
+                source: UM.Controller.activeStage != null ? UM.Controller.activeStage.stageMenuComponent : ""
             }
 
             Connections
@@ -252,13 +252,13 @@ UM.MainWindow
 
                 MouseArea
                 {
-                    visible: UM.Controller.activeStage.mainComponent != ""
+                    visible: parent.source != ""
                     anchors.fill: parent
                     acceptedButtons: Qt.AllButtons
                     onWheel: wheel.accepted = true
                 }
 
-                source: UM.Controller.activeStage.mainComponent
+                source: UM.Controller.activeStage != null ? UM.Controller.activeStage.mainComponent : ""
             }
 
             UM.MessageStack
diff --git a/resources/qml/MaterialAndVariantSelector.qml b/resources/qml/MaterialAndVariantSelector.qml
index fff3ef1100..31a898f8ae 100644
--- a/resources/qml/MaterialAndVariantSelector.qml
+++ b/resources/qml/MaterialAndVariantSelector.qml
@@ -174,15 +174,18 @@ Rectangle
 
                             font: UM.Theme.getFont("large_nonbold")
                             text: catalog.i18nc("@label", "Extruder")
-                            visible: width < (control.width - extruderIconItem.width - UM.Theme.getSize("default_margin").width)
+                            visible: width < (control.width - extruderIcon.width - UM.Theme.getSize("default_margin").width)
                             elide: Text.ElideRight
                         }
 
                         ExtruderIcon
                         {
                             // Round icon with the extruder number and material color indicator.
+                            id: extruderIcon
+
                             anchors.verticalCenter: parent.verticalCenter
                             anchors.left: extruderStaticText.right
+                            anchors.leftMargin: UM.Theme.getSize("default_margin").width
                             width: control.height - Math.round(UM.Theme.getSize("default_margin").width / 2)
                             height: width
 
diff --git a/resources/qml/ProgressAndSaveWidget.qml b/resources/qml/ProgressAndSaveWidget.qml
index 2fa5cf6149..1e82681164 100644
--- a/resources/qml/ProgressAndSaveWidget.qml
+++ b/resources/qml/ProgressAndSaveWidget.qml
@@ -20,7 +20,7 @@ Rectangle
     signal hideTooltip()
 
     // Also add an extra margin, as we ant some breathing room around the edges.
-    height: childrenRect.height + UM.Theme.getSize("sidebar_margin").height
+    height: saveButton.height + UM.Theme.getSize("sidebar_margin").height
     Label
     {
         id: timeDetails
diff --git a/resources/qml/Skeleton/TopHeader.qml b/resources/qml/Skeleton/TopHeader.qml
index 7344d01436..867a6bafbb 100644
--- a/resources/qml/Skeleton/TopHeader.qml
+++ b/resources/qml/Skeleton/TopHeader.qml
@@ -93,7 +93,6 @@ Rectangle
                 color: UM.Theme.getColor("topheader_button_text_active")
                 font: UM.Theme.getFont("action_button")
                 renderType: Text.NativeRendering
-                anchors.verticalCenter: control.verticalCenter
             }
 
         }