diff --git a/assets/sass/_theme/_configuration.sass b/assets/sass/_theme/_configuration.sass
index 243584b2c05280f900df00b3cd8c6efb1c260ef6..726b97b76c9ffa56a394f8e12ba8210b77b770ff 100644
--- a/assets/sass/_theme/_configuration.sass
+++ b/assets/sass/_theme/_configuration.sass
@@ -101,6 +101,8 @@ $header-dropdown-transition: $header-transition !default
 $header-nav-padding-y: $spacing0 !default
 $header-logo-height: 20px !default
 $header-logo-height-md: $header-logo-height !default
+$header-height: 84px !default
+$header-height-md: 74px !default
 
 // Navs
 $body-overlay-color: rgba(0, 0, 0, 0.3) !default
diff --git a/assets/sass/_theme/design-system/layout.sass b/assets/sass/_theme/design-system/layout.sass
index a6cb86087c66a8b185d1e6db7838c56a9b6f214b..3c8c27ae81cbe11fa7a39cf91c5a278ccfb67105 100644
--- a/assets/sass/_theme/design-system/layout.sass
+++ b/assets/sass/_theme/design-system/layout.sass
@@ -4,7 +4,10 @@
     box-sizing: border-box
 
 \:root
-    --header-height: #{$header-nav-padding-y * 2 + $header-logo-height}
+    --header-height: #{$header-height}
+    @include media-breakpoint-up(md)
+        --header-height: #{$header-height-md}
+
 
 body
     color: $body-color
diff --git a/assets/sass/_theme/design-system/nav.sass b/assets/sass/_theme/design-system/nav.sass
index c8bfe140f5b6548328307e27d1314a92270f3940..d6e946b5e4681aa6137b640ad1aabb8af9fd9222 100644
--- a/assets/sass/_theme/design-system/nav.sass
+++ b/assets/sass/_theme/design-system/nav.sass
@@ -66,8 +66,9 @@
             > a, span
                 display: block
                 padding: $spacing0
-            &:last-child a
-                padding-right: 0
+            &:last-child 
+                a, span
+                    padding-right: 0
         li.has-children
             [aria-expanded="true"] + .dropdown-menu
                 display: block
diff --git a/assets/sass/_theme/design-system/table_of_content.sass b/assets/sass/_theme/design-system/table_of_content.sass
index 0e016472acbb4f38f910b3b6ac138a7405ee4852..54c4e83aae6dbb15c9dc9d3d62fe08c1b792fcbb 100644
--- a/assets/sass/_theme/design-system/table_of_content.sass
+++ b/assets/sass/_theme/design-system/table_of_content.sass
@@ -4,7 +4,8 @@
         align-items: flex-start
         margin: 0
         flex-direction: column
-        padding-top: $spacing1
+        padding-top: $spacing0
+        padding-bottom: $spacing0
         li
             &:not(:last-child)
                 margin-bottom: 1rem
@@ -14,8 +15,6 @@
                 display: block
                 font-size: px2rem(18)
                 line-height: px2rem(20)
-                margin-left: -$spacing1/2
-                margin-right: -$spacing1/2
                 text-decoration: none
                 &:hover
                     text-decoration: underline