diff --git a/.eslintignore b/.eslintignore
index e0d8f5366..4c03e2214 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -12,7 +12,9 @@ CNAME
 # Ignore files by extension
 /**/*.svg
 /**/*.png
+/**/*.ico
 /**/*.md
+/**/*.webmanifest
 
 # Ignore files by folders
 /src/resources/font-awesome/**
diff --git a/src/index.html b/src/index.html
index 8c69afc8a..acc35756d 100644
--- a/src/index.html
+++ b/src/index.html
@@ -32,7 +32,14 @@
 		/>
 		<meta name="twitter:image" content="https://bestofui5.org/img/B_UI5_V.png" />
 
-		<link type="image/x-icon" rel="icon" href="resources/img/favicon.png" />
+		<link rel="apple-touch-icon" sizes="180x180" href="resources/favicon/apple-touch-icon.png" />
+		<link rel="icon" type="image/png" sizes="32x32" href="resources/favicon/favicon-32x32.png" />
+		<link rel="icon" type="image/png" sizes="16x16" href="resources/favicon/favicon-16x16.png" />
+		<link rel="manifest" href="resources/favicon/site.webmanifest" />
+		<link rel="mask-icon" href="resources/favicon/safari-pinned-tab.svg" color="#5bbad5" />
+		<meta name="msapplication-TileColor" content="#ffffff" />
+		<meta name="theme-color" content="#ffffff" />
+
 		<title>Best of UI5</title>
 
 		<style>
diff --git a/src/mockServer.html b/src/mockServer.html
index 29d3010a0..04560f99b 100644
--- a/src/mockServer.html
+++ b/src/mockServer.html
@@ -32,7 +32,14 @@
 		/>
 		<meta name="twitter:image" content="https://bestofui5.org/img/B_UI5_V.png" />
 
-		<link type="image/x-icon" rel="icon" href="resources/img/favicon.png" />
+		<link rel="apple-touch-icon" sizes="180x180" href="resources/favicon/apple-touch-icon.png" />
+		<link rel="icon" type="image/png" sizes="32x32" href="resources/favicon/favicon-32x32.png" />
+		<link rel="icon" type="image/png" sizes="16x16" href="resources/favicon/favicon-16x16.png" />
+		<link rel="manifest" href="resources/favicon/site.webmanifest" />
+		<link rel="mask-icon" href="resources/favicon/safari-pinned-tab.svg" color="#5bbad5" />
+		<meta name="msapplication-TileColor" content="#ffffff" />
+		<meta name="theme-color" content="#ffffff" />
+
 		<title>Best of UI5</title>
 
 		<style>
diff --git a/src/resources/favicon/android-chrome-192x192.png b/src/resources/favicon/android-chrome-192x192.png
new file mode 100644
index 000000000..de44f09e6
Binary files /dev/null and b/src/resources/favicon/android-chrome-192x192.png differ
diff --git a/src/resources/favicon/android-chrome-512x512.png b/src/resources/favicon/android-chrome-512x512.png
new file mode 100644
index 000000000..100515be3
Binary files /dev/null and b/src/resources/favicon/android-chrome-512x512.png differ
diff --git a/src/resources/favicon/apple-touch-icon.png b/src/resources/favicon/apple-touch-icon.png
new file mode 100644
index 000000000..98e670249
Binary files /dev/null and b/src/resources/favicon/apple-touch-icon.png differ
diff --git a/src/resources/favicon/browserconfig.xml b/src/resources/favicon/browserconfig.xml
new file mode 100644
index 000000000..0bb463b52
--- /dev/null
+++ b/src/resources/favicon/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/src/resources/favicon/favicon-16x16.png b/src/resources/favicon/favicon-16x16.png
new file mode 100644
index 000000000..3d43116f8
Binary files /dev/null and b/src/resources/favicon/favicon-16x16.png differ
diff --git a/src/resources/img/favicon.png b/src/resources/favicon/favicon-32x32.png
similarity index 100%
rename from src/resources/img/favicon.png
rename to src/resources/favicon/favicon-32x32.png
diff --git a/src/resources/favicon/favicon.ico b/src/resources/favicon/favicon.ico
new file mode 100644
index 000000000..d0e8875be
Binary files /dev/null and b/src/resources/favicon/favicon.ico differ
diff --git a/src/resources/favicon/mstile-150x150.png b/src/resources/favicon/mstile-150x150.png
new file mode 100644
index 000000000..0f0624f55
Binary files /dev/null and b/src/resources/favicon/mstile-150x150.png differ
diff --git a/src/resources/favicon/safari-pinned-tab.svg b/src/resources/favicon/safari-pinned-tab.svg
new file mode 100644
index 000000000..1942df595
--- /dev/null
+++ b/src/resources/favicon/safari-pinned-tab.svg
@@ -0,0 +1 @@
+<svg height="1000pt" preserveAspectRatio="xMidYMid meet" viewBox="0 0 1000 1000" width="1000pt" xmlns="http://www.w3.org/2000/svg"><path d="m4894 9963c19-101 131-276 274-425 181-189 503-436 802-613 132-78 499-326 635-428 380-286 700-592 942-902 247-317 449-731 499-1025 3-14 6-30 9-37 11-33 20-176 19-328 0-252-39-415-149-640-255-515-776-819-1185-689-81 25-174 80-223 132l-28 29 62 59c123 117 165 167 244 287 67 104 127 237 154 345 20 75 39 242 29 242-3 0-52-28-109-63-168-102-384-207-427-207-10 0-9 6 2 28 26 50 94 263 101 317 2 11 6 34 9 50 21 112 28 193 31 365 3 171-1 251-19 390-3 19-5 39-6 44 0 5-22-22-49-60-145-207-379-407-661-565-61-34-113-59-116-57-3 3 2 23 10 44 62 163 92 343 90 554-1 149-16 243-56 367-30 92-48 111-48 50 0-18-13-69-29-114-95-273-362-564-758-826-184-123-355-218-639-357-137-67-292-147-344-178-417-244-664-494-757-765-24-72-28-97-28-202 0-121 18-215 50-258 12-17 16-16 61 18 115 88 229 126 389 131 102 3 134-1 214-21 334-87 524-313 530-635 7-346-226-687-570-837-354-153-811-125-1187 73-534 282-950 896-1074 1589-17 97-22 161-22 340-1 121 2 254 7 295 62 617 343 1173 852 1685 77 78 262 249 410 381 448 399 594 563 709 793 38 75 84 201 99 268 4 16-24-2-107-71-198-166-397-305-790-551-692-434-923-593-1231-849-130-109-415-388-512-502-360-424-586-883-678-1379-10-49-19-99-21-110-30-152-49-402-49-655 0-483 56-858 186-1244 202-601 533-1174 944-1636 22-25 103-110 180-188 668-685 1523-1146 2475-1336 327-65 549-84 955-81 187 2 358 6 380 9s67 8 100 11c183 17 466 68 669 119 985 251 1842 787 2502 1566 449 529 789 1192 958 1865 57 229 93 426 112 605 3 36 8 67 9 70 2 3 7 61 12 130 14 220 7 814-12 890-2 8-6 49-10 90-10 128-64 437-106 610-241 988-786 1776-1674 2421-190 139-503 334-730 456-110 60-532 271-630 315-44 20-116 53-160 73s-192 86-330 147c-678 299-945 433-1134 573l-64 47zm-616-4593c67-41 89-116 52-177-48-79-118-84-318-23-74 22-148 40-165 40-32 1-31 1 23 36 72 46 204 114 255 130 59 19 115 17 153-6z" transform="matrix(.1 0 0 -.1 0 1000)"/></svg>
\ No newline at end of file
diff --git a/src/resources/favicon/site.webmanifest b/src/resources/favicon/site.webmanifest
new file mode 100644
index 000000000..8a8184728
--- /dev/null
+++ b/src/resources/favicon/site.webmanifest
@@ -0,0 +1,19 @@
+{
+	"name": "Best Of UI5 - Website",
+	"short_name": "Best Of UI5",
+	"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"
+}