diff --git a/ui/public/android-chrome-192x192.png b/ui/public/android-chrome-192x192.png
new file mode 100644
index 000000000..c6f0c9bb5
Binary files /dev/null and b/ui/public/android-chrome-192x192.png differ
diff --git a/ui/public/android-chrome-512x512.png b/ui/public/android-chrome-512x512.png
new file mode 100644
index 000000000..2bb8c77d1
Binary files /dev/null and b/ui/public/android-chrome-512x512.png differ
diff --git a/ui/public/android-icon-144x144.png b/ui/public/android-icon-144x144.png
deleted file mode 100644
index ed4036b9c..000000000
Binary files a/ui/public/android-icon-144x144.png and /dev/null differ
diff --git a/ui/public/android-icon-192x192.png b/ui/public/android-icon-192x192.png
deleted file mode 100644
index ce84eaeba..000000000
Binary files a/ui/public/android-icon-192x192.png and /dev/null differ
diff --git a/ui/public/android-icon-36x36.png b/ui/public/android-icon-36x36.png
deleted file mode 100644
index b8a0b31f5..000000000
Binary files a/ui/public/android-icon-36x36.png and /dev/null differ
diff --git a/ui/public/android-icon-48x48.png b/ui/public/android-icon-48x48.png
deleted file mode 100644
index c44049146..000000000
Binary files a/ui/public/android-icon-48x48.png and /dev/null differ
diff --git a/ui/public/android-icon-72x72.png b/ui/public/android-icon-72x72.png
deleted file mode 100644
index 258ac278c..000000000
Binary files a/ui/public/android-icon-72x72.png and /dev/null differ
diff --git a/ui/public/android-icon-96x96.png b/ui/public/android-icon-96x96.png
deleted file mode 100644
index cc923e64a..000000000
Binary files a/ui/public/android-icon-96x96.png and /dev/null differ
diff --git a/ui/public/apple-icon-114x114.png b/ui/public/apple-icon-114x114.png
deleted file mode 100644
index b263bb624..000000000
Binary files a/ui/public/apple-icon-114x114.png and /dev/null differ
diff --git a/ui/public/apple-icon-120x120.png b/ui/public/apple-icon-120x120.png
deleted file mode 100644
index 803e4df66..000000000
Binary files a/ui/public/apple-icon-120x120.png and /dev/null differ
diff --git a/ui/public/apple-icon-144x144.png b/ui/public/apple-icon-144x144.png
deleted file mode 100644
index ed4036b9c..000000000
Binary files a/ui/public/apple-icon-144x144.png and /dev/null differ
diff --git a/ui/public/apple-icon-152x152.png b/ui/public/apple-icon-152x152.png
deleted file mode 100644
index c2a6c0d26..000000000
Binary files a/ui/public/apple-icon-152x152.png and /dev/null differ
diff --git a/ui/public/apple-icon-180x180.png b/ui/public/apple-icon-180x180.png
deleted file mode 100644
index db4ca5383..000000000
Binary files a/ui/public/apple-icon-180x180.png and /dev/null differ
diff --git a/ui/public/apple-icon-57x57.png b/ui/public/apple-icon-57x57.png
deleted file mode 100644
index bbd2dd55e..000000000
Binary files a/ui/public/apple-icon-57x57.png and /dev/null differ
diff --git a/ui/public/apple-icon-60x60.png b/ui/public/apple-icon-60x60.png
deleted file mode 100644
index a547a1977..000000000
Binary files a/ui/public/apple-icon-60x60.png and /dev/null differ
diff --git a/ui/public/apple-icon-72x72.png b/ui/public/apple-icon-72x72.png
deleted file mode 100644
index 258ac278c..000000000
Binary files a/ui/public/apple-icon-72x72.png and /dev/null differ
diff --git a/ui/public/apple-icon-76x76.png b/ui/public/apple-icon-76x76.png
deleted file mode 100644
index 5dc373302..000000000
Binary files a/ui/public/apple-icon-76x76.png and /dev/null differ
diff --git a/ui/public/apple-icon-precomposed.png b/ui/public/apple-icon-precomposed.png
deleted file mode 100644
index 6f9a9c793..000000000
Binary files a/ui/public/apple-icon-precomposed.png and /dev/null differ
diff --git a/ui/public/apple-icon.png b/ui/public/apple-icon.png
deleted file mode 100644
index 6f9a9c793..000000000
Binary files a/ui/public/apple-icon.png and /dev/null differ
diff --git a/ui/public/apple-touch-icon-120x120.png b/ui/public/apple-touch-icon-120x120.png
new file mode 100644
index 000000000..2814c7388
Binary files /dev/null and b/ui/public/apple-touch-icon-120x120.png differ
diff --git a/ui/public/apple-touch-icon-152x152.png b/ui/public/apple-touch-icon-152x152.png
new file mode 100644
index 000000000..37ebc546b
Binary files /dev/null and b/ui/public/apple-touch-icon-152x152.png differ
diff --git a/ui/public/apple-touch-icon-180x180.png b/ui/public/apple-touch-icon-180x180.png
new file mode 100644
index 000000000..d4daca1de
Binary files /dev/null and b/ui/public/apple-touch-icon-180x180.png differ
diff --git a/ui/public/apple-touch-icon-60x60.png b/ui/public/apple-touch-icon-60x60.png
new file mode 100644
index 000000000..40b37d9ff
Binary files /dev/null and b/ui/public/apple-touch-icon-60x60.png differ
diff --git a/ui/public/apple-touch-icon-76x76.png b/ui/public/apple-touch-icon-76x76.png
new file mode 100644
index 000000000..098490606
Binary files /dev/null and b/ui/public/apple-touch-icon-76x76.png differ
diff --git a/ui/public/apple-touch-icon.png b/ui/public/apple-touch-icon.png
new file mode 100644
index 000000000..a4fb4e39e
Binary files /dev/null and b/ui/public/apple-touch-icon.png differ
diff --git a/ui/public/browserconfig.xml b/ui/public/browserconfig.xml
index c55414822..b3930d0f0 100644
--- a/ui/public/browserconfig.xml
+++ b/ui/public/browserconfig.xml
@@ -1,2 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<browserconfig><msapplication><tile><square70x70logo src="/ms-icon-70x70.png"/><square150x150logo src="/ms-icon-150x150.png"/><square310x310logo src="/ms-icon-310x310.png"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>
\ No newline at end of file
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square150x150logo src="/mstile-150x150.png"/>
+            <TileColor>#da532c</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>
diff --git a/ui/public/favicon-16x16.png b/ui/public/favicon-16x16.png
index ad786bcb7..1f5375f6b 100644
Binary files a/ui/public/favicon-16x16.png and b/ui/public/favicon-16x16.png differ
diff --git a/ui/public/favicon-32x32.png b/ui/public/favicon-32x32.png
index 3012c0e39..0e9989b13 100644
Binary files a/ui/public/favicon-32x32.png and b/ui/public/favicon-32x32.png differ
diff --git a/ui/public/favicon-96x96.png b/ui/public/favicon-96x96.png
deleted file mode 100644
index cc923e64a..000000000
Binary files a/ui/public/favicon-96x96.png and /dev/null differ
diff --git a/ui/public/favicon.ico b/ui/public/favicon.ico
index 062b82608..3ccc57516 100644
Binary files a/ui/public/favicon.ico and b/ui/public/favicon.ico differ
diff --git a/ui/public/index.html b/ui/public/index.html
index 8554cfb1c..73b534958 100644
--- a/ui/public/index.html
+++ b/ui/public/index.html
@@ -6,26 +6,16 @@
             name="description"
             content="Navidrome Music Server - {{.Version}}"
     />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
