diff --git a/applets/systemtray/package/contents/ui/main.qml b/applets/systemtray/package/contents/ui/main.qml
--- a/applets/systemtray/package/contents/ui/main.qml
+++ b/applets/systemtray/package/contents/ui/main.qml
@@ -39,7 +39,7 @@
     property var iconSizes: ["small", "smallMedium", "medium", "large", "huge", "enormous"];
 
     property bool vertical: plasmoid.formFactor == PlasmaCore.Types.Vertical
-    property int itemSize: units.roundToIconSize(Math.min(Math.min(width, height), units.iconSizes[iconSizes[plasmoid.configuration.iconSize]]))
+    property int itemSize: Math.min(width, height, units.iconSizeHints.panel)
     property int hiddenItemSize: units.iconSizes.smallMedium
     property alias expanded: dialog.visible
     property Item activeApplet
@@ -108,9 +108,18 @@
         var plasmoidContainer = plasmoidItemComponent.createObject(invisibleEntriesContainer, {"x": x, "y": y, "applet": applet});
 
         applet.parent = plasmoidContainer
+
         applet.anchors.left = plasmoidContainer.left
         applet.anchors.top = plasmoidContainer.top
         applet.anchors.bottom = plasmoidContainer.bottom
+
+        if (tasksRow) {
+            applet.anchors.topMargin = tasksRow.marginHints.top;
+            applet.anchors.bottomMargin = tasksRow.marginHints.bottom;
+            applet.anchors.leftMargin = tasksRow.marginHints.left;
+            applet.anchors.rightMargin = tasksRow.marginHints.right;
+        }
+
         applet.width = plasmoidContainer.height
         applet.visible = true
         plasmoidContainer.visible = true