diff --git a/web/favicon.svg b/web/favicon.svg
index 7615d8310..09c8a6982 100644
--- a/web/favicon.svg
+++ b/web/favicon.svg
@@ -1,30 +1,22 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="16" height="16" fill="url(#paint0_linear_2979_156006)"/>
-<rect width="16" height="16" fill="url(#paint1_linear_2979_156006)"/>
-<rect width="16" height="16" fill="url(#paint2_linear_2979_156006)"/>
-<rect width="16" height="16" fill="url(#paint3_linear_2979_156006)"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4 14.0001C2.89543 14.0001 2 13.1047 2 12.0001V7.07048C2 6.40177 2.3342 5.77731 2.8906 5.40637L6.8906 2.73971C7.5624 2.29184 8.4376 2.29184 9.1094 2.73971L13.1094 5.40637C13.6658 5.77731 14 6.40177 14 7.07048V12.0001C14 13.1047 13.1046 14.0001 12 14.0001H4ZM3 12V7L6.75061 10.0005C7.48105 10.5848 8.51895 10.5848 9.24939 10.0005L13 7V12C13 12.5523 12.5523 13 12 13H4C3.44772 13 3 12.5523 3 12ZM6 6V5H10V6H8.5V9H7.5V6H6Z" fill="white"/>
+<svg width="197" height="196" viewBox="0 0 197 196" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="0.265625" width="196" height="196" rx="64.7295" fill="white"/>
+<rect x="0.265625" width="196" height="196" rx="64.7295" fill="url(#paint0_linear_56449_2948)"/>
+<rect x="0.265625" width="196" height="196" rx="64.7295" fill="url(#paint1_linear_56449_2948)"/>
+<rect x="0.265625" width="196" height="196" rx="64.7295" fill="url(#paint2_linear_56449_2948)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M32.7604 68.2245C28.1112 71.7701 25.3828 77.2821 25.3828 83.129V146.492C25.3828 158.915 35.4532 168.985 47.8757 168.985H148.428C160.85 168.985 170.921 158.915 170.921 146.492V83.129C170.921 77.2821 168.192 71.7701 163.543 68.2245L109.518 27.0241C102.805 21.9047 93.4984 21.9047 86.7854 27.0241L32.7604 68.2245ZM41.5537 81.7787V145.632C41.5537 149.772 44.9105 153.129 49.0513 153.129H147.252C151.393 153.129 154.75 149.772 154.75 145.632V81.7787L106.754 115.393C101.59 119.01 94.7141 119.01 89.5496 115.393L41.5537 81.7787Z" fill="white"/>
 <defs>
-<linearGradient id="paint0_linear_2979_156006" x1="8" y1="0" x2="8" y2="16" gradientUnits="userSpaceOnUse">
-<stop stop-color="#2C942B"/>
-<stop offset="0.582834" stop-color="#D0CC01"/>
-<stop offset="1" stop-color="#FEC303"/>
+<linearGradient id="paint0_linear_56449_2948" x1="196.266" y1="114.333" x2="143.2" y2="80.4541" gradientUnits="userSpaceOnUse">
+<stop offset="0.12998" stop-color="#A033FF"/>
+<stop offset="0.610381" stop-color="#0094FF"/>
+<stop offset="1" stop-color="#1D90FF"/>
 </linearGradient>
-<linearGradient id="paint1_linear_2979_156006" x1="9.16417e-08" y1="12.1159" x2="15.7681" y2="12.1159" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFCF01" stop-opacity="0"/>
-<stop offset="0.57659" stop-color="#F05A2B"/>
-<stop offset="1" stop-color="#E90B00"/>
+<linearGradient id="paint1_linear_56449_2948" x1="90.099" y1="61.25" x2="28.8489" y2="183.75" gradientUnits="userSpaceOnUse">
+<stop stop-color="#FFD600" stop-opacity="0"/>
+<stop offset="0.563347" stop-color="#FFC700"/>
 </linearGradient>
