diff --git a/docs/advanced_topics/customisation/admin_templates.rst b/docs/advanced_topics/customisation/admin_templates.rst
index 93684afa9..c81274144 100644
--- a/docs/advanced_topics/customisation/admin_templates.rst
+++ b/docs/advanced_topics/customisation/admin_templates.rst
@@ -34,7 +34,7 @@ To replace the default logo, create a template file ``dashboard/templates/wagtai
 .. code-block:: html+django
 
     {% extends "wagtailadmin/base.html" %}
-    {% load staticfiles %}
+    {% load static %}
 
     {% block branding_logo %}
         <img src="{% static 'images/custom-logo.svg' %}" alt="Custom Project" width="80" />
@@ -50,7 +50,7 @@ To replace the favicon displayed when viewing admin pages, create a template fil
 .. code-block:: html+django
 
     {% extends "wagtailadmin/admin_base.html" %}
-    {% load staticfiles %}
+    {% load static %}
 
     {% block branding_favicon %}
         <link rel="shortcut icon" href="{% static 'images/favicon.ico' %}" />
diff --git a/wagtail/admin/templates/wagtailadmin/404.html b/wagtail/admin/templates/wagtailadmin/404.html
index 6db142f4f..8e96afe17 100644
--- a/wagtail/admin/templates/wagtailadmin/404.html
+++ b/wagtail/admin/templates/wagtailadmin/404.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/admin_base.html" %}
-{% load wagtailadmin_tags wagtailcore_tags staticfiles i18n %}
+{% load wagtailadmin_tags wagtailcore_tags static i18n %}
 {% block titletag %}{% trans "Error 404: Page not found" %}{% endblock %}
 
 
diff --git a/wagtail/admin/templates/wagtailadmin/account/password_reset/complete.html b/wagtail/admin/templates/wagtailadmin/account/password_reset/complete.html
index 6c192a26b..bf74cd2d7 100644
--- a/wagtail/admin/templates/wagtailadmin/account/password_reset/complete.html
+++ b/wagtail/admin/templates/wagtailadmin/account/password_reset/complete.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/admin_base.html" %}
-{% load staticfiles i18n %}
+{% load static i18n %}
 {% block titletag %}{% trans "Reset password" %}{% endblock %}
 {% block bodyclass %}login{% endblock %}
 
diff --git a/wagtail/admin/templates/wagtailadmin/account/password_reset/confirm.html b/wagtail/admin/templates/wagtailadmin/account/password_reset/confirm.html
index ea7630894..bdb0e1862 100644
--- a/wagtail/admin/templates/wagtailadmin/account/password_reset/confirm.html
+++ b/wagtail/admin/templates/wagtailadmin/account/password_reset/confirm.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/admin_base.html" %}
-{% load staticfiles i18n %}
+{% load static i18n %}
 {% block titletag %}
     {% if validlink %}
         {% trans "Set your new password" %}
diff --git a/wagtail/admin/templates/wagtailadmin/account/password_reset/done.html b/wagtail/admin/templates/wagtailadmin/account/password_reset/done.html
index 1b657b4b9..88e6ddef8 100644
--- a/wagtail/admin/templates/wagtailadmin/account/password_reset/done.html
+++ b/wagtail/admin/templates/wagtailadmin/account/password_reset/done.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/admin_base.html" %}
-{% load staticfiles i18n %}
+{% load static i18n %}
 {% block titletag %}{% trans "Reset password" %}{% endblock %}
 {% block bodyclass %}login{% endblock %}
 
diff --git a/wagtail/admin/templates/wagtailadmin/account/password_reset/form.html b/wagtail/admin/templates/wagtailadmin/account/password_reset/form.html
index 261bcfe84..26c772b04 100644
--- a/wagtail/admin/templates/wagtailadmin/account/password_reset/form.html
+++ b/wagtail/admin/templates/wagtailadmin/account/password_reset/form.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/admin_base.html" %}
-{% load staticfiles i18n %}
+{% load static i18n %}
 {% block titletag %}{% trans "Reset password" %}{% endblock %}
 {% block bodyclass %}login{% endblock %}
 
