diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/apps_conversations.png b/OpenKeychain/src/main/res/drawable-xxhdpi/apps_conversations.png
deleted file mode 100644
index 65c1af343..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/apps_conversations.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/apps_k9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/apps_k9.png
deleted file mode 100644
index 970c536b7..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/apps_k9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/apps_password_store.png b/OpenKeychain/src/main/res/drawable-xxhdpi/apps_password_store.png
deleted file mode 100644
index 84ebf04ac..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/apps_password_store.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable/apps_conversations.xml b/OpenKeychain/src/main/res/drawable/apps_conversations.xml
new file mode 100644
index 000000000..39334f274
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable/apps_conversations.xml
@@ -0,0 +1,90 @@
+<vector android:height="192dp" android:viewportHeight="201.97"
+    android:viewportWidth="201.97" android:width="192dp"
+    xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="0.4" android:fillColor="#000000"
+        android:fillType="evenOdd"
+        android:pathData="M100.89,2.74A95.89,95.89 0,0 0,5 98.63,95.89 95.89,0 0,0 100.89,194.52 95.89,95.89 0,0 0,143.59 184.45l0.13,0.01 40.79,15.83c3.25,1.26 7.54,3.05 10.46,0.27 2.83,-2.69 2.17,-5.42 1.19,-9.41l-11.35,-46.17a95.89,95.89 0,0 1,-0 0l0,-0.01 0,0.01A95.89,95.89 0,0 0,196.78 98.63,95.89 95.89,0 0,0 100.89,2.74Z"
+        android:strokeAlpha="0.4" android:strokeColor="#00000000"
+        android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="4"/>
+    <path android:fillColor="#00a000" android:fillType="evenOdd"
+        android:pathData="M100.89,0.74A95.89,95.89 0,0 0,5 96.63,95.89 95.89,0 0,0 100.89,192.52 95.89,95.89 0,0 0,143.59 182.45l0.13,0.01 40.79,15.83c3.25,1.26 7.54,3.05 10.46,0.27 2.83,-2.69 2.17,-5.42 1.19,-9.41L184.81,142.98a95.89,95.89 0,0 1,-0 0l0,-0.01 0,0.01A95.89,95.89 0,0 0,196.78 96.63,95.89 95.89,0 0,0 100.89,0.74Z"
+        android:strokeColor="#00000000" android:strokeLineCap="round"
+        android:strokeLineJoin="round" android:strokeWidth="4"/>
+    <group>
+        <clip-path android:pathData="M100.89,0.74A95.89,95.89 0,0 0,5 96.63,95.89 95.89,0 0,0 100.89,192.52 95.89,95.89 0,0 0,143.59 182.45l0.13,0.01 40.79,15.83c3.25,1.26 7.54,3.05 10.46,0.27 2.83,-2.69 2.17,-5.42 1.19,-9.41l-11.35,-46.17a95.89,95.89 0,0 1,-0 0l0,-0.01 0,0.01A95.89,95.89 0,0 0,196.78 96.63,95.89 95.89,0 0,0 100.89,0.74Z"/>
+        <path android:fillColor="#80d080" android:fillType="evenOdd"
+            android:pathData="m146.16,11.93 l-5.13,9.65c-0.78,1.47 -0.66,2.41 0.67,3.18 9.67,5.49 18.12,12.87 24.86,21.71 1.06,1.62 2.08,1.71 3.68,0.57L179.05,40.74C170.45,28.73 159.2,18.87 146.16,11.93Z"
+            android:strokeColor="#00000000" android:strokeLineCap="butt"
+            android:strokeLineJoin="miter" android:strokeWidth="1"/>
+    </group>
+    <group>
+        <clip-path android:pathData="M100.89,0.74A95.89,95.89 0,0 0,5 96.63,95.89 95.89,0 0,0 100.89,192.52 95.89,95.89 0,0 0,143.59 182.45l0.13,0.01 40.79,15.83c3.25,1.26 7.54,3.05 10.46,0.27 2.83,-2.69 2.17,-5.42 1.19,-9.41l-11.35,-46.17a95.89,95.89 0,0 1,-0 0l0,-0.01 0,0.01A95.89,95.89 0,0 0,196.78 96.63,95.89 95.89,0 0,0 100.89,0.74Z"/>
+        <path android:fillColor="#80d080" android:fillType="evenOdd"
+            android:pathData="m194.8,76.36 l-9.63,2.06c-2.66,0.57 -3.41,1.17 -2.91,3.92 0.86,4.71 1.3,9.5 1.33,14.29 -0.03,5.58 -0.62,11.14 -1.77,16.59 -0.87,3.23 0.14,3.77 3.16,4.58l8.99,2.3c1.98,-7.67 3.01,-15.55 3.05,-23.47 -0.02,-6.82 -0.76,-13.61 -2.22,-20.27z"
+            android:strokeColor="#00000000" android:strokeLineCap="butt"
+            android:strokeLineJoin="miter" android:strokeWidth="1"/>
+    </group>
+    <group>
+        <clip-path android:pathData="M100.89,0.74A95.89,95.89 0,0 0,5 96.63,95.89 95.89,0 0,0 100.89,192.52 95.89,95.89 0,0 0,143.59 182.45l0.13,0.01 40.79,15.83c3.25,1.26 7.54,3.05 10.46,0.27 2.83,-2.69 2.17,-5.42 1.19,-9.41l-11.35,-46.17a95.89,95.89 0,0 1,-0 0l0,-0.01 0,0.01A95.89,95.89 0,0 0,196.78 96.63,95.89 95.89,0 0,0 100.89,0.74Z"/>
+        <path android:fillColor="#80d080" android:fillType="evenOdd"
+            android:pathData="m15.26,103.51 l-10.21,0.88c1.21,14.83 5.85,29.18 13.57,41.9l8.54,-5.23c2.39,-1.47 1.9,-3.38 0.99,-5.05 -5.12,-9.4 -8.36,-19.72 -9.54,-30.37 0,-2.09 -1.88,-2.27 -3.35,-2.14z"
+            android:strokeColor="#00000000" android:strokeLineCap="butt"
+            android:strokeLineJoin="miter" android:strokeWidth="1"/>
+    </group>
+    <group>
+        <clip-path android:pathData="M100.89,0.74A95.89,95.89 0,0 0,5 96.63,95.89 95.89,0 0,0 100.89,192.52 95.89,95.89 0,0 0,143.59 182.45l0.13,0.01 40.79,15.83c3.25,1.26 7.54,3.05 10.46,0.27 2.83,-2.69 2.17,-5.42 1.19,-9.41l-11.35,-46.17a95.89,95.89 0,0 1,-0 0l0,-0.01 0,0.01A95.89,95.89 0,0 0,196.78 96.63,95.89 95.89,0 0,0 100.89,0.74Z"/>
+        <path android:fillColor="#80d080" android:fillType="evenOdd"
+            android:pathData="m52.5,167.35 l-5.82,8.51c12.71,8.71 27.33,14.23 42.63,16.1l1.22,-9.91c0.36,-2.88 -1.09,-3.53 -3.33,-3.9 -10.4,-1.74 -20.37,-5.45 -29.37,-10.95 -1.65,-1.07 -3.64,-2.31 -5.32,0.15z"
+            android:strokeColor="#00000000" android:strokeLineCap="butt"
+            android:strokeLineJoin="miter" android:strokeWidth="1"/>
+    </group>
+    <group>
+        <clip-path android:pathData="M100.89,0.74A95.89,95.89 0,0 0,5 96.63,95.89 95.89,0 0,0 100.89,192.52 95.89,95.89 0,0 0,143.59 182.45l0.13,0.01 40.79,15.83c3.25,1.26 7.54,3.05 10.46,0.27 2.83,-2.69 2.17,-5.42 1.19,-9.41l-11.35,-46.17a95.89,95.89 0,0 1,-0 0l0,-0.01 0,0.01A95.89,95.89 0,0 0,196.78 96.63,95.89 95.89,0 0,0 100.89,0.74Z"/>
+        <path android:fillColor="#80d080" android:fillType="evenOdd"
+            android:pathData="M33.21,28.43C22.78,38.82 14.88,51.48 10.13,65.42L20.34,68.83c1.66,0.56 2.83,-0.12 3.37,-1.59 3.78,-10.02 9.47,-19.21 16.76,-27.05 1.56,-1.56 1.57,-2.96 0.45,-4.08z"
+            android:strokeColor="#00000000" android:strokeLineCap="butt"
+            android:strokeLineJoin="miter" android:strokeWidth="1"/>
+    </group>
+    <group>
+        <clip-path android:pathData="M100.89,0.74A95.89,95.89 0,0 0,5 96.63,95.89 95.89,0 0,0 100.89,192.52 95.89,95.89 0,0 0,143.59 182.45l0.13,0.01 40.79,15.83c3.25,1.26 7.54,3.05 10.46,0.27 2.83,-2.69 2.17,-5.42 1.19,-9.41l-11.35,-46.17a95.89,95.89 0,0 1,-0 0l0,-0.01 0,0.01A95.89,95.89 0,0 0,196.78 96.63,95.89 95.89,0 0,0 100.89,0.74Z"/>
+        <path android:fillColor="#80d080" android:fillType="evenOdd"
+            android:pathData="M100.89,0.49C88.7,0.52 76.63,2.87 65.32,7.42l3.53,8.75c1.06,2.64 1.62,3.53 4.97,2.35 8.69,-3.03 17.84,-4.59 27.06,-4.6 5.56,0 6.49,0.35 6.78,-3.45l0.75,-9.65C105.91,0.62 103.4,0.51 100.89,0.49Z"
+            android:strokeColor="#00000000" android:strokeLineCap="butt"
+            android:strokeLineJoin="miter" android:strokeWidth="1"/>
+    </group>
+    <group>
+        <clip-path android:pathData="M100.89,0.74A95.89,95.89 0,0 0,5 96.63,95.89 95.89,0 0,0 100.89,192.52 95.89,95.89 0,0 0,143.59 182.45l0.13,0.01 40.79,15.83c3.25,1.26 7.54,3.05 10.46,0.27 2.83,-2.69 2.17,-5.42 1.19,-9.41l-11.35,-46.17a95.89,95.89 0,0 1,-0 0l0,-0.01 0,0.01A95.89,95.89 0,0 0,196.78 96.63,95.89 95.89,0 0,0 100.89,0.74Z"/>
+        <path android:fillColor="#80d080" android:fillType="evenOdd"
+            android:pathData="m139.72,169.23c-4.18,2.25 -8.56,4.09 -13.05,5.63 -1,0.34 -1.21,1.18 -0.87,2.27l3.44,11.07c4.93,-1.53 9.73,-3.46 14.35,-5.76l0.13,0.01 14.03,5.45 4.12,-10.21c0.75,-1.87 -0.02,-2.7 -1.59,-3.31l-14.72,-5.71c-1.87,-0.72 -3.69,-0.6 -5.83,0.56z"
+            android:strokeColor="#00000000" android:strokeLineCap="butt"
+            android:strokeLineJoin="miter" android:strokeWidth="1"/>
+    </group>
+    <group>
+        <clip-path android:pathData="M100.89,0.74A95.89,95.89 0,0 0,5 96.63,95.89 95.89,0 0,0 100.89,192.52 95.89,95.89 0,0 0,143.59 182.45l0.13,0.01 40.79,15.83c3.25,1.26 7.54,3.05 10.46,0.27 2.83,-2.69 2.17,-5.42 1.19,-9.41l-11.35,-46.17a95.89,95.89 0,0 1,-0 0l0,-0.01 0,0.01A95.89,95.89 0,0 0,196.78 96.63,95.89 95.89,0 0,0 100.89,0.74Z"/>
+        <path android:fillColor="#80d080" android:fillType="evenOdd"
+            android:pathData="m187.53,153.55 l-10.64,2.71c-0.79,0.2 -1.67,1.02 -1.35,2.34l9.76,40.15c8.57,5.98 15.3,3.07 11.02,-9.47z"
+            android:strokeColor="#00000000" android:strokeLineCap="butt"
+            android:strokeLineJoin="miter" android:strokeWidth="1"/>
+    </group>
+    <path android:fillColor="#f5f5f5" android:fillType="evenOdd"
+        android:pathData="M54.33,97.73m-10.47,0a10.47,10.47 0,1 1,20.94 0a10.47,10.47 0,1 1,-20.94 0" android:strokeColor="#00000000"/>
+    <path android:fillColor="#f5f5f5" android:fillType="evenOdd"
+        android:pathData="M100.28,97.73m-10.47,0a10.47,10.47 0,1 1,20.94 0a10.47,10.47 0,1 1,-20.94 0" android:strokeColor="#00000000"/>
+    <path android:fillColor="#f5f5f5" android:fillType="evenOdd"
+        android:pathData="M146.35,97.73m-10.47,0a10.47,10.47 0,1 1,20.94 0a10.47,10.47 0,1 1,-20.94 0" android:strokeColor="#00000000"/>
+    <group>
+        <clip-path android:pathData="M100.89,0.74A95.89,95.89 0,0 0,5 96.63,95.89 95.89,0 0,0 100.89,192.52 95.89,95.89 0,0 0,143.59 182.45l0.13,0.01 40.79,15.83c3.25,1.26 7.54,3.05 10.46,0.27 2.83,-2.69 2.17,-5.42 1.19,-9.41L184.81,142.98a95.89,95.89 0,0 1,-0 0l0,-0.01 0,0.01A95.89,95.89 0,0 0,196.78 96.63,95.89 95.89,0 0,0 100.89,0.74Z"/>
+        <path android:fillAlpha="0.19211821"
+            android:pathData="m193.43,48.46c-61.7,0 -111.7,49.1 -111.7,109.67 0,12.78 2.23,25.04 6.32,36.44 5.07,0.71 10.25,1.07 15.51,1.07 18.8,0 30.91,7.28 47.47,1.27l54,6.07c5.24,2.12 11.63,1.38 10.27,-4.11l-14.24,-57.57c9.15,-16.07 12.28,-34.37 12.28,-53.24 0,-13.73 -2.63,-26.84 -7.42,-38.91 -4.1,-0.45 -8.27,-0.68 -12.49,-0.68z"
+            android:strokeAlpha="0.19211821" android:strokeColor="#00000000">
+            <aapt:attr name="android:fillColor">
+                <gradient android:centerX="108.6"
+                    android:centerY="172.7"
+                    android:gradientRadius="139.28" android:type="radial">
+                    <item android:color="#FFFFFFFF" android:offset="0"/>
+                    <item android:color="#00FFFFFF" android:offset="1"/>
+                </gradient>
+            </aapt:attr>
+        </path>
+    </group>
+</vector>
diff --git a/OpenKeychain/src/main/res/drawable/apps_k9.xml b/OpenKeychain/src/main/res/drawable/apps_k9.xml
new file mode 100644
index 000000000..cbc5d3af9
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable/apps_k9.xml
@@ -0,0 +1,277 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="192dp"
+    android:height="192dp"
+    android:viewportWidth="192"
+    android:viewportHeight="192">
+  <path
+      android:pathData="m50,12c-3.32,0 -6,2.68 -6,6v8c0,3.32 2.68,6 6,6h14v16h8v-16h2c3.32,0 6,-2.68 6,-6v-8c0,-3.32 -2.68,-6 -6,-6zM118,12c-3.32,0 -6,2.68 -6,6v8c0,3.32 2.68,6 6,6h2v16h8v-16h14c3.32,0 6,-2.68 6,-6v-8c0,-3.32 -2.68,-6 -6,-6zM32,120v12l25.61,38c2.07,3.59 5.94,6 10.39,6h56c4.46,0 8.32,-2.41 10.39,-6h0.01l25.6,-38v-12z"
+      android:strokeAlpha="0.2"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.34016225"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:fillAlpha="0.2"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="m50,8c-3.32,0 -6,2.68 -6,6v8c0,3.32 2.68,6 6,6h14v16h8v-16h2c3.32,0 6,-2.68 6,-6v-8c0,-3.32 -2.68,-6 -6,-6zM118,8c-3.32,0 -6,2.68 -6,6v8c0,3.32 2.68,6 6,6h2v16h8v-16h14c3.32,0 6,-2.68 6,-6v-8c0,-3.32 -2.68,-6 -6,-6zM32,116v12l25.61,38c2.07,3.59 5.94,6 10.39,6h56c4.46,0 8.32,-2.41 10.39,-6h0.01l25.6,-38v-12z"
+      android:strokeAlpha="0.2"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.34016225"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:fillAlpha="0.2"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="m24,116 l8,12 25.61,38c2.07,3.59 5.94,6 10.39,6h56c4.46,0 8.32,-2.41 10.39,-6h0.01l25.6,-38 8,-12z"
+      android:strokeAlpha="0.2"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.34016225"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:fillAlpha="0.2"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="m32,116v12l25.61,38c2.07,3.59 5.94,6 10.39,6h56c4.46,0 8.32,-2.41 10.39,-6h0.01L160,128v-12z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.37600005"
+      android:fillColor="#607d8b"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeLineCap="butt"/>
+  <path
+      android:pathData="M64,16h8v28h-8z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="5.99999952"
+      android:fillColor="#263238"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M120,16h8v28h-8z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="5.99999952"
+      android:fillColor="#263238"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="m32,127v1l25.61,38c2.07,3.59 5.94,6 10.39,6h56c4.46,0 8.32,-2.41 10.39,-6h0.01l25.6,-38v-1l-25.6,38h-0.01c-2.07,3.59 -5.94,6 -10.39,6h-56c-4.46,0 -8.32,-2.41 -10.39,-6z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.34016225"
+      android:fillColor="#4d6570"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M80,14L80,22A6,6 0,0 1,74 28L50,28A6,6 0,0 1,44 22L44,14A6,6 0,0 1,50 8L74,8A6,6 0,0 1,80 14z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.34016225"
+      android:fillColor="#607d8b"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M148,14L148,22A6,6 0,0 1,142 28L118,28A6,6 0,0 1,112 22L112,14A6,6 0,0 1,118 8L142,8A6,6 0,0 1,148 14z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.34016225"
+      android:fillColor="#607d8b"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="m44,21v1c0,3.32 2.68,6 6,6h24c3.32,0 6,-2.68 6,-6v-1c0,3.32 -2.68,6 -6,6h-24c-3.32,0 -6,-2.68 -6,-6z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.34016225"
+      android:fillColor="#4d6570"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="m112,21v1c0,3.32 2.68,6 6,6h24c3.32,0 6,-2.68 6,-6v-1c0,3.32 -2.68,6 -6,6h-24c-3.32,0 -6,-2.68 -6,-6z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.34016225"
+      android:fillColor="#4d6570"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="m50,8c-3.32,0 -6,2.68 -6,6v1c0,-3.32 2.68,-6 6,-6h24c3.32,0 6,2.68 6,6v-1c0,-3.32 -2.68,-6 -6,-6z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.34016225"
+      android:fillColor="#8097a2"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="m118,8c-3.32,0 -6,2.68 -6,6v1c0,-3.32 2.68,-6 6,-6h24c3.32,0 6,2.68 6,6v-1c0,-3.32 -2.68,-6 -6,-6z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.34016225"
+      android:fillColor="#8097a2"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="m32,116v12l25.61,38c2.07,3.59 5.94,6 10.39,6h56c4.46,0 8.32,-2.41 10.39,-6h0.01l25.6,-38v-12z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.37600005"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeLineCap="butt">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="80"
+          android:startY="112"
+          android:endX="80"
+          android:endY="140"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF4D6570"/>
+        <item android:offset="1" android:color="#0F4D6570"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M172,52L172,120A12,12 0,0 1,160 132L32,132A12,12 0,0 1,20 120L20,52A12,12 0,0 1,32 40L160,40A12,12 0,0 1,172 52z"
+      android:strokeAlpha="0.2"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.34016225"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:fillAlpha="0.2"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M172,48L172,116A12,12 0,0 1,160 128L32,128A12,12 0,0 1,20 116L20,48A12,12 0,0 1,32 36L160,36A12,12 0,0 1,172 48z"
+      android:strokeAlpha="0.2"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.34016225"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:fillAlpha="0.2"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M172,48L172,116A12,12 0,0 1,160 128L32,128A12,12 0,0 1,20 116L20,48A12,12 0,0 1,32 36L160,36A12,12 0,0 1,172 48z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.34016225"
+      android:fillColor="#ff1744"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="m36,52 l60,32 60,-32"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="6"
+      android:fillColor="#00000000"
+      android:strokeColor="#fbe9e7"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="m32,36c-6.65,0 -12,5.35 -12,12v1c0,-6.65 5.35,-12 12,-12h128c6.65,0 12,5.35 12,12v-1c0,-6.65 -5.35,-12 -12,-12z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.34016225"
+      android:fillColor="#ff4569"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="m20,115v1c0,6.65 5.35,12 12,12h128c6.65,0 12,-5.35 12,-12v-1c0,6.65 -5.35,12 -12,12L32,127c-6.65,0 -12,-5.35 -12,-12z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.34016225"
+      android:fillColor="#d81a3d"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="m90,156c-3.32,0 -6,2.68 -6,6v12c0,0.27 0.03,0.54 0.06,0.8 0,0 -0,0 0,0.01A12,12 0,0 0,84 176a12,12 0,0 0,12 12,12 12,0 0,0 12,-12 12,12 0,0 0,-0.07 -1.15C107.97,174.57 108,174.29 108,174v-12c0,-3.32 -2.68,-6 -6,-6z"
+      android:strokeAlpha="0.2"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="8.99999523"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:fillAlpha="0.2"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="m90,152c-3.32,0 -6,2.68 -6,6v12c0,0.27 0.03,0.54 0.06,0.8 0,0 -0,0 0,0.01A12,12 0,0 0,84 172a12,12 0,0 0,12 12,12 12,0 0,0 12,-12 12,12 0,0 0,-0.07 -1.15C107.97,170.57 108,170.29 108,170v-12c0,-3.32 -2.68,-6 -6,-6z"
+      android:strokeAlpha="0.2"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="8.99999523"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:fillAlpha="0.2"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M108,158L108,170A6,6 0,0 1,102 176L90,176A6,6 0,0 1,84 170L84,158A6,6 0,0 1,90 152L102,152A6,6 0,0 1,108 158z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.34016225"
+      android:fillColor="#263238"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M96,172m-12,0a12,12 0,1 1,24 0a12,12 0,1 1,-24 0"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="8.99999523"
+      android:fillColor="#263238"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="m90,152c-3.32,0 -6,2.68 -6,6v1c0,-3.32 2.68,-6 6,-6h12c3.32,0 6,2.68 6,6v-1c0,-3.32 -2.68,-6 -6,-6z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.34016225"
+      android:fillColor="#37474f"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M84.02,171.43A12,12 0,0 0,84 172,12 12,0 0,0 96,184 12,12 0,0 0,108 172,12 12,0 0,0 107.98,171.59 12,12 0,0 1,96 183,12 12,0 0,1 84.02,171.43Z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="8.99999523"
+      android:fillColor="#1a252a"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="m50,8c-3.32,0 -6,2.68 -6,6v8c0,3.32 2.68,6 6,6h14v8h-32c-6.65,0 -12,5.35 -12,12v68c0,6.65 5.35,12 12,12l25.61,38c2.07,3.59 5.94,6 10.39,6h16a12,12 0,0 0,12 12,12 12,0 0,0 12,-12h16c4.46,0 8.32,-2.41 10.39,-6h0.01l25.6,-38c6.65,-0 12,-5.35 12,-12v-68c0,-6.65 -5.35,-12 -12,-12h-32v-8h14c3.32,0 6,-2.68 6,-6v-8c0,-3.32 -2.68,-6 -6,-6h-24c-3.32,0 -6,2.68 -6,6v8c0,3.32 2.68,6 6,6h2v8h-48v-8h2c3.32,0 6,-2.68 6,-6v-8c0,-3.32 -2.68,-6 -6,-6z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.37600005"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeLineCap="butt">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:centerX="0"
+          android:centerY="-0"
+          android:gradientRadius="271.53"
+          android:type="radial">
+        <item android:offset="0" android:color="#19FBFCFC"/>
+        <item android:offset="1" android:color="#00FBFCFC"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="m50,8c-3.32,0 -6,2.68 -6,6v8c0,3.32 2.68,6 6,6h14v8h-32c-6.65,0 -12,5.35 -12,12v68c0,6.65 5.35,12 12,12l25.61,38c2.07,3.59 5.94,6 10.39,6h16a12,12 0,0 0,12 12,12 12,0 0,0 12,-12h16c4.46,0 8.32,-2.41 10.39,-6h0.01l25.6,-38c6.65,-0 12,-5.35 12,-12v-68c0,-6.65 -5.35,-12 -12,-12h-32v-8h14c3.32,0 6,-2.68 6,-6v-8c0,-3.32 -2.68,-6 -6,-6h-24c-3.32,0 -6,2.68 -6,6v8c0,3.32 2.68,6 6,6h2v8h-48v-8h2c3.32,0 6,-2.68 6,-6v-8c0,-3.32 -2.68,-6 -6,-6z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.37600005"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeLineCap="butt">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="192"
+          android:startY="0"
+          android:endX="192"
+          android:endY="192"
+          android:type="linear">
+        <item android:offset="0" android:color="#19FBFCFC"/>
+        <item android:offset="1" android:color="#00FBFCFC"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>
diff --git a/OpenKeychain/src/main/res/drawable/apps_password_store.xml b/OpenKeychain/src/main/res/drawable/apps_password_store.xml
new file mode 100644
index 000000000..d78d2f99e
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable/apps_password_store.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
+  ~ SPDX-License-Identifier: GPL-3.0-only
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="432"
+    android:viewportHeight="432">
+  <group android:scaleX="2.06"
+      android:scaleY="2.06"
+      android:translateX="-228.96"
+      android:translateY="-215.96">
+    <path android:pathData="M128.18,195.79C126.46,181.89 137.12,169.6 150.91,169.6H281.09C294.91,169.6 305.59,181.95 303.8,195.88L292.58,283.72C291.09,295.32 281.37,304 269.86,304H161.8C150.26,304 140.51,295.27 139.07,283.63L128.18,195.79Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:endX="216"
+            android:endY="304"
+            android:startX="216"
+            android:startY="169.6"
+            android:type="linear">
+          <item
+              android:color="#FF2AE9DD"
+              android:offset="0" />
+          <item
+              android:color="#FF0BAFAF"
+              android:offset="1" />
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path android:pathData="M245.33,169.6V160C245.33,144.09 232.2,131.2 216,131.2C199.8,131.2 186.67,144.09 186.67,160V169.6H167.11V160C167.11,133.49 189,112 216,112C243,112 264.89,133.49 264.89,160V169.6H245.33Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:centerX="216"
+            android:centerY="169.6"
+            android:gradientRadius="33.6"
+            android:type="radial">
+          <item
+              android:color="#FF0086D1"
+              android:offset="0.24" />
+          <item
+              android:color="#FF77E7FF"
+              android:offset="0.75" />
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#77E7FF"
+        android:pathData="M245.33,169.6h19.56v38.4h-19.56z" />
+    <path
+        android:fillColor="#77E7FF"
+        android:pathData="M245.33,217.6h19.56v48h-19.56z" />
+    <path
+        android:fillColor="#77E7FF"
+        android:pathData="M239.11,205.19l13.83,13.58l-34.57,33.94l-13.83,-13.58z" />
+    <path
+        android:fillColor="#D1FEFF"
+        android:pathData="M235.56,208a19.56,19.2 0,1 0,39.11 0a19.56,19.2 0,1 0,-39.11 0z" />
+    <path
+        android:fillColor="#D1FEFF"
+        android:pathData="M235.56,275.2a19.56,19.2 0,1 0,39.11 0a19.56,19.2 0,1 0,-39.11 0z" />
+    <path
+        android:fillColor="#D1FEFF"
+        android:pathData="M204.54,252.71m-13.83,-13.58a19.56,19.2 0,1 1,27.66 27.15a19.56,19.2 0,1 1,-27.66 -27.15" />
+  </group>
+</vector>