diff --git a/plugins/PostProcessingPlugin/PostProcessingPlugin.qml b/plugins/PostProcessingPlugin/PostProcessingPlugin.qml
index 5aa7660237..d5fe618b2d 100644
--- a/plugins/PostProcessingPlugin/PostProcessingPlugin.qml
+++ b/plugins/PostProcessingPlugin/PostProcessingPlugin.qml
@@ -61,7 +61,7 @@ UM.Dialog
                 anchors.leftMargin: base.textMargin
                 anchors.right: parent.right
                 anchors.rightMargin: base.textMargin
-                font: UM.Theme.getFont("large")
+                font: UM.Theme.getFont("large_bold")
                 elide: Text.ElideRight
             }
             ListView
@@ -289,7 +289,7 @@ UM.Dialog
 
                 elide: Text.ElideRight
                 height: 20 * screenScaleFactor
-                font: UM.Theme.getFont("large")
+                font: UM.Theme.getFont("large_bold")
                 color: UM.Theme.getColor("text")
             }
 
diff --git a/plugins/SimulationView/SimulationViewMenuComponent.qml b/plugins/SimulationView/SimulationViewMenuComponent.qml
index fe32fe9eb1..4c952d4c43 100644
--- a/plugins/SimulationView/SimulationViewMenuComponent.qml
+++ b/plugins/SimulationView/SimulationViewMenuComponent.qml
@@ -43,7 +43,7 @@ Cura.ExpandableComponent
             verticalAlignment: Text.AlignVCenter
             height: parent.height
             elide: Text.ElideRight
-            font: UM.Theme.getFont("default")
+            font: UM.Theme.getFont("medium")
             color: UM.Theme.getColor("text_medium")
             renderType: Text.NativeRendering
         }
@@ -60,7 +60,7 @@ Cura.ExpandableComponent
             }
             height: parent.height
             elide: Text.ElideRight
-            font: UM.Theme.getFont("default")
+            font: UM.Theme.getFont("medium")
             color: UM.Theme.getColor("text")
             renderType: Text.NativeRendering
         }
diff --git a/plugins/Toolbox/resources/qml/SmallRatingWidget.qml b/plugins/Toolbox/resources/qml/SmallRatingWidget.qml
index 4950ea9242..965b81dc0f 100644
--- a/plugins/Toolbox/resources/qml/SmallRatingWidget.qml
+++ b/plugins/Toolbox/resources/qml/SmallRatingWidget.qml
@@ -30,7 +30,7 @@ Row
         width: contentWidth
         anchors.verticalCenter: starIcon.verticalCenter
         color: starIcon.color
-        font: UM.Theme.getFont("small")
+        font: UM.Theme.getFont("default")
         renderType: Text.NativeRendering
     }
 }
\ No newline at end of file
diff --git a/plugins/Toolbox/resources/qml/ToolboxAuthorPage.qml b/plugins/Toolbox/resources/qml/ToolboxAuthorPage.qml
index 7b026566c3..b653f1a73b 100644
--- a/plugins/Toolbox/resources/qml/ToolboxAuthorPage.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxAuthorPage.qml
@@ -55,7 +55,7 @@ Item
                 bottomMargin: UM.Theme.getSize("default_margin").height
             }
             text: details.name || ""
-            font: UM.Theme.getFont("large")
+            font: UM.Theme.getFont("large_bold")
             wrapMode: Text.WordWrap
             width: parent.width
             height: UM.Theme.getSize("toolbox_property_label").height
diff --git a/plugins/Toolbox/resources/qml/ToolboxBackColumn.qml b/plugins/Toolbox/resources/qml/ToolboxBackColumn.qml
index edb1967fee..dba9f19ccd 100644
--- a/plugins/Toolbox/resources/qml/ToolboxBackColumn.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxBackColumn.qml
@@ -61,8 +61,13 @@ Item
                 id: labelStyle
                 text: control.text
                 color: control.enabled ? (control.hovered ? UM.Theme.getColor("primary") : UM.Theme.getColor("text")) : UM.Theme.getColor("text_inactive")
-                font: UM.Theme.getFont("default_bold")
-                horizontalAlignment: Text.AlignRight
+                font: UM.Theme.getFont("medium_bold")
+                horizontalAlignment: Text.AlignLeft
+                anchors
+                {
+                    left: parent.left
+                    leftMargin: UM.Theme.getSize("default_margin").width
+                }
                 width: control.width
                 renderType: Text.NativeRendering
             }
