diff --git a/assets/sass/_theme/blocks/pages.sass b/assets/sass/_theme/blocks/pages.sass
index 741d7e07fa92370e04a1a9823e2d9d1d4b8dabb9..0e85b9d2601a2f619e65d345929756174312f6c3 100644
--- a/assets/sass/_theme/blocks/pages.sass
+++ b/assets/sass/_theme/blocks/pages.sass
@@ -50,15 +50,18 @@
         background-color: $block-pages-card-background
         padding-bottom: $grid-gutter
         padding-top: $grid-gutter
+        .block-gallery + &, .block-pages--card + &
+            margin-top: 0
         .main-page
             a
                 @include icon("arrow-right", after)
                 @include hover-translate-icon(before, 3)
                 &::after
                     font-size: px2rem(14)
+        .main-page + .pages
+            margin-top: $spacing2
         .pages
             @include grid(3, md)
-            margin-top: $spacing2
             @include in-page-with-sidebar
                 @include grid(2, md)
             .page
diff --git a/assets/sass/_theme/design-system/grid.sass b/assets/sass/_theme/design-system/grid.sass
index eb1052e438987b6aa2f2fb8c9679712f932f5ebc..4318e73cf44b674a80cafc63e7ce751690246395 100644
--- a/assets/sass/_theme/design-system/grid.sass
+++ b/assets/sass/_theme/design-system/grid.sass
@@ -3,8 +3,10 @@
 
 .document-content
     position: relative
-    @include media-breakpoint-up(md)
-        @include in-page-with-sidebar
-            .blocks
-                .block-content
+    @include in-page-with-sidebar
+        .blocks
+            .block-content
+                @include media-breakpoint-up(md)
+                    padding-left: offset(4)
+                @include media-breakpoint-up(xxl)
                     padding-left: offset(5)
diff --git a/assets/sass/_theme/design-system/table_of_content.sass b/assets/sass/_theme/design-system/table_of_content.sass
index ce661a739af43dcd98032c90c794f8da2bb55b59..753ce2bceaf3f600d9137ec84390e28c8c91ffc0 100644
--- a/assets/sass/_theme/design-system/table_of_content.sass
+++ b/assets/sass/_theme/design-system/table_of_content.sass
@@ -119,7 +119,10 @@
             margin-top: 0
             height: 100%
             position: absolute
-            width: col-outside-container(4)
+            @include media-breakpoint-up(md)
+                width: col-outside-container(4)
+            @include media-breakpoint-up(xxl)
+                width: col-outside-container(5)
             .toc-content
                 position: sticky
                 top: var(--header-height)
diff --git a/assets/sass/_theme/design-system/typography.sass b/assets/sass/_theme/design-system/typography.sass
index d3d93c76406bfc71a824a57d81f15ba879230329..55dec3a1f8a8c6832dd623b394e4dbcfabf27f72 100644
--- a/assets/sass/_theme/design-system/typography.sass
+++ b/assets/sass/_theme/design-system/typography.sass
@@ -51,6 +51,13 @@ h2, .h2
         &:hover
             text-decoration-thickness: 1px
 
+[itemprop="articleBody"]
+    h1, h2, h3, h4, h5, h6
+        margin-block-start: 2em
+        margin-block-end: 0
+        &:first-child, meta + &
+            margin-block-start: 0
+
 body
     font-family: $body-font-family
     -moz-osx-font-smoothing: grayscale
diff --git a/assets/sass/_theme/sections/posts.sass b/assets/sass/_theme/sections/posts.sass
index 060cd942f051a2192e749c7c19bbdeecd2e682f8..dc301481391ddd966d5491a9b1ee2798214fbadb 100644
--- a/assets/sass/_theme/sections/posts.sass
+++ b/assets/sass/_theme/sections/posts.sass
@@ -109,8 +109,6 @@
         text-align: right
     .share
         justify-content: flex-end
-        li:last-child
-            margin-right: -$spacing0
 
 .related
     margin-top: $spacing1