diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/head.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/head.jsp
index 1f969495..cf916de3 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/head.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/head.jsp
@@ -5,7 +5,13 @@
 <![endif]-->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <c:set var="styleSheet"><spring:theme code="styleSheet"/></c:set>
-<link rel="icon" type="image/png" href="<c:url value="/icons/favicon.png"/>"/>
+<link rel="apple-touch-icon" sizes="180x180" href="<c:url value="/icons/apple-touch-icon.png"/>"/>
+<link rel="icon" type="image/png" sizes="32x32" href="<c:url value="/icons/favicon-32x32.png"/>"/>
+<link rel="icon" type="image/png" sizes="16x16" href="<c:url value="/icons/favicon-16x16.png"/>"/>
+<link rel="manifest" href="<c:url value="/icons/site.webmanifest"/>"/>
+<link rel="mask-icon" href="<c:url value="/icons/safari-pinned-tab.svg"/>" color="#2f7bd9"/>"/>
+<meta name="msapplication-TileColor" content="#ffffff">
+<meta name="theme-color" content="#ffffff">
 <!-- Included before airsonic stylesheet to allow overriding -->
 <link type="text/css" rel="stylesheet" href="<c:url value="/script/mediaelement/mediaelementplayer.min.css"/>">
 <link rel="stylesheet" href="<c:url value="/${styleSheet}"/>" type="text/css">
