diff --git a/assets/sass/base/images.sass b/assets/sass/base/images.sass
index f46537f40..ea169d700 100644
--- a/assets/sass/base/images.sass
+++ b/assets/sass/base/images.sass
@@ -1,9 +1,11 @@
 img
+  &.has-border,
   &.with-border
     @apply border border-solid border-grey-light
 
+  &.has-padding,
   &.with-padding
-    @apply p-1
+    @apply p-2
 
   &.avatar
     @apply border p-1 rounded-full
diff --git a/assets/sass/components/markdown.sass b/assets/sass/components/markdown.sass
index 1f6fdf77c..21ff9687f 100644
--- a/assets/sass/components/markdown.sass
+++ b/assets/sass/components/markdown.sass
@@ -17,3 +17,9 @@
   .hljs
     @apply bg-grey-lighter block border-grey-dark border-l-4 font-mono
     @apply leading-loose overflow-x-scroll p-6 rounded text-sm
+
+  figure
+    @apply block mb-8
+
+  figcaption
+    @apply italic text-sm text-grey-darker text-center mb-0 mt-1