diff --git a/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml b/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml
index b9b36cd878..fef2732af9 100644
--- a/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml
@@ -59,7 +59,7 @@ Item
                 leftMargin: UM.Theme.getSize("default_margin").width
             }
             text: details === null ? "" : (details.name || "")
-            font: UM.Theme.getFont("large")
+            font: UM.Theme.getFont("large_bold")
             color: UM.Theme.getColor("text")
             width: contentWidth
             height: contentHeight
diff --git a/plugins/Toolbox/resources/qml/ToolboxDownloadsGrid.qml b/plugins/Toolbox/resources/qml/ToolboxDownloadsGrid.qml
index 85f0ff8be4..a9fcb39b28 100644
--- a/plugins/Toolbox/resources/qml/ToolboxDownloadsGrid.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxDownloadsGrid.qml
@@ -22,7 +22,7 @@ Column
         text: gridArea.heading
         width: parent.width
         color: UM.Theme.getColor("text_medium")
-        font: UM.Theme.getFont("medium")
+        font: UM.Theme.getFont("large")
         renderType: Text.NativeRendering
     }
     Grid
diff --git a/plugins/Toolbox/resources/qml/ToolboxDownloadsGridTile.qml b/plugins/Toolbox/resources/qml/ToolboxDownloadsGridTile.qml
index 58e4f070e0..a11c6ee963 100644
--- a/plugins/Toolbox/resources/qml/ToolboxDownloadsGridTile.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxDownloadsGridTile.qml
@@ -112,7 +112,7 @@ Item
             elide: Text.ElideRight
             width: parent.width
             wrapMode: Text.WordWrap
-            color: UM.Theme.getColor("text_medium")
+            color: UM.Theme.getColor("text")
             font: UM.Theme.getFont("default")
             anchors.top: name.bottom
             anchors.bottom: rating.top
diff --git a/plugins/Toolbox/resources/qml/ToolboxDownloadsShowcase.qml b/plugins/Toolbox/resources/qml/ToolboxDownloadsShowcase.qml
index 820b74554a..795622cf82 100644
--- a/plugins/Toolbox/resources/qml/ToolboxDownloadsShowcase.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxDownloadsShowcase.qml
@@ -23,7 +23,7 @@ Rectangle
             text: catalog.i18nc("@label", "Featured")
             width: parent.width
             color: UM.Theme.getColor("text_medium")
-            font: UM.Theme.getFont("medium")
+            font: UM.Theme.getFont("large")
             renderType: Text.NativeRendering
         }
         Grid
diff --git a/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml b/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml
index e1d01db59a..a85a69cbac 100644
--- a/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml
@@ -37,7 +37,7 @@ ScrollView
             width: page.width
             text: catalog.i18nc("@title:tab", "Plugins")
             color: UM.Theme.getColor("text_medium")
-            font: UM.Theme.getFont("medium")
+            font: UM.Theme.getFont("large")
             renderType: Text.NativeRendering
         }
         Rectangle
diff --git a/plugins/Toolbox/resources/qml/ToolboxInstalledTile.qml b/plugins/Toolbox/resources/qml/ToolboxInstalledTile.qml
index 593e024309..333d4dd50a 100644
--- a/plugins/Toolbox/resources/qml/ToolboxInstalledTile.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxInstalledTile.qml
@@ -49,13 +49,14 @@ Item
                 width: parent.width
                 height: Math.floor(UM.Theme.getSize("toolbox_property_label").height)
                 wrapMode: Text.WordWrap
-                font: UM.Theme.getFont("default_bold")
+                font: UM.Theme.getFont("large_bold")
                 color: pluginInfo.color
                 renderType: Text.NativeRendering
             }
             Label
             {
                 text: model.description
+                font: UM.Theme.getFont("default")
                 maximumLineCount: 3
                 elide: Text.ElideRight
                 width: parent.width
@@ -82,6 +83,7 @@ Item
                         return model.author_name
                     }
                 }
+                font: UM.Theme.getFont("medium")
                 width: parent.width
                 height: Math.floor(UM.Theme.getSize("toolbox_property_label").height)
                 wrapMode: Text.WordWrap
@@ -96,6 +98,7 @@ Item
             Label
             {
                 text: model.version
+                font: UM.Theme.getFont("default")
                 width: parent.width
                 height: UM.Theme.getSize("toolbox_property_label").height
                 color: UM.Theme.getColor("text")
diff --git a/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml b/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml
index 80b5c2f99e..3883a7e285 100644
--- a/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml
+++ b/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml
@@ -223,7 +223,7 @@ Cura.MachineAction
                     width: parent.width
                     wrapMode: Text.WordWrap
                     text: base.selectedDevice ? base.selectedDevice.name : ""
-                    font: UM.Theme.getFont("large")
+                    font: UM.Theme.getFont("large_bold")
                     elide: Text.ElideRight
                     renderType: Text.NativeRendering
                 }
diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml
index 2ca37a7e13..b8c4353811 100644
--- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml
+++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml
@@ -81,7 +81,7 @@ Item
                     text: printer && printer.name ? printer.name : ""
                     color: "#414054" // TODO: Theme!
                     elide: Text.ElideRight
-                    font: UM.Theme.getFont("large") // 16pt, bold
+                    font: UM.Theme.getFont("large_bold") // 16pt, bold
                     width: parent.width
 
                     // FIXED-LINE-HEIGHT:
@@ -185,7 +185,7 @@ Item
                     verticalCenter: parent.verticalCenter
                 }
                 color: "#414054" // TODO: Theme!
-                font: UM.Theme.getFont("large") // 16pt, bold
+                font: UM.Theme.getFont("large_bold") // 16pt, bold
                 text: {
                     if (printer && printer.state == "disabled")
                     {
@@ -236,7 +236,7 @@ Item
                     id: printerJobNameLabel
                     color: printer.activePrintJob && printer.activePrintJob.isActive ? "#414054" : "#babac1" // TODO: Theme!
                     elide: Text.ElideRight
-                    font: UM.Theme.getFont("large") // 16pt, bold
+                    font: UM.Theme.getFont("large_bold") // 16pt, bold
                     text: base.printer.activePrintJob ? base.printer.activePrintJob.name : "Untitled" // TODO: I18N
                     width: parent.width
 
diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml
index 884dbabc2f..f2a0e785b8 100644
--- a/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml
+++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml
@@ -23,7 +23,7 @@ Item
             top: parent.top
         }
         color: UM.Theme.getColor("text")
-        font: UM.Theme.getFont("large_nonbold")
+        font: UM.Theme.getFont("large")
         text: catalog.i18nc("@label", "Queued")
     }
 
diff --git a/resources/qml/Account/AccountDetails.qml b/resources/qml/Account/AccountDetails.qml
index bfb23930c6..45f822e41f 100644
--- a/resources/qml/Account/AccountDetails.qml
+++ b/resources/qml/Account/AccountDetails.qml
@@ -44,7 +44,7 @@ Column
         horizontalAlignment: Text.AlignHCenter
         renderType: Text.NativeRendering
         text: loggedIn ? profile["username"] : catalog.i18nc("@label", "Please log in or create an account to\nenjoy all features of Ultimaker Cura.")
-        font: loggedIn ? UM.Theme.getFont("large") : UM.Theme.getFont("default")
+        font: loggedIn ? UM.Theme.getFont("large_bold") : UM.Theme.getFont("default")
         color: UM.Theme.getColor("text")
     }
 
diff --git a/resources/qml/ActionPanel/OutputProcessWidget.qml b/resources/qml/ActionPanel/OutputProcessWidget.qml
index a8797670b4..15214f212c 100644
--- a/resources/qml/ActionPanel/OutputProcessWidget.qml
+++ b/resources/qml/ActionPanel/OutputProcessWidget.qml
@@ -50,7 +50,8 @@ Column
 
                 text: preSlicedData ? catalog.i18nc("@label", "No time estimation available") : PrintInformation.currentPrintTime.getDisplayString(UM.DurationFormat.Long)
                 source: UM.Theme.getIcon("clock")
