diff --git a/static/images/favicon/android-chrome-192x192.png b/static/images/favicon/android-chrome-192x192.png
new file mode 100644
index 000000000..ef901a091
Binary files /dev/null and b/static/images/favicon/android-chrome-192x192.png differ
diff --git a/static/images/favicon/android-chrome-512x512.png b/static/images/favicon/android-chrome-512x512.png
new file mode 100644
index 000000000..933d7209c
Binary files /dev/null and b/static/images/favicon/android-chrome-512x512.png differ
diff --git a/static/images/favicon/apple-touch-icon-120x120.png b/static/images/favicon/apple-touch-icon-120x120.png
deleted file mode 100644
index 600cb9a31..000000000
Binary files a/static/images/favicon/apple-touch-icon-120x120.png and /dev/null differ
diff --git a/static/images/favicon/apple-touch-icon-152x152.png b/static/images/favicon/apple-touch-icon-152x152.png
deleted file mode 100644
index 158a85e6b..000000000
Binary files a/static/images/favicon/apple-touch-icon-152x152.png and /dev/null differ
diff --git a/static/images/favicon/apple-touch-icon-180x180.png b/static/images/favicon/apple-touch-icon-180x180.png
deleted file mode 100644
index 293ed36f1..000000000
Binary files a/static/images/favicon/apple-touch-icon-180x180.png and /dev/null differ
diff --git a/static/images/favicon/apple-touch-icon-60x60.png b/static/images/favicon/apple-touch-icon-60x60.png
deleted file mode 100644
index 393f6a55a..000000000
Binary files a/static/images/favicon/apple-touch-icon-60x60.png and /dev/null differ
diff --git a/static/images/favicon/apple-touch-icon-76x76.png b/static/images/favicon/apple-touch-icon-76x76.png
deleted file mode 100644
index 55435cee3..000000000
Binary files a/static/images/favicon/apple-touch-icon-76x76.png and /dev/null differ
diff --git a/static/images/favicon/apple-touch-icon.png b/static/images/favicon/apple-touch-icon.png
new file mode 100644
index 000000000..38cb9f13f
Binary files /dev/null and b/static/images/favicon/apple-touch-icon.png differ
diff --git a/static/images/favicon/browserconfig.xml b/static/images/favicon/browserconfig.xml
new file mode 100644
index 000000000..c0a26d79b
--- /dev/null
+++ b/static/images/favicon/browserconfig.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square70x70logo src="/images/mstile-70x70.png"/>
+            <square150x150logo src="/images/mstile-150x150.png"/>
+            <square310x310logo src="/images/mstile-310x310.png"/>
+            <wide310x150logo src="/images/mstile-310x150.png"/>
+            <TileColor>#e2b714</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>
diff --git a/static/images/favicon/fav.png b/static/images/favicon/fav.png
deleted file mode 100644
index 6a59c1ff5..000000000
Binary files a/static/images/favicon/fav.png and /dev/null differ
diff --git a/static/images/favicon/favicon-16x16.png b/static/images/favicon/favicon-16x16.png
new file mode 100644
index 000000000..9d90563a3
Binary files /dev/null and b/static/images/favicon/favicon-16x16.png differ
diff --git a/static/images/favicon/favicon-32x32.png b/static/images/favicon/favicon-32x32.png
new file mode 100644
index 000000000..8f7fc98d8
Binary files /dev/null and b/static/images/favicon/favicon-32x32.png differ
diff --git a/static/images/favicon/favicon.ico b/static/images/favicon/favicon.ico
new file mode 100644
index 000000000..8d9729161
Binary files /dev/null and b/static/images/favicon/favicon.ico differ
diff --git a/static/images/favicon/mstile-150x150.png b/static/images/favicon/mstile-150x150.png
new file mode 100644
index 000000000..2ea52db4d
Binary files /dev/null and b/static/images/favicon/mstile-150x150.png differ
diff --git a/static/images/favicon/mstile-310x150.png b/static/images/favicon/mstile-310x150.png
new file mode 100644
index 000000000..06cc29a7a
Binary files /dev/null and b/static/images/favicon/mstile-310x150.png differ
diff --git a/static/images/favicon/mstile-310x310.png b/static/images/favicon/mstile-310x310.png
new file mode 100644
index 000000000..0da3f0302
Binary files /dev/null and b/static/images/favicon/mstile-310x310.png differ
diff --git a/static/images/favicon/mstile-70x70.png b/static/images/favicon/mstile-70x70.png
new file mode 100644
index 000000000..a9cbdb12b
Binary files /dev/null and b/static/images/favicon/mstile-70x70.png differ
diff --git a/static/images/favicon/safari-pinned-tab.svg b/static/images/favicon/safari-pinned-tab.svg
new file mode 100644
index 000000000..d93c1ca3a
--- /dev/null
+++ b/static/images/favicon/safari-pinned-tab.svg
@@ -0,0 +1,36 @@
+<?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="700.000000pt" height="700.000000pt" viewBox="0 0 700.000000 700.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.14, written by Peter Selinger 2001-2017
+</metadata>
+<g transform="translate(0.000000,700.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M1539 6986 c-2 -2 -26 -6 -54 -9 -177 -19 -451 -124 -638 -244 -487
+-314 -792 -800 -821 -1313 -30 -518 -30 -3420 -1 -3825 13 -174 18 -210 52
+-325 136 -469 470 -864 920 -1085 117 -57 201 -89 364 -139 l106 -32 2044 1
+2044 1 165 56 c384 129 623 285 863 562 164 190 320 500 362 721 46 237 50
+420 50 2130 0 1354 -5 1789 -21 1940 -3 28 -6 57 -6 65 1 55 -45 258 -74 338
+-48 128 -153 329 -222 426 -112 157 -376 399 -547 502 -85 51 -213 109 -380
+172 l-160 60 -2021 1 c-1112 0 -2023 -1 -2025 -3z m4136 -2038 c4 -3 6 -137 6
+-296 l-1 -290 207 0 c115 -1 231 -1 258 -1 l50 -1 -2 -213 c-1 -116 -2 -231
+-2 -254 l-1 -43 -255 0 -255 0 1 -895 c0 -492 -2 -899 -5 -903 -3 -5 -492 -8
+-528 -3 -3 1 -6 387 -7 859 0 471 0 876 0 900 l-1 42 -228 0 -227 0 0 255 0
+255 35 1 c19 0 122 0 228 0 173 0 192 2 193 17 0 9 0 141 1 292 0 151 4 277 8
+280 12 7 518 5 525 -2z m-3311 -569 c86 -15 193 -57 258 -101 80 -53 180 -158
+214 -223 16 -30 33 -55 37 -55 15 0 69 42 152 119 203 187 402 273 640 275
+267 4 402 -49 564 -219 114 -121 159 -199 185 -328 35 -170 41 -310 51 -1117
+4 -283 8 -552 9 -597 3 -76 1 -82 -18 -85 -18 -3 -467 -2 -531 1 -21 1 -21 4
+-22 499 0 485 -8 907 -19 1027 -10 118 -96 244 -200 292 -39 18 -77 25 -155
+29 -239 14 -377 -58 -499 -260 l-53 -89 -3 -156 c-3 -147 -12 -982 -13 -1231
+l-1 -115 -243 1 c-133 1 -254 2 -268 3 l-25 1 -2 543 c-1 725 -6 855 -39 1017
+-18 93 -44 143 -97 192 -125 117 -332 135 -521 44 -87 -42 -141 -88 -182 -158
+-60 -99 -62 -122 -79 -1063 -4 -214 -7 -429 -8 -477 l-1 -88 -40 -1 c-22 -1
+-67 -2 -100 -4 -33 -1 -139 -4 -235 -6 l-175 -4 2 585 c2 1011 8 1701 13 1710
+3 4 102 11 220 15 280 9 289 9 294 4 2 -2 6 -60 7 -129 3 -127 6 -160 18 -160
+3 0 29 21 56 46 261 236 509 317 809 263z"/>
+</g>
+</svg>
diff --git a/static/images/favicon/site.webmanifest b/static/images/favicon/site.webmanifest
new file mode 100644
index 000000000..91aedef05
--- /dev/null
+++ b/static/images/favicon/site.webmanifest
@@ -0,0 +1,19 @@
+{
+  "name": "",
+  "short_name": "",
+  "icons": [
+    {
+      "src": "/images/android-chrome-192x192.png",
+      "sizes": "192x192",
+      "type": "image/png"
+    },
+    {
+      "src": "/images/android-chrome-512x512.png",
+      "sizes": "512x512",
+      "type": "image/png"
+    }
+  ],
+  "theme_color": "#ffffff",
+  "background_color": "#ffffff",
+  "display": "standalone"
+}
diff --git a/static/index.html b/static/index.html
index 21c5746d4..b6d144a3d 100644
--- a/static/index.html
+++ b/static/index.html
@@ -19,33 +19,24 @@
     <link rel="stylesheet" href="css/style.css" />
     <link rel="stylesheet" href="themes/serika_dark.css" id="currentTheme" />
     <link rel="stylesheet" href="" id="funBoxTheme" />
