diff --git a/geonode/people/templates/people/avatar/add.html b/geonode/people/templates/people/avatar/add.html
new file mode 100644
index 00000000000..70f74f35e47
--- /dev/null
+++ b/geonode/people/templates/people/avatar/add.html
@@ -0,0 +1,27 @@
+{% extends "geonode_base.html" %}
+{% load i18n avatar_tags bootstrap_tags %}
+
+{% block body_outer %}
+<div class="page-header">
+    <h2>{% trans "Add Avatar" %}</h2>
+</div>
+<div class="row">
+    <div class="col-md-12">
+        <h3>{% trans "Your current avatar: " %}</h3>
+        {% avatar user %}
+        {% if not avatars %}
+            <p>{% trans "You haven't uploaded an avatar yet. Please upload one now." %}</p>
+        {% endif %}
+        <hr />
+        <h3>{% trans "Add new avatar" %}</h3>
+        <form enctype="multipart/form-data" method="POST" action="{% url 'avatar:add' %}">
+            {{ upload_avatar_form|as_bootstrap_inline }}
+            <p>
+                {% csrf_token %}
+                <input type="submit" class="btn btn-primary" value="{% trans "Upload New Image" %}" />
+                <a href="{% url 'profile_edit' user.username %}" class="btn btn-link"> {% trans "Go back to Edit Your Profile" %}</a>
+            </p>
+        </form>
+    </div>
+</div>
+{% endblock %}
diff --git a/geonode/people/templates/people/avatar/change.html b/geonode/people/templates/people/avatar/change.html
new file mode 100644
index 00000000000..abbaa540cad
--- /dev/null
+++ b/geonode/people/templates/people/avatar/change.html
@@ -0,0 +1,42 @@
+{% extends "geonode_base.html" %}
+{% load i18n avatar_tags bootstrap_tags %}
+
+{% block body_outer %}
+
+<div class="page-header">
+  <h2>{% trans "Change Avatar" %}</h2>
+</div>
+<div class="row">
+    <div class="col-md-12">
+        <h3>{% trans "Your current avatar: " %}</h3>
+        {% avatar user %}
+        {% if not avatars %}
+            <p>{% trans "You haven't uploaded an avatar yet. Please upload one now." %}</p>
+        {% else %}
+        <hr />
+        <h3>{% trans "Select default avatar"%}</h3>
+            <form method="POST" action="{% url 'avatar:change' %}">
+                <ul>
+                    {{ primary_avatar_form|as_bootstrap_inline }}
+                </ul>
+                <p>
+                    {% csrf_token %}
+                    <input type="submit" class="btn btn-primary" value="{% trans 'Choose new Default' %}" />
+                    <a href="{% url 'avatar:delete' %}" class="btn btn-danger"> {% trans "Delete avatar" %}</a>
+                    <a href="{% url 'profile_edit' user.username %}" class="btn btn-link"> {% trans "Go back to Edit Your Profile" %}</a>
+                </p>
+            </form>
+        {% endif %}
+        <hr />
+        <h3>{% trans "Add new avatar" %}</h3>
+        <form enctype="multipart/form-data" method="POST" action="{% url 'avatar:add' %}">
+            {{ upload_avatar_form|as_bootstrap_inline }}
+            <p>
+                {% csrf_token %}
+                <input type="submit" class="btn btn-primary" value="{% trans 'Upload New Image' %}" />
+                <a href="{% url 'profile_edit' user.username %}" class="btn btn-link"> {% trans "Go back to Edit Your Profile" %}</a>
+            </p>
+        </form>
+    </div>
+</div>
+{% endblock %}
diff --git a/geonode/people/templates/people/avatar/confirm_delete.html b/geonode/people/templates/people/avatar/confirm_delete.html
new file mode 100644
index 00000000000..679a1e1a2eb
--- /dev/null
+++ b/geonode/people/templates/people/avatar/confirm_delete.html
@@ -0,0 +1,26 @@
+{% extends "geonode_base.html" %}
+{% load i18n bootstrap_tags %}
+
+{% block body_outer %}
+<div class="page-header">
+    <h2>{% trans "Delete Avatar" %}</h2>
+</div>
+<div class="row">
+    <div class="col-md-12">
+    {% if not avatars %}
+        {% url 'avatar_change' as avatar_change_url %}
+        <p>{% blocktrans %}You have no avatars to delete. Please <a href="{{ avatar_change_url }}">upload one</a> now.{% endblocktrans %}</p>
+    {% else %}
+        <p>{% trans "Please select the avatars that you would like to delete." %}</p>
+        <form method="POST" action="{% url 'avatar:delete' %}">
+            {{ delete_avatar_form|as_bootstrap_inline }}
+            <p>
+                {% csrf_token %}
+                <input type="submit" class="btn btn-primary" value="{% trans 'Delete These' %}" />
+                <a href="{% url 'profile_edit' user.username %}" class="btn btn-link"> {% trans "Go back to Edit Your Profile" %}</a>
+            </p>
+        </form>
+    {% endif %}
+    </div>
+</div>
+{% endblock %}
diff --git a/geonode/settings.py b/geonode/settings.py
index 8e31414e304..a4c27949c86 100644
--- a/geonode/settings.py
+++ b/geonode/settings.py
@@ -2331,3 +2331,8 @@ def get_geonode_catalogue_service():
 ]
 INSTALLED_APPS += ("geonode.assets",)
 GEONODE_APPS += ("geonode.assets",)
+
+# Django-Avatar - Change default templates to Geonode based
+AVATAR_ADD_TEMPLATE = "people/avatar/add.html"
+AVATAR_CHANGE_TEMPLATE = "people/avatar/change.html"
+AVATAR_DELETE_TEMPLATE = "people/avatar/confirm_delete.html"