diff --git a/public/browserconfig.xml b/public/browserconfig.xml
deleted file mode 100644
index 2b0ada30d5..0000000000
--- a/public/browserconfig.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<browserconfig>
-    <msapplication>
-        <tile>
-            <square150x150logo src="%PUBLIC_URL%/images/mstile-150x150.png"/>
-            <TileColor>#64b145</TileColor>
-        </tile>
-    </msapplication>
-</browserconfig>
diff --git a/public/favicon.ico b/public/favicon.ico
new file mode 100644
index 0000000000..b6984f3988
Binary files /dev/null and b/public/favicon.ico differ
diff --git a/public/images/android-chrome-192x192.png b/public/images/android-chrome-192x192.png
deleted file mode 100644
index 3cbf87e50d..0000000000
Binary files a/public/images/android-chrome-192x192.png and /dev/null differ
diff --git a/public/images/android-chrome-512x512.png b/public/images/android-chrome-512x512.png
deleted file mode 100644
index c01c0bcc72..0000000000
Binary files a/public/images/android-chrome-512x512.png and /dev/null differ
diff --git a/public/images/apple-touch-icon.png b/public/images/apple-touch-icon.png
index 942cc282c7..7a93fcea2c 100644
Binary files a/public/images/apple-touch-icon.png and b/public/images/apple-touch-icon.png differ
diff --git a/public/images/cord-icon.svg b/public/images/cord-icon.svg
deleted file mode 100644
index b8ac6bc147..0000000000
--- a/public/images/cord-icon.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg fill="#409E04" width="21" height="24" xmlns="http://www.w3.org/2000/svg"><path d="M12.3243243 16.8648649c-2.865883 0-5.1891892-2.1779794-5.1891892-4.8648649s2.3233062-4.8648649 5.1891892-4.8648649v9.7297298zM0 12C0 5.3831111 5.4544946 0 12.1591277 0c3.2476129 0 6.3006798 1.2482222 8.5976291 3.5146667l-2.516264 2.4835555c-1.6245945-1.6031111-3.7844159-2.486-6.0813651-2.486-4.7425102 0-8.6003312 3.8075556-8.6003312 8.4877778 0 4.6802222 3.857821 8.4877778 8.6003312 8.4877778 2.2971744 0 4.4567706-.8828889 6.0813651-2.486l2.516264 2.4835555C18.4600326 22.7517778 15.4069658 24 12.1591277 24 5.4544946 24 0 18.6166667 0 12z" fill-rule="evenodd"/></svg>
diff --git a/public/images/favicon-16x16.png b/public/images/favicon-16x16.png
deleted file mode 100644
index c92d08e6d4..0000000000
Binary files a/public/images/favicon-16x16.png and /dev/null differ
diff --git a/public/images/favicon-32x32.png b/public/images/favicon-32x32.png
deleted file mode 100644
index 2d3c99c1f0..0000000000
Binary files a/public/images/favicon-32x32.png and /dev/null differ
diff --git a/public/images/favicon.ico b/public/images/favicon.ico
deleted file mode 100644
index 157c48bfa3..0000000000
Binary files a/public/images/favicon.ico and /dev/null differ
diff --git a/public/images/favicon.svg b/public/images/favicon.svg
new file mode 100644
index 0000000000..74a64b3716
--- /dev/null
+++ b/public/images/favicon.svg
@@ -0,0 +1 @@
+<svg fill="#1EA973" viewBox="0 0 24.426315 24.011841" xmlns="http://www.w3.org/2000/svg"><path d="M12.351955 16.864865c-2.8658829 0-5.1891891-2.177979-5.1891891-4.864865 0-2.6868855 2.3233062-4.8648649 5.1891891-4.8648649zM.02763081 12c0-6.6168889 5.45449459-12 12.15912819-12 3.247613 0 6.300679 1.2482222 8.597629 3.5146667l-2.516264 2.4835555c-1.624595-1.6031111-3.784416-2.486-6.081365-2.486-4.7425107 0-8.6003317 3.8075556-8.6003317 8.4877778 0 4.680222 3.857821 8.487778 8.6003317 8.487778 2.297174 0 4.45677-.882889 6.081365-2.486l2.516264 2.483555C18.487664 22.751778 15.434597 24 12.186759 24 5.4821254 24 .02763081 18.616667.02763081 12Z" fill-rule="evenodd"/></svg>
diff --git a/public/images/mstile-150x150.png b/public/images/mstile-150x150.png
deleted file mode 100644
index 06818b8ce5..0000000000
Binary files a/public/images/mstile-150x150.png and /dev/null differ
diff --git a/public/images/safari-pinned-tab.svg b/public/images/safari-pinned-tab.svg
deleted file mode 100644
index 1ab3f3440b..0000000000
--- a/public/images/safari-pinned-tab.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg version="1" xmlns="http://www.w3.org/2000/svg" width="1024" height="1024" viewBox="0 0 768 768"><path d="M413.8.5c-.2.2-4.1.6-8.8.9-4.7.4-9.8.9-11.5 1.1-1.6.2-4.8.6-7 .9-2.2.2-6.2.7-9 1.1-2.7.3-5.9.9-6.9 1.2-1.1.3-3.4.7-5 .9-1.7.2-4.2.6-5.6.9-1.4.4-3.4.8-4.5 1-1.1.1-4 .8-6.4 1.5-2.5.6-5.4 1.3-6.5 1.5-1.2.1-2.8.5-3.6.8-.8.3-6.4 1.9-12.5 3.7-14.1 4-33.9 11.2-47 17.1-2.7 1.2-5.2 2.3-5.5 2.4-1.4.3-24.1 11.9-28.5 14.5-2.7 1.6-5.9 3.4-7 3.9-1.1.5-4.4 2.5-7.2 4.5-2.9 2-5.5 3.6-5.7 3.6-.6 0-16.1 10.6-20.1 13.7-1.6 1.3-3.4 2.7-4 3.1-19.6 14.6-42.9 36.2-59.3 55.2-4 4.7-8.1 9.4-9.1 10.5-3.4 4-15.9 21.2-20.7 28.5-2.7 4.1-5.1 7.7-5.5 8-1 1-12.7 21.6-17.2 30.5-5.6 11-11.5 23.7-13.3 28.8-.7 2-2 5.2-2.8 7-.8 1.7-2.4 6.1-3.6 9.7-1.1 3.6-2.5 7.4-3 8.5-1.6 3.3-9 30.8-10.4 38.5-.3 1.4-1.1 5.9-2 10-1.6 8.1-2.2 11.8-3.1 19.5-.4 2.7-.8 6.1-1 7.4-1.3 8-2 23.5-1.9 44.6.1 24.5.5 31.8 2.5 46 .6 4.4 1.2 9.3 1.4 11 .2 1.6.4 3 .5 3 .1 0 .4 1.3.6 3 .4 2.4 2.2 11.7 2.9 14.5.1.3.5 2.5 1 5 1 5.3 1.2 5.9 1.4 6.2.2.2.4 1.4.7 2.7.2 1.3 1.2 4.9 2.1 8 .9 3.1 1.7 5.8 1.8 6.1.4 2 3.7 12.9 4.4 14.5.5 1.1 1.4 3.3 1.9 5 2.2 6.4 8.2 21.3 11.2 27.9 5.8 13.1 6.3 14.1 7.6 15.6.7.8 1.3 1.9 1.3 2.5.1 1.3 13 24.6 14.7 26.6.8.8 1.4 1.9 1.4 2.3 0 .4.5 1.2 1 1.9.6.7 3.6 5 6.7 9.7 18.1 27.3 48.1 60.5 71.8 79.5 2 1.6 4.2 3.5 4.9 4.1 6 5.5 38.5 28.4 40.4 28.4.5 0 1.5.7 2.2 1.5.7.9 2.9 2.3 4.9 3.2 2 1 4.1 2.1 4.6 2.6 3 2.5 41.6 21.4 45 22.1.6.1 2 .7 3.2 1.4 1.2.7 2.6 1.2 3.1 1.2s2.7.8 4.8 1.7c2.2.9 4.1 1.7 4.4 1.8 1.3.3 8.7 2.7 10.5 3.5 2.1.9 8 2.8 11.1 3.5 1 .3 5.1 1.4 8.9 2.5 6.7 2 30 7.2 37.5 8.4 7.7 1.2 26.9 3.7 34 4.3 16 1.5 64.7.7 76-1.1 1.4-.3 5-.7 8.1-1.1 3.1-.3 6.7-.8 8-1 1.3-.3 5.6-1 9.4-1.6 3.9-.6 8.4-1.4 10-1.8 1.7-.5 5.7-1.4 9-2.1 3.3-.7 7.1-1.6 8.5-2.1 1.4-.5 3.4-1 4.5-1.2 1.1-.1 2.6-.6 3.3-1 .6-.5 1.2-.6 1.2-.3s2.5-.4 5.5-1.4c3-1 5.5-1.7 5.5-1.5 0 .2 2-.4 4.5-1.5s4.7-2 5-2c.3 0 .6 0 .8-.1.1 0 .9-.2 1.7-.4 1.9-.5 19.4-7.2 23.5-9 1.7-.7 6.1-2.7 9.8-4.4 3.8-1.7 7.3-3.1 7.8-3.1s.9-.5.9-1c0-.6.4-.9.8-.8.9.3 10.4-4.3 11.3-5.5.3-.5.9-.8 1.3-.7.7.1 14.4-7.5 20.6-11.5 1.9-1.2 6.9-4.4 11-7.1 7.7-4.9 27.3-19.3 32.3-23.8 1.6-1.4 4.7-4 7-5.8 2.2-1.8 7.6-6.7 12-10.8l7.9-7.4-40.3-39.8-40.3-39.8-4 3.7c-2.2 2.1-5.2 4.9-6.6 6.3-3.4 3.2-9.4 8.1-14.5 12-2.2 1.6-4.6 3.4-5.2 4-.7.6-3.4 2.5-6 4.2-2.7 1.8-4.9 3.6-5.1 4-.2.4-.8.8-1.3.8s-3.3 1.5-6.2 3.4c-9.8 6.4-33.5 18.6-36.1 18.6-.7 0-1.6.4-2.2.8-.5.5-2.2 1.4-3.9 2-1.6.6-4.3 1.7-6 2.3-1.6.7-3.2 1.3-3.5 1.4-6.9 2-9.7 3-10.5 3.6-.5.4-2.6 1-4.5 1.3-1.9.3-5.1 1-7 1.6-3.9 1.2-6 1.8-9.2 2.5-1.3.2-4.3.9-6.8 1.5s-5.8 1.2-7.5 1.4c-1.6.3-6.6.9-11 1.5-22.2 3.1-47.6 3.3-71 .6-8.8-1.1-10.9-1.4-13.5-1.9-1.4-.4-3.8-.8-5.5-1.1-4.9-.7-8.9-1.5-10.5-2.1-.8-.3-2.6-.8-4-1-2.4-.5-11.9-3.2-20.5-5.9-4.5-1.5-12-4.2-15-5.6-2.7-1.2-7.9-3.2-8.5-3.3-3.8-.7-42.2-22.1-44-24.5-.3-.4-2.3-1.8-4.5-3.1-2.2-1.4-4.9-3.2-6-4.1-1.1-1-5.6-4.6-10-8.1-7.4-5.9-27.2-25-34.1-32.9-6.2-7.2-16.4-20.7-16.4-21.8 0-.6-.4-1.1-.8-1.1-.5 0-1.5-1.2-2.3-2.7-.8-1.6-1.6-3-1.9-3.3-3.6-3.3-23-40.3-23-43.8 0-.7-.4-1.2-.8-1.2-.5 0-.9-.6-1-1.3 0-.6-1.3-4.4-2.7-8.2-2.7-7.1-7.7-23.2-9.1-29.5-.4-1.9-.9-4-1-4.5-.8-3.4-2.6-12.6-3-16-.3-2.2-.8-5.1-1-6.5-2.6-16.8-2.6-61.1.1-73.3.2-1.2.7-3.8.9-5.7.3-1.9 1-5.8 1.5-8.5 2.7-13.2 5.2-22.8 6.3-24.3.6-.6.8-1.2.5-1.2-.6 0 4.6-15.8 7.4-22.5.7-1.7 1.3-3.2 1.4-3.5 0-.3 1.1-2.6 2.2-5.3 1.2-2.6 2.3-5.1 2.4-5.5.2-.7 6.4-12.5 9.8-18.7 4-7.3 15.7-24.9 17.5-26.4.9-.7 1.6-1.9 1.6-2.6 0-.8.4-1.5.8-1.7.5-.2 2.6-2.6 4.8-5.3 6.6-8.5 9.5-11.6 21-23 12-11.8 13.2-13 20.9-19 2.8-2.2 5.2-4.3 5.3-4.8.2-.4 1-.7 1.8-.7s1.4-.4 1.4-.8 1.5-1.6 3.3-2.7c1.7-1 3.4-2.1 3.7-2.5.3-.3 3-2.2 6-4.1 13.1-8.4 10.9-7.1 23.5-13.8 14.7-7.8 42-18.7 54.1-21.6 1-.3 5.5-1.3 9.9-2.4 4.4-1.1 9.6-2.2 11.5-2.5 1.9-.3 4.6-.8 6-1.1 1.4-.3 4.5-.8 7-1.1 2.5-.3 5.6-.7 7-1 9.4-1.7 40.6-2.3 56-1 8.7.7 10.1.9 18 2.1 9.3 1.3 10.6 1.5 15.1 2.6 2.6.6 5.5 1.2 6.5 1.4 1.1.2 1.9.4 1.9.5 0 .1 1.1.4 2.5.6 8.1 1.5 28.6 8.2 42 13.9 6.8 2.8 32.1 15.5 33 16.5.3.3 3 2.1 6 4 10.9 6.8 29 20.4 36 27 .3.3 2.8 2.6 5.6 5.3l5 4.7 40.3-39.7 40.3-39.8-6.9-6.5c-14.6-13.9-33.7-29.1-50.8-40.4-5.5-3.6-10.5-7-11.2-7.6-.7-.5-1.5-1-1.8-1-.3 0-2.2-1.1-4.3-2.3-13.4-8.5-39.6-21.2-58.2-28.4-10.1-3.9-33.1-11.3-35.1-11.3-1 0-2.1-.5-2.4-1.1-.4-.5-1.2-.8-1.8-.6-.7.2-2.3 0-3.7-.5-2.4-1-16.2-4.2-22.5-5.4-1.6-.3-4.1-.7-5.5-1-1.4-.3-3.4-.6-4.5-.8-1.1-.2-3.6-.6-5.5-.9-4.1-.7-11.8-1.7-17.5-2.3-2.2-.2-6.2-.6-9-.9-5.2-.6-57.1-1.5-57.7-1z"/><path d="M431.7 228.6c-.1.1-3.7.4-7.9.8-13.4 1.1-34.6 6.4-47.3 11.7-1.6.7-3.2 1.3-3.5 1.4-1.1.2-16.5 8-17 8.5-.7.7-4.2 2.9-6 3.7-.8.3-5.6 3.7-10.6 7.3-10.6 7.9-25.2 22.2-31.7 31.1-2.5 3.5-5.2 7.1-5.9 8-1.6 1.9-3.4 5-6.2 10.4-1.2 2.2-2.5 4.3-2.9 4.6-.5.3-1 1.2-1.1 2-.1.8-1.5 4-2.9 7.2-3.4 7.6-8.3 22.8-9.3 29.2-.9 5.6-1.1 6.4-1.4 6.7-.5.7-1.3 14.3-1.3 23.3-.1 9.5.9 22.1 1.8 24.8.2.6.6 2.3.9 3.7.8 4.8 3.9 16.5 4.6 17.5.4.5 1 2.3 1.4 3.9 1.3 5.5 12.7 27.8 16 31.5.9 1 1.6 2.1 1.6 2.5 0 .7 4.2 6.3 9 11.9 18.4 21.8 44.9 40 71.5 49.2 2.8.9 5.9 2.1 7 2.5 1.1.5 3.4 1.1 5 1.5 1.7.3 5 1.1 7.5 1.7 2.5.5 5.6 1.2 7 1.4 1.4.1 3.6.5 5 .9 3 .6 10 1.4 19.2 2 4.6.3 7 0 7.5-.8.8-1.3 1.1-309.6.3-309.8-.8-.3-10-.5-10.3-.3z"/></svg>
diff --git a/public/images/web-app-manifest-192x192.png b/public/images/web-app-manifest-192x192.png
new file mode 100644
index 0000000000..86f705e7c8
Binary files /dev/null and b/public/images/web-app-manifest-192x192.png differ
diff --git a/public/images/web-app-manifest-512x512.png b/public/images/web-app-manifest-512x512.png
new file mode 100644
index 0000000000..a4e8ddb2ee
Binary files /dev/null and b/public/images/web-app-manifest-512x512.png differ
diff --git a/public/site.webmanifest b/public/site.webmanifest
index 2ec25c63d1..a087f860de 100644
--- a/public/site.webmanifest
+++ b/public/site.webmanifest
@@ -1,19 +1,21 @@
 {
-    "name": "CORD Field",
-    "short_name": "CORD Field",
-    "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"
+  "name": "CORD Field",
+  "short_name": "CORD",
+  "icons": [
+    {
+      "src": "/images/web-app-manifest-192x192.png",
+      "sizes": "192x192",
+      "type": "image/png",
+      "purpose": "maskable"
+    },
+    {
+      "src": "/images/web-app-manifest-512x512.png",
+      "sizes": "512x512",
+      "type": "image/png",
+      "purpose": "maskable"
+    }
+  ],
+  "theme_color": "#ffffff",
+  "background_color": "#ffffff",
+  "display": "standalone"
 }
