diff --git a/allianceauth/static/allianceauth/icons/android-chrome-192x192.png b/allianceauth/static/allianceauth/icons/android-chrome-192x192.png
new file mode 100644
index 00000000..a83b4d06
Binary files /dev/null and b/allianceauth/static/allianceauth/icons/android-chrome-192x192.png differ
diff --git a/allianceauth/static/allianceauth/icons/android-chrome-512x512.png b/allianceauth/static/allianceauth/icons/android-chrome-512x512.png
new file mode 100644
index 00000000..2cdf71f0
Binary files /dev/null and b/allianceauth/static/allianceauth/icons/android-chrome-512x512.png differ
diff --git a/allianceauth/static/allianceauth/icons/apple-touch-icon.png b/allianceauth/static/allianceauth/icons/apple-touch-icon.png
old mode 100755
new mode 100644
index f1d16af3..7c7ea0f6
Binary files a/allianceauth/static/allianceauth/icons/apple-touch-icon.png and b/allianceauth/static/allianceauth/icons/apple-touch-icon.png differ
diff --git a/allianceauth/static/allianceauth/icons/browserconfig.xml b/allianceauth/static/allianceauth/icons/browserconfig.xml
new file mode 100644
index 00000000..1677cc2c
--- /dev/null
+++ b/allianceauth/static/allianceauth/icons/browserconfig.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square150x150logo src="/static/allianceauth/icons/mstile-150x150.png"/>
+            <TileColor>#2d89ef</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>
diff --git a/allianceauth/static/allianceauth/icons/favicon-16x16.png b/allianceauth/static/allianceauth/icons/favicon-16x16.png
old mode 100755
new mode 100644
index 2e17b905..454c33a0
Binary files a/allianceauth/static/allianceauth/icons/favicon-16x16.png and b/allianceauth/static/allianceauth/icons/favicon-16x16.png differ
diff --git a/allianceauth/static/allianceauth/icons/favicon-32x32.png b/allianceauth/static/allianceauth/icons/favicon-32x32.png
old mode 100755
new mode 100644
index fcd164fd..1aa26b78
Binary files a/allianceauth/static/allianceauth/icons/favicon-32x32.png and b/allianceauth/static/allianceauth/icons/favicon-32x32.png differ
diff --git a/allianceauth/static/allianceauth/icons/favicon.ico b/allianceauth/static/allianceauth/icons/favicon.ico
new file mode 100644
index 00000000..34c9d60d
Binary files /dev/null and b/allianceauth/static/allianceauth/icons/favicon.ico differ
diff --git a/allianceauth/static/allianceauth/icons/mstile-150x150.png b/allianceauth/static/allianceauth/icons/mstile-150x150.png
new file mode 100644
index 00000000..df59dcc9
Binary files /dev/null and b/allianceauth/static/allianceauth/icons/mstile-150x150.png differ
diff --git a/allianceauth/static/allianceauth/icons/safari-pinned-tab.svg b/allianceauth/static/allianceauth/icons/safari-pinned-tab.svg
new file mode 100644
index 00000000..eb448142
--- /dev/null
+++ b/allianceauth/static/allianceauth/icons/safari-pinned-tab.svg
@@ -0,0 +1,41 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="575.000000pt" height="575.000000pt" viewBox="0 0 575.000000 575.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.14, written by Peter Selinger 2001-2017
+</metadata>
+<g transform="translate(0.000000,575.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M2765 5731 c-58 -21 -122 -62 -143 -92 -8 -11 -32 -62 -54 -112 -21
+-51 -45 -105 -53 -122 -7 -16 -47 -109 -88 -205 -112 -261 -375 -871 -415
+-960 -11 -25 -61 -142 -112 -260 -50 -118 -102 -237 -115 -265 -12 -27 -71
+-162 -130 -300 -217 -505 -297 -691 -310 -720 -8 -16 -145 -334 -305 -705
+-160 -371 -298 -691 -307 -710 -28 -63 -40 -91 -168 -390 -70 -162 -133 -308
+-140 -325 -8 -16 -25 -55 -38 -85 -13 -30 -35 -80 -47 -110 -12 -30 -31 -73
+-41 -95 -16 -35 -36 -81 -106 -244 l-14 -33 33 20 c18 11 103 60 188 110 85
+49 171 99 190 111 19 11 55 32 80 46 25 14 70 40 101 58 208 121 326 189 339
+198 8 5 94 55 190 110 96 56 191 111 210 122 19 11 46 27 60 34 14 8 46 26 71
+41 69 41 557 326 577 337 9 6 68 39 130 75 62 36 125 71 140 79 15 8 29 18 30
+23 2 4 8 8 13 8 4 0 46 22 91 49 46 27 99 58 118 68 19 11 172 100 340 198
+168 98 320 186 338 197 18 10 103 59 187 108 84 49 169 98 187 108 18 11 56
+33 84 49 27 17 70 41 95 55 24 14 123 72 219 128 96 56 195 114 220 128 25 13
+50 29 57 36 9 8 -16 74 -103 276 -63 146 -121 279 -128 295 -8 17 -28 64 -46
+105 -34 80 -55 127 -75 175 -71 163 -148 341 -355 820 -133 308 -250 578 -260
+600 -10 22 -44 101 -75 175 -32 74 -66 153 -76 175 -10 22 -65 148 -121 281
+-113 263 -126 282 -224 326 -67 29 -173 34 -239 9z"/>
+<path d="M4500 2370 c-14 -11 -28 -20 -32 -20 -6 0 -107 -58 -158 -90 -8 -5
+-28 -17 -45 -26 -16 -9 -168 -97 -337 -195 -169 -99 -322 -187 -340 -198 -18
+-10 -58 -33 -88 -51 -30 -18 -71 -42 -90 -53 -44 -25 -414 -239 -418 -242 -2
+-2 16 -14 40 -27 24 -14 153 -89 288 -168 135 -78 259 -150 275 -160 17 -9
+116 -67 220 -127 105 -61 206 -120 225 -130 19 -11 86 -50 148 -87 62 -36 132
+-77 155 -90 23 -13 98 -56 167 -96 68 -40 138 -81 155 -90 16 -9 64 -37 105
+-62 41 -24 82 -47 90 -51 8 -4 29 -15 45 -26 151 -92 639 -370 643 -366 3 3
+-1 17 -8 32 -7 16 -56 129 -110 253 -93 216 -131 302 -150 345 -5 11 -62 142
+-126 290 -64 149 -124 288 -134 310 -10 22 -39 90 -64 150 -26 61 -54 124 -61
+141 -8 16 -30 68 -50 114 -78 183 -84 197 -124 283 -17 37 -31 74 -31 80 0 7
+-4 17 -9 22 -4 6 -41 87 -81 180 -40 94 -73 171 -74 172 -1 1 -12 -7 -26 -17z"/>
+</g>
+</svg>
diff --git a/allianceauth/static/allianceauth/icons/site.webmanifest b/allianceauth/static/allianceauth/icons/site.webmanifest
new file mode 100644
index 00000000..5e0c19c8
--- /dev/null
+++ b/allianceauth/static/allianceauth/icons/site.webmanifest
@@ -0,0 +1,19 @@
+{
+    "name": "",
+    "short_name": "",
+    "icons": [
+        {
+            "src": "/static/allianceauth/icons/android-chrome-192x192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "/static/allianceauth/icons/android-chrome-512x512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        }
+    ],
+    "theme_color": "#ffffff",
+    "background_color": "#ffffff",
+    "display": "standalone"
+}
diff --git a/allianceauth/templates/allianceauth/icons.html b/allianceauth/templates/allianceauth/icons.html
index 9a661dc7..10b058a2 100644
--- a/allianceauth/templates/allianceauth/icons.html
+++ b/allianceauth/templates/allianceauth/icons.html
@@ -1,5 +1,12 @@
 {% load static %}
