diff --git a/src/declarativeimports/plasmacomponents3/ToolButton.qml b/src/declarativeimports/plasmacomponents3/ToolButton.qml
--- a/src/declarativeimports/plasmacomponents3/ToolButton.qml
+++ b/src/declarativeimports/plasmacomponents3/ToolButton.qml
@@ -24,6 +24,7 @@
 import org.kde.kirigami 2.5 as Kirigami
 import "private" as Private
 
+
 T.ToolButton {
     id: control
 
@@ -46,13 +47,15 @@
 
     contentItem: RowLayout {
         PlasmaCore.IconItem {
-            Layout.fillWidth: true
-            Layout.fillHeight: true
-            colorGroup: PlasmaCore.ColorScope.colorGroup
+            id: icon
             visible: source.length > 0
+            Layout.preferredWidth: control.icon.width > 0 ? control.icon.width : -1
+            Layout.preferredHeight: control.icon.height > 0 ? control.icon.height : -1
+            colorGroup: PlasmaCore.ColorScope.colorGroup
             source: control.icon ? (control.icon.name || control.icon.source) : ""
         }
         Label {
+            id: label
             Layout.fillWidth: true
             visible: text.length > 0
             text: control.Kirigami.MnemonicData.richTextLabel