-    <link rel="apple-touch-icon" sizes="57x57" href="%PUBLIC_URL%/apple-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="%PUBLIC_URL%/apple-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="%PUBLIC_URL%/apple-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="%PUBLIC_URL%/apple-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="%PUBLIC_URL%/apple-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="%PUBLIC_URL%/apple-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="%PUBLIC_URL%/apple-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="%PUBLIC_URL%/apple-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="%PUBLIC_URL%/apple-icon-180x180.png">
-    <link rel="icon" type="image/png" sizes="192x192"  href="%PUBLIC_URL%/android-icon-192x192.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="%PUBLIC_URL%/apple-touch-icon.png">
     <link rel="icon" type="image/png" sizes="32x32" href="%PUBLIC_URL%/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="96x96" href="%PUBLIC_URL%/favicon-96x96.png">
+    <link rel="icon" type="image/png" sizes="192x192" href="%PUBLIC_URL%/android-chrome-192x192.png">
     <link rel="icon" type="image/png" sizes="16x16" href="%PUBLIC_URL%/favicon-16x16.png">
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
-    <meta name="msapplication-TileColor" content="#ffffff">
-    <meta name="msapplication-TileImage" content="%PUBLIC_URL%/ms-icon-144x144.png">
+    <link rel="mask-icon" href="%PUBLIC_URL%/safari-pinned-tab.svg" color="#5b5fd5">
+    <meta name="msapplication-TileColor" content="#da532c">
     <meta name="theme-color" content="#ffffff">
