diff --git a/containments/taskpanel/package/contents/ui/Button.qml b/containments/taskpanel/package/contents/ui/Button.qml
index 6f290968..db16efc0 100644
--- a/containments/taskpanel/package/contents/ui/Button.qml
+++ b/containments/taskpanel/package/contents/ui/Button.qml
@@ -19,6 +19,7 @@ Item {
 
     property MouseArea mouseArea
     readonly property bool pressed: mouseArea.pressed && mouseArea.activeButton == button
+    property double iconSizeFactor: 1
     property alias iconSource: icon.source
     property alias colorGroup: icon.colorGroup
     signal clicked()
@@ -67,7 +68,7 @@ Item {
         id: icon
         anchors {
             fill: parent
-            margins: parent.height * 0.25
+            margins: Math.round((parent.height - parent.height * iconSizeFactor * 0.6) / 2)
         }
         colorGroup: PlasmaCore.ColorScope.colorGroup
         //enabled: button.enabled && button.clickable
diff --git a/containments/taskpanel/package/contents/ui/main.qml b/containments/taskpanel/package/contents/ui/main.qml
index 3b3a0c68..96f084ce 100644
--- a/containments/taskpanel/package/contents/ui/main.qml
+++ b/containments/taskpanel/package/contents/ui/main.qml
@@ -200,6 +200,7 @@ PlasmaCore.ColorScope {
                     plasmoid.nativeInterface.showDesktop = false;
                     taskSwitcher.visible ? taskSwitcher.hide() : taskSwitcher.show();
                 }
+                iconSizeFactor: 0.75
                 iconSource: "mobile-task-switcher"
                 colorGroup: root.showingApp ? PlasmaCore.Theme.NormalColorGroup : PlasmaCore.Theme.ComplementaryColorGroup
             }
@@ -222,6 +223,7 @@ PlasmaCore.ColorScope {
                     MobileShell.HomeScreenControls.resetHomeScreenPosition();
                     plasmoid.nativeInterface.allMinimizedChanged();
                 }
+                iconSizeFactor: 1
                 iconSource: "start-here-kde"
                 colorGroup: root.showingApp ? PlasmaCore.Theme.NormalColorGroup : PlasmaCore.Theme.ComplementaryColorGroup
             }
@@ -253,6 +255,8 @@ PlasmaCore.ColorScope {
                     }
                 }
 
+                // mobile-close-app (from plasma-frameworks) seems to have less margins than icons from breeze-icons
+                iconSizeFactor: TaskPanel.KWinVirtualKeyboard.active ? 1 : 0.75
                 iconSource: TaskPanel.KWinVirtualKeyboard.active ? "go-down-symbolic" : "mobile-close-app"
                 colorGroup: root.showingApp ? PlasmaCore.Theme.NormalColorGroup : PlasmaCore.Theme.ComplementaryColorGroup
             }