diff --git a/assets/css/010_spacing.css b/assets/css/010_spacing.css
index 500700c..600f9fa 100644
--- a/assets/css/010_spacing.css
+++ b/assets/css/010_spacing.css
@@ -61,7 +61,7 @@ p + p {
 
 /* Figures */
 
-{{- $elementsWithXLBlockMargins := "blockquote, .figure--image, .figure--youtube, .codeblock, .highlight, table" -}}
+{{- $elementsWithXLBlockMargins := "blockquote, .figure--code, .figure--image, .figure--youtube, .codeblock, .highlight, table" -}}
 
 p + :is({{ $elementsWithXLBlockMargins }}) {
     margin-block-start: var(--space-xl);
diff --git a/assets/css/010_typography.css b/assets/css/010_typography.css
index f85b255..0428bbd 100644
--- a/assets/css/010_typography.css
+++ b/assets/css/010_typography.css
@@ -84,10 +84,6 @@ h4 {
 
 p {
   letter-spacing: 0.01em;
-
-  :has(img:only-child) {
-    line-height: 1;
-  }
 }
 
 sup {
@@ -113,3 +109,7 @@ small,
   font-size: var(--text-s);
   letter-spacing: 0.01em;
 }
+
+:has(> img:only-child) {
+  line-height: 1;
+}
diff --git a/assets/css/050_figures.css b/assets/css/050_figures.css
index 71d5370..cbc3345 100644
--- a/assets/css/050_figures.css
+++ b/assets/css/050_figures.css
@@ -7,11 +7,24 @@
  * FIGURES
  **********/
 
+.figure--code,
+.figure--image {
+  grid-column: wide-gutter-start / wide-gutter-end;
+}
+
 .figure--image {
     display: grid;
-    grid-column: wide-gutter-start / wide-gutter-end;
     grid-template-columns: subgrid;
 
+    .figure__container {
+      align-items: center;
+      display: flex;
+      gap: var(--body-item-spacing);
+      grid-column: wide-gutter-start / wide-gutter-end;
+      justify-content: center;
+      min-width: fit-content;
+    }
+
     img {
         grid-column: wide-gutter-start / wide-gutter-end;
     }