diff --git a/src/scenes/Root/AppMetadata.tsx b/src/scenes/Root/AppMetadata.tsx
index c481493b80..39bd5f59db 100644
--- a/src/scenes/Root/AppMetadata.tsx
+++ b/src/scenes/Root/AppMetadata.tsx
@@ -18,30 +18,22 @@ export const AppMetadata = () => (
       />
     )}
 
-    <link
-      rel="apple-touch-icon"
-      sizes="180x180"
-      href="images/apple-touch-icon.png"
-    />
+    {/* https://dev.to/masakudamatsu/favicon-nightmare-how-to-maintain-sanity-3al7 */}
+    <link rel="icon" href="/favicon.ico" sizes="48x48" />
     <link
       rel="icon"
-      type="image/png"
-      sizes="32x32"
-      href="images/favicon-32x32.png"
+      href="/images/favicon.svg"
+      sizes="any"
+      type="image/svg+xml"
     />
     <link
-      rel="icon"
-      type="image/png"
-      sizes="16x16"
-      href="images/favicon-16x16.png"
+      rel="apple-touch-icon"
+      href="/images/apple-touch-icon.png"
+      sizes="180x180"
     />
     <link rel="manifest" href="site.webmanifest" />
-    <link rel="mask-icon" href="images/safari-pinned-tab.svg" color="#64b145" />
-    <link rel="shortcut icon" href="images/favicon.ico" />
     <meta name="apple-mobile-web-app-title" content="CORD Field" />
     <meta name="application-name" content="CORD Field" />
-    <meta name="msapplication-TileColor" content="#64b145" />
-    <meta name="msapplication-config" content="browserconfig.xml" />
-    <meta name="theme-color" content="#ffffff" />
+    <meta name="theme-color" content="#1EA973" />
   </Helmet>
 );