diff --git a/wowchemy/assets/scss/wowchemy/elements/_media.scss b/wowchemy/assets/scss/wowchemy/elements/_media.scss
index 5eb485ae..1963a2fb 100644
--- a/wowchemy/assets/scss/wowchemy/elements/_media.scss
+++ b/wowchemy/assets/scss/wowchemy/elements/_media.scss
@@ -45,30 +45,17 @@ video {
  **************************************************/
 
 figure {
-  display: flex;
-  flex-flow: row wrap;
-  justify-content: center;
-
-  .figure-img-wrap {
-    flex-basis: 100%;
-    // Safari fix for responsive aspect ratio issue when `height: auto` set with flex parent.
-    // See https://stackoverflow.com/a/61196907
-    align-self: flex-start;
-  }
-
   img {
     height: auto;
     max-width: 100%;
   }
 
-  // Center all figure captions by default.
   figcaption {
-    flex-basis: 100%; // Appear on row beneath image.
     margin-top: 0.75em;
     margin-bottom: 1.65rem;
     line-height: 1.4;
     font-size: 0.76rem;
-    text-align: center;
+    text-align: center; // Center figure captions.
   }
 
   figcaption.numbered::before {
diff --git a/wowchemy/layouts/shortcodes/figure.html b/wowchemy/layouts/shortcodes/figure.html
index f15fca8b..008599de 100644
--- a/wowchemy/layouts/shortcodes/figure.html
+++ b/wowchemy/layouts/shortcodes/figure.html
@@ -22,40 +22,42 @@
   {{- end -}}
 {{- end -}}
 
-<figure {{ with .Get "class" }}class="{{.}}"{{ end }} {{ with $id }}id="figure-{{ . }}"{{ end }}>
-  <div class="figure-img-wrap" {{ with .Get "max_width" }}style="max-width: {{.}}"{{end}}>
-    {{- if $img -}}
-      {{ $isSVG := eq $img.MediaType.SubType "svg" }}
-      {{ if $isSVG -}}
-        <img alt="{{ $alt }}"
-         src="{{ $img.RelPermalink }}"
-         loading="lazy"
-         {{- if $zoom }} data-zoomable{{end}}
-         {{- with .Get "width" }} width="{{.}}"{{end}}
-         {{- with .Get "height" }} height="{{.}}"{{end}}
-         {{- with $img_class }} class="{{.}}"{{end}} />
-      {{- else }}
-        {{- $img_lg := $img.Fit "1200x1200" -}}
-        {{- $img_md := $img_lg.Fit "760x760" -}}{{/* Match `.docs-article-container` max-width */}}
-        {{- $img_sm := $img_md.Fit "400x400" -}}
-        {{- $width := (.Get "width") | default $img_md.Width -}}
-        {{- $height := (.Get "height") | default $img_md.Height -}}
-        <img alt="{{ $alt }}" srcset="
-             {{ $img_sm.RelPermalink }} 400w,
-             {{ $img_md.RelPermalink }} 760w,
-             {{ $img_lg.RelPermalink }} 1200w"
-             src="{{ $img_sm.RelPermalink }}"
-             width="{{ $width }}"
-             height="{{ $height }}"
-             loading="lazy"
-             {{- if $zoom }} data-zoomable{{end}}
-             {{- with $img_class }} class="{{.}}"{{end}} />
-      {{- end }}
-    {{- else -}}
-      <img src="{{ $destination | safeURL }}" alt="{{ $alt }}" loading="lazy" {{ if $zoom }}data-zoomable{{end}}
-           {{- with .Get "width" }} width="{{.}}"{{end}} {{- with .Get "height" }} height="{{.}}"{{end}}
+<figure {{ with .Get "class" }}class="{{.}}"{{end}} {{ with $id }}id="figure-{{ . }}"{{ end }}>
+  <div class="d-flex justify-content-center">
+    <div {{ with .Get "max_width" }}style="max-width: {{.}}"{{end}}>
+      {{- if $img -}}
+        {{ $isSVG := eq $img.MediaType.SubType "svg" }}
+        {{ if $isSVG -}}
+          <img alt="{{ $alt }}"
+           src="{{ $img.RelPermalink }}"
+           loading="lazy"
+           {{- if $zoom }} data-zoomable{{end}}
+           {{- with .Get "width" }} width="{{.}}"{{end}}
+           {{- with .Get "height" }} height="{{.}}"{{end}}
            {{- with $img_class }} class="{{.}}"{{end}} />
-    {{- end -}}
+        {{- else }}
+          {{- $img_lg := $img.Fit "1200x1200" -}}
+          {{- $img_md := $img_lg.Fit "760x760" -}}{{/* Match `.docs-article-container` max-width */}}
+          {{- $img_sm := $img_md.Fit "400x400" -}}
+          {{- $width := (.Get "width") | default $img_md.Width -}}
+          {{- $height := (.Get "height") | default $img_md.Height -}}
+          <img alt="{{ $alt }}" srcset="
+               {{ $img_sm.RelPermalink }} 400w,
+               {{ $img_md.RelPermalink }} 760w,
+               {{ $img_lg.RelPermalink }} 1200w"
+               src="{{ $img_sm.RelPermalink }}"
+               width="{{ $width }}"
+               height="{{ $height }}"
+               loading="lazy"
+               {{- if $zoom }} data-zoomable{{end}}
+               {{- with $img_class }} class="{{.}}"{{end}} />
+        {{- end }}
+      {{- else -}}
+        <img src="{{ $destination | safeURL }}" alt="{{ $alt }}" loading="lazy" {{ if $zoom }}data-zoomable{{end}}
+             {{- with .Get "width" }} width="{{.}}"{{end}} {{- with .Get "height" }} height="{{.}}"{{end}}
+             {{- with $img_class }} class="{{.}}"{{end}} />
+      {{- end -}}
+    </div>
   </div>
 
   {{- if $caption -}}
@@ -65,4 +67,4 @@
       {{ $caption | markdownify | emojify }}
     </figcaption>
   {{- end -}}
-</figure>
+</figure>
\ No newline at end of file