diff --git a/packages/client/src/components/app/Layout.svelte b/packages/client/src/components/app/Layout.svelte
index 4a49dabbe9..72121640a6 100644
--- a/packages/client/src/components/app/Layout.svelte
+++ b/packages/client/src/components/app/Layout.svelte
@@ -406,6 +406,9 @@
     max-width: 100%;
     gap: var(--spacing-xl);
   }
+  .nav.size--max {
+    padding: 10px;
+  }
   .nav :global(.spectrum-Icon) {
     color: var(--navTextColor);
     opacity: 0.75;
@@ -414,10 +417,6 @@
     color: var(--navTextColor);
     opacity: 1;
   }
-  .layout:has(.screenslot-dom > .component > .grid) .nav {
-    padding: 24px 42px 20px 42px;
-  }
-
   .nav :global(h1) {
     color: var(--navTextColor);
   }
@@ -483,6 +482,9 @@
     position: relative;
     padding: 32px;
   }
+  .main:not(.size--max):has(.screenslot-dom > .component > .grid) {
+    padding: 22px;
+  }
 
   .layout--none .main {
     padding: 0;
@@ -614,6 +616,10 @@
   .mobile:not(.layout--none) .main {
     padding: 16px;
   }
+  .mobile:not(.layout--none)
+    .main:not(.size--max):has(.screenslot-dom > .component > .grid) {
+    padding: 6px;
+  }
   .mobile .main.size--max {
     padding: 0;
   }