diff --git a/addon/components/pix-button.hbs b/addon/components/pix-button.hbs
index 8cee67f35..d6f1b225d 100644
--- a/addon/components/pix-button.hbs
+++ b/addon/components/pix-button.hbs
@@ -14,22 +14,13 @@
     </div>
     <span class="loader__not-visible-text">{{yield}}</span>
   {{else}}
-    {{#if @iconBefore}}
-      <PixIcon
-        class="pix-button__icon pix-button__icon--before"
-        @ariaHidden={{true}}
-        @name={{@iconBefore}}
-        @plainIcon={{@plainIconBefore}}
-      />
-    {{/if}}
-    {{yield}}
-    {{#if @iconAfter}}
-      <PixIcon
-        class="pix-button__icon pix-button__icon--after"
-        @name={{@iconAfter}}
-        @ariaHidden={{true}}
-        @plainIcon={{@plainIconAfter}}
-      />
-    {{/if}}
+    <ContentWithPixIcons
+      @iconBefore={{@iconBefore}}
+      @iconAfter={{@iconAfter}}
+      @plainIconAfter={{@plainIconAfter}}
+      @plainIconBefore={{@plainIconBefore}}
+    >
+      {{yield}}
+    </ContentWithPixIcons>
   {{/if}}
 </button>
\ No newline at end of file