+
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="theme-color" content="#000000" />
     <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
diff --git a/ui/public/manifest.json b/ui/public/manifest.json
index 2540e1b25..f965d716d 100644
--- a/ui/public/manifest.json
+++ b/ui/public/manifest.json
@@ -8,40 +8,14 @@
  "theme_color": "blue",
  "icons": [
   {
-   "src": "\/android-icon-36x36.png",
-   "sizes": "36x36",
-   "type": "image\/png",
-   "density": "0.75"
-  },
-  {
-   "src": "\/android-icon-48x48.png",
-   "sizes": "48x48",
-   "type": "image\/png",
-   "density": "1.0"
-  },
-  {
-   "src": "\/android-icon-72x72.png",
-   "sizes": "72x72",
-   "type": "image\/png",
-   "density": "1.5"
-  },
-  {
-   "src": "\/android-icon-96x96.png",
-   "sizes": "96x96",
-   "type": "image\/png",
-   "density": "2.0"
-  },
-  {
-   "src": "\/android-icon-144x144.png",
-   "sizes": "144x144",
-   "type": "image\/png",
-   "density": "3.0"
-  },
-  {
-   "src": "\/android-icon-192x192.png",
+   "src": "/android-chrome-192x192.png",
    "sizes": "192x192",
-   "type": "image\/png",
-   "density": "4.0"
+   "type": "image/png"
+  },
+  {
+   "src": "/android-chrome-512x512.png",
+   "sizes": "512x512",
+   "type": "image/png"
   }
  ]
 }
