diff --git a/shared/templates/styleguide/2.3.x/blocks/button_block.html b/shared/templates/styleguide/2.3.x/blocks/button_block.html
index 180e5fbd4b6fb185702f2ac38ad1900ebb1b8255..b68f389a9e07e82b814a29dc25be6d04b6bcff98 100644
--- a/shared/templates/styleguide/2.3.x/blocks/button_block.html
+++ b/shared/templates/styleguide/2.3.x/blocks/button_block.html
@@ -1,7 +1,13 @@
 {% load wagtailcore_tags wagtailimages_tags %}
 {% firstof self.page.url self.link as target %}
-
-<a href="{{ target }}" class="btn btn--{{ self.color }} {% if self.hoveractive %}btn--hoveractive{% endif %} btn--autowidth text-{{ self.size }}"
+<a href="{{ target }}" class="btn btn--{{ self.color }} {% if self.hoveractive %}btn--hoveractive{% endif %} {% if self.icon %}btn--icon{% endif %} btn--autowidth text-{{ self.size }}"
 >
-    <div class="btn__body ">{{ self.title }}</div>
+    {% if self.icon %}
+        <div class="btn__body-wrap">
+            <div class="btn__body ">{{ self.title }}</div>
+            <div class="btn__icon "><i class="ico--{{ self.icon }}"></i></div>
+        </div>
+    {% else %}
+        <div class="btn__body ">{{ self.title }}</div>
+    {% endif %}
 </a>