diff --git a/containment/package/contents/ui/applet/AppletItem.qml b/containment/package/contents/ui/applet/AppletItem.qml
index f5e7b1a69..08e3bc2d1 100644
--- a/containment/package/contents/ui/applet/AppletItem.qml
+++ b/containment/package/contents/ui/applet/AppletItem.qml
@@ -164,9 +164,7 @@ Item {
     property Item latteStyleApplet: applet && ((applet.pluginName === "org.kde.latte.spacer") || (applet.pluginName === "org.kde.latte.separator")) ?
                                         (applet.children[0] ? applet.children[0] : null) : null
 
-    property Item appletWrapper: applet &&
-                                 ((applet.pluginName === root.plasmoidName) ||
-                                  isSystray) ? wrapper : wrapper.wrapperContainer
+    property Item appletWrapper: applet && (applet.pluginName === root.plasmoidName )? wrapper : wrapper.wrapperContainer
 
     property Item tooltipVisualParent: titleTooltipParent
 
diff --git a/containment/package/contents/ui/applet/indicator/Loader.qml b/containment/package/contents/ui/applet/indicator/Loader.qml
index c043625f0..cb745c0d9 100644
--- a/containment/package/contents/ui/applet/indicator/Loader.qml
+++ b/containment/package/contents/ui/applet/indicator/Loader.qml
@@ -42,8 +42,29 @@ Loader {
         return indicators.indicatorComponent;
     }
 
-    width: root.isHorizontal && canBeHovered  ? appletItem.wrapperAlias.zoomScale * visualLockedWidth : appletItem.wrapperAlias.width
-    height: root.isVertical && canBeHovered  ? appletItem.wrapperAlias.zoomScale * visualLockedHeight : appletItem.wrapperAlias.height
+    width: {
+        if (root.isHorizontal) {
+            if (canBeHovered) {
+                return appletItem.wrapperAlias.zoomScale * visualLockedWidth;
+            }
+
+            return appletWrapper.width + appletItem.internalWidthMargins;
+        } else {
+            return appletItem.wrapperAlias.width;
+        }
+    }
+
+    height: {
+        if (root.isVertical) {
+            if (canBeHovered) {
+               return appletItem.wrapperAlias.zoomScale * visualLockedHeight;
+            }
+
+            return appletWrapper.height + appletItem.internalHeightMargins;
+        } else {
+            return appletItem.wrapperAlias.height;
+        }
+    }
 
     readonly property bool locked: appletItem.lockZoom || root.zoomFactor === 1