diff --git a/fet2020/core/admin.py b/fet2020/core/admin.py
index 26dccaf6..1679847d 100644
--- a/fet2020/core/admin.py
+++ b/fet2020/core/admin.py
@@ -36,6 +36,11 @@ class CustomFlatPageAdmin(FlatPageAdmin):
     list_filter = ("registration_required",)
 
 
+# Customise the Django Admin
+admin.site.index_title = "FET"
+admin.site.site_header = "Admin"
+admin.site.site_title = "Admin"
+
 # Re-register FlatPageAdmin
 admin.site.unregister(FlatPage)
 admin.site.register(CustomFlatPage, CustomFlatPageAdmin)
diff --git a/fet2020/templates/admin/base.html b/fet2020/templates/admin/base.html
index 9d29ab17..ef679128 100644
--- a/fet2020/templates/admin/base.html
+++ b/fet2020/templates/admin/base.html
@@ -12,15 +12,6 @@
         {% if site_url %}
             <a class="button" href="{{ site_url }}">Zurück zur FET Homepage</a>
         {% endif %}
-        {% if user.is_active and user.is_staff %}
-            {% url 'django-admindocs-docroot' as docsroot %}
-            {% if docsroot %}
-                <a class="button" href="{{ docsroot }}">{% translate 'Documentation' %}</a>
-            {% endif %}
-        {% endif %}
-        {% if user.has_usable_password %}
-        <a class="button" href="{% url 'admin:password_change' %}">{% translate 'Change password' %}</a>
-        {% endif %}
         <a class="button" href="{% url 'admin:logout' %}">{% translate 'Log out' %}</a>
     {% endblock %}
 </div>
diff --git a/fet2020/templates/admin/base_site.html b/fet2020/templates/admin/base_site.html
new file mode 100644
index 00000000..bb52bd7c
--- /dev/null
+++ b/fet2020/templates/admin/base_site.html
@@ -0,0 +1,8 @@
+{% extends "admin/base_site.html" %}
+{% load static %}
+
+{% block title %}{% if subtitle %}{{ subtitle }} | {% endif %}{{ title }} - {{ site_title|default:_('Django site admin') }}{% endblock %}
+
+{% block extrahead %}
+    <link rel="shortcut icon" type="image/png" href="{% static 'img/fet_logo_white.png' %}"/>
+{% endblock %}