diff --git a/cura/Settings/SimpleModeSettingsManager.py b/cura/Settings/SimpleModeSettingsManager.py
index 210a5794d4..b22aea15ea 100644
--- a/cura/Settings/SimpleModeSettingsManager.py
+++ b/cura/Settings/SimpleModeSettingsManager.py
@@ -1,5 +1,6 @@
 # Copyright (c) 2017 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
+from typing import Set
 
 from PyQt5.QtCore import QObject, pyqtSignal, pyqtProperty, pyqtSlot
 
@@ -63,10 +64,10 @@ class SimpleModeSettingsManager(QObject):
 
     @pyqtSlot()
     def updateIsProfileUserCreated(self) -> None:
-        quality_changes_keys = set()
+        quality_changes_keys = set()  # type: Set[str]
 
         if not self._machine_manager.activeMachine:
-            return False
+            return
 
         global_stack = self._machine_manager.activeMachine
 
diff --git a/plugins/MonitorStage/MonitorMain.qml b/plugins/MonitorStage/MonitorMain.qml
index 1f287fc0fa..8f113735ee 100644
--- a/plugins/MonitorStage/MonitorMain.qml
+++ b/plugins/MonitorStage/MonitorMain.qml
@@ -35,6 +35,6 @@ Item
         property real maximumWidth: parent.width
         property real maximumHeight: parent.height
 
-        sourceComponent: Cura.MachineManager.printerOutputDevices.length > 0 ? Cura.MachineManager.printerOutputDevices[0].monitorItem: null
+        sourceComponent: Cura.MachineManager.printerOutputDevices.length > 0 ? Cura.MachineManager.printerOutputDevices[0].monitorItem : null
     }
 }
diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml
index 4d59e0eb6b..98ca715108 100644
--- a/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml
+++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml
@@ -34,16 +34,20 @@ Component
             name: "cura"
         }
 
