diff --git a/wagtail/admin/templates/wagtailadmin/account/change_avatar.html b/wagtail/admin/templates/wagtailadmin/account/change_avatar.html
index db160d559..160b08a9d 100644
--- a/wagtail/admin/templates/wagtailadmin/account/change_avatar.html
+++ b/wagtail/admin/templates/wagtailadmin/account/change_avatar.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-{% load avatar i18n %}
+{% load wagtailadmin_tags i18n %}
 
 {% block titletag %}{% trans "Change profile picture" %}{% endblock %}
 {% block content %}
diff --git a/wagtail/admin/templates/wagtailadmin/home.html b/wagtail/admin/templates/wagtailadmin/home.html
index af08da3c7..e75d3cdc8 100644
--- a/wagtail/admin/templates/wagtailadmin/home.html
+++ b/wagtail/admin/templates/wagtailadmin/home.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-{% load avatar staticfiles i18n %}
+{% load wagtailadmin_tags staticfiles i18n %}
 {% block titletag %}{% trans "Dashboard" %}{% endblock %}
 {% block bodyclass %}homepage{% endblock %}
 
diff --git a/wagtail/admin/templates/wagtailadmin/pages/edit.html b/wagtail/admin/templates/wagtailadmin/pages/edit.html
index 8d95a9a4d..c968e0e55 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/edit.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/edit.html
@@ -1,6 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
 {% load wagtailadmin_tags %}
-{% load avatar %}
 {% load i18n %}
 {% load l10n %}
 {% block titletag %}{% blocktrans with title=page.get_admin_display_title page_type=content_type.model_class.get_verbose_name %}Editing {{ page_type }}: {{ title }}{% endblocktrans %}{% endblock %}
diff --git a/wagtail/admin/templates/wagtailadmin/pages/revisions/list.html b/wagtail/admin/templates/wagtailadmin/pages/revisions/list.html
index a8bc0c590..adcbb3889 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/revisions/list.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/revisions/list.html
@@ -1,4 +1,4 @@
-{% load i18n wagtailadmin_tags avatar %}
+{% load i18n wagtailadmin_tags %}
 {% load l10n %}
 
 <table class="listing">
diff --git a/wagtail/admin/templates/wagtailadmin/shared/main_nav.html b/wagtail/admin/templates/wagtailadmin/shared/main_nav.html
index 93a194479..55dd1c0f9 100644
--- a/wagtail/admin/templates/wagtailadmin/shared/main_nav.html
+++ b/wagtail/admin/templates/wagtailadmin/shared/main_nav.html
@@ -1,4 +1,4 @@
-{% load avatar wagtailadmin_tags %}
+{% load wagtailadmin_tags %}
 {% load i18n %}
 <nav class="nav-main">
     <ul>
diff --git a/wagtail/admin/templates/wagtailadmin/shared/user_avatar.html b/wagtail/admin/templates/wagtailadmin/shared/user_avatar.html
index feaf31b18..8891e00f4 100644
--- a/wagtail/admin/templates/wagtailadmin/shared/user_avatar.html
+++ b/wagtail/admin/templates/wagtailadmin/shared/user_avatar.html
@@ -1,4 +1,4 @@
-{% load avatar %}
+{% load wagtailadmin_tags %}
 
 <span class="avatar small">
     <img src="{% avatar_url user size=25 %}" />
diff --git a/wagtail/admin/templatetags/avatar.py b/wagtail/admin/templatetags/avatar.py
deleted file mode 100644
index cb1566f81..000000000
--- a/wagtail/admin/templatetags/avatar.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from __future__ import absolute_import, unicode_literals
-
-from django import template
-from django.contrib.staticfiles.templatetags.staticfiles import static
-register = template.Library()
-
-
-@register.simple_tag(takes_context=True)
-def avatar_url(context, user, size=50):
-    """
-    A template tag that receives a user and size and return
-    the appropiate avatar url for that user.
-    Example usage: {% avatar_url request.user 50 %}
-    """
-
-    if hasattr(user, 'wagtail_userprofile'):  # A user could not have profile yet, so this is necessay
-        return user.wagtail_userprofile.get_avatar_url(size=size)
-    return static('wagtailadmin/images/default-user-avatar.svg')
diff --git a/wagtail/admin/templatetags/wagtailadmin_tags.py b/wagtail/admin/templatetags/wagtailadmin_tags.py
index e5fd8abc4..becfe6e30 100644
--- a/wagtail/admin/templatetags/wagtailadmin_tags.py
+++ b/wagtail/admin/templatetags/wagtailadmin_tags.py
@@ -5,6 +5,7 @@ from django.conf import settings
 from django.contrib.admin.utils import quote
 from django.contrib.humanize.templatetags.humanize import intcomma
 from django.contrib.messages.constants import DEFAULT_TAGS as MESSAGE_TAGS
+from django.contrib.staticfiles.templatetags.staticfiles import static
 from django.template.defaultfilters import stringfilter
 from django.template.loader import render_to_string
 from django.utils.html import conditional_escape
@@ -371,3 +372,16 @@ def _abs(val):
 @register.filter
 def admin_urlquote(value):
     return quote(value)
+
+
+@register.simple_tag(takes_context=True)
+def avatar_url(context, user, size=50):
+    """
+    A template tag that receives a user and size and return
+    the appropiate avatar url for that user.
+    Example usage: {% avatar_url request.user 50 %}
+    """
+
+    if hasattr(user, 'wagtail_userprofile'):  # A user could not have profile yet, so this is necessary
+        return user.wagtail_userprofile.get_avatar_url(size=size)
+    return static('wagtailadmin/images/default-user-avatar.svg')
diff --git a/wagtail/contrib/styleguide/templates/wagtailstyleguide/base.html b/wagtail/contrib/styleguide/templates/wagtailstyleguide/base.html
index 0a111479d..9d61ca1af 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 avatar %}
+{% load wagtailadmin_tags i18n staticfiles %}
 
 {% block extra_css %}
     {{ block.super }}
diff --git a/wagtail/users/templates/wagtailusers/groups/index.html b/wagtail/users/templates/wagtailusers/groups/index.html
index 0f6ebaae6..fea4c7f0f 100644
--- a/wagtail/users/templates/wagtailusers/groups/index.html
+++ b/wagtail/users/templates/wagtailusers/groups/index.html
@@ -1,6 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
 {% load i18n %}
-{% load avatar %}
 {% block titletag %}{% trans "groups" %}{% endblock %}
 {% block extra_js %}
     {{ block.super }}
diff --git a/wagtail/users/templates/wagtailusers/users/index.html b/wagtail/users/templates/wagtailusers/users/index.html
index 4ee5a8caa..a84d45627 100644
--- a/wagtail/users/templates/wagtailusers/users/index.html
+++ b/wagtail/users/templates/wagtailusers/users/index.html
@@ -1,6 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
 {% load i18n %}
-{% load avatar %}
 {% block titletag %}{% trans "Users" %}{% endblock %}
 {% block extra_js %}
     {{ block.super }}
diff --git a/wagtail/users/templates/wagtailusers/users/list.html b/wagtail/users/templates/wagtailusers/users/list.html
index 03ecb695b..6d67276df 100644
--- a/wagtail/users/templates/wagtailusers/users/list.html
+++ b/wagtail/users/templates/wagtailusers/users/list.html
@@ -1,5 +1,4 @@
-{% load i18n wagtailusers_tags %}
-{% load avatar %}
+{% load i18n wagtailusers_tags wagtailadmin_tags %}
 <table class="listing">
     <thead>
         <tr>