diff --git a/assets/javascripts/wizard/templates/components/wizard-editor.hbs b/assets/javascripts/wizard/templates/components/wizard-editor.hbs
index 78870ac8..4b45a3db 100644
--- a/assets/javascripts/wizard/templates/components/wizard-editor.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-editor.hbs
@@ -30,13 +30,12 @@
                 content=popupMenuOptions}}
             {{else}}
               <div>{{d.icon}}</div>
-              {{d-button
-                action=b.action
-                actionParam=b
-                translatedTitle=b.title
-                label=b.label
-                icon=b.icon
-                class=b.className}}
+              <button class='wizard-btn {{b.className}}' {{action b.action b}} title="{{b.title}}">
+                {{d-icon b.icon}}
+                {{#if b.label}}
+                  <span class="d-button-label">{{i18n b.label}}</span>
+                {{/if}}
+              </button>
             {{/if}}
           {{/each}}
 
diff --git a/assets/javascripts/wizard/templates/components/wizard-field-composer.hbs b/assets/javascripts/wizard/templates/components/wizard-field-composer.hbs
index 7ff7d3d6..ca97246d 100644
--- a/assets/javascripts/wizard/templates/components/wizard-field-composer.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-field-composer.hbs
@@ -1,2 +1,4 @@
 {{wizard-editor showPreview=showPreview value=field.value placeholder=field.placeholder}}
-{{d-button class='wizard-btn primary' action='togglePreview' label=togglePreviewLabel}}
+<button class='wizard-btn primary' {{action 'togglePreview'}}>
+  <span class="d-button-label">{{i18n togglePreviewLabel}}</span>
+</button>
\ No newline at end of file