-                font: UM.Theme.getFont("default_bold")
+                font: UM.Theme.getFont("large_bold")
+
                 PrintInformationWidget
                 {
                     id: printInformationPanel
diff --git a/resources/qml/ActionPanel/SliceProcessWidget.qml b/resources/qml/ActionPanel/SliceProcessWidget.qml
index 127f454902..1695be8748 100644
--- a/resources/qml/ActionPanel/SliceProcessWidget.qml
+++ b/resources/qml/ActionPanel/SliceProcessWidget.qml
@@ -44,9 +44,9 @@ Column
     {
         id: autoSlicingLabel
         width: parent.width
-        visible: prepareButtons.autoSlice && (widget.backendState == UM.Backend.Processing || widget.backendState == UM.Backend.NotStarted)
+        visible: progressBar.visible
 
-        text: catalog.i18nc("@label:PrintjobStatus", "Auto slicing...")
+        text: catalog.i18nc("@label:PrintjobStatus", "Slicing...")
         color: UM.Theme.getColor("text")
         font: UM.Theme.getFont("default")
         renderType: Text.NativeRendering
diff --git a/resources/qml/Dialogs/AboutDialog.qml b/resources/qml/Dialogs/AboutDialog.qml
index add84614e0..ac115a0e5f 100644
--- a/resources/qml/Dialogs/AboutDialog.qml
+++ b/resources/qml/Dialogs/AboutDialog.qml
@@ -51,7 +51,7 @@ UM.Dialog
         id: version
 
         text: catalog.i18nc("@label","version: %1").arg(UM.Application.version)
-        font: UM.Theme.getFont("large")
+        font: UM.Theme.getFont("large_bold")
         color: UM.Theme.getColor("text")
         anchors.right : logo.right
         anchors.top: logo.bottom
diff --git a/resources/qml/ExpandableComponentHeader.qml b/resources/qml/ExpandableComponentHeader.qml
index 09ea262c82..94066340e3 100644
--- a/resources/qml/ExpandableComponentHeader.qml
+++ b/resources/qml/ExpandableComponentHeader.qml
@@ -25,7 +25,7 @@ Cura.RoundedRectangle
     {
         id: headerLabel
         text: ""
-        font: UM.Theme.getFont("default")
+        font: UM.Theme.getFont("medium")
         renderType: Text.NativeRendering
         verticalAlignment: Text.AlignVCenter
         color: UM.Theme.getColor("small_button_text")
diff --git a/resources/qml/ExtruderIcon.qml b/resources/qml/ExtruderIcon.qml
index fcc49c9040..015ebea52e 100644
--- a/resources/qml/ExtruderIcon.qml
+++ b/resources/qml/ExtruderIcon.qml
@@ -48,7 +48,7 @@ Item
             id: extruderNumberText
             anchors.centerIn: parent
             text: index + 1
-            font: UM.Theme.getFont("very_small")
+            font: UM.Theme.getFont("small")
             color: UM.Theme.getColor("text")
             width: contentWidth
             height: contentHeight
@@ -66,7 +66,7 @@ Item
             sourceSize.height: width
             source: UM.Theme.getIcon("cross1")
             visible: !extruderEnabled
-            color: "black"
+            color: UM.Theme.getColor("text")
         }
     }
 }
