diff --git a/containment/package/contents/ui/LayoutsContainer.qml b/containment/package/contents/ui/LayoutsContainer.qml
index 4fcfbfa40..aba5c981b 100644
--- a/containment/package/contents/ui/LayoutsContainer.qml
+++ b/containment/package/contents/ui/LayoutsContainer.qml
@@ -35,6 +35,8 @@ Item{
     property int currentSpot: -1000
     property int hoveredIndex: -1
 
+    readonly property int fillApplets: _startLayout.fillApplets + _mainLayout.fillApplets + _endLayout.fillApplets
+
     property Item startLayout : _startLayout
     property Item mainLayout: _mainLayout
     property Item endLayout: _endLayout
diff --git a/containment/package/contents/ui/main.qml b/containment/package/contents/ui/main.qml
index 55587a04f..bf84eef74 100644
--- a/containment/package/contents/ui/main.qml
+++ b/containment/package/contents/ui/main.qml
@@ -62,7 +62,7 @@ DragDrop.DropArea {
     property bool addLaunchersMessage: false
     property bool addLaunchersInTaskManager: plasmoid.configuration.addLaunchersInTaskManager
     // when there are only plasma style task managers the automatic icon size algorithm should better be disabled
-    property bool autoDecreaseIconSize: plasmoid.configuration.autoDecreaseIconSize && !containsOnlyPlasmaTasks
+    property bool autoDecreaseIconSize: plasmoid.configuration.autoDecreaseIconSize && !containsOnlyPlasmaTasks && layoutsContainer.fillApplets<=0
     property bool backgroundOnlyOnMaximized: plasmoid.configuration.backgroundOnlyOnMaximized
     property bool behaveAsPlasmaPanel: {
         if (!dock || !dock.visibility)
diff --git a/shell/package/contents/configuration/TypeSelection.qml b/shell/package/contents/configuration/TypeSelection.qml
index 062c90174..237c7df31 100644
--- a/shell/package/contents/configuration/TypeSelection.qml
+++ b/shell/package/contents/configuration/TypeSelection.qml
@@ -48,16 +48,7 @@ Rectangle {
 
         readonly property bool isPanel: (plasmoid.configuration.panelPosition === Latte.Dock.Justify)
                                         && (plasmoid.configuration.useThemePanel) && (plasmoid.configuration.panelSize===100)
-                                        && (plasmoid.configuration.zoomLevel === 0) && !plasmoid.configuration.autoDecreaseIconSize
-
-        /*layer.enabled: true
-    layer.effect: DropShadow {
-        radius: dockTypeButton.height / 10
-        samples: radius
-        color: "#0a0a0a"
-        horizontalOffset: -1
-        //opacity: 0.5
-    }*/
+                                        && (plasmoid.configuration.zoomLevel === 0)
 
         ExclusiveGroup {
             id: dockTypeGroup
@@ -81,8 +72,6 @@ Rectangle {
                     plasmoid.configuration.panelSize = 0;
                     plasmoid.configuration.shadows = 2;
                     plasmoid.configuration.zoomLevel = 16;
-                    plasmoid.configuration.autoDecreaseIconSize = true;
-                    plasmoid.configuration.shrinkThickMargins = false;
                 }
             }
         }
@@ -106,7 +95,6 @@ Rectangle {
                     plasmoid.configuration.panelShadows = true;
                     plasmoid.configuration.shadows = 0;
                     plasmoid.configuration.zoomLevel = 0;
-                    plasmoid.configuration.autoDecreaseIconSize = false;
                     plasmoid.configuration.shrinkThickMargins = true;
                 }
             }