diff --git a/assets/sass/_theme/blocks/base.sass b/assets/sass/_theme/blocks/base.sass
index 232940c5c..cc09c0b6d 100644
--- a/assets/sass/_theme/blocks/base.sass
+++ b/assets/sass/_theme/blocks/base.sass
@@ -24,10 +24,10 @@
 $backgrounded_blocks: "[class*="--accent_background"], [class*="--alt_background"], .block-timeline--horizontal, .block-pages--cards"
 main
     .blocks
-        .block:first-child:is(#{$backgrounded_blocks})
-            margin-top: 0
         .block:last-child:is(#{$backgrounded_blocks})
             margin-bottom: 0
+        .block:first-child:is(#{$backgrounded_blocks})
+            margin-top: 0
 
 // Following chapters
 .block-chapter
diff --git a/assets/sass/_theme/design-system/hero.sass b/assets/sass/_theme/design-system/hero.sass
index 8ebed73d9..9cef7c111 100644
--- a/assets/sass/_theme/design-system/hero.sass
+++ b/assets/sass/_theme/design-system/hero.sass
@@ -45,7 +45,6 @@
                 width: 100%
                 height: auto
             @include collapsed-figcaption
-
     .breadcrumb-nav + .content
         padding-top: 0
     .content + .breadcrumb-nav
@@ -55,6 +54,8 @@
             position: relative
             > a
                 @include stretched-link
+    &.has-breadcrumb-hero-end
+        padding-bottom: 0
     @include media-breakpoint-down(desktop)
         .content
             padding-top: 0
diff --git a/assets/sass/_theme/design-system/layout.sass b/assets/sass/_theme/design-system/layout.sass
index 59748c719..dd15d45f3 100644
--- a/assets/sass/_theme/design-system/layout.sass
+++ b/assets/sass/_theme/design-system/layout.sass
@@ -75,17 +75,14 @@ ol
     > .blocks
         .block:first-child
             margin-top: var(--grid-gutter)
-    
     @include in-page-with-sidebar
         .heading h2, .block .block-content
             padding-left: offset(4)
-    
-    // @include in-page-without-sidebar
-    //     > .blocks
-    //         .block:first-child
-    //             &[class*="--accent_background"],
-    //             &[class*="--alt_background"]
-    //                 margin-top: 0
+    .has-breadcrumb-hero-end + &
+        @include in-page-with-sidebar
+            > .blocks
+                margin-top: var(--grid-gutter)
+
 details
     &:not([open]):hover
         summary::after