diff --git a/plugins/ChangeLogPlugin/ChangeLog.qml b/plugins/ChangeLogPlugin/ChangeLog.qml
index 69af3192d1..e5c2ec0ea1 100644
--- a/plugins/ChangeLogPlugin/ChangeLog.qml
+++ b/plugins/ChangeLogPlugin/ChangeLog.qml
@@ -21,7 +21,7 @@ UM.Dialog
     {
         width: parent.width
         height: parent.height - 25
-        Text
+        Label
         {
             text: manager.getChangeLogString()
             width:base.width - 35
diff --git a/plugins/ImageReader/ConfigUI.qml b/plugins/ImageReader/ConfigUI.qml
index 3f41ba9bfa..1df57d74c0 100644
--- a/plugins/ImageReader/ConfigUI.qml
+++ b/plugins/ImageReader/ConfigUI.qml
@@ -20,7 +20,7 @@ UM.Dialog
 
     title: catalog.i18nc("@title:window", "Convert Image...")
 
-    GridLayout 
+    GridLayout
     {
         UM.I18nCatalog{id: catalog; name:"cura"}
         anchors.fill: parent;
@@ -36,7 +36,7 @@ UM.Dialog
             Row {
                 width: parent.width
 
-                Text {
+                Label {
                     text: catalog.i18nc("@action:label","Height (mm)")
                     width: 150
                     anchors.verticalCenter: parent.verticalCenter
@@ -59,7 +59,7 @@ UM.Dialog
             Row {
                 width: parent.width
 
-                Text {
+                Label {
                     text: catalog.i18nc("@action:label","Base (mm)")
                     width: 150
                     anchors.verticalCenter: parent.verticalCenter
@@ -74,7 +74,7 @@ UM.Dialog
                 }
             }
         }
-        
+
         UM.TooltipArea {
             Layout.fillWidth:true
             height: childrenRect.height
@@ -82,7 +82,7 @@ UM.Dialog
             Row {
                 width: parent.width
 
-                Text {
+                Label {
                     text: catalog.i18nc("@action:label","Width (mm)")
                     width: 150
                     anchors.verticalCenter: parent.verticalCenter
@@ -98,7 +98,7 @@ UM.Dialog
                 }
             }
         }
-        
+
         UM.TooltipArea {
             Layout.fillWidth:true
             height: childrenRect.height
@@ -106,7 +106,7 @@ UM.Dialog
             Row {
                 width: parent.width
 
-                Text {
+                Label {
                     text: catalog.i18nc("@action:label","Depth (mm)")
                     width: 150
                     anchors.verticalCenter: parent.verticalCenter
@@ -121,7 +121,7 @@ UM.Dialog
                 }
             }
         }
-        
+
         UM.TooltipArea {
             Layout.fillWidth:true
             height: childrenRect.height
@@ -130,7 +130,7 @@ UM.Dialog
                 width: parent.width
 
                 //Empty label so 2 column layout works.
-                Text {
+                Label {
                     text: ""
                     width: 150
                     anchors.verticalCenter: parent.verticalCenter
@@ -152,7 +152,7 @@ UM.Dialog
             Row {
                 width: parent.width
 
-                Text {
+                Label {
                     text: catalog.i18nc("@action:label","Smoothing")
                     width: 150
                     anchors.verticalCenter: parent.verticalCenter
diff --git a/plugins/USBPrinting/ControlWindow.qml b/plugins/USBPrinting/ControlWindow.qml
index 553da23fed..50dfe64f1f 100644
--- a/plugins/USBPrinting/ControlWindow.qml
+++ b/plugins/USBPrinting/ControlWindow.qml
@@ -22,17 +22,17 @@ UM.Dialog
         Row
         {
             spacing: UM.Theme.getSize("default_margin").width;
-            Text
+            Label
             {
                 //: USB Printing dialog label, %1 is head temperature
                 text: catalog.i18nc("@label","Extruder Temperature %1").arg(manager.extruderTemperature)
             }
-            Text
+            Label
             {
                 //: USB Printing dialog label, %1 is bed temperature
                 text: catalog.i18nc("@label","Bed Temperature %1").arg(manager.bedTemperature)
             }
-            Text
+            Label
             {
                 text: "" + manager.error
             }
diff --git a/resources/qml/WizardPages/AddMachine.qml b/resources/qml/WizardPages/AddMachine.qml
index 5a6a27c0a3..abbe6f292f 100644
--- a/resources/qml/WizardPages/AddMachine.qml
+++ b/resources/qml/WizardPages/AddMachine.qml
@@ -101,7 +101,7 @@ Item
                         height: UM.Theme.getSize("standard_list_lineheight").height
                         width: machineList.width
                     }
-                    label: Text {
+                    label: Label {
                         anchors.left: parent.left
                         anchors.leftMargin: UM.Theme.getSize("standard_arrow").width + UM.Theme.getSize("default_margin").width
                         text: control.text