3 files changed, 27 insertions, 5 deletions

diff --git a/tpl/objects/badge.pug b/tpl/objects/badge.pug
index c91e74f..48e4029 100644
--- a/tpl/objects/badge.pug
+++ b/tpl/objects/badge.pug
@@ -18,12 +18,20 @@ mixin badge(variant)
             if attributes.icon
                 +icon(attributes.icon)
                 = ' '
-            span.o-badge__label
-                block
+            if block
+                span.o-badge__label
+                    block
+            if attributes.postIcon
+                = ' '
+                +icon(attributes.postIcon)
     else
         span(class=classes)
             if attributes.icon
                 +icon(attributes.icon)
                 = ' '
-            span.o-badge__label
-                block
+            if block
+                span.o-badge__label
+                    block
+            if attributes.postIcon
+                = ' '
+                +icon(attributes.postIcon)
diff --git a/tpl/objects/button.pug b/tpl/objects/button.pug
index 1fa3347..0884c8d 100644
--- a/tpl/objects/button.pug
+++ b/tpl/objects/button.pug
@@ -20,4 +20,9 @@ mixin a-button
         if attributes.icon
             +icon(attributes.icon)
             = ' '
-        block
+        if block
+            span.o-button__label
+                block
+        if attributes.postIcon
+            = ' '
+            +icon(attributes.postIcon)
diff --git a/tpl/views/button.pug b/tpl/views/button.pug
index eacf302..edd8ef6 100644
--- a/tpl/views/button.pug
+++ b/tpl/views/button.pug
@@ -19,6 +19,15 @@ mixin view-button
             +a-button(size='xl' outline=true)= 'Button'
 
         .c-box
+            +a-button(postIcon='arrow-right' size='sm')= 'Button'
+            = ' '
+            +a-button(postIcon='arrow-right')= 'Button'
+            = ' '
+            +a-button(postIcon='arrow-right' size='lg')= 'Button'
+            = ' '
+            +a-button(postIcon='arrow-right' size='xl')= 'Button'
+
+        .c-box
             .l-button-group
                 +a-button= 'Button'
                 +a-button(disabled=true)= 'Button'