-<linearGradient id="paint2_linear_2979_156006" x1="14.1449" y1="1.04348" x2="4.81159" y2="11.6522" gradientUnits="userSpaceOnUse">
-<stop offset="0.0103405" stop-color="#0394F7"/>
-<stop offset="0.177129" stop-color="#0693F3" stop-opacity="0.88"/>
-<stop offset="0.504933" stop-color="#0B92EE" stop-opacity="0.39"/>
-<stop offset="1" stop-color="#E84232" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint3_linear_2979_156006" x1="0.405797" y1="1.50725" x2="7.42029" y2="9.44928" gradientUnits="userSpaceOnUse">
-<stop offset="0.0291436" stop-color="#2B9629"/>
-<stop offset="0.449248" stop-color="#4BBC06" stop-opacity="0.25"/>
-<stop offset="1" stop-color="#0792F7" stop-opacity="0"/>
+<linearGradient id="paint2_linear_56449_2948" x1="106.432" y1="114.333" x2="175.849" y2="187.833" gradientUnits="userSpaceOnUse">
+<stop offset="0.0297327" stop-color="#FF3B30" stop-opacity="0"/>
+<stop offset="0.842824" stop-color="#E73B2D"/>
 </linearGradient>
 </defs>
 </svg>
diff --git a/web/icons/Icon-192.png b/web/icons/Icon-192.png
index 81c4bfeb2..6e7edbc06 100644
Binary files a/web/icons/Icon-192.png and b/web/icons/Icon-192.png differ
diff --git a/web/icons/Icon-512.png b/web/icons/Icon-512.png
index c22b280b9..be2122a70 100644
Binary files a/web/icons/Icon-512.png and b/web/icons/Icon-512.png differ
diff --git a/web/icons/Icon-maskable-192.png b/web/icons/Icon-maskable-192.png
deleted file mode 100644
index 81c4bfeb2..000000000
Binary files a/web/icons/Icon-maskable-192.png and /dev/null differ
diff --git a/web/icons/Icon-maskable-512.png b/web/icons/Icon-maskable-512.png
deleted file mode 100644
index c22b280b9..000000000
Binary files a/web/icons/Icon-maskable-512.png and /dev/null differ
diff --git a/web/index.html b/web/index.html
index 778f9b118..7839419c0 100644
--- a/web/index.html
+++ b/web/index.html
@@ -18,18 +18,18 @@
 
   <meta charset="UTF-8">
   <meta content="IE=Edge" http-equiv="X-UA-Compatible">
-  <meta name="description" content="Team Mail">
+  <meta name="description" content="Twake Mail">
 
   <!-- iOS meta tags & icons -->
   <meta name="apple-mobile-web-app-capable" content="yes">
   <meta name="apple-mobile-web-app-status-bar-style" content="black">
-  <meta name="apple-mobile-web-app-title" content="Team Mail">
+  <meta name="apple-mobile-web-app-title" content="Twake Mail">
   <link rel="apple-touch-icon" href="icons/Icon-192.png">
 
   <!-- Favicon -->
   <link rel="icon" type="image/svg" href="favicon.svg"/>
 
-  <title>Team Mail</title>
+  <title>Twake Mail</title>
   <link rel="manifest" href="manifest.json">
   <link rel="stylesheet" type="text/css" href="splash/style.css">
   <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport">
diff --git a/web/manifest.json b/web/manifest.json
index 0bd61dcfa..101bece8f 100644
--- a/web/manifest.json
+++ b/web/manifest.json
@@ -1,11 +1,11 @@
 {
-    "name": "Team Mail - JMAP Email Client",
-    "short_name": "Team Mail",
+    "name": "Twake Mail - JMAP Email Client",
+    "short_name": "Twake Mail",
     "start_url": ".",
     "display": "standalone",
     "background_color": "#0175C2",
     "theme_color": "#0175C2",
-    "description": "Team Mail - JMAP Email Client",
+    "description": "Twake Mail - JMAP Email Client",
     "orientation": "portrait-primary",
     "prefer_related_applications": false,
     "icons": [
@@ -20,13 +20,13 @@
             "type": "image/png"
         },
         {
-            "src": "icons/Icon-maskable-192.png",
+            "src": "icons/Icon-192.png",
             "sizes": "192x192",
             "type": "image/png",
             "purpose": "maskable"
         },
         {
-            "src": "icons/Icon-maskable-512.png",
+            "src": "icons/Icon-512.png",
             "sizes": "512x512",
             "type": "image/png",
             "purpose": "maskable"