\ No newline at end of file
diff --git a/resources/qml/JobSpecs.qml b/resources/qml/JobSpecs.qml
index c7f82b8876..144616c22d 100644
--- a/resources/qml/JobSpecs.qml
+++ b/resources/qml/JobSpecs.qml
@@ -97,7 +97,7 @@ Item
             style: TextFieldStyle
             {
                 textColor: UM.Theme.getColor("text_scene")
-                font: UM.Theme.getFont("default_bold")
+                font: UM.Theme.getFont("default")
                 background: Rectangle
                 {
                     opacity: 0
@@ -115,7 +115,7 @@ Item
 
         height: UM.Theme.getSize("jobspecs_line").height
         verticalAlignment: Text.AlignVCenter
-        font: UM.Theme.getFont("default_bold")
+        font: UM.Theme.getFont("default")
         color: UM.Theme.getColor("text_scene")
         text: CuraApplication.getSceneBoundingBoxString
     }
diff --git a/resources/qml/MainWindow/MainWindowHeader.qml b/resources/qml/MainWindow/MainWindowHeader.qml
index e3b7e199fa..3e296ead40 100644
--- a/resources/qml/MainWindow/MainWindowHeader.qml
+++ b/resources/qml/MainWindow/MainWindowHeader.qml
@@ -102,6 +102,7 @@ Item
         {
             id: label
             text: marketplaceButton.text
+            font: UM.Theme.getFont("default")
             color: marketplaceButton.hovered ? UM.Theme.getColor("main_window_header_background") : UM.Theme.getColor("primary_text")
             width: contentWidth
             verticalAlignment: Text.AlignVCenter
diff --git a/resources/qml/Menus/ConfigurationMenu/AutoConfiguration.qml b/resources/qml/Menus/ConfigurationMenu/AutoConfiguration.qml
index a3ed5040b7..18409dd43a 100644
--- a/resources/qml/Menus/ConfigurationMenu/AutoConfiguration.qml
+++ b/resources/qml/Menus/ConfigurationMenu/AutoConfiguration.qml
@@ -16,7 +16,7 @@ Item
     {
         id: header
         text: catalog.i18nc("@header", "Configurations")
-        font: UM.Theme.getFont("default")
+        font: UM.Theme.getFont("medium")
         color: UM.Theme.getColor("small_button_text")
         height: contentHeight
         renderType: Text.NativeRendering
diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml
index 5e47cafcf1..058c1ff4c2 100644
--- a/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml
+++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml
@@ -189,25 +189,13 @@ Button
             height: childrenRect.height
             visible: configuration.buildplateConfiguration != "" && false //Buildplate is disabled as long as we have no printers that properly support buildplate swapping (so we can't test).
 
-            UM.RecolorImage
-            {
-                id: buildplateIcon
-                anchors.left: parent.left
-                width: UM.Theme.getSize("main_window_header_button_icon").width
-                height: UM.Theme.getSize("main_window_header_button_icon").height
-                source: UM.Theme.getIcon("buildplate")
-                color: UM.Theme.getColor("text")
-            }
-
-            Label
+            // Show the type of buildplate. The first letter is capitalized
+            Cura.IconWithText
             {
                 id: buildplateLabel
-                anchors.left: buildplateIcon.right
-                anchors.verticalCenter: buildplateIcon.verticalCenter
-                anchors.leftMargin: UM.Theme.getSize("narrow_margin").height
-                text: configuration.buildplateConfiguration
-                renderType: Text.NativeRendering
-                color: UM.Theme.getColor("text")
+                source: UM.Theme.getIcon("buildplate")
+                text: configuration.buildplateConfiguration.charAt(0).toUpperCase() + configuration.buildplateConfiguration.substr(1)
+                anchors.left: parent.left
             }
         }
     }
diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
index 207b65afc7..3001efac54 100644
--- a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
+++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
@@ -86,7 +86,7 @@ Cura.ExpandablePopup
                 {
                     text: model.material
                     elide: Text.ElideRight
-                    font: UM.Theme.getFont("default")
+                    font: UM.Theme.getFont("medium")
                     color: UM.Theme.getColor("text")
                     renderType: Text.NativeRendering
 
@@ -107,7 +107,7 @@ Cura.ExpandablePopup
         {
             text: catalog.i18nc("@label", "Select configuration")
             elide: Text.ElideRight
-            font: UM.Theme.getFont("default")
+            font: UM.Theme.getFont("medium")
             color: UM.Theme.getColor("text")
             renderType: Text.NativeRendering
 
diff --git a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
index 4d6d80c1b4..5cecda4e5c 100644
--- a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
+++ b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
@@ -23,7 +23,7 @@ Item
     {
         id: header
         text: catalog.i18nc("@header", "Custom")
-        font: UM.Theme.getFont("default")
+        font: UM.Theme.getFont("medium")
         color: UM.Theme.getColor("small_button_text")
         height: contentHeight
         renderType: Text.NativeRendering
diff --git a/resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml b/resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml
index a344e31d4f..db6a97aa65 100644
--- a/resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml
+++ b/resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml
@@ -39,7 +39,7 @@ Row
             text: printCoreConfiguration.material.brand ? printCoreConfiguration.material.name : " " //Use space so that the height is still correct.
             renderType: Text.NativeRendering
             elide: Text.ElideRight
-            font: UM.Theme.getFont("default")
+            font: UM.Theme.getFont("medium")
             color: UM.Theme.getColor("text")
         }
         Label
diff --git a/resources/qml/MonitorButton.qml b/resources/qml/MonitorButton.qml
index fd7d2287c4..99640b1059 100644
--- a/resources/qml/MonitorButton.qml
+++ b/resources/qml/MonitorButton.qml
@@ -168,7 +168,7 @@ Item
         anchors.leftMargin: UM.Theme.getSize("thick_margin").width
 
         color: base.statusColor
-        font: UM.Theme.getFont("large")
+        font: UM.Theme.getFont("large_bold")
         text: statusText
     }
 
@@ -179,7 +179,7 @@ Item
         anchors.right: progressBar.right
 
         color: base.statusColor
-        font: UM.Theme.getFont("large")
+        font: UM.Theme.getFont("large_bold")
         text: Math.round(progress) + "%"
         visible: showProgress
     }
diff --git a/resources/qml/Preferences/MachinesPage.qml b/resources/qml/Preferences/MachinesPage.qml
index 4acefdb493..d5ecb10658 100644
--- a/resources/qml/Preferences/MachinesPage.qml
+++ b/resources/qml/Preferences/MachinesPage.qml
@@ -70,7 +70,7 @@ UM.ManagementPage
         {
             id: machineName
             text: base.currentItem && base.currentItem.name ? base.currentItem.name : ""
-            font: UM.Theme.getFont("large")
+            font: UM.Theme.getFont("large_bold")
             width: parent.width
             elide: Text.ElideRight
         }
diff --git a/resources/qml/Preferences/Materials/MaterialsDetailsPanel.qml b/resources/qml/Preferences/Materials/MaterialsDetailsPanel.qml
index 92970f40e2..eb4a63250f 100644
--- a/resources/qml/Preferences/Materials/MaterialsDetailsPanel.qml
+++ b/resources/qml/Preferences/Materials/MaterialsDetailsPanel.qml
@@ -65,7 +65,7 @@ Item
 
             Label {
                 text: materialProperties.name
-                font: UM.Theme.getFont("large")
+                font: UM.Theme.getFont("large_bold")
             }
         }
 
