diff --git a/applets/kicker/package/contents/ui/CompactRepresentation.qml b/applets/kicker/package/contents/ui/CompactRepresentation.qml
--- a/applets/kicker/package/contents/ui/CompactRepresentation.qml
+++ b/applets/kicker/package/contents/ui/CompactRepresentation.qml
@@ -25,88 +25,58 @@
 Item {
     id: root
 
-    property bool vertical: (plasmoid.formFactor == PlasmaCore.Types.Vertical)
+    readonly property bool vertical: (plasmoid.formFactor == PlasmaCore.Types.Vertical)
+    readonly property bool useCustomButtonImage: (plasmoid.configuration.useCustomButtonImage
+        && plasmoid.configuration.customButtonImage.length != 0)
     property QtObject dashWindow: null
 
+    onWidthChanged: updateSizeHints()
+    onHeightChanged: updateSizeHints()
+
     onDashWindowChanged: {
         if (dashWindow) {
             dashWindow.visualParent = root;
         }
     }
 
-    PlasmaCore.IconItem {
-        id: buttonIcon
-
-        anchors.fill: parent
-
-        visible: !(plasmoid.configuration.useCustomButtonImage && plasmoid.configuration.customButtonImage)
-
-        source: plasmoid.configuration.icon
-        active: mouseArea.containsMouse && !justOpenedTimer.running
-
-        onWidthChanged: {
-            if (vertical && visible) {
+    function updateSizeHints() {
+        if (useCustomButtonImage) {
+            if (vertical) {
+                var scaledHeight = Math.floor(parent.width * (buttonIcon.implicitHeight / buttonIcon.implicitWidth));
+                root.Layout.minimumHeight = scaledHeight;
+                root.Layout.maximumHeight = scaledHeight;
                 root.Layout.minimumWidth = units.iconSizes.small;
-                root.Layout.minimumHeight = parent.width;
-            }
-        }
-
-        onHeightChanged: {
-            if (!vertical && visible) {
-                root.Layout.minimumWidth = parent.height;
+                root.Layout.maximumWidth = undefined;
+            } else {
+                var scaledWidth = Math.floor(parent.height * (buttonIcon.implicitWidth / buttonIcon.implicitHeight));
+                root.Layout.minimumWidth = scaledWidth;
+                root.Layout.maximumWidth = scaledWidth;
                 root.Layout.minimumHeight = units.iconSizes.small;
+                root.Layout.maximumHeight = undefined;
             }
-        }
-
-        onVisibleChanged: {
-            if (visible) {
-                if (vertical) {
-                    root.Layout.minimumWidth = units.iconSizes.small;
-                    root.Layout.minimumHeight = units.iconSizes.small;
-                } else {
-                    root.Layout.minimumWidth = parent.height;
-                    root.Layout.minimumHeight = units.iconSizes.small;
-                }
-            }
+        } else {
+            root.Layout.minimumWidth = units.iconSizes.small;
+            root.Layout.maximumWidth = undefined;
+            root.Layout.minimumHeight = units.iconSizes.small
+            root.Layout.maximumHeight = undefined;
         }
     }
 
-    Image {
-        id: buttonImage
+    PlasmaCore.IconItem {
+        id: buttonIcon
 
-        width: vertical ? parent.width : undefined
-        height: vertical ? undefined : parent.height
+        anchors.fill: parent
 
-        onPaintedWidthChanged: {
-            if (!vertical && visible) {
-                root.Layout.minimumWidth = paintedWidth;
-                root.Layout.minimumHeight = units.iconSizes.small;
-            }
-        }
+        readonly property double aspectRatio: (vertical ? implicitHeight / implicitWidth
+            : implicitWidth / implicitHeight)
 
-        onPaintedHeightChanged: {
-            if (vertical && visible) {
-                root.Layout.minimumWidth = units.iconSizes.small;
-                root.Layout.minimumHeight = paintedHeight;
-            }
-        }
+        source: useCustomButtonImage ? plasmoid.configuration.customButtonImage : plasmoid.configuration.icon
 
-        onVisibleChanged: {
-            if (visible) {
-                if (vertical) {
-                    root.Layout.minimumWidth = units.iconSizes.small;
-                    root.Layout.minimumHeight = paintedHeight;
-                } else {
-                    root.Layout.minimumWidth = paintedWidth;
-                    root.Layout.minimumHeight = units.iconSizes.small;
-                }
-            }
-        }
+        active: mouseArea.containsMouse && !justOpenedTimer.running
+
+        roundToIconSize: !useCustomButtonImage
 
-        visible: plasmoid.configuration.useCustomButtonImage && (plasmoid.configuration.customButtonImage != "")
-        source: plasmoid.configuration.customButtonImage
-        fillMode: Image.PreserveAspectFit
-        smooth: true
+        onSourceChanged: updateSizeHints()
     }
 
     MouseArea