diff --git a/wagtail/admin/templates/wagtailadmin/admin_base.html b/wagtail/admin/templates/wagtailadmin/admin_base.html
index 22d3c979b..136214f08 100644
--- a/wagtail/admin/templates/wagtailadmin/admin_base.html
+++ b/wagtail/admin/templates/wagtailadmin/admin_base.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/skeleton.html" %}
-{% load i18n staticfiles wagtailadmin_tags %}
+{% load i18n static wagtailadmin_tags %}
 
 {% block css %}
     <link rel="stylesheet" href="{% static 'wagtailadmin/css/vendor/jquery-ui/jquery-ui-1.10.3.verdant.css' %}" />
diff --git a/wagtail/admin/templates/wagtailadmin/base.html b/wagtail/admin/templates/wagtailadmin/base.html
index 804fa977d..b0b3ab090 100644
--- a/wagtail/admin/templates/wagtailadmin/base.html
+++ b/wagtail/admin/templates/wagtailadmin/base.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/admin_base.html" %}
-{% load wagtailadmin_tags wagtailcore_tags staticfiles i18n %}
+{% load wagtailadmin_tags wagtailcore_tags static i18n %}
 
 {% block furniture %}
     <div class="nav-wrapper">
diff --git a/wagtail/admin/templates/wagtailadmin/home.html b/wagtail/admin/templates/wagtailadmin/home.html
index 6973ef320..5585fb16d 100644
--- a/wagtail/admin/templates/wagtailadmin/home.html
+++ b/wagtail/admin/templates/wagtailadmin/home.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-{% load wagtailadmin_tags staticfiles i18n %}
+{% load wagtailadmin_tags static i18n %}
 {% block titletag %}{% trans "Dashboard" %}{% endblock %}
 {% block bodyclass %}homepage{% endblock %}
 
diff --git a/wagtail/admin/templates/wagtailadmin/home/upgrade_notification.html b/wagtail/admin/templates/wagtailadmin/home/upgrade_notification.html
index 9a69a2053..5c7dec951 100644
--- a/wagtail/admin/templates/wagtailadmin/home/upgrade_notification.html
+++ b/wagtail/admin/templates/wagtailadmin/home/upgrade_notification.html
@@ -1,4 +1,4 @@
-{% load wagtailcore_tags staticfiles %}
+{% load wagtailcore_tags static %}
 
 <div class="panel nice-padding panel-upgrade-notification" style="display:none">
     <div class="help-block help-warning">Wagtail upgrade available. Your version: <strong>{% wagtail_version %}</strong>. New version: <strong class="newversion"></strong>. <a class="releasenotes-link" href="">Read the release notes.</a></div>
diff --git a/wagtail/admin/templates/wagtailadmin/login.html b/wagtail/admin/templates/wagtailadmin/login.html
index a79ed5805..f4400b5d4 100644
--- a/wagtail/admin/templates/wagtailadmin/login.html
+++ b/wagtail/admin/templates/wagtailadmin/login.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/admin_base.html" %}
-{% load staticfiles i18n %}
+{% load static i18n %}
 {% block titletag %}{% trans "Sign in" %}{% endblock %}
 {% block bodyclass %}login{% endblock %}
 