diff --git a/airsonic-main/src/main/webapp/browserconfig.xml b/airsonic-main/src/main/webapp/browserconfig.xml
new file mode 100644
index 00000000..d416bc53
--- /dev/null
+++ b/airsonic-main/src/main/webapp/browserconfig.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square150x150logo src="/mstile-150x150.png"/>
+            <TileColor>#ffffff</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>
diff --git a/airsonic-main/src/main/webapp/favicon.ico b/airsonic-main/src/main/webapp/favicon.ico
new file mode 100644
index 00000000..df7c0ebb
Binary files /dev/null and b/airsonic-main/src/main/webapp/favicon.ico differ
diff --git a/airsonic-main/src/main/webapp/icons/android-chrome-192x192.png b/airsonic-main/src/main/webapp/icons/android-chrome-192x192.png
new file mode 100644
index 00000000..54bffe31
Binary files /dev/null and b/airsonic-main/src/main/webapp/icons/android-chrome-192x192.png differ
diff --git a/airsonic-main/src/main/webapp/icons/android-chrome-512x512.png b/airsonic-main/src/main/webapp/icons/android-chrome-512x512.png
new file mode 100644
index 00000000..cd7de23e
Binary files /dev/null and b/airsonic-main/src/main/webapp/icons/android-chrome-512x512.png differ
diff --git a/airsonic-main/src/main/webapp/icons/apple-touch-icon.png b/airsonic-main/src/main/webapp/icons/apple-touch-icon.png
new file mode 100644
index 00000000..f58d9900
Binary files /dev/null and b/airsonic-main/src/main/webapp/icons/apple-touch-icon.png differ
diff --git a/airsonic-main/src/main/webapp/icons/favicon-16x16.png b/airsonic-main/src/main/webapp/icons/favicon-16x16.png
new file mode 100644
index 00000000..ee107108
Binary files /dev/null and b/airsonic-main/src/main/webapp/icons/favicon-16x16.png differ
diff --git a/airsonic-main/src/main/webapp/icons/favicon-32x32.png b/airsonic-main/src/main/webapp/icons/favicon-32x32.png
new file mode 100644
index 00000000..2ee08f35
Binary files /dev/null and b/airsonic-main/src/main/webapp/icons/favicon-32x32.png differ
diff --git a/airsonic-main/src/main/webapp/icons/favicon.png b/airsonic-main/src/main/webapp/icons/favicon.png
deleted file mode 100644
index a3240833..00000000
Binary files a/airsonic-main/src/main/webapp/icons/favicon.png and /dev/null differ
diff --git a/airsonic-main/src/main/webapp/icons/mstile-144x144.png b/airsonic-main/src/main/webapp/icons/mstile-144x144.png
new file mode 100644
index 00000000..660d6f3d
Binary files /dev/null and b/airsonic-main/src/main/webapp/icons/mstile-144x144.png differ
diff --git a/airsonic-main/src/main/webapp/icons/mstile-150x150.png b/airsonic-main/src/main/webapp/icons/mstile-150x150.png
new file mode 100644
index 00000000..6dbbe5eb
Binary files /dev/null and b/airsonic-main/src/main/webapp/icons/mstile-150x150.png differ
diff --git a/airsonic-main/src/main/webapp/icons/mstile-310x150.png b/airsonic-main/src/main/webapp/icons/mstile-310x150.png
new file mode 100644
index 00000000..344f4635
Binary files /dev/null and b/airsonic-main/src/main/webapp/icons/mstile-310x150.png differ
diff --git a/airsonic-main/src/main/webapp/icons/mstile-310x310.png b/airsonic-main/src/main/webapp/icons/mstile-310x310.png
new file mode 100644
index 00000000..393fad7c
Binary files /dev/null and b/airsonic-main/src/main/webapp/icons/mstile-310x310.png differ
diff --git a/airsonic-main/src/main/webapp/icons/mstile-70x70.png b/airsonic-main/src/main/webapp/icons/mstile-70x70.png
new file mode 100644
index 00000000..bbc2e3f8
Binary files /dev/null and b/airsonic-main/src/main/webapp/icons/mstile-70x70.png differ
diff --git a/airsonic-main/src/main/webapp/icons/safari-pinned-tab.svg b/airsonic-main/src/main/webapp/icons/safari-pinned-tab.svg
new file mode 100644
index 00000000..197e8e74
--- /dev/null
+++ b/airsonic-main/src/main/webapp/icons/safari-pinned-tab.svg
@@ -0,0 +1,49 @@
+<?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="M3192 5298 c-50 -11 -103 -61 -118 -110 -7 -21 -10 -636 -9 -1698 l0
+-1665 24 -41 c42 -74 140 -106 211 -69 32 17 74 68 85 104 13 44 9 3342 -5
+3376 -30 78 -106 119 -188 103z"/>
+<path d="M2622 5270 c-25 -12 -51 -34 -69 -61 l-28 -43 -2 -1666 c-2 -1662 -2
+-1668 19 -1709 36 -74 111 -108 186 -85 54 15 80 38 103 89 18 38 19 110 19
+1693 0 1777 2 1690 -48 1745 -44 49 -119 64 -180 37z"/>
+<path d="M3725 5074 c-48 -16 -91 -58 -106 -102 -8 -25 -11 -457 -11 -1585 0
+-1686 -3 -1592 54 -1643 36 -33 63 -44 108 -44 57 0 112 33 141 84 l24 41 0
+1565 0 1565 -23 40 c-42 73 -116 104 -187 79z"/>
+<path d="M2072 5053 c-35 -17 -65 -53 -82 -98 -7 -19 -11 -514 -10 -1576 0
+-1506 0 -1550 19 -1587 37 -72 102 -106 173 -90 48 10 78 32 109 77 l24 35 0
+1561 c0 1488 -1 1563 -18 1601 -36 80 -136 116 -215 77z"/>
+<path d="M4244 4519 c-22 -10 -50 -35 -64 -56 l-25 -37 -3 -1290 c-3 -1436 -7
+-1348 64 -1402 35 -27 103 -41 147 -30 13 3 38 18 55 33 65 57 61 -29 59 1394
+l-2 1294 -23 32 c-53 74 -135 99 -208 62z"/>
+<path d="M1529 4507 c-24 -11 -51 -37 -67 -61 l-26 -41 -1 -1270 c-1 -977 2
+-1280 11 -1314 50 -174 291 -154 313 26 4 27 6 611 6 1298 l-1 1250 -24 43
+c-45 80 -132 109 -211 69z"/>
+<path d="M4780 4489 c-40 -25 -60 -50 -76 -95 -9 -23 -12 -371 -12 -1295 0
+-1212 1 -1266 19 -1303 52 -107 170 -131 257 -52 54 49 52 -12 52 1363 0 1232
+-1 1275 -19 1311 -42 82 -149 117 -221 71z"/>
+<path d="M1017 4305 c-57 -14 -84 -37 -108 -90 -16 -38 -18 -105 -17 -1112 l0
+-1072 21 -43 c56 -110 204 -118 281 -14 21 27 21 32 21 1131 0 1099 0 1104
+-21 1131 -48 65 -105 87 -177 69z"/>
+<path d="M5328 4217 c-30 -15 -51 -36 -68 -67 l-24 -45 -1 -1120 c0 -641 3
+-1137 9 -1160 16 -72 83 -125 157 -125 56 0 111 33 140 84 l23 41 1 1120 c0
+616 -3 1138 -7 1159 -24 109 -132 162 -230 113z"/>
+<path d="M5875 3817 c-38 -18 -60 -43 -80 -90 -13 -32 -15 -151 -15 -960 l0
+-924 23 -43 c61 -115 221 -113 285 3 16 30 17 96 17 969 0 892 -1 939 -18 971
+-28 52 -73 80 -132 84 -28 2 -63 -3 -80 -10z"/>
+<path d="M448 3760 c-18 -9 -46 -34 -63 -54 l-30 -38 -3 -526 c-2 -290 0 -546
+3 -570 7 -50 59 -114 103 -130 46 -16 111 -5 149 24 71 54 70 44 71 630 0 291
+-4 540 -9 558 -26 95 -140 150 -221 106z"/>
+<path d="M6445 3413 c-37 -9 -87 -55 -105 -97 -17 -38 -18 -82 -18 -541 0
+-552 -1 -548 64 -604 18 -17 49 -33 67 -36 78 -15 166 38 187 113 14 51 14
+1021 -1 1059 -29 77 -116 125 -194 106z"/>
+</g>
+</svg>
diff --git a/airsonic-main/src/main/webapp/icons/site.webmanifest b/airsonic-main/src/main/webapp/icons/site.webmanifest
new file mode 100644
index 00000000..b20abb7c
--- /dev/null
+++ b/airsonic-main/src/main/webapp/icons/site.webmanifest
@@ -0,0 +1,19 @@
+{
+    "name": "",
+    "short_name": "",
+    "icons": [
+        {
+            "src": "/android-chrome-192x192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "/android-chrome-512x512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        }
+    ],
+    "theme_color": "#ffffff",
+    "background_color": "#ffffff",
+    "display": "standalone"
+}