diff --git a/src/static_src/img/favicon/android-chrome-192x192.png b/src/static_src/img/favicon/android-chrome-192x192.png
new file mode 100644
index 00000000..4266993e
Binary files /dev/null and b/src/static_src/img/favicon/android-chrome-192x192.png differ
diff --git a/src/static_src/img/favicon/android-chrome-384x384.png b/src/static_src/img/favicon/android-chrome-384x384.png
new file mode 100644
index 00000000..550d5f22
Binary files /dev/null and b/src/static_src/img/favicon/android-chrome-384x384.png differ
diff --git a/src/static_src/img/favicon/apple-touch-icon.png b/src/static_src/img/favicon/apple-touch-icon.png
new file mode 100644
index 00000000..56cc6144
Binary files /dev/null and b/src/static_src/img/favicon/apple-touch-icon.png differ
diff --git a/src/static_src/img/favicon/browserconfig.xml b/src/static_src/img/favicon/browserconfig.xml
new file mode 100644
index 00000000..f9c2e67f
--- /dev/null
+++ b/src/static_src/img/favicon/browserconfig.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square150x150logo src="/mstile-150x150.png"/>
+            <TileColor>#2b5797</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>
diff --git a/src/static_src/img/favicon/favicon-16x16.png b/src/static_src/img/favicon/favicon-16x16.png
new file mode 100644
index 00000000..5d53b84b
Binary files /dev/null and b/src/static_src/img/favicon/favicon-16x16.png differ
diff --git a/src/static_src/img/favicon/favicon-32x32.png b/src/static_src/img/favicon/favicon-32x32.png
new file mode 100644
index 00000000..da69a578
Binary files /dev/null and b/src/static_src/img/favicon/favicon-32x32.png differ
diff --git a/src/static_src/img/favicon/favicon.ico b/src/static_src/img/favicon/favicon.ico
new file mode 100644
index 00000000..1e43aeaf
Binary files /dev/null and b/src/static_src/img/favicon/favicon.ico differ
diff --git a/src/static_src/img/favicon/favicons.zip b/src/static_src/img/favicon/favicons.zip
new file mode 100644
index 00000000..50f55006
Binary files /dev/null and b/src/static_src/img/favicon/favicons.zip differ
diff --git a/src/static_src/img/favicon/manifest.json b/src/static_src/img/favicon/manifest.json
new file mode 100644
index 00000000..f784358e
--- /dev/null
+++ b/src/static_src/img/favicon/manifest.json
@@ -0,0 +1,18 @@
+{
+    "name": "",
+    "icons": [
+        {
+            "src": "/android-chrome-192x192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "/android-chrome-384x384.png",
+            "sizes": "384x384",
+            "type": "image/png"
+        }
+    ],
+    "theme_color": "#ffffff",
+    "background_color": "#ffffff",
+    "display": "standalone"
+}
\ No newline at end of file
diff --git a/src/static_src/img/favicon/mstile-150x150.png b/src/static_src/img/favicon/mstile-150x150.png
new file mode 100644
index 00000000..76600d6e
Binary files /dev/null and b/src/static_src/img/favicon/mstile-150x150.png differ
diff --git a/src/static_src/img/favicon/safari-pinned-tab.svg b/src/static_src/img/favicon/safari-pinned-tab.svg
new file mode 100644
index 00000000..5c45d9b8
--- /dev/null
+++ b/src/static_src/img/favicon/safari-pinned-tab.svg
@@ -0,0 +1,51 @@
+<?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="16.000000pt" height="16.000000pt" viewBox="0 0 16.000000 16.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.11, written by Peter Selinger 2001-2013
+</metadata>
+<g transform="translate(0.000000,16.000000) scale(0.004000,-0.004000)"
+fill="#000000" stroke="none">
+<path d="M890 3793 c-85 -47 -157 -87 -158 -89 -2 -1 -13 -75 -23 -163 l-19
+-161 -113 -257 -113 -258 -44 -232 -43 -231 51 -184 50 -183 -19 -120 c-11
+-66 -24 -167 -29 -223 -8 -79 -19 -125 -45 -190 -19 -47 -34 -86 -32 -88 1 -1
+21 -11 43 -22 40 -21 54 -38 54 -69 0 -8 32 -52 72 -97 63 -72 76 -82 112 -86
+37 -5 43 -10 70 -58 26 -49 41 -62 189 -158 l160 -105 57 20 57 21 113 -64
+c96 -55 118 -64 147 -59 21 4 38 1 42 -5 4 -6 94 -43 201 -82 l195 -71 70 -70
+c69 -68 72 -69 103 -58 30 10 36 8 112 -45 79 -56 84 -58 253 -96 94 -22 197
+-51 227 -66 35 -16 84 -28 137 -33 72 -7 92 -14 153 -51 l70 -42 38 26 c70 49
+110 91 244 256 74 91 138 171 142 177 4 7 -9 62 -28 123 -20 60 -36 115 -36
+121 0 6 13 27 30 46 21 23 30 44 30 67 0 28 8 40 45 70 45 37 45 38 45 101 0
+62 1 65 50 121 l49 58 -6 81 c-3 44 -13 96 -21 115 -8 19 -16 58 -17 85 -1 28
+-8 72 -16 99 l-14 49 49 42 c47 42 48 44 33 66 -15 20 -14 25 4 60 10 21 19
+40 19 42 0 2 -59 59 -131 126 l-130 124 -52 -15 c-52 -14 -52 -14 -147 25 -65
+27 -148 76 -264 155 -123 84 -183 119 -219 127 -36 8 -69 28 -127 75 -79 65
+-79 65 -130 185 -42 102 -59 129 -104 174 l-53 52 -86 -42 c-80 -40 -87 -42
+-104 -27 -25 23 -261 129 -303 137 -32 6 -38 12 -74 88 l-39 82 -58 -6 -57 -6
+-56 53 -57 53 -35 -16 c-19 -9 -39 -17 -44 -17 -4 0 -31 69 -59 153 l-52 154
+-94 59 -94 59 -1 103 c0 56 -3 102 -7 102 -5 -1 -78 -39 -163 -87z m196 -325
+c27 -16 35 -34 79 -173 27 -86 53 -159 59 -163 28 -21 154 -59 168 -51 11 6
+28 -2 61 -31 35 -31 53 -40 82 -40 35 0 37 -2 72 -75 l35 -75 56 0 c45 0 76
+-9 166 -50 92 -42 116 -58 140 -91 27 -39 30 -40 70 -34 22 4 70 20 105 36 35
+16 65 28 66 27 1 -2 23 -56 50 -121 l48 -118 120 -100 c103 -86 124 -99 156
+-99 35 0 124 -53 266 -159 22 -17 55 -37 73 -47 17 -9 32 -20 32 -25 0 -5 7
+-9 15 -9 8 0 34 -8 58 -19 156 -69 195 -81 227 -69 30 10 34 8 83 -38 28 -27
+53 -50 56 -51 11 -6 -26 -72 -57 -98 l-34 -31 22 -73 c19 -65 20 -75 7 -88
+-13 -13 -10 -26 24 -108 51 -123 51 -144 -6 -211 -41 -48 -45 -57 -45 -106 0
+-51 -3 -56 -45 -98 -37 -36 -45 -51 -45 -80 0 -27 -10 -47 -40 -84 -22 -26
+-40 -53 -40 -60 0 -6 16 -62 35 -125 l34 -114 -121 -148 c-67 -82 -127 -149
+-134 -149 -7 0 -28 9 -46 20 -21 12 -68 23 -125 30 -55 6 -105 18 -125 29 -18
+11 -114 38 -212 60 l-179 41 -95 67 c-74 51 -103 66 -127 65 -24 -2 -39 7 -74
+42 -39 40 -61 51 -219 108 -174 62 -176 63 -190 101 -17 41 -19 41 -107 27
+l-60 -10 -122 70 -123 70 -51 -21 -52 -20 -51 32 c-28 18 -64 39 -80 48 -16 9
+-40 26 -54 39 -14 12 -28 22 -32 22 -8 0 -40 67 -40 85 0 8 -4 15 -10 15 -5 0
+-16 13 -25 29 -13 27 -21 30 -67 33 -48 3 -55 6 -85 46 -24 32 -33 54 -33 82
+0 28 -6 41 -22 52 -20 14 -21 18 -10 43 7 15 15 55 18 89 3 33 17 147 31 251
+l26 190 -46 168 c-26 92 -47 179 -47 193 0 15 16 112 36 218 l37 191 113 255
+c104 237 113 262 123 350 7 52 14 112 17 132 l6 37 86 -56 c48 -31 101 -64
+118 -75z"/>
+</g>
+</svg>
diff --git a/src/static_src/img/shortcut.png b/src/static_src/img/shortcut.png
deleted file mode 100644
index 8efc3bb1..00000000
Binary files a/src/static_src/img/shortcut.png and /dev/null differ
diff --git a/src/templates/base.html b/src/templates/base.html
index b7cddc56..85b1094b 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -23,7 +23,13 @@
 
     {% bootstrap_javascript jquery=1 %}
 
-    <link rel="shortcut icon" href="{% static 'img/shortcut.png' %}">
+    <!-- favicon.ico stuff -->
+    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
+    <link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="/manifest.json">
+    <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
+    <meta name="theme-color" content="#ffffff">
 
     {% block extra_head %}
     {% endblock %}