diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_preview_button_on_create.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_preview_button_on_create.html
index 2e671c82f..598ee73a5 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_preview_button_on_create.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_preview_button_on_create.html
@@ -1,4 +1,4 @@
-<button class="action-preview button"
+<button class="action-preview button icon icon-view"
     data-action="{% url 'wagtailadmin_pages_preview_on_create' content_type.app_label content_type.model parent_page.id %}{% if mode %}?mode={{ mode|urlencode }}{% endif %}"
     data-placeholder="{% url 'wagtailadmin_pages_preview_placeholder' %}"
-    data-windowname="wagtail_preview_{{ parent_page.id }}_child" value="{{ label }}" />
+    data-windowname="wagtail_preview_{{ parent_page.id }}_child">{{ label }}</button>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html
index 53cebea2d..cc3e1e0b9 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html
@@ -55,7 +55,7 @@
                 <li class="actions preview">
                     {% trans 'Preview' as preview_label %}
                     {% if display_modes|length > 1 %}
-                        <div class="dropdown dropup dropdown-button match-width icon icon-view">
+                        <div class="dropdown dropup dropdown-button match-width">
                             {% include "wagtailadmin/pages/_preview_button_on_edit.html" with label=preview_label %}
                             <div class="dropdown-toggle icon icon-arrow-up"></div>
                             <ul role="menu">