diff --git a/i18n/en.yaml b/i18n/en.yaml
index ff197211..59aeafe8 100644
--- a/i18n/en.yaml
+++ b/i18n/en.yaml
@@ -20,6 +20,9 @@
 - id: next
   translation: Next
 
+- id: figure
+  translation: "Figure %d:"
+
 # Buttons
 
 - id: btn_preprint
diff --git a/i18n/zh.yaml b/i18n/zh.yaml
index aa408975..f025e37d 100644
--- a/i18n/zh.yaml
+++ b/i18n/zh.yaml
@@ -14,6 +14,15 @@
 - id: minute_read
   translation: 分钟阅读时间
 
+- id: previous
+  translation: 上一页
+
+- id: next
+  translation: 下一页
+
+- id: figure
+  translation: "图%d:"
+
 # Buttons
 
 - id: btn_preprint
diff --git a/layouts/partials/css/academic.css b/layouts/partials/css/academic.css
index a9bc68e9..60122a42 100644
--- a/layouts/partials/css/academic.css
+++ b/layouts/partials/css/academic.css
@@ -139,12 +139,6 @@ video {
   margin: 0 auto;
 }
 
-figcaption:before {
-  font-weight: 700;
-  text-transform: uppercase;
-  content: "Figure " counter(captions) ": ";
-}
-
 figcaption {
   display: block;
   margin-top: 0.75em;
@@ -152,6 +146,15 @@ figcaption {
   font-size: 1rem;
   margin-bottom: 1.65rem;
   font-family: '{{ .Get "heading_font" }}', sans-serif;
+}
+
+figcaption.numbered:before {
+  font-weight: 700;
+  text-transform: uppercase;
+  content: attr(data-pre) counter(captions) attr(data-post);
+}
+
+figcaption.numbered {
   counter-increment: captions;
 }
 
diff --git a/layouts/shortcodes/figure.html b/layouts/shortcodes/figure.html
new file mode 100644
index 00000000..a746ebc8
--- /dev/null
+++ b/layouts/shortcodes/figure.html
@@ -0,0 +1,17 @@
+<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 }}/>
+{{ 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 }}
+  {{ if or (.Get "caption") (.Get "attr")}}<p>
+    {{ .Get "caption" }}
+    {{ with .Get "attrlink"}}<a href="{{.}}"> {{ end }}
+    {{ .Get "attr" }}
+    {{ if .Get "attrlink"}}</a> {{ end }}
+  </p> {{ end }}
+</figcaption>
+{{ end }}
+</figure>
\ No newline at end of file