20 files changed, 48 insertions, 3 deletions
diff --git a/app/Helpers/functions.php b/app/Helpers/functions.php
index c43e45e6a0..bbb3216392 100644
--- a/app/Helpers/functions.php
+++ b/app/Helpers/functions.php
@@ -17,6 +17,7 @@
 declare(strict_types=1);
 
 use Fisharebest\Webtrees\Application;
+use Fisharebest\Webtrees\Webtrees;
 use Illuminate\Cache\Repository;
 
 /**
@@ -36,6 +37,25 @@ function app(string $abstract = null)
 }
 
 /**
+ * Generate a URL to an asset file in the public folder.
+ * Add a version parameter for cache-busting.
+ *
+ * @param string $path
+ *
+ * @return string
+ */
+function asset(string $path): string
+{
+    if (Webtrees::STABILITY === '') {
+        $version = Webtrees::VERSION;
+    } else {
+        $version = filemtime(WT_ROOT . 'public/' . $path);
+    }
+
+    return 'public/' . $path . '?v=' . $version;
+}
+
+/**
  * Generate a CSRF token form field.
  *
  * @return string
diff --git a/public/browserconfig.xml b/public/browserconfig.xml
new file mode 100644
index 0000000000..e2a8b47fa0
--- /dev/null
+++ b/public/browserconfig.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square70x70logo src="public/favicon-128.png"/>
+            <square150x150logo src="public/favicon-192.png"/>
+            <TileColor>#ffffff</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>
diff --git a/public/favicon-120.png b/public/favicon-120.png
new file mode 100644
index 0000000000..5c48dd5728
--- /dev/null
+++ b/public/favicon-120.png
diff --git a/public/favicon-128.png b/public/favicon-128.png
new file mode 100644
index 0000000000..eaa7a0c850
--- /dev/null
+++ b/public/favicon-128.png
diff --git a/public/favicon-144.png b/public/favicon-144.png
new file mode 100644
index 0000000000..f49a61f3a8
--- /dev/null
+++ b/public/favicon-144.png
diff --git a/public/favicon-152.png b/public/favicon-152.png
new file mode 100644
index 0000000000..ca7ea08bf1
--- /dev/null
+++ b/public/favicon-152.png
diff --git a/public/favicon-167.png b/public/favicon-167.png
new file mode 100644
index 0000000000..6cbed6d700
--- /dev/null
+++ b/public/favicon-167.png
diff --git a/public/favicon-180.png b/public/favicon-180.png
new file mode 100644
index 0000000000..e696b6be00
--- /dev/null
+++ b/public/favicon-180.png
diff --git a/public/favicon-192.png b/public/favicon-192.png
new file mode 100644
index 0000000000..9041c30b51
--- /dev/null
+++ b/public/favicon-192.png
diff --git a/public/favicon-196.png b/public/favicon-196.png
new file mode 100644
index 0000000000..b6894d5904
--- /dev/null
+++ b/public/favicon-196.png
diff --git a/public/favicon-32.png b/public/favicon-32.png
new file mode 100644
index 0000000000..40c9107967
--- /dev/null
+++ b/public/favicon-32.png
diff --git a/public/favicon-57.png b/public/favicon-57.png
new file mode 100644
index 0000000000..db81dcc1e7
--- /dev/null
+++ b/public/favicon-57.png
diff --git a/public/favicon-76.png b/public/favicon-76.png
new file mode 100644
index 0000000000..056e03a533
--- /dev/null
+++ b/public/favicon-76.png
diff --git a/public/favicon-96.png b/public/favicon-96.png
new file mode 100644
index 0000000000..fc913c0449
--- /dev/null
+++ b/public/favicon-96.png
diff --git a/resources/img/webtrees-icon.png b/resources/img/webtrees-icon.png
new file mode 100644
index 0000000000..46bf667f73
--- /dev/null
+++ b/resources/img/webtrees-icon.png
diff --git a/resources/img/webtrees-logo.psd b/resources/img/webtrees-logo.psd
new file mode 100644
index 0000000000..cb5e26c965
--- /dev/null
+++ b/resources/img/webtrees-logo.psd
diff --git a/resources/views/layouts/default.phtml b/resources/views/layouts/default.phtml
index 054a13730c..72351e42a0 100644
--- a/resources/views/layouts/default.phtml
+++ b/resources/views/layouts/default.phtml
@@ -28,9 +28,24 @@
             <?php endif ?>
         </title>
 
-        <link rel="icon" href="themes/_common/css-2.0.0/favicon.png" type="image/png">
-        <link rel="icon" type="image/png" href="themes/_common/css-2.0.0/favicon192.png" sizes="192x192">
-        <link rel="apple-touch-icon" sizes="180x180" href="themes/_common/css-2.0.0/favicon180.png">
+        <!-- Generic favicons -->
+        <link rel="icon" sizes="32x32" href="<?= e(asset('favicon-32.png')) ?>">
+        <link rel="icon" sizes="57x57" href="<?= e(asset('favicon-57.png')) ?>">
+        <link rel="icon" sizes="76x76" href="<?= e(asset('favicon-76.png')) ?>">
+        <link rel="icon" sizes="96x96" href="<?= e(asset('favicon-96.png')) ?>">
+        <link rel="icon" sizes="128x128" href="<?= e(asset('favicon-128.png')) ?>">
+        <link rel="icon" sizes="192x192" href="<?= e(asset('favicon-192.png')) ?>">
+        <!-- Android -->
+        <link rel="shortcut icon" sizes="196x196" href=“<?= e(asset('favicon-196.png')) ?>">
+        <!-- iOS -->
+        <link rel="apple-touch-icon" sizes="120x120" href="<?= e(asset('favicon-120.png')) ?>">
+        <link rel="apple-touch-icon" sizes="152x152" href="<?= e(asset('favicon-152.png')) ?>">
+        <link rel="apple-touch-icon" sizes="180x180" href="<?= e(asset('favicon-180.png')) ?>">
+        <!-- Windows 8 IE 10 -->
+        <meta name="msapplication-TileColor" content="#FFFFFF">
+        <meta name="msapplication-TileImage" content="<?= e(asset('favicon-144.png')) ?>">
+        <!-- Windows 8.1 + IE11 and above -->
+        <meta name="msapplication-config" content="<?= e(asset('browserconfig.xml')) ?>">
 
         <?php if (I18N::direction() === 'rtl') : ?>
             <link rel="stylesheet" type="text/css" href="<?= e(Webtrees::ASSETS_PATH . 'css/vendor-rtl.css') ?>">
diff --git a/themes/_common/css-2.0.0/favicon.png b/themes/_common/css-2.0.0/favicon.png
deleted file mode 100644
index 4c54cc0e4e..0000000000
--- a/themes/_common/css-2.0.0/favicon.png
+++ /dev/null
diff --git a/themes/_common/css-2.0.0/favicon180.png b/themes/_common/css-2.0.0/favicon180.png
deleted file mode 100644
index 6a99778509..0000000000
--- a/themes/_common/css-2.0.0/favicon180.png
+++ /dev/null
diff --git a/themes/_common/css-2.0.0/favicon192.png b/themes/_common/css-2.0.0/favicon192.png
deleted file mode 100644
index 2dad9762fa..0000000000
--- a/themes/_common/css-2.0.0/favicon192.png
+++ /dev/null