diff --git a/resources/qml/Preferences/ProfilesPage.qml b/resources/qml/Preferences/ProfilesPage.qml
index d20519b361..d9b679e344 100644
--- a/resources/qml/Preferences/ProfilesPage.qml
+++ b/resources/qml/Preferences/ProfilesPage.qml
@@ -471,7 +471,7 @@ Item
 
                     Label {
                         text: base.currentItemName
-                        font: UM.Theme.getFont("large")
+                        font: UM.Theme.getFont("large_bold")
                     }
                 }
 
diff --git a/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml b/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml
index 8baaf9a7ae..32c07a52a6 100644
--- a/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml
+++ b/resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml
@@ -25,7 +25,7 @@ Item
             right: globalProfileSelection.left
         }
         text: catalog.i18nc("@label", "Profile")
-        font: UM.Theme.getFont("default")
+        font: UM.Theme.getFont("medium")
         color: UM.Theme.getColor("text")
         verticalAlignment: Text.AlignVCenter
     }
diff --git a/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml b/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml
index 94da5bdd6f..5ae9488cd3 100644
--- a/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml
+++ b/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml
@@ -29,6 +29,7 @@ RowLayout
             }
             return ""
         }
+        font: UM.Theme.getFont("medium")
 
         UM.SettingPropertyProvider
         {
@@ -43,6 +44,7 @@ RowLayout
     {
         source: UM.Theme.getIcon("category_infill")
         text: Cura.MachineManager.activeStack ? parseInt(infillDensity.properties.value) + "%" : "0%"
+        font: UM.Theme.getFont("medium")
 
         UM.SettingPropertyProvider
         {
@@ -57,6 +59,7 @@ RowLayout
     {
         source: UM.Theme.getIcon("category_support")
         text: supportEnabled.properties.value == "True" ? enabledText : disabledText
+        font: UM.Theme.getFont("medium")
 
         UM.SettingPropertyProvider
         {
@@ -71,6 +74,7 @@ RowLayout
     {
         source: UM.Theme.getIcon("category_adhesion")
         text: platformAdhesionType.properties.value != "skirt" && platformAdhesionType.properties.value != "none" ? enabledText : disabledText
+        font: UM.Theme.getFont("medium")
 
         UM.SettingPropertyProvider
         {
diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml
index a5f35f333b..941199707c 100644
--- a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml
+++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml
@@ -26,6 +26,7 @@ Item
         anchors.left: parent.left
         source: UM.Theme.getIcon("category_adhesion")
         text: catalog.i18nc("@label", "Adhesion")
+        font: UM.Theme.getFont("medium")
         width: labelColumnWidth
     }
 
diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml
index 0da53cc1c1..19f199fea6 100644
--- a/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml
+++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml
@@ -63,6 +63,7 @@ Item
         anchors.left: parent.left
         source: UM.Theme.getIcon("category_infill")
         text: catalog.i18nc("@label", "Infill") + " (%)"
+        font: UM.Theme.getFont("medium")
         width: labelColumnWidth
     }
 
@@ -140,6 +141,7 @@ Item
                         Label
                         {
                             text: index
+                            font: UM.Theme.getFont("default")
                             visible: (index % 20) == 0 // Only show steps of 20%
                             anchors.horizontalCenter: parent.horizontalCenter
                             y: UM.Theme.getSize("thin_margin").height
diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml
index 1e71134404..801e76382b 100644
--- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml
+++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml
@@ -173,6 +173,7 @@ Item
             id: qualityRowTitle
             source: UM.Theme.getIcon("category_layer_height")
             text: catalog.i18nc("@label", "Layer Height")
+            font: UM.Theme.getFont("medium")
             anchors.left: parent.left
             anchors.right: customisedSettings.left
         }
@@ -271,6 +272,7 @@ Item
                         return Math.round((settingsColumnWidth / qualityModel.totalTicks) * index - (width / 2))
                     }
                 }
+                font: UM.Theme.getFont("default")
             }
         }
     }
diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml
index 87fb664713..0e834ac4df 100644
--- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml
+++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml
@@ -27,6 +27,7 @@ Item
         visible: enableSupportCheckBox.visible
         source: UM.Theme.getIcon("category_support")
         text: catalog.i18nc("@label", "Support")
+        font: UM.Theme.getFont("medium")
         width: labelColumnWidth
     }
 
diff --git a/resources/qml/PrintSetupTooltip.qml b/resources/qml/PrintSetupTooltip.qml
index 693b703813..6b1538d849 100644
--- a/resources/qml/PrintSetupTooltip.qml
+++ b/resources/qml/PrintSetupTooltip.qml
@@ -41,7 +41,8 @@ UM.PointingRectangle {
         base.opacity = 0;
     }
 
-    Label {
+    Label
+    {
         id: label;
         anchors {
             top: parent.top;
diff --git a/resources/qml/PrinterOutput/ExtruderBox.qml b/resources/qml/PrinterOutput/ExtruderBox.qml
index 9ba78f778f..a19c02b0dd 100644
--- a/resources/qml/PrinterOutput/ExtruderBox.qml
+++ b/resources/qml/PrinterOutput/ExtruderBox.qml
@@ -80,7 +80,7 @@ Item
             id: extruderCurrentTemperature
             text: Math.round(extruderModel.hotendTemperature) + "°C"
             color: UM.Theme.getColor("text")
-            font: UM.Theme.getFont("large")
+            font: UM.Theme.getFont("large_bold")
             anchors.right: extruderTargetTemperature.left
             anchors.top: parent.top
             anchors.margins: UM.Theme.getSize("default_margin").width
diff --git a/resources/qml/PrinterOutput/HeatedBedBox.qml b/resources/qml/PrinterOutput/HeatedBedBox.qml
index ac541f707c..77421c8aad 100644
--- a/resources/qml/PrinterOutput/HeatedBedBox.qml
+++ b/resources/qml/PrinterOutput/HeatedBedBox.qml
@@ -67,7 +67,7 @@ Item
         {
             id: bedCurrentTemperature
             text: printerModel != null ? printerModel.bedTemperature + "°C" : ""
-            font: UM.Theme.getFont("large")
+            font: UM.Theme.getFont("large_bold")
             color: UM.Theme.getColor("text")
             anchors.right: bedTargetTemperature.left
             anchors.top: parent.top
diff --git a/resources/qml/PrinterOutput/OutputDeviceHeader.qml b/resources/qml/PrinterOutput/OutputDeviceHeader.qml
index 16280eab5f..47f855266b 100644
--- a/resources/qml/PrinterOutput/OutputDeviceHeader.qml
+++ b/resources/qml/PrinterOutput/OutputDeviceHeader.qml
@@ -31,7 +31,7 @@ Item
         Label
         {
             id: outputDeviceNameLabel
-            font: UM.Theme.getFont("large")
+            font: UM.Theme.getFont("large_bold")
             color: UM.Theme.getColor("text")
             anchors.left: parent.left
             anchors.top: parent.top
diff --git a/resources/qml/PrinterSelector/MachineSelectorList.qml b/resources/qml/PrinterSelector/MachineSelectorList.qml
index 604e0f668d..b9c20d0de1 100644
--- a/resources/qml/PrinterSelector/MachineSelectorList.qml
+++ b/resources/qml/PrinterSelector/MachineSelectorList.qml
@@ -18,7 +18,7 @@ ListView
     {
         text: section == "true" ? catalog.i18nc("@label", "Connected printers") : catalog.i18nc("@label", "Preset printers")
         width: parent.width
-        height: visible ? contentHeight + 2 * UM.Theme.getSize("default_margin").height : 0
+        height: UM.Theme.getSize("action_button").height
         leftPadding: UM.Theme.getSize("default_margin").width
         renderType: Text.NativeRendering
         font: UM.Theme.getFont("medium")
diff --git a/resources/qml/Settings/SettingCategory.qml b/resources/qml/Settings/SettingCategory.qml
index da731bcd55..1e88867889 100644
--- a/resources/qml/Settings/SettingCategory.qml
+++ b/resources/qml/Settings/SettingCategory.qml
@@ -73,7 +73,7 @@ Button
             text: definition.label
             textFormat: Text.PlainText
             renderType: Text.NativeRendering
-            font: UM.Theme.getFont("default")
+            font: UM.Theme.getFont("medium_bold")
             color:
             {
                 if (!base.enabled)
diff --git a/resources/qml/ToolTip.qml b/resources/qml/ToolTip.qml
index 87586f76d8..e82caf01b2 100644
--- a/resources/qml/ToolTip.qml
+++ b/resources/qml/ToolTip.qml
@@ -25,7 +25,7 @@ ToolTip
     text: ""
     delay: 500
     font: UM.Theme.getFont("default")
-    
+
     // If the text is not set, just set the height to 0 to prevent it from showing
     height: text != "" ? label.contentHeight + 2 * UM.Theme.getSize("thin_margin").width: 0
 
diff --git a/resources/qml/ViewsSelector.qml b/resources/qml/ViewsSelector.qml
index 1f5a0bbc85..0e9be649db 100644
--- a/resources/qml/ViewsSelector.qml
+++ b/resources/qml/ViewsSelector.qml
@@ -51,7 +51,7 @@ Cura.ExpandablePopup
             verticalAlignment: Text.AlignVCenter
             height: parent.height
             elide: Text.ElideRight
-            font: UM.Theme.getFont("default")
+            font: UM.Theme.getFont("medium")
             color: UM.Theme.getColor("text_medium")
             renderType: Text.NativeRendering
         }
@@ -68,7 +68,7 @@ Cura.ExpandablePopup
             }
             height: parent.height
             elide: Text.ElideRight
-            font: UM.Theme.getFont("default")
+            font: UM.Theme.getFont("medium")
             color: UM.Theme.getColor("text")
             renderType: Text.NativeRendering
         }
diff --git a/resources/themes/cura-light/styles.qml b/resources/themes/cura-light/styles.qml
index 2c4dab7c89..4361c3ae2b 100755
--- a/resources/themes/cura-light/styles.qml
+++ b/resources/themes/cura-light/styles.qml
@@ -207,8 +207,8 @@ QtObject
                         anchors.horizontalCenter: parent.horizontalCenter
                         anchors.verticalCenter: parent.verticalCenter
 
-                        text: control.text;
-                        font: Theme.getFont("button_tooltip")
+                        text: control.text
+                        font: Theme.getFont("default")
                         color: Theme.getColor("tooltip_text")
                     }
                 }
diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json
index d56869d895..42ef632673 100644
--- a/resources/themes/cura-light/theme.json
+++ b/resources/themes/cura-light/theme.json
@@ -6,17 +6,17 @@
     "fonts": {
         "large": {
             "size": 1.35,
-            "weight": 63,
+            "weight": 40,
             "family": "Noto Sans"
         },
-        "large_nonbold": {
+        "large_bold": {
             "size": 1.35,
-            "weight": 50,
+            "weight": 63,
             "family": "Noto Sans"
         },
         "medium": {
             "size": 1.16,
-            "weight": 50,
+            "weight": 40,
             "family": "Noto Sans"
         },
         "medium_bold": {
@@ -25,29 +25,24 @@
             "family": "Noto Sans"
         },
         "default": {
-            "size": 1.0,
-            "weight": 50,
+            "size": 0.95,
+            "weight": 40,
             "family": "Noto Sans"
         },
         "default_bold": {
-            "size": 1.0,
+            "size": 0.95,
             "weight": 63,
             "family": "Noto Sans"
         },
         "default_italic": {
-            "size": 1.0,
-            "weight": 50,
+            "size": 0.95,
+            "weight": 40,
             "italic": true,
             "family": "Noto Sans"
         },
         "small": {
-            "size": 0.85,
-            "weight": 50,
-            "family": "Noto Sans"
-        },
-        "very_small": {
             "size": 0.7,
-            "weight": 50,
+            "weight": 40,
             "family": "Noto Sans"
         }
     },
@@ -302,7 +297,7 @@
         "printer_config_mismatch": [127, 127, 127, 255],
 
         "toolbox_header_button_text_active": [0, 0, 0, 255],
-        "toolbox_header_button_text_inactive": [128, 128, 128, 255],
+        "toolbox_header_button_text_inactive": [0, 0, 0, 255],
         "toolbox_header_button_text_hovered": [0, 0, 0, 255],
 
         "favorites_header_bar": [245, 245, 245, 255],
@@ -491,7 +486,7 @@
         "toolbox_detail_header": [1.0, 14.0],
         "toolbox_detail_tile": [1.0, 8.0],
         "toolbox_back_column": [6.0, 1.0],
-        "toolbox_back_button": [4.0, 2.0],
+        "toolbox_back_button": [6.0, 2.0],
         "toolbox_installed_tile": [1.0, 8.0],
         "toolbox_property_label": [1.0, 2.0],
         "toolbox_heading_label": [1.0, 3.8],