diff --git a/plugins/GCodeReader/FlavorParser.py b/plugins/GCodeReader/FlavorParser.py
index 56e50d2145..2b6fa215e0 100644
--- a/plugins/GCodeReader/FlavorParser.py
+++ b/plugins/GCodeReader/FlavorParser.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Ultimaker B.V.
+# Copyright (c) 2021 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
 import math
@@ -153,7 +153,7 @@ class FlavorParser:
         Af = (self._filament_diameter / 2) ** 2 * numpy.pi
         # Length of the extruded filament
         de = current_extrusion - previous_extrusion
-        # Volumne of the extruded filament
+        # Volume of the extruded filament
         dVe = de * Af
         # Length of the printed line
         dX = numpy.sqrt((current_point[0] - previous_point[0])**2 + (current_point[2] - previous_point[2])**2)
diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
index 8c09a5ffad..1a04b85fcb 100644
--- a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
+++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
@@ -60,7 +60,7 @@ Cura.ExpandablePopup
                         anchors.verticalCenter: parent.verticalCenter
                     }
 
-                    ColumnLayout
+                    Column
                     {
                         opacity: model.enabled ? 1 : UM.Theme.getColor("extruder_disabled").a
                         spacing: 0
@@ -83,7 +83,7 @@ Cura.ExpandablePopup
                             font: UM.Theme.getFont("default")
                             color: UM.Theme.getColor("text")
                             renderType: Text.NativeRendering
-                            Layout.preferredWidth: parent.width
+                            width: parent.width
                             visible: !truncated
                         }
 
@@ -96,7 +96,7 @@ Cura.ExpandablePopup
                             font: UM.Theme.getFont("default")
                             color: UM.Theme.getColor("text")
                             renderType: Text.NativeRendering
-                            Layout.preferredWidth: parent.width
+                            width: parent.width
                             visible: !materialBrandColorTypeLabel.visible && !truncated
                         }
 
@@ -109,7 +109,7 @@ Cura.ExpandablePopup
                             font: UM.Theme.getFont("default")
                             color: UM.Theme.getColor("text")
                             renderType: Text.NativeRendering
-                            Layout.preferredWidth: parent.width
+                            width: parent.width
                             visible: !materialBrandColorTypeLabel.visible && !materialColorTypeLabel.visible
                         }
                         // Label that shows the name of the variant
diff --git a/resources/themes/cura-light/icons/deprecated_icons.json b/resources/themes/cura-light/icons/deprecated_icons.json
index 8b71e063de..8fb1982617 100644
--- a/resources/themes/cura-light/icons/deprecated_icons.json
+++ b/resources/themes/cura-light/icons/deprecated_icons.json
@@ -167,6 +167,10 @@
         "new_icon": "Check",
         "size": "default"
     },
+    "star": {
+        "new_icon": "StarFilled",
+        "size": "default"
+    },
     "pencil": {
         "new_icon": "Pen",
         "size": "default"