-        LinearGradient {
+        LinearGradient
+        {
             anchors.fill: parent
-            gradient: Gradient {
-                GradientStop {
+            gradient: Gradient
+            {
+                GradientStop
+                {
                     position: 0.0
-                    color: "#f6f6f6"
+                    color: "#f6f6f6" // TODO: Theme!
                 }
-                GradientStop {
+                GradientStop
+                {
                     position: 1.0
-                    color: "#ffffff"
+                    color: "#ffffff" // TODO: Theme!
                 }
             }
         }
@@ -81,7 +85,8 @@ Component
             id: queue
             width: Math.min(834 * screenScaleFactor, maximumWidth)
 
-            anchors {
+            anchors
+            {
                 bottom: parent.bottom
                 horizontalCenter: parent.horizontalCenter
                 top: printers.bottom
@@ -210,7 +215,8 @@ Component
             ScrollView
             {
                 id: queuedPrintJobs
-                anchors {
+                anchors
+                {
                     bottom: parent.bottom
                     horizontalCenter: parent.horizontalCenter
                     top: printJobQueueHeadings.bottom
@@ -239,7 +245,8 @@ Component
             }
         }
 
-        PrinterVideoStream {
+        PrinterVideoStream
+        {
             anchors.fill: parent
             cameraUrl: OutputDevice.activeCameraUrl
             visible: OutputDevice.activeCameraUrl != ""
diff --git a/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml b/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml
index 42e3b7d160..320201e165 100644
--- a/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml
+++ b/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml
@@ -13,8 +13,40 @@ Item {
     property string activeQualityDefinitionId: Cura.MachineManager.activeQualityDefinitionId;
     property bool isUM3: activeQualityDefinitionId == "ultimaker3" || activeQualityDefinitionId.match("ultimaker_") != null;
     property bool printerConnected: Cura.MachineManager.printerConnected;
-    property bool printerAcceptsCommands: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands;
-    property bool authenticationRequested: printerConnected && (Cura.MachineManager.printerOutputDevices[0].authenticationState == 2 || Cura.MachineManager.printerOutputDevices[0].authenticationState == 5); // AuthState.AuthenticationRequested or AuthenticationReceived.
+    property bool printerAcceptsCommands:
+    {
+        if (printerConnected && Cura.MachineManager.printerOutputDevices[0])
+        {
+            return Cura.MachineManager.printerOutputDevices[0].acceptsCommands
+        }
+        return false
+    }
+    property bool authenticationRequested:
+    {
+        if (printerConnected && Cura.MachineManager.printerOutputDevices[0])
+        {
+            var device = Cura.MachineManager.printerOutputDevices[0]
+            // AuthState.AuthenticationRequested or AuthState.AuthenticationReceived
+            return device.authenticationState == 2 || device.authenticationState == 5
+        }
+        return false
+    }
+    property var materialNames:
+    {
+        if (printerConnected && Cura.MachineManager.printerOutputDevices[0])
+        {
+            return Cura.MachineManager.printerOutputDevices[0].materialNames
+        }
+        return null
+    }
+    property var hotendIds:
+    {
+        if (printerConnected && Cura.MachineManager.printerOutputDevices[0])
+        {
+            return Cura.MachineManager.printerOutputDevices[0].hotendIds
+        }
+        return null
+    }
 
     UM.I18nCatalog {
         id: catalog;
@@ -94,7 +126,7 @@ Item {
             Column {
                 Repeater {
                     id: nozzleColumn;
-                    model: printerConnected ? Cura.MachineManager.printerOutputDevices[0].hotendIds : null;
+                    model: hotendIds
 
                     Label {
                         text: nozzleColumn.model[index];
@@ -105,7 +137,7 @@ Item {
             Column {
                 Repeater {
                     id: materialColumn;
-                    model: printerConnected ? Cura.MachineManager.printerOutputDevices[0].materialNames : null;
+                    model: materialNames
 
                     Label {
                         text: materialColumn.model[index];
diff --git a/resources/qml/ActionPanel/OutputProcessWidget.qml b/resources/qml/ActionPanel/OutputProcessWidget.qml
index b6aa9289f5..eb6dc5b417 100644
--- a/resources/qml/ActionPanel/OutputProcessWidget.qml
+++ b/resources/qml/ActionPanel/OutputProcessWidget.qml
@@ -120,6 +120,8 @@ Column
 
             height: UM.Theme.getSize("action_button").height
             text: catalog.i18nc("@button", "Preview")
+            tooltip: text
+            fixedWidthMode: true
 
             onClicked: UM.Controller.setActiveStage("PreviewStage")
             visible: UM.Controller.activeStage != null && UM.Controller.activeStage.stageId != "PreviewStage"
diff --git a/resources/qml/ViewOrientationButton.qml b/resources/qml/ViewOrientationButton.qml
index 5371f8549b..5d72de9a8d 100644
--- a/resources/qml/ViewOrientationButton.qml
+++ b/resources/qml/ViewOrientationButton.qml
@@ -11,5 +11,5 @@ UM.SimpleButton
     height: UM.Theme.getSize("small_button").height
     hoverColor: UM.Theme.getColor("small_button_text_hover")
     color: UM.Theme.getColor("small_button_text")
-    iconMargin: 0.5 * UM.Theme.getSize("wide_lining").width
+    iconMargin: UM.Theme.getSize("thick_lining").width
 }
\ No newline at end of file
diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json
index 2ff014bd31..ea6c92b479 100644
--- a/resources/themes/cura-light/theme.json
+++ b/resources/themes/cura-light/theme.json
@@ -361,7 +361,7 @@
         "configuration_selector": [35.0, 4.0],
         "configuration_selector_mode_tabs": [0.0, 3.0],
 
-        "action_panel_widget": [25.0, 0.0],
+        "action_panel_widget": [26.0, 0.0],
         "action_panel_information_widget": [20.0, 0.0],
 
         "machine_selector_widget": [20.0, 4.0],