diff --git a/wagtail/admin/templates/wagtailadmin/notifications/base.html b/wagtail/admin/templates/wagtailadmin/notifications/base.html
index de0800588..9234257bb 100644
--- a/wagtail/admin/templates/wagtailadmin/notifications/base.html
+++ b/wagtail/admin/templates/wagtailadmin/notifications/base.html
@@ -1,4 +1,4 @@
-{% load i18n staticfiles %}
+{% load i18n static %}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
diff --git a/wagtail/admin/templates/wagtailadmin/pages/_editor_css.html b/wagtail/admin/templates/wagtailadmin/pages/_editor_css.html
index 53efcb767..c1e7e5b51 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/_editor_css.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/_editor_css.html
@@ -1,4 +1,4 @@
-{% load wagtailadmin_tags staticfiles %}
+{% load wagtailadmin_tags static %}
 
 {% comment %}
     CSS declarations to be included on the 'create page' and 'edit page' views
diff --git a/wagtail/admin/templates/wagtailadmin/pages/_editor_js.html b/wagtail/admin/templates/wagtailadmin/pages/_editor_js.html
index 548fe5713..f902805cf 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/_editor_js.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/_editor_js.html
@@ -1,4 +1,4 @@
-{% load wagtailadmin_tags staticfiles %}
+{% load wagtailadmin_tags static %}
 
 {% comment %}
     Javascript declarations to be included on the 'create page' and 'edit page' views
diff --git a/wagtail/admin/templates/wagtailadmin/pages/index.html b/wagtail/admin/templates/wagtailadmin/pages/index.html
index 9c2c2ab38..2732d8400 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/index.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/index.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-{% load wagtailadmin_tags staticfiles i18n %}
+{% load wagtailadmin_tags static i18n %}
 {% block titletag %}{% blocktrans with title=parent_page.get_admin_display_title %}Exploring {{ title }}{% endblocktrans %}{% endblock %}
 {% block bodyclass %}page-explorer {% if ordering == 'ord' %}reordering{% endif %}{% endblock %}
 
diff --git a/wagtail/admin/templates/wagtailadmin/shared/animated_logo.html b/wagtail/admin/templates/wagtailadmin/shared/animated_logo.html
index ac3e19318..9a62cdf71 100644
--- a/wagtail/admin/templates/wagtailadmin/shared/animated_logo.html
+++ b/wagtail/admin/templates/wagtailadmin/shared/animated_logo.html
@@ -1,4 +1,4 @@
-{% load wagtailadmin_tags staticfiles %}
+{% load wagtailadmin_tags static %}
 
 <div class="wagtail-logo-container__desktop u-hidden@small">
     <img class="wagtail-logo wagtail-logo__body" src="{% static 'wagtailadmin/images/logo-body.svg' %}" alt=""/>
diff --git a/wagtail/admin/templates/wagtailadmin/skeleton.html b/wagtail/admin/templates/wagtailadmin/skeleton.html
index c610429fb..39c4487e0 100644
--- a/wagtail/admin/templates/wagtailadmin/skeleton.html
+++ b/wagtail/admin/templates/wagtailadmin/skeleton.html
@@ -1,5 +1,5 @@
 <!doctype html>
-{% load staticfiles i18n %}
+{% load static i18n %}
 <html class="no-js" lang="{{ LANGUAGE_CODE|default:"en-gb" }}">
 <head>
     <meta charset="utf-8" />
diff --git a/wagtail/admin/templates/wagtailadmin/userbar/base.html b/wagtail/admin/templates/wagtailadmin/userbar/base.html
index 775719b29..a8cb581a5 100644
--- a/wagtail/admin/templates/wagtailadmin/userbar/base.html
+++ b/wagtail/admin/templates/wagtailadmin/userbar/base.html
@@ -1,4 +1,4 @@
-{% load staticfiles i18n %}
+{% load static i18n %}
 <!-- Wagtail user bar embed code -->
 <div class="wagtail-userbar-reset">
     <div class="wagtail-userbar wagtail-userbar--{{ position|default:'bottom-right' }}" data-wagtail-userbar>