diff --git a/ui/public/ms-icon-144x144.png b/ui/public/ms-icon-144x144.png
deleted file mode 100644
index ed4036b9c..000000000
Binary files a/ui/public/ms-icon-144x144.png and /dev/null differ
diff --git a/ui/public/ms-icon-150x150.png b/ui/public/ms-icon-150x150.png
deleted file mode 100644
index 0e86f49ad..000000000
Binary files a/ui/public/ms-icon-150x150.png and /dev/null differ
diff --git a/ui/public/ms-icon-310x310.png b/ui/public/ms-icon-310x310.png
deleted file mode 100644
index fe924ce09..000000000
Binary files a/ui/public/ms-icon-310x310.png and /dev/null differ
diff --git a/ui/public/ms-icon-70x70.png b/ui/public/ms-icon-70x70.png
deleted file mode 100644
index 9853d20a4..000000000
Binary files a/ui/public/ms-icon-70x70.png and /dev/null differ
diff --git a/ui/public/mstile-144x144.png b/ui/public/mstile-144x144.png
new file mode 100644
index 000000000..3727200ba
Binary files /dev/null and b/ui/public/mstile-144x144.png differ
diff --git a/ui/public/mstile-150x150.png b/ui/public/mstile-150x150.png
new file mode 100644
index 000000000..fcafe34d3
Binary files /dev/null and b/ui/public/mstile-150x150.png differ
diff --git a/ui/public/mstile-310x150.png b/ui/public/mstile-310x150.png
new file mode 100644
index 000000000..0719e0398
Binary files /dev/null and b/ui/public/mstile-310x150.png differ
diff --git a/ui/public/mstile-310x310.png b/ui/public/mstile-310x310.png
new file mode 100644
index 000000000..b7b8e5b89
Binary files /dev/null and b/ui/public/mstile-310x310.png differ
diff --git a/ui/public/mstile-70x70.png b/ui/public/mstile-70x70.png
new file mode 100644
index 000000000..3abf502d9
Binary files /dev/null and b/ui/public/mstile-70x70.png differ
diff --git a/ui/public/safari-pinned-tab.svg b/ui/public/safari-pinned-tab.svg
new file mode 100644
index 000000000..0c359b831
--- /dev/null
+++ b/ui/public/safari-pinned-tab.svg
@@ -0,0 +1,60 @@
+<?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.11, written by Peter Selinger 2001-2013
+</metadata>
+<g transform="translate(0.000000,700.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M3225 6988 c-973 -78 -1852 -545 -2463 -1308 -833 -1041 -996 -2480
+-418 -3695 329 -691 917 -1285 1611 -1625 373 -183 748 -291 1190 -342 142
+-16 568 -16 710 0 628 73 1164 273 1659 620 162 114 334 262 491 423 417 428
+695 906 860 1479 91 317 129 599 129 960 0 332 -27 560 -100 855 -277 1108
+-1095 2023 -2164 2423 -473 176 -1004 251 -1505 210z m530 -289 c873 -75 1651
+-478 2209 -1145 396 -473 639 -1031 723 -1662 24 -181 24 -608 -1 -787 -83
+-604 -293 -1109 -662 -1585 -110 -142 -372 -407 -519 -525 -467 -373 -997
+-597 -1610 -681 -184 -25 -608 -25 -790 0 -521 72 -956 233 -1375 511 -185
+122 -326 239 -505 419 -511 513 -814 1133 -912 1863 -24 178 -24 608 0 785 81
+608 305 1136 681 1613 102 129 372 399 503 502 503 399 1085 631 1728 692 131
+12 391 12 530 0z"/>
+<path d="M3255 6279 c-624 -54 -1227 -328 -1682 -763 -398 -380 -683 -887
+-798 -1419 -16 -73 -16 -81 0 -122 31 -83 122 -117 201 -77 51 26 67 58 104
+209 84 342 252 679 477 958 101 126 309 328 435 423 406 305 867 473 1383 503
+195 11 217 19 253 91 18 35 22 55 16 83 -8 42 -44 89 -85 110 -31 17 -139 18
+-304 4z"/>
+<path d="M3320 5639 c-526 -45 -1008 -277 -1376 -661 -362 -379 -576 -891
+-587 -1401 -2 -137 3 -154 66 -201 37 -27 117 -27 154 0 59 44 65 62 74 212
+17 292 75 508 205 762 93 180 177 294 339 455 158 158 273 245 445 334 256
+133 478 193 772 210 114 7 144 12 166 28 48 36 66 69 66 123 0 53 -18 87 -66
+123 -32 24 -113 29 -258 16z"/>
+<path d="M3363 4840 c-313 -35 -592 -170 -813 -390 -190 -190 -314 -420 -371
+-693 -31 -143 -31 -371 0 -514 57 -273 179 -500 370 -692 255 -257 587 -394
+951 -394 491 0 922 252 1173 685 189 327 225 740 96 1105 -135 382 -440 687
+-822 822 -176 62 -413 91 -584 71z m265 -290 c235 -30 448 -134 618 -304 363
+-363 414 -920 123 -1347 -56 -83 -187 -214 -267 -268 -96 -65 -236 -128 -347
+-157 -87 -23 -119 -27 -255 -27 -136 0 -168 4 -255 27 -188 49 -356 145 -490
+280 -358 360 -414 901 -139 1324 218 335 617 521 1012 472z"/>
+<path d="M3405 3886 c-201 -49 -333 -251 -296 -452 31 -172 154 -294 331 -326
+257 -48 499 197 451 458 -23 124 -95 227 -198 281 -96 51 -189 63 -288 39z
+m174 -307 c26 -26 31 -38 31 -79 0 -41 -5 -53 -31 -79 -26 -26 -38 -31 -79
+-31 -41 0 -53 5 -79 31 -26 26 -31 38 -31 79 0 41 5 53 31 79 26 26 38 31 79
+31 41 0 53 -5 79 -31z"/>
+<path d="M792 3693 c-53 -26 -76 -68 -80 -145 -7 -116 49 -191 142 -191 53 0
+102 26 126 66 16 25 20 50 20 114 0 73 -3 85 -26 113 -51 59 -117 75 -182 43z"/>
+<path d="M5454 3639 c-18 -5 -46 -25 -62 -44 -34 -38 -38 -58 -47 -229 -20
+-409 -207 -829 -510 -1145 -331 -346 -759 -542 -1244 -570 -153 -9 -171 -15
+-215 -74 -27 -37 -27 -117 0 -154 46 -61 66 -68 187 -66 695 12 1351 382 1744
+985 140 214 244 473 298 743 31 155 50 398 36 452 -13 47 -55 90 -102 103 -39
+11 -43 11 -85 -1z"/>
+<path d="M6083 3631 c-64 -30 -83 -69 -83 -168 0 -73 3 -85 26 -113 38 -45 79
+-63 130 -57 87 9 134 71 134 177 0 134 -99 211 -207 161z"/>
+<path d="M6019 3101 c-47 -26 -63 -61 -103 -221 -101 -408 -313 -788 -611
+-1098 -320 -334 -692 -557 -1143 -686 -159 -46 -333 -74 -536 -87 -196 -12
+-218 -20 -254 -89 -17 -33 -21 -54 -17 -80 17 -88 75 -130 181 -130 197 0 510
+46 712 105 495 142 879 369 1233 725 371 374 631 849 744 1363 16 74 16 81 0
+122 -9 25 -30 54 -47 66 -42 31 -113 35 -159 10z"/>
+</g>
+</svg>