diff --git a/declarativeimports/plasmacomponents/qml/ToolButton.qml b/declarativeimports/plasmacomponents/qml/ToolButton.qml
index 0447a6961..00ffa4ccc 100644
--- a/declarativeimports/plasmacomponents/qml/ToolButton.qml
+++ b/declarativeimports/plasmacomponents/qml/ToolButton.qml
@@ -84,7 +84,7 @@ Item {
         if (label.paintedWidth == 0) {
             return implicitHeight
         } else {
-            return Math.max(theme.defaultFont.mSize.width*12, icon.width + label.paintedWidth + surface.margins.left + surface.margins.right) + ((icon.valid) ? surface.margins.left : 0)
+            return icon.width + label.paintedWidth + surface.margins.left + surface.margins.right + ((icon.valid) ? surface.margins.left : 0)
         }
     }
     implicitHeight: Math.max(theme.defaultFont.mSize.height*1.6, Math.max(icon.height, label.paintedHeight) + surface.margins.top/2 + surface.margins.bottom/2)
@@ -200,7 +200,7 @@ Item {
                 top: parent.top
                 bottom: parent.bottom
                 left: icon.valid ? icon.right : parent.left
-                leftMargin: icon.valid ? parent.anchors.leftMargin : 0
+                leftMargin: icon.valid ? surface.margins.left : 0
                 right: parent.right
             }
             font.capitalization: theme.defaultFont.capitalization