diff --git a/panels/dock/package/main.qml b/panels/dock/package/main.qml
index 5d12374f8..c49edd7df 100644
--- a/panels/dock/package/main.qml
+++ b/panels/dock/package/main.qml
@@ -27,7 +27,7 @@ Window {
             
         let otherOccupied = 0;
         if (otherCount > 0) {
-            otherOccupied = otherCount * dockItemMaxSize + otherCount * spacing;
+            otherOccupied = otherCount * dockItemIconSize + otherCount * spacing;
         }
 
         if (useColumnLayout) {
diff --git a/panels/dock/taskmanager/package/AppItem.qml b/panels/dock/taskmanager/package/AppItem.qml
index ae91589f3..e6326d732 100644
--- a/panels/dock/taskmanager/package/AppItem.qml
+++ b/panels/dock/taskmanager/package/AppItem.qml
@@ -38,7 +38,7 @@ Item {
     Drag.mimeData: { "text/x-dde-dock-dnd-appid": itemId, "text/x-dde-dock-dnd-source": "taskbar", "text/x-dde-dock-dnd-winid": windows.length > 0 ? windows[0] : ""}
     
     property bool useColumnLayout: Panel.rootObject.useColumnLayout
-    property int iconSize: Panel.rootObject.dockItemMaxSize * 9 / 14
+    property real iconSize: Panel.rootObject.dockItemMaxSize * 9 / 14
     property bool enableTitle: false
     property bool titleActive: enableTitle && titleLoader.active
     property var iconGlobalPoint: {
diff --git a/panels/dock/taskmanager/package/TaskManager.qml b/panels/dock/taskmanager/package/TaskManager.qml
index ce7aeafed..ff374c892 100644
--- a/panels/dock/taskmanager/package/TaskManager.qml
+++ b/panels/dock/taskmanager/package/TaskManager.qml
@@ -62,8 +62,8 @@ ContainmentItem {
         dataModel: taskmanager.Applet.dataModel
         iconSize: Panel.rootObject.dockItemMaxSize * 9 / 14
         spacing: appContainer.spacing
-        cellSize: visualModel.cellWidth
-        itemPadding: taskmanager.appTitleSpacing
+        cellSize: textCalculator.iconSize
+        itemPadding: Math.round(textCalculator.iconSize / 8)
         remainingSpace: taskmanager.remainingSpacesForTaskManager
         font.family: D.DTK.fontManager.t6.family
         font.pixelSize: Math.max(10, Math.min(20, Math.round(textCalculator.iconSize * 0.35)))
@@ -132,24 +132,8 @@ ContainmentItem {
                 Behavior on opacity { NumberAnimation { duration: 200 } }
                 Behavior on scale { NumberAnimation { duration: 200 } }
 
-                implicitWidth: {
-                    let targetW = useColumnLayout ? taskmanager.implicitWidth : appItem.implicitWidth;
-                    if (useColumnLayout || visualModel.count <= 0) return targetW;
-                    
-                    let totalSpacing = Math.max(0, visualModel.count - 1) * taskmanager.appTitleSpacing;
-                    let availableW = taskmanager.remainingSpacesForTaskManager - totalSpacing;
-                    let maxW = availableW / visualModel.count;
-                    return Math.min(targetW, Math.max(1, maxW));
-                }
-                implicitHeight: {
-                    let targetH = useColumnLayout ? visualModel.cellWidth : taskmanager.implicitHeight;
-                    if (!useColumnLayout || visualModel.count <= 0) return targetH;
-                    
-                    let totalSpacing = Math.max(0, visualModel.count - 1) * taskmanager.appTitleSpacing;
-                    let availableH = taskmanager.remainingSpacesForTaskManager - totalSpacing;
-                    let maxH = availableH / visualModel.count;
-                    return Math.min(targetH, Math.max(1, maxH));
-                }
+                implicitWidth: useColumnLayout ? taskmanager.implicitWidth : appItem.implicitWidth
+                implicitHeight: useColumnLayout ? visualModel.cellWidth : taskmanager.implicitHeight
 
                 property int visualIndex: DelegateModel.itemsIndex
                 property var modelIndex: visualModel.modelIndex(index)