diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/chooser/chooser.html b/wagtail/wagtaildocs/templates/wagtaildocs/chooser/chooser.html
index 9359f1f9a..07ba11985 100644
--- a/wagtail/wagtaildocs/templates/wagtaildocs/chooser/chooser.html
+++ b/wagtail/wagtaildocs/templates/wagtaildocs/chooser/chooser.html
@@ -32,7 +32,9 @@
                     {% for field in uploadform %}
                         {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
                     {% endfor %}
-                    <li><input type="submit" value="{% trans 'Save' %}" /></li>
+                    <li>
+                        <button type="submit" class="button-longrunning" data-clicked-text="{% trans 'Uploading...' %}"><span class="icon icon-spinner"></span><em>{% trans 'Upload' %}</em></button>
+                    </li>
                 </ul>
             </form>
         </section>
diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/add.html b/wagtail/wagtaildocs/templates/wagtaildocs/documents/add.html
index 575575ec7..4cd4782a9 100644
--- a/wagtail/wagtaildocs/templates/wagtaildocs/documents/add.html
+++ b/wagtail/wagtaildocs/templates/wagtaildocs/documents/add.html
@@ -22,7 +22,7 @@
                     {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
                 {% endfor %}
                 <li>
-                    <button type="submit" class="button-longrunning" data-clicked-text="{% trans 'Saving...' %}"><span class="icon icon-spinner"></span><em>{% trans 'Save' %}</em></button>
+                    <button type="submit" class="button-longrunning" data-clicked-text="{% trans 'Uploading...' %}"><span class="icon icon-spinner"></span><em>{% trans 'Upload' %}</em></button>
                 </li>
             </ul>
         </form>
diff --git a/wagtail/wagtailimages/templates/wagtailimages/chooser/chooser.html b/wagtail/wagtailimages/templates/wagtailimages/chooser/chooser.html
index e42ffe818..5f4e3a227 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/chooser/chooser.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/chooser/chooser.html
@@ -44,7 +44,9 @@
                             {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
                         {% endif %}
                     {% endfor %}
-                    <li><input type="submit" value="{% trans 'Upload' %}" /></li>
+                    <li>
+                        <button type="submit" class="button-longrunning" data-clicked-text="{% trans 'Uploading...' %}"><span class="icon icon-spinner"></span><em>{% trans 'Upload' %}</em></button>
+                    </li>
                 </ul>
             </form>
         </section>