+
+<link rel="apple-touch-icon" sizes="180x180" href="{% static 'allianceauth/icons/apple-touch-icon.png' %}">
 <link rel="icon" type="image/png" href="{% static 'allianceauth/icons/favicon-16x16.png' %}" sizes="16x16">
 <link rel="icon" type="image/png" href="{% static 'allianceauth/icons/favicon-32x32.png' %}" sizes="32x32">
 <link rel="icon" type="image/png" href="{% static 'allianceauth/icons/favicon-96x96.png' %}" sizes="96x96">
-<link rel="apple-touch-icon" href="{% static 'allianceauth/icons/apple-touch-icon.png' %}">
+<link rel="manifest" href="{% static 'allianceauth/icons/site.webmanifest' %}">
+<link rel="mask-icon" href="{% static 'allianceauth/icons/safari-pinned-tab.svg' %}" color="#5bbad5">
+<link rel="shortcut icon" type="image/png" href="{% static 'allianceauth/icons/favicon.ico' %}">
+<meta name="msapplication-TileColor" content="#2d89ef">
+<meta name="msapplication-config" content="{% static 'allianceauth/icons/browserconfig.xml' %}">
+<meta name="theme-color" content="#ffffff">
diff --git a/docs/installation/apache.md b/docs/installation/apache.md
index 4b268509..79f8c615 100644
--- a/docs/installation/apache.md
+++ b/docs/installation/apache.md
@@ -75,6 +75,7 @@ Place your virtual host configuration in the appropriate section within `/etc/ht
 
         ProxyPassMatch ^/static !
         ProxyPassMatch ^/robots.txt !
+        ProxyPassMatch ^/favicon.ico !
 
         ProxyPass / http://127.0.0.1:8000/
         ProxyPassReverse / http://127.0.0.1:8000/
@@ -82,6 +83,7 @@ Place your virtual host configuration in the appropriate section within `/etc/ht
 
         Alias "/static" "/var/www/myauth/static"
         Alias "/robots.txt" "/var/www/myauth/static/robots.txt"
+        Alias "/favicon.ico" "/var/www/myauth/static/allianceauth/icons/favicon.ico"
 
         <Directory "/var/www/myauth/static">
             Require all granted
@@ -91,6 +93,11 @@ Place your virtual host configuration in the appropriate section within `/etc/ht
             SetHandler None
             Require all granted
         </Location>
+
+        <Location "/favicon.ico">
+            SetHandler None
+            Require all granted
+        </Location>
 </VirtualHost>
 ```
 
diff --git a/docs/installation/nginx.md b/docs/installation/nginx.md
index 189bd3cd..a79a86ae 100644
--- a/docs/installation/nginx.md
+++ b/docs/installation/nginx.md
@@ -83,8 +83,6 @@ server {
 
     server_name example.com;
 
-    location = /favicon.ico { access_log off; log_not_found off; }
-
     location /static {
         alias /var/www/myauth/static;
         autoindex off;
@@ -94,6 +92,10 @@ server {
         alias /var/www/myauth/static/robots.txt;
     }
 
+    location /favicon.ico {
+        alias /var/www/myauth/static/allianceauth/icons/favicon.ico;
+    }
+
     # Gunicorn config goes below
     location / {
         include proxy_params;