diff --git a/assets/css/010_spacing.css b/assets/css/010_spacing.css
index a6030c8..6ab72a9 100644
--- a/assets/css/010_spacing.css
+++ b/assets/css/010_spacing.css
@@ -61,7 +61,7 @@ p + p {
 
 /* Figures */
 
-{{- $elementsWithXLBlockMargins := "blockquote, figure, .codeblock, .highlight" -}}
+{{- $elementsWithXLBlockMargins := "blockquote, .figure--image, .codeblock, .highlight" -}}
 
 p + :is({{ $elementsWithXLBlockMargins }}) {
     margin-block-start: var(--space-xl);
@@ -74,9 +74,18 @@ p + :is({{ $elementsWithXLBlockMargins }}) {
 .codeblock {
   --padding: var(--space-m);
 
-  margin-inline-start: calc(-1 * var(--padding));
+  margin-inline: calc(-1 * var(--padding));
   padding: var(--padding);
-  width: 100%;
+}
+
+.figure--image {
+  --padding: var(--space-m);
+  margin-inline-start: calc(-1 * var(--padding));
+  width: calc(100% + 2 * var(--padding));
+
+  figcaption {
+    margin-inline: var(--padding);
+  }
 }
 
 /* Blockquotes */