diff --git a/allianceauth/authentication/templates/public/base.html b/allianceauth/authentication/templates/public/base.html
index 1464ac91..6b6bd049 100644
--- a/allianceauth/authentication/templates/public/base.html
+++ b/allianceauth/authentication/templates/public/base.html
@@ -6,6 +6,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <meta name="description" content="">
         <meta name="author" content="">
+        {% include 'allianceauth/icons.html' %}
 
         <title>{% block title %}{{ SITE_NAME }}{% endblock %}</title>
 
diff --git a/allianceauth/static/icons/allianceauth.png b/allianceauth/static/icons/allianceauth.png
new file mode 100755
index 00000000..59ef82fa
Binary files /dev/null and b/allianceauth/static/icons/allianceauth.png differ
diff --git a/allianceauth/static/icons/apple-touch-icon.png b/allianceauth/static/icons/apple-touch-icon.png
new file mode 100755
index 00000000..f1d16af3
Binary files /dev/null and b/allianceauth/static/icons/apple-touch-icon.png differ
diff --git a/allianceauth/static/icons/favicon-16x16.png b/allianceauth/static/icons/favicon-16x16.png
new file mode 100755
index 00000000..2e17b905
Binary files /dev/null and b/allianceauth/static/icons/favicon-16x16.png differ
diff --git a/allianceauth/static/icons/favicon-32x32.png b/allianceauth/static/icons/favicon-32x32.png
new file mode 100755
index 00000000..fcd164fd
Binary files /dev/null and b/allianceauth/static/icons/favicon-32x32.png differ
diff --git a/allianceauth/static/icons/favicon-96x96.png b/allianceauth/static/icons/favicon-96x96.png
new file mode 100755
index 00000000..8cac32a7
Binary files /dev/null and b/allianceauth/static/icons/favicon-96x96.png differ
diff --git a/allianceauth/templates/allianceauth/base.html b/allianceauth/templates/allianceauth/base.html
index c3a3b118..ee7db14d 100644
--- a/allianceauth/templates/allianceauth/base.html
+++ b/allianceauth/templates/allianceauth/base.html
@@ -9,6 +9,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
+    {% include 'allianceauth/icons.html' %}
 
     <title>{% block title %}{% block page_title %}{% endblock page_title %} - Alliance Auth{% endblock title %}</title>
 
diff --git a/allianceauth/templates/allianceauth/icons.html b/allianceauth/templates/allianceauth/icons.html
new file mode 100644
index 00000000..78c0a248
--- /dev/null
+++ b/allianceauth/templates/allianceauth/icons.html
@@ -0,0 +1,5 @@
+{% load static %}
+<link rel="icon" type="image/png" href="{% static 'icons/favicon-16x16.png' %}" sizes="16x16">
+<link rel="icon" type="image/png" href="{% static 'icons/favicon-32x32.png' %}" sizes="32x32">
+<link rel="icon" type="image/png" href="{% static 'icons/favicon-96x96.png' %}" sizes="96x96">
+<link rel="apple-touch-icon" href="{% static 'icons/apple-touch-icon.png' %}">
diff --git a/allianceauth/templates/allianceauth/top-menu.html b/allianceauth/templates/allianceauth/top-menu.html
index bb02d354..4bf888e6 100644
--- a/allianceauth/templates/allianceauth/top-menu.html
+++ b/allianceauth/templates/allianceauth/top-menu.html
@@ -1,4 +1,5 @@
 {% load i18n %}
+{% load static %}
 {% load navactive %}
 <nav class="navbar navbar-default navbar-static-top auth-navbar-top" role="navigation">
     <div class="container-fluid">
@@ -10,6 +11,7 @@
               <span class="icon-bar"></span>
             </button>
             <a class="navbar-brand">
+                <img src="{% static 'icons/favicon-32x32.png' %}" style="display: inline-block;" height="32" width="32"/>
                 {{ SITE_NAME }}
             </a>
         </div>