diff --git a/layouts/partials/css/academic.css b/layouts/partials/css/academic.css
index 60122a42..3f5602e2 100644
--- a/layouts/partials/css/academic.css
+++ b/layouts/partials/css/academic.css
@@ -159,7 +159,7 @@ figcaption.numbered {
 }
 
 figcaption h4 {
-  display: inline-block;
+  display: inline;
   font-size: 1rem;
   font-weight: 400;
   margin: 0;
diff --git a/layouts/shortcodes/figure.html b/layouts/shortcodes/figure.html
index a746ebc8..ded982e8 100644
--- a/layouts/shortcodes/figure.html
+++ b/layouts/shortcodes/figure.html
@@ -1,13 +1,13 @@
 <figure{{ with .Get "class" }} class="{{.}}"{{ end }}>
 {{ if .Get "link"}}<a href="{{ .Get "link" }}"{{ with .Get "target" }} target="{{ . }}"{{ end }}{{ with .Get "rel" }} rel="{{ . }}"{{ end }}>{{ end }}
-<img src="{{ .Get "src" }}" {{ if or (.Get "alt") (.Get "caption") }}alt="{{ with .Get "alt"}}{{.}}{{else}}{{ .Get "caption" }}{{ end }}" {{ end }}{{ with .Get "width" }}width="{{.}}" {{ end }}{{ with .Get "height" }}height="{{.}}" {{ end }}/>
+<img src="{{ .Get "src" | relURL }}" {{ if or (.Get "alt") (.Get "caption") }}alt="{{ with .Get "alt"}}{{.}}{{else}}{{ .Get "caption" }}{{ end }}" {{ end }}{{ with .Get "width" }}width="{{.}}" {{ end }}{{ with .Get "height" }}height="{{.}}" {{ end }}/>
 {{ if .Get "link"}}</a>{{ end }}
 {{ if or (or (.Get "title") (.Get "caption")) (.Get "attr")}}
 {{ $figure := split (i18n "figure" | default "Figure %d:") "%d" }}
 <figcaption data-pre="{{ index $figure 0 }}" data-post="{{ index $figure 1 }}" {{ if eq (.Get "numbered") "true" }}class="numbered"{{ end }}>{{ if isset .Params "title" }}
-  <h4>{{ .Get "title" }}</h4>{{ end }}
+  <h4>{{ .Get "title" | markdownify | emojify }}</h4>{{ end }}
   {{ if or (.Get "caption") (.Get "attr")}}<p>
-    {{ .Get "caption" }}
+    {{ .Get "caption" | markdownify | emojify }}
     {{ with .Get "attrlink"}}<a href="{{.}}"> {{ end }}
     {{ .Get "attr" }}
     {{ if .Get "attrlink"}}</a> {{ end }}