diff --git a/layouts/partials/images/image.html b/layouts/partials/images/image.html
index 4c7cf0e..96241e9 100644
--- a/layouts/partials/images/image.html
+++ b/layouts/partials/images/image.html
@@ -214,11 +214,8 @@
     {{- $figureClass := default "figure" $siteParams.figure_class_name }}
     {{- $figureCaptionClass := default "figure-caption" $siteParams.figure_caption_class_name }}
     {{- $figureImgClass := default "figure-img" $siteParams.figure_image_class_name }}
-    <figure class="{{ $figureClass }} {{ $wrapperClass }}">
-      {{ partial "images/picture" (merge $ctx (dict "className" (printf "%s %s" $figureImgClass $className))) }}
-      <figcaption class="{{ $figureCaptionClass }}">{{ $caption }}</figcaption>
-    </figure>
+<figure class="{{ $figureClass }} {{ $wrapperClass }}">{{ partial "images/picture" (merge $ctx (dict "className" (printf "%s %s" $figureImgClass $className))) }}<figcaption class="{{ $figureCaptionClass }}">{{ $caption }}</figcaption></figure>
   {{- else }}
-    {{ partial "images/picture" (merge $ctx (dict "wrapperClass" $wrapperClass)) }}
+{{ partial "images/picture" (merge $ctx (dict "wrapperClass" $wrapperClass)) }}
   {{- end }}
 {{- end -}}
diff --git a/layouts/partials/images/picture.html b/layouts/partials/images/picture.html
index b2f07d2..b2dddc7 100644
--- a/layouts/partials/images/picture.html
+++ b/layouts/partials/images/picture.html
@@ -1,16 +1,6 @@
 <picture{{ with .wrapperClass }} class="{{ . }}"{{ end }}>
-  {{- range .sources }}
-    <source srcset="{{ .srcset }}" type="{{ .type }}" />
-  {{- end }}
-  <img
-    class="{{ .className }}"
-    src="{{ .src }}"
-    alt="{{ .alt }}"
-    {{ if .lazyLoading }}loading="lazy"{{ end }}
-    {{ with .naturalHeight }}height="{{ . }}"{{ end }}
-    {{ with .naturalWidth }}width="{{ . }}"{{ end }}
-    {{ with .style }}{{ printf `style="%s"` (delimit . `; `) | safeHTMLAttr }}{{ end }}
-    {{ if and .original .originalSrc }}data-src="{{ .originalSrc }}"{{ end }}
-    {{ if and .original .originalWidth }}data-width="{{ .originalWidth }}"{{ end }}
-    {{ if and .original .originalHeight }}data-height="{{ .originalHeight }}"{{ end }} />
+{{- range .sources }}
+<source srcset="{{ .srcset }}" type="{{ .type }}" />
+{{- end }}
+<img class="{{ .className }}" src="{{ .src }}" alt="{{ .alt }}"{{ if .lazyLoading }} loading="lazy"{{ end }}{{ with .naturalHeight }} height="{{ . }}"{{ end }}{{ with .naturalWidth }} width="{{ . }}"{{ end }}{{ with .style }}{{ printf ` style="%s"` (delimit . `; `) | safeHTMLAttr }}{{ end }}{{ if and .original .originalSrc }} data-src="{{ .originalSrc }}"{{ end }}{{ if and .original .originalWidth }} data-width="{{ .originalWidth }}"{{ end }}{{ if and .original .originalHeight }} data-height="{{ .originalHeight }}"{{ end }} />
 </picture>