diff --git a/applets/icon/package/contents/ui/main.qml b/applets/icon/package/contents/ui/main.qml
--- a/applets/icon/package/contents/ui/main.qml
+++ b/applets/icon/package/contents/ui/main.qml
@@ -108,11 +108,12 @@
 
     PlasmaCore.IconItem {
         id: icon
-        anchors{
+        anchors {
             left: parent.left
             right: parent.right
             top: parent.top
             bottom: constrained ? parent.bottom : text.top
+            margins: inPanel ? Math.round(units.smallSpacing / 2) : 0
         }
         source: plasmoid.icon
         enabled: root.enabled
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.max(0, Math.min(Math.min(width, height) - units.smallSpacing, units.iconSizeHints.panel))
     property int hiddenItemSize: units.iconSizes.smallMedium
     property alias expanded: dialog.visible
     property Item activeApplet