diff --git a/src/sass/gnome-shell/common/_app-grid.scss b/src/sass/gnome-shell/common/_app-grid.scss
index 083c0b1..dd074ea 100644
--- a/src/sass/gnome-shell/common/_app-grid.scss
+++ b/src/sass/gnome-shell/common/_app-grid.scss
@@ -56,22 +56,22 @@
   padding: 12px;
 
   & .folder-name-container {
-    padding: 24px 36px 0;
-    spacing: 12px;
+    padding: $container_padding * 3 $container_padding * 4 0;
+    spacing: $base_spacing * 2;
 
     & .folder-name-label,
     & .folder-name-entry {
-      font-size: 18pt;
+      font-size: if($laptop == 'true', 16pt, 18pt);
       font-weight: bold;
     }
 
     & .folder-name-entry {
       @extend %search-entry;
-      width: 300px;
+      width: if($laptop == 'true', 240px, 320px) !important;
     }
 
     /* FIXME: this is to keep the label in sync with the entry */
-    & .folder-name-label { padding: 5px 7px; color: $light_alt_fg_color; }
+    & .folder-name-label { padding: $base_padding; color: $light_alt_fg_color; }
 
     & .edit-folder-button {
       background-color: $light_divider_color;
@@ -90,8 +90,8 @@
   }
 
   & .icon-grid {
-    row-spacing: $container_padding * 2;
-    column-spacing: $container_padding * 5;
+    row-spacing: 12px;
+    column-spacing: 30px;
     page-padding-top: 0;
     page-padding-bottom: 0;
     page-padding-left: 0;
@@ -105,8 +105,8 @@
 
 .app-folder-dialog-container {
   padding: $container_padding;
-  width: 620px;
-  height: 620px;
+  width: if($laptop == 'true', 500px, 620px);
+  height: if($laptop == 'true', 500px, 620px);
 }
 
 // Running app indicator (also shown in dash)
diff --git a/src/sass/gnome-shell/widgets-40-0/_app-grid.scss b/src/sass/gnome-shell/widgets-40-0/_app-grid.scss
index 264c9ff..77b97bd 100644
--- a/src/sass/gnome-shell/widgets-40-0/_app-grid.scss
+++ b/src/sass/gnome-shell/widgets-40-0/_app-grid.scss
@@ -1,25 +1,25 @@
 
-$app_icon_size: 96px;
-
 // app icons
 .icon-grid {
-  row-spacing: $base_spacing * 2;
-  column-spacing: $base_spacing * 2;
-  max-row-spacing: $base_spacing * 12;
-  max-column-spacing: $base_spacing * 12;
-  page-padding-top: $base_padding * 4;
-  page-padding-bottom: $base_padding * 4;
-  page-padding-left: $base_padding * 2;
-  page-padding-right: $base_padding * 2;
+  row-spacing: 12px;
+  column-spacing: 12px;
+  max-row-spacing: 72px;
+  max-column-spacing: 72px;
+  page-padding-top: 24px;
+  page-padding-bottom: 24px;
+  page-padding-left: 12px;
+  page-padding-right: 12px;
 }
 
 .app-folder-dialog {
   background-color: rgba(#262626, 0.9);
 
-  .page-navigation-hint { width: 80px; }
+  .page-navigation-hint {
+    width: if($laptop == 'true', 60px, 80px);
+  }
 
   .page-navigation-arrow {
-    margin: $container_padding * 3;
+    margin: 18px;
   }
 }
 
@@ -28,7 +28,7 @@ $app_icon_size: 96px;
 }
 
 .page-navigation-hint {
-  width: 300px;
+  width: if($laptop == 'true', 220px, 300px);
 
   &.dnd {
     background: rgba(255, 255, 255, 0.1);