diff --git a/containments/homescreen/package/contents/ui/AppletsArea.qml b/containments/homescreen/package/contents/ui/AppletsArea.qml
index 3becfa19..06611a90 100644
--- a/containments/homescreen/package/contents/ui/AppletsArea.qml
+++ b/containments/homescreen/package/contents/ui/AppletsArea.qml
@@ -222,8 +222,9 @@ MouseEventListener {
             property int columns: 4
             interactive: false
             flow: GridView.FlowTopToBottom
-            cellWidth: root.buttonHeight
-            cellHeight: cellWidth
+
+            cellWidth: root.width / 4
+            cellHeight: units.iconSizes.huge
 
             model: plasmoid.nativeInterface.applicationListModel
             delegate: HomeLauncher {
@@ -247,4 +248,3 @@ MouseEventListener {
         }
     }
 }
-            
\ No newline at end of file
diff --git a/containments/homescreen/package/contents/ui/HomeLauncher.qml b/containments/homescreen/package/contents/ui/HomeLauncher.qml
index daa8d940..b520da56 100644
--- a/containments/homescreen/package/contents/ui/HomeLauncher.qml
+++ b/containments/homescreen/package/contents/ui/HomeLauncher.qml
@@ -6,7 +6,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents
 Item {
     id: delegateRoot
     width: applicationsView.cellWidth
-    height: width
+    height: applicationsView.cellHeight
 
     property var modelData: model
     property bool isDropTarget: delegateRoot != dragDelegate && root.reorderingApps && applicationsView.dragData && applicationsView.dragData.ApplicationStorageIdRole == modelData.ApplicationStorageIdRole
diff --git a/containments/homescreen/package/contents/ui/HomeLauncherSvg.qml b/containments/homescreen/package/contents/ui/HomeLauncherSvg.qml
index 1b897900..7725c087 100644
--- a/containments/homescreen/package/contents/ui/HomeLauncherSvg.qml
+++ b/containments/homescreen/package/contents/ui/HomeLauncherSvg.qml
@@ -4,7 +4,7 @@ import org.kde.plasma.core 2.0 as PlasmaCore
 Item {
     id: root
     width: parent.width / parent.columns
-    height: parent.buttonHeight
+    height: units.iconSizes.huge
     property var callback
     property string text
     property string sub
diff --git a/containments/homescreen/package/contents/ui/SatelliteStripe.qml b/containments/homescreen/package/contents/ui/SatelliteStripe.qml
index 1480668e..d57216e1 100644
--- a/containments/homescreen/package/contents/ui/SatelliteStripe.qml
+++ b/containments/homescreen/package/contents/ui/SatelliteStripe.qml
@@ -18,7 +18,7 @@ PlasmaCore.ColorScope {
     }
 
     //cut away one line from the favorites bar
-    height: applicationsView.cellWidth - units.gridUnit
+    height: applicationsView.cellHeight - units.gridUnit
     width: parent.width
     y: parent.height / 2 - height / 2
     x: 0
diff --git a/containments/homescreen/package/contents/ui/main.qml b/containments/homescreen/package/contents/ui/main.qml
index 4a79cc85..f7f49901 100644
--- a/containments/homescreen/package/contents/ui/main.qml
+++ b/containments/homescreen/package/contents/ui/main.qml
@@ -34,7 +34,7 @@ Item {
 //BEGIN properties
     property Item toolBox
     property alias appletsSpace: applicationsView.headerItem
-    property int buttonHeight: width/4
+    property int buttonHeight: units.iconSizes.huge
     property bool reorderingApps: false
     property bool locked: applicationsView.contentY < -applicationsView.headerItem.height + plasmoid.availableScreenRect.height
     property var layoutManager: LayoutManager
@@ -468,8 +468,8 @@ Item {
 
                 property var dragData
 
-                cellWidth: root.buttonHeight
-                cellHeight: cellWidth
+                cellWidth: root.width / 4
+                cellHeight: units.iconSizes.huge
                 model: plasmoid.nativeInterface.applicationListModel
 
                 snapMode: GridView.SnapToRow