diff --git a/src/styles/Desktop/ToolButtonStyle.qml b/src/styles/Desktop/ToolButtonStyle.qml
index 33b03d1a68d703b8853cbee8e588047889f2012c..69099586df28f376c7d7a00d7bee0e52d723c97e 100644
--- a/src/styles/Desktop/ToolButtonStyle.qml
+++ b/src/styles/Desktop/ToolButtonStyle.qml
@@ -69,7 +69,7 @@ Style {
             id: textitem
             text: control.text
             anchors.centerIn: parent
-            visible: control.iconSource === ""
+            visible: control.iconSource.toString() === ""
         }
     }
 }
diff --git a/tests/manual/testbench/content/Components.qml b/tests/manual/testbench/content/Components.qml
index 07d0acb02d78dc624a38219bc046db59d9c7418a..985e0dadc4faf76c94d03057fb80380c681d4072 100644
--- a/tests/manual/testbench/content/Components.qml
+++ b/tests/manual/testbench/content/Components.qml
@@ -44,6 +44,7 @@ import QtDesktop 1.0
 Item {
     property Component button: Button { text: "Push me"}
     property Component checkbox: CheckBox { text: "A CheckBox" }
+    property Component toolbutton: ToolButton { text: "A ToolButton" }
     property Component radiobutton: RadioButton { text: "A RadioButton" }
     property Component textfield: TextField { }
     property Component spinbox: SpinBox {}
@@ -96,6 +97,7 @@ Item {
     property var componentModel: ListModel {
         Component.onCompleted: {
             append({ name: "Button",        component: button});
+            append({ name: "ToolButton",    component: toolbutton});
             append({ name: "CheckBox",      component: checkbox});
             append({ name: "ComboBox",      component: combobox});
             append({ name: "RadioButton",   component: radiobutton});
@@ -107,7 +109,7 @@ Item {
             append({ name: "ToolBar",       component: toolbar});
             append({ name: "StatusBar",     component: statusbar});
             append({ name: "TableView",     component: tableview});
-            append({ name: "ScrollArea",     component: scrollarea});
+            append({ name: "ScrollArea",    component: scrollarea});
         }
     }
 }