-    <link id="favicon" rel="shortcut icon" href="images/fav.png" />
-    <!-- <link rel="shortcut icon" href="images/favicon/fav.png" /> -->
+    <link id="favicon" rel="shortcut icon" href="/images/favicon/favicon.ico" />
     <link
-      href="images/favicon/apple-touch-icon-180x180.png"
       rel="apple-touch-icon"
       sizes="180x180"
+      href="/images/favicon/apple-touch-icon.png"
     />
+    <link rel="manifest" href="/images/favicon/site.webmanifest" />
     <link
-      href="images/favicon/apple-touch-icon-152x152.png"
-      rel="apple-touch-icon"
-      sizes="152x152"
+      rel="mask-icon"
+      href="/images/favicon/safari-pinned-tab.svg"
+      color="#eee"
     />
-    <link
-      href="images/favicon/apple-touch-icon-120x120.png"
-      rel="apple-touch-icon"
-      sizes="120x120"
-    />
-
-    <link
-      href="images/favicon/apple-touch-icon-76x76.png"
-      rel="apple-touch-icon"
-      sizes="76x76"
-    />
-    <link
-      rel="apple-touch-icon"
-      href="images/favicon/apple-touch-icon-60x60.png"
+    <meta name="msapplication-TileColor" content="#e2b714" />
+    <meta
+      name="msapplication-config"
+      content="/images/favicon/browserconfig.xml"
     />
+    <meta id="metaThemeColor" name="theme-color" content="#e2b714" />
     <link
       rel="stylesheet"
       href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css"
@@ -76,7 +67,6 @@
       property="og:description"
       content="A minimalistic, customisable typing website. Test yourself in various modes, track your progress and improve your typing speed."
     />
-    <meta name="theme-color" content="#e2b714" id="metaThemeColor" />
     <meta name="twitter:title" content="Monkeytype" />
     <meta
       name="twitter:image"