diff --git a/assets/sass/_theme/_utils.sass b/assets/sass/_theme/_utils.sass
index e00c827b6b4c5043b8c3b4ae404432884ff5851e..35172dc770443a9c79dc953827628ec2062e45a2 100644
--- a/assets/sass/_theme/_utils.sass
+++ b/assets/sass/_theme/_utils.sass
@@ -368,6 +368,15 @@
         @include media-breakpoint-up(desktop)
             &:before
                 padding-right: 0
+        @include media-breakpoint-down(desktop)
+            position: relative
+            background: $color-background
+            &::before
+                background: transparent
+            p
+                display: block
+                background: transparent
+                position: relative
 
     &:hover
         figcaption p
diff --git a/assets/sass/_theme/design-system/hero.sass b/assets/sass/_theme/design-system/hero.sass
index 6ca0cf94f5c3cdc7ead0732ea33caea4981eec3b..28833f74a895687e32394e82c660311c4b10ce8f 100644
--- a/assets/sass/_theme/design-system/hero.sass
+++ b/assets/sass/_theme/design-system/hero.sass
@@ -48,9 +48,10 @@
                 > h1, > hgroup
                     margin-bottom: $spacing2
         &--image-landscape
-            figure
-                margin-left: half(-$grid-gutter-sm)
-                margin-right: half(-$grid-gutter-sm)
+            .content
+                figure
+                    margin-left: half(-$grid-gutter-sm)
+                    margin-right: half(-$grid-gutter-sm)
         &--image-portrait, &--image-square
             .container
                 display: flex
diff --git a/layouts/partials/header/hero.html b/layouts/partials/header/hero.html
index df099f4fa7ce3d9fc466ba83f21493cfafb1e403..cb14b4bce0bb5c8b80ab2d2a34cc33cf94f0ab3d 100644
--- a/layouts/partials/header/hero.html
+++ b/layouts/partials/header/hero.html
@@ -33,7 +33,7 @@
                 "sizes"    ( .sizes | default site.Params.image_sizes.design_system.hero )
                 "lazy"     false
               ) }}
-              {{ if .image.credit }}
+              {{ if partial "GetTextFromHTML" .image.credit }}
                 <figcaption tabindex="0">
                   <p>
                     {{- partial "GetTextFromHTML" .image.credit -}}