diff --git a/dist/css/layout/core_navigation.css b/dist/css/layout/core_navigation.css
index 8115754b4294437dcecc0cd54f7d9bd1540794a7..cb8061cf4c7baeef0116655123dcafb233444a18 100644
--- a/dist/css/layout/core_navigation.css
+++ b/dist/css/layout/core_navigation.css
@@ -62,7 +62,32 @@ body.gin--core-navigation {
   inline-size: var(--gin-spacing-xxs);
 }
 
-.admin-toolbar__content,
+.admin-toolbar__header {
+  -webkit-padding-before: var(--gin-spacing-xs);
+          padding-block-start: var(--gin-spacing-xs);
+}
+
+@media (min-width: 64em) {
+  .admin-toolbar__header {
+    -webkit-padding-before: 0;
+            padding-block-start: 0;
+  }
+}
+
+.admin-toolbar__content {
+  padding: var(--admin-toolbar-sidebar-header) var(--gin-spacing-s) var(--gin-spacing-s) var(--gin-spacing-s);
+  -webkit-margin-before: calc(var(--gin-spacing-xxs) * -1);
+          margin-block-start: calc(var(--gin-spacing-xxs) * -1);
+}
+
+@media (min-width: 64em) {
+  .admin-toolbar__content {
+    padding: var(--gin-spacing-s);
+    -webkit-margin-before: 0;
+            margin-block-start: 0;
+  }
+}
+
 .admin-toolbar__footer {
   padding: var(--gin-spacing-s);
 }
diff --git a/styles/layout/core_navigation.scss b/styles/layout/core_navigation.scss
index 891b70a13fc2e3e32e41047df046b1d376e175d4..642077e66fcf8fa1ecf86db5e6105320ca240094 100644
--- a/styles/layout/core_navigation.scss
+++ b/styles/layout/core_navigation.scss
@@ -67,7 +67,24 @@ body.gin--core-navigation {
   inline-size: var(--gin-spacing-xxs);
 }
 
-.admin-toolbar__content,
+.admin-toolbar__header {
+  padding-block-start: var(--gin-spacing-xs);
+
+  @include mq(large) {
+    padding-block-start: 0;
+  }
+}
+
+.admin-toolbar__content {
+  padding: var(--admin-toolbar-sidebar-header) var(--gin-spacing-s) var(--gin-spacing-s) var(--gin-spacing-s);
+  margin-block-start: calc(var(--gin-spacing-xxs) * -1);
+
+  @include mq(large) {
+    padding: var(--gin-spacing-s);
+    margin-block-start: 0;
+  }
+}
+
 .admin-toolbar__footer {
   padding: var(--gin-spacing-s);
 }