diff --git a/wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/includes/searchpromotion_form.html b/wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/includes/searchpromotion_form.html
index 67f3d2103b..7167a8a5b5 100644
--- a/wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/includes/searchpromotion_form.html
+++ b/wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/includes/searchpromotion_form.html
@@ -1,9 +1,9 @@
 {% load i18n %}
 <li id="inline_child_{{ form.prefix }}"{% if form.DELETE.value %} style="display: none;"{% endif %}>
     <ul class="controls">
-        <li><button class="icon text-replace icon-order-up inline-child-move-up" id="{{ form.prefix }}-move-up">{% trans "Move up" %}</button></li>
-        <li><button class="icon text-replace icon-order-down inline-child-move-down" id="{{ form.prefix }}-move-down">{% trans "Move down" %}</button></li>
-        <li><button class="icon text-replace icon-bin" id="{{ form.DELETE.id_for_label }}-button">{% trans "Delete" %}</button></li>
+        <li><button type="button" class="button icon text-replace icon-order-up inline-child-move-up" id="{{ form.prefix }}-move-up">{% trans "Move up" %}</button></li>
+        <li><button type="button" class="button icon text-replace icon-order-down inline-child-move-down" id="{{ form.prefix }}-move-down">{% trans "Move down" %}</button></li>
+        <li><button type="button" class="button icon text-replace icon-bin" id="{{ form.DELETE.id_for_label }}-button">{% trans "Delete" %}</button></li>
     </ul>
 
     <fieldset>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_lock_switch.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_lock_switch.html
index 57ff0f0108..c83cca7a8c 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_lock_switch.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_lock_switch.html
@@ -12,7 +12,7 @@
             <form action="{% url 'wagtailadmin_pages:unlock' page.id %}" method="POST" class="status-tag primary">
                 {% csrf_token %}
                 <input type="hidden" name="next" value="{% url 'wagtailadmin_pages:edit' page.id %}">
-                <input type="submit" class="unbutton" value="{% trans "Locked" %}">
+                <input type="submit" class="button unbutton" value="{% trans "Locked" %}">
             </form>
         {% else %}
             <span class="status-tag primary">Locked</span>