diff --git a/src/open_inwoner/scss/components/Container/Container.scss b/src/open_inwoner/scss/components/Container/Container.scss
index 9cc7f7dc5f..94db45a42b 100644
--- a/src/open_inwoner/scss/components/Container/Container.scss
+++ b/src/open_inwoner/scss/components/Container/Container.scss
@@ -1,6 +1,6 @@
 .container {
-  $hm: max(calc((100vw - var(--container-width)) / 2), var(--spacing-large));
-  margin: var(--row-height) $hm calc(var(--row-height) * 2);
+  margin: var(--row-height) var(--spacing-large) var(--row-height)
+    var(--spacing-large);
   min-height: calc(
     100vh - var(--header-height) - calc(var(--row-height) * 3) - 400px
   ); //FIXME
@@ -12,4 +12,9 @@
     margin-top: 0;
     margin-bottom: 0;
   }
+
+  @media (min-width: 768px) {
+    $hm: max(calc((100vw - var(--container-width)) / 2), var(--spacing-large));
+    margin: var(--row-height) $hm calc(var(--row-height) * 2);
+  }
 }
diff --git a/src/open_inwoner/scss/components/Divider/Divider.scss b/src/open_inwoner/scss/components/Divider/Divider.scss
index 43fcfe4865..4e785e7137 100644
--- a/src/open_inwoner/scss/components/Divider/Divider.scss
+++ b/src/open_inwoner/scss/components/Divider/Divider.scss
@@ -1,8 +1,12 @@
 .divider {
   border: 1px var(--color-gray-light) solid;
-  margin: var(--spacing-giant) 0;
+  margin: var(--spacing-extra-large) 0;
 
   &--small {
     margin: var(--spacing-large) 0;
   }
+
+  @media (min-width: 768px) {
+    margin: var(--spacing-giant) 0;
+  }
 }
diff --git a/src/open_inwoner/scss/components/Footer/Footer.scss b/src/open_inwoner/scss/components/Footer/Footer.scss
index 7cb9ecbeb7..490ae34258 100644
--- a/src/open_inwoner/scss/components/Footer/Footer.scss
+++ b/src/open_inwoner/scss/components/Footer/Footer.scss
@@ -8,7 +8,7 @@
   background-color: var(--color-gray-lightest);
   box-sizing: border-box;
   display: grid;
-  gap: var(--gutter-width);
+  gap: var(--spacing-medium);
   grid-template-areas:
     'lg-tx lg-tx lg-tx lg-tx'
     'lg   lg   lg   lg'
@@ -21,6 +21,7 @@
   padding: $vm $hm;
 
   @media (min-width: 768px) {
+    gap: var(--gutter-width);
     grid-template-areas:
       'lg-tx lg-tx lg-tx lg-tx . . . . . . . . '
       'lg   lg   lg   lg   lg  lg  lg  lg  lg   lg   lg lg'
@@ -32,6 +33,7 @@
   /// Layout.
 
   &__logo {
+    display: flex;
     grid-area: lg;
 
     img {
diff --git a/src/open_inwoner/scss/components/Grid/Grid.scss b/src/open_inwoner/scss/components/Grid/Grid.scss
index 70eb716c8c..f69d78f053 100644
--- a/src/open_inwoner/scss/components/Grid/Grid.scss
+++ b/src/open_inwoner/scss/components/Grid/Grid.scss
@@ -1,7 +1,7 @@
 .grid {
   display: flex;
   flex-direction: column;
-  gap: var(--gutter-width);
+  gap: var(--spacing-medium);
   width: 100%;
   position: relative;
 
@@ -18,6 +18,7 @@
     display: grid;
     grid-template-columns: repeat(12, 1fr);
     grid-template-rows: 1fr;
+    gap: var(--gutter-width);
   }
 
   /// Layout.
diff --git a/src/open_inwoner/scss/components/Notification/_Notification.scss b/src/open_inwoner/scss/components/Notification/_Notification.scss
index 3da3cbeed5..ccae917a94 100644
--- a/src/open_inwoner/scss/components/Notification/_Notification.scss
+++ b/src/open_inwoner/scss/components/Notification/_Notification.scss
@@ -7,7 +7,7 @@
   color: var(--notification-color-text);
   display: flex;
   gap: var(--spacing-extra-large);
-  margin: var(--row-height) 0;
+  margin: var(--spacing-medium) 0;
   padding: var(--spacing-extra-large);
   box-sizing: border-box;
   position: relative;
@@ -63,4 +63,8 @@
     color: var(--color-white);
     background-color: var(--notification-color-text);
   }
+
+  @media (min-width: 768px) {
+    margin: var(--row-height) 0;
+  }
 }