diff --git a/wagtail/contrib/modeladmin/templates/modeladmin/choose_parent.html b/wagtail/contrib/modeladmin/templates/modeladmin/choose_parent.html
index 93a07a3c9..5a9470294 100644
--- a/wagtail/contrib/modeladmin/templates/modeladmin/choose_parent.html
+++ b/wagtail/contrib/modeladmin/templates/modeladmin/choose_parent.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-{% load i18n modeladmin_tags admin_static %}
+{% load i18n modeladmin_tags static %}
 
 {% block titletag %}{{ view.get_meta_title }}{% endblock %}
 
diff --git a/wagtail/contrib/modeladmin/templates/modeladmin/includes/search_form.html b/wagtail/contrib/modeladmin/templates/modeladmin/includes/search_form.html
index bc5089782..3d2a68dbd 100644
--- a/wagtail/contrib/modeladmin/templates/modeladmin/includes/search_form.html
+++ b/wagtail/contrib/modeladmin/templates/modeladmin/includes/search_form.html
@@ -1,4 +1,4 @@
-{% load i18n admin_static %}
+{% load i18n static %}
 {% if view.search_fields %}
 <form id="changelist-search" class="col search-form" action="{{ view.index_url }}" method="get">
     <ul class="fields">
diff --git a/wagtail/contrib/modeladmin/templates/modeladmin/inspect.html b/wagtail/contrib/modeladmin/templates/modeladmin/inspect.html
index ba8d876d9..7ae5368c6 100644
--- a/wagtail/contrib/modeladmin/templates/modeladmin/inspect.html
+++ b/wagtail/contrib/modeladmin/templates/modeladmin/inspect.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-{% load i18n admin_static %}
+{% load i18n static %}
 
 {% block titletag %}{{ view.get_meta_title }}{% endblock %}
 
diff --git a/wagtail/contrib/search_promotions/templates/wagtailsearchpromotions/add.html b/wagtail/contrib/search_promotions/templates/wagtailsearchpromotions/add.html
index a81eb14e2..e0326bdab 100644
--- a/wagtail/contrib/search_promotions/templates/wagtailsearchpromotions/add.html
+++ b/wagtail/contrib/search_promotions/templates/wagtailsearchpromotions/add.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-{% load i18n staticfiles %}
+{% load i18n static %}
 {% block titletag %}{% trans "Add search promotion" %}{% endblock %}
 {% block content %}
     {% trans "Add search pick" as add_str %}
diff --git a/wagtail/contrib/search_promotions/templates/wagtailsearchpromotions/edit.html b/wagtail/contrib/search_promotions/templates/wagtailsearchpromotions/edit.html
index 700c564ff..444cece57 100644
--- a/wagtail/contrib/search_promotions/templates/wagtailsearchpromotions/edit.html
+++ b/wagtail/contrib/search_promotions/templates/wagtailsearchpromotions/edit.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-{% load i18n staticfiles %}
+{% load i18n static %}
 {% block titletag %}{% blocktrans with query=query.query_string %}Editing {{ query }}{% endblocktrans %}{% endblock %}
 {% block content %}
     {% trans "Editing" as editing_str %}
diff --git a/wagtail/contrib/styleguide/templates/wagtailstyleguide/base.html b/wagtail/contrib/styleguide/templates/wagtailstyleguide/base.html
index e967efb34..41d6bd961 100644
--- a/wagtail/contrib/styleguide/templates/wagtailstyleguide/base.html
+++ b/wagtail/contrib/styleguide/templates/wagtailstyleguide/base.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-{% load wagtailadmin_tags i18n staticfiles %}
+{% load wagtailadmin_tags i18n static %}
 
 {% block extra_css %}
     {{ block.super }}
diff --git a/wagtail/documents/templates/wagtaildocs/multiple/add.html b/wagtail/documents/templates/wagtaildocs/multiple/add.html
index 1a63752aa..4142a5aa5 100644
--- a/wagtail/documents/templates/wagtaildocs/multiple/add.html
+++ b/wagtail/documents/templates/wagtaildocs/multiple/add.html
@@ -1,7 +1,7 @@
 {% extends "wagtailadmin/base.html" %}
 {% load i18n %}
 {% load l10n %}
