diff --git a/app/view/visibilitymanager.cpp b/app/view/visibilitymanager.cpp
index d801194b2..cc6251a1e 100644
--- a/app/view/visibilitymanager.cpp
+++ b/app/view/visibilitymanager.cpp
@@ -541,7 +541,7 @@ void VisibilityManager::onHeadThicknessChanged()
 }
 
 void VisibilityManager::publishFrameExtents(bool forceUpdate)
-{
+{   
     if (m_frameExtentsHeadThicknessGap != m_latteView->headThicknessGap()
             || m_frameExtentsLocation != m_latteView->location()
             || forceUpdate) {
diff --git a/containment/package/contents/ui/VisibilityManager.qml b/containment/package/contents/ui/VisibilityManager.qml
index aa4589893..b183bb544 100644
--- a/containment/package/contents/ui/VisibilityManager.qml
+++ b/containment/package/contents/ui/VisibilityManager.qml
@@ -101,7 +101,7 @@ Item{
         target: latteView
         property:"normalThickness"
         when: latteView && inPublishingState
-        value: root.behaveAsPlasmaPanel ? thicknessAsPanel : metrics.mask.thickness.maxNormalForItems
+        value: root.behaveAsPlasmaPanel ? thicknessAsPanel : metrics.mask.screenEdge + metrics.mask.maxNormalForItemsWithoutScreenEdge
     }
 
     Binding{
@@ -120,7 +120,7 @@ Item{
                 return 0;
             }
 
-            return metrics.mask.thickness.maxZoomed - metrics.mask.thickness.maxNormal + metrics.extraThicknessForNormal;
+            return metrics.mask.thickness.maxZoomed - metrics.mask.thickness.maxNormalForItems;
         }
     }
 
diff --git a/containment/package/contents/ui/abilities/Metrics.qml b/containment/package/contents/ui/abilities/Metrics.qml
index 6e57913b8..36f279951 100644
--- a/containment/package/contents/ui/abilities/Metrics.qml
+++ b/containment/package/contents/ui/abilities/Metrics.qml
@@ -53,15 +53,19 @@ Ability.MetricsPrivate {
     mask.thickness.normal: mask.screenEdge + Math.max(totals.thickness + extraThicknessForNormal, background.thickness + background.shadows.headThickness)
     mask.thickness.medium: mask.screenEdge + (1 + (0.65 * (parabolic.factor.maxZoom-1)))*(totals.thickness+extraThicknessForZoomed)
     mask.thickness.zoomed: mask.screenEdge + ((totals.thickness+extraThicknessForZoomed) * parabolic.factor.maxZoom) + 2
-    mask.thickness.maxNormal: mask.screenEdge + maxIconSize + (margin.maxThickness * 2) + extraThicknessForNormal
-    mask.thickness.maxMedium: mask.screenEdge + Math.max(mask.thickness.maxNormalForItems, extraThicknessForNormal + (1 + (0.65 * (parabolic.factor.maxZoom-1)))*(maxIconSize+margin.maxThickness))
+    mask.thickness.maxNormal: mask.maxScreenEdge + maxIconSize + (margin.maxThickness * 2) + extraThicknessForNormal
+    mask.thickness.maxMedium: mask.maxScreenEdge + Math.max(mask.thickness.maxNormalForItems, extraThicknessForNormal + (1 + (0.65 * (parabolic.factor.maxZoom-1)))*(maxIconSize+margin.maxThickness))
     mask.thickness.maxZoomed: mask.maxScreenEdge + Math.max( ((maxIconSize+(margin.maxThickness * 2)) * parabolic.factor.maxZoom) + extraThicknessForZoomed,
                                                                     background.thickness + background.shadows.headThickness)
 
     mask.thickness.normalForItems: margin.screenEdge + totals.thickness
     mask.thickness.zoomedForItems: margin.screenEdge + (parabolic.factor.maxZoom * totals.thickness)
-    mask.thickness.maxNormalForItems: mask.screenEdge + maxIconSize + (margin.maxThickness * 2)
-    mask.thickness.maxZoomedForItems: mask.maxScreenEdge + (maxIconSize + (margin.maxThickness * 2)) * parabolic.factor.maxZoom
+
+    mask.thickness.maxNormalForItemsWithoutScreenEdge: maxIconSize + (margin.maxThickness * 2)
+    mask.thickness.maxZoomedForItemsWithoutScreenEdge: (maxIconSize + (margin.maxThickness * 2)) * parabolic.factor.maxZoom
+
+    mask.thickness.maxNormalForItems: mask.maxScreenEdge + mask.thickness.maxNormalForItemsWithoutScreenEdge
+    mask.thickness.maxZoomedForItems: mask.maxScreenEdge + mask.thickness.maxZoomedForItemsWithoutScreenEdge
 
     //! Padding
     padding.length: fraction.lengthPadding * iconSize
diff --git a/declarativeimports/abilities/definition/Metrics.qml b/declarativeimports/abilities/definition/Metrics.qml
index eeb5ba2ea..c91dba1a6 100644
--- a/declarativeimports/abilities/definition/Metrics.qml
+++ b/declarativeimports/abilities/definition/Metrics.qml
@@ -68,6 +68,9 @@ Item {
             maxNormalForItems: 48
             maxMediumForItems: 48
             maxZoomedForItems: 48
+
+            maxNormalForItemsWithoutScreenEdge: 48
+            maxZoomedForItemsWithoutScreenEdge: 48
         }
     }
 }
diff --git a/declarativeimports/abilities/definition/metrics/mask/Thickness.qml b/declarativeimports/abilities/definition/metrics/mask/Thickness.qml
index 0d68e82e4..ecd19eebf 100644
--- a/declarativeimports/abilities/definition/metrics/mask/Thickness.qml
+++ b/declarativeimports/abilities/definition/metrics/mask/Thickness.qml
@@ -36,4 +36,7 @@ Item {
     property int maxNormalForItems: 48
     property int maxMediumForItems: 48
     property int maxZoomedForItems: 48
+
+    property int maxNormalForItemsWithoutScreenEdge: 48
+    property int maxZoomedForItemsWithoutScreenEdge: 48
 }