-{% load staticfiles %}
+{% load static %}
 {% block titletag %}{% trans "Add multiple documents" %}{% endblock %}
 {% block extra_css %}
     {{ block.super }}
diff --git a/wagtail/images/templates/wagtailimages/images/edit.html b/wagtail/images/templates/wagtailimages/images/edit.html
index deb50d291..362c56ac4 100644
--- a/wagtail/images/templates/wagtailimages/images/edit.html
+++ b/wagtail/images/templates/wagtailimages/images/edit.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-{% load wagtailimages_tags wagtailadmin_tags staticfiles i18n l10n %}
+{% load wagtailimages_tags wagtailadmin_tags static i18n l10n %}
 {% block titletag %}{% blocktrans with title=image.title %}Editing image {{ title }}{% endblocktrans %}{% endblock %}
 {% block extra_css %}
     {{ block.super }}
diff --git a/wagtail/images/templates/wagtailimages/images/url_generator.html b/wagtail/images/templates/wagtailimages/images/url_generator.html
index 3024a05f3..74faded5c 100644
--- a/wagtail/images/templates/wagtailimages/images/url_generator.html
+++ b/wagtail/images/templates/wagtailimages/images/url_generator.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-{% load wagtailimages_tags staticfiles i18n %}
+{% load wagtailimages_tags static i18n %}
 
 {% block titletag %}{% blocktrans with title=image.title %}Editing image {{ title }}{% endblocktrans %}{% endblock %}
 
diff --git a/wagtail/images/templates/wagtailimages/multiple/add.html b/wagtail/images/templates/wagtailimages/multiple/add.html
index 78655230c..97ae8ba13 100644
--- a/wagtail/images/templates/wagtailimages/multiple/add.html
+++ b/wagtail/images/templates/wagtailimages/multiple/add.html
@@ -1,7 +1,7 @@
 {% extends "wagtailadmin/base.html" %}
 {% load i18n %}
 {% load l10n %}
-{% load staticfiles %}
+{% load static %}
 {% load wagtailimages_tags %}
 {% block titletag %}{% trans "Add multiple images" %}{% endblock %}
 {% block extra_css %}
diff --git a/wagtail/users/templates/wagtailusers/groups/create.html b/wagtail/users/templates/wagtailusers/groups/create.html
index 2eec89766..d1ef09795 100644
--- a/wagtail/users/templates/wagtailusers/groups/create.html
+++ b/wagtail/users/templates/wagtailusers/groups/create.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-{% load wagtailusers_tags wagtailimages_tags staticfiles i18n %}
+{% load wagtailusers_tags wagtailimages_tags static i18n %}
 
 {% block titletag %}{% trans "Add group" %}{% endblock %}
 
diff --git a/wagtail/users/templates/wagtailusers/groups/edit.html b/wagtail/users/templates/wagtailusers/groups/edit.html
index 9ed29333a..2e8f33b5d 100644
--- a/wagtail/users/templates/wagtailusers/groups/edit.html
+++ b/wagtail/users/templates/wagtailusers/groups/edit.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-{% load wagtailusers_tags staticfiles i18n %}
+{% load wagtailusers_tags static i18n %}
 
 {% block titletag %}{% trans "Editing" %} {{ group.name }}{% endblock %}
 
diff --git a/wagtail/users/templates/wagtailusers/groups/includes/group_form_js.html b/wagtail/users/templates/wagtailusers/groups/includes/group_form_js.html
index 45a70c34e..ea16b551f 100644
--- a/wagtail/users/templates/wagtailusers/groups/includes/group_form_js.html
+++ b/wagtail/users/templates/wagtailusers/groups/includes/group_form_js.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 <script>
     window.chooserUrls = {
         'pageChooser': '{% url "wagtailadmin_choose_page" %}'