diff --git a/app/src/debug/ic_launcher-playstore.png b/app/src/debug/ic_launcher-playstore.png
new file mode 100644
index 000000000..d93ce3cfd
Binary files /dev/null and b/app/src/debug/ic_launcher-playstore.png differ
diff --git a/app/src/debug/res/drawable-v24/ic_launcher_foreground.xml b/app/src/debug/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 000000000..c14f1e6f8
--- /dev/null
+++ b/app/src/debug/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,63 @@
+<?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">
+  <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="#FFFFA800"
+          android:offset="0" />
+        <item
+          android:color="#FFFF6341"
+          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="#FFD1004B"
+          android:offset="0.24" />
+        <item
+          android:color="#FFFFD749"
+          android:offset="0.75" />
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+    android:fillColor="#FFD749"
+    android:pathData="M245.33,169.6h19.56v38.4h-19.56z" />
+  <path
+    android:fillColor="#FFD749"
+    android:pathData="M245.33,217.6h19.56v48h-19.56z" />
+  <path
+    android:fillColor="#FFD749"
+    android:pathData="M239.11,205.19l13.83,13.58l-34.57,33.94l-13.83,-13.58z" />
+  <path
+    android:fillColor="#FFFFF0"
+    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="#FFFFF0"
+    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="#FFFFF0"
+    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" />
+</vector>
diff --git a/app/src/debug/res/drawable/ic_launcher_background.xml b/app/src/debug/res/drawable/ic_launcher_background.xml
new file mode 100644
index 000000000..f7c2be3e1
--- /dev/null
+++ b/app/src/debug/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,14 @@
+<?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"
+  android:width="108dp"
+  android:height="108dp"
+  android:viewportWidth="432"
+  android:viewportHeight="432">
+  <path
+    android:fillColor="#5E0033"
+    android:pathData="M0,0h432v432h-432z" />
+</vector>
diff --git a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 000000000..6067a8c7a
--- /dev/null
+++ b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,10 @@
+<?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
+  -->
+
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@drawable/ic_launcher_background" />
+  <foreground android:drawable="@drawable/ic_launcher_foreground" />
+  <monochrome android:drawable="@drawable/ic_launcher_foreground_monochrome" />
+</adaptive-icon>
diff --git a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 000000000..28204caa8
--- /dev/null
+++ b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,9 @@
+<?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
+  -->
+
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@drawable/ic_launcher_background" />
+  <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher.png b/app/src/debug/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..a3b28da5f
Binary files /dev/null and b/app/src/debug/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher.webp b/app/src/debug/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index 5b266c223..000000000
Binary files a/app/src/debug/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.webp b/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.webp
deleted file mode 100644
index 5b327a0ef..000000000
Binary files a/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.webp and /dev/null differ
diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 000000000..a3b28da5f
Binary files /dev/null and b/app/src/debug/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher.png b/app/src/debug/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..0be8ba3ce
Binary files /dev/null and b/app/src/debug/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher.webp b/app/src/debug/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index f3a1ffd55..000000000
Binary files a/app/src/debug/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.webp b/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.webp
deleted file mode 100644
index e51822c1c..000000000
Binary files a/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.webp and /dev/null differ
diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 000000000..0be8ba3ce
Binary files /dev/null and b/app/src/debug/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..02a4af494
Binary files /dev/null and b/app/src/debug/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher.webp b/app/src/debug/res/mipmap-xhdpi/ic_launcher.webp
deleted file mode 100644
index 034d724a6..000000000
Binary files a/app/src/debug/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.webp b/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.webp
deleted file mode 100644
index 18fa08daa..000000000
Binary files a/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.webp and /dev/null differ
diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 000000000..02a4af494
Binary files /dev/null and b/app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..9d32c97c8
Binary files /dev/null and b/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/debug/res/mipmap-xxhdpi/ic_launcher.webp
deleted file mode 100644
index 291580ead..000000000
Binary files a/app/src/debug/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.webp
deleted file mode 100644
index 17b8647f4..000000000
Binary files a/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.webp and /dev/null differ
diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 000000000..9d32c97c8
Binary files /dev/null and b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..d7d4ef183
Binary files /dev/null and b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.webp
deleted file mode 100644
index 024a67127..000000000
Binary files a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.webp
deleted file mode 100644
index 55ea3223c..000000000
Binary files a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.webp and /dev/null differ
diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 000000000..d7d4ef183
Binary files /dev/null and b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
index e0e0edec9..8de23a46f 100644
Binary files a/app/src/main/ic_launcher-playstore.png and b/app/src/main/ic_launcher-playstore.png differ
diff --git a/app/src/main/res/drawable-v24/ic_launcher_background.xml b/app/src/main/res/drawable-v24/ic_launcher_background.xml
deleted file mode 100644
index 3c554d83c..000000000
--- a/app/src/main/res/drawable-v24/ic_launcher_background.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<!--
-  ~ 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="108"
-  android:viewportHeight="108">
-  <group
-    android:scaleX="0.25"
-    android:scaleY="0.25">
-    <group>
-      <clip-path android:pathData="M0,0h432v432h-432z" />
-      <path android:pathData="M0,0h432v432h-432z">
-        <aapt:attr name="android:fillColor">
-          <gradient
-            android:endX="216"
-            android:endY="432"
-            android:startX="216"
-            android:startY="0"
-            android:type="linear">
-            <item
-              android:color="#FF66BFFF"
-              android:offset="0" />
-            <item
-              android:color="#FF3C5CCE"
-              android:offset="1" />
-          </gradient>
-        </aapt:attr>
-      </path>
-      <path android:pathData="M0,0h432v432h-432z">
-        <aapt:attr name="android:fillColor">
-          <gradient
-            android:endX="216"
-            android:endY="432"
-            android:startX="216"
-            android:startY="0"
-            android:type="linear">
-            <item
-              android:color="#E5212121"
-              android:offset="0" />
-            <item
-              android:color="#FF212121"
-              android:offset="1" />
-          </gradient>
-        </aapt:attr>
-      </path>
-      <path android:pathData="M0,0.5h432v432h-432z">
-        <aapt:attr name="android:fillColor">
-          <gradient
-            android:endX="216"
-            android:endY="432.5"
-            android:startX="216"
-            android:startY="0.5"
-            android:type="linear">
-            <item
-              android:color="#FF3895EB"
-              android:offset="0" />
-            <item
-              android:color="#FF3545D8"
-              android:offset="1" />
-          </gradient>
-        </aapt:attr>
-      </path>
-      <path android:pathData="M0,0.366h432v432h-432z">
-        <aapt:attr name="android:fillColor">
-          <gradient
-            android:endX="216"
-            android:endY="432.366"
-            android:startX="216"
-            android:startY="0.365753"
-            android:type="linear">
-            <item
-              android:color="#FFFFD56A"
-              android:offset="0" />
-            <item
-              android:color="#FFE47140"
-              android:offset="1" />
-          </gradient>
-        </aapt:attr>
-      </path>
-      <path
-        android:fillColor="#EEEEEE"
-        android:pathData="M0,0h432v432h-432z" />
-      <path android:pathData="M0,0h432v432h-432z">
-        <aapt:attr name="android:fillColor">
-          <gradient
-            android:endX="216"
-            android:endY="432"
-            android:startX="216"
-            android:startY="0"
-            android:type="linear">
-            <item
-              android:color="#FF66BFFF"
-              android:offset="0" />
-            <item
-              android:color="#FF3C5CCE"
-              android:offset="1" />
-          </gradient>
-        </aapt:attr>
-      </path>
-      <path android:pathData="M0,0h432v432h-432z">
-        <aapt:attr name="android:fillColor">
-          <gradient
-            android:endX="219.872"
-            android:endY="0.0346945"
-            android:startX="216"
-            android:startY="432"
-            android:type="linear">
-            <item
-              android:color="#FF212121"
-              android:offset="0" />
-            <item
-              android:color="#FF2C2C2C"
-              android:offset="1" />
-          </gradient>
-        </aapt:attr>
-      </path>
-      <path android:pathData="M0,0h432v432h-432z">
-        <aapt:attr name="android:fillColor">
-          <gradient
-            android:centerX="57.9512"
-            android:centerY="44.7805"
-            android:gradientRadius="516.521"
-            android:type="radial">
-            <item
-              android:color="#FF673BB7"
-              android:offset="0" />
-            <item
-              android:color="#FF43249F"
-              android:offset="1" />
-          </gradient>
-        </aapt:attr>
-      </path>
-      <path android:pathData="M0,0h432v432h-432z">
-        <aapt:attr name="android:fillColor">
-          <gradient
-            android:endX="216"
-            android:endY="432"
-            android:startX="216"
-            android:startY="0"
-            android:type="linear">
-            <item
-              android:color="#FF00596C"
-              android:offset="0" />
-            <item
-              android:color="#FF002249"
-              android:offset="1" />
-          </gradient>
-        </aapt:attr>
-      </path>
-    </group>
-  </group>
-</vector>
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 000000000..26a34e3dc
--- /dev/null
+++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,63 @@
+<?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">
+  <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" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 000000000..0c1d10f6d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,14 @@
+<?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"
+  android:width="108dp"
+  android:height="108dp"
+  android:viewportWidth="432"
+  android:viewportHeight="432">
+  <path
+    android:fillColor="#00375E"
+    android:pathData="M0,0h432v432h-432z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_foreground_monochrome.xml b/app/src/main/res/drawable/ic_launcher_foreground_monochrome.xml
new file mode 100644
index 000000000..18d183754
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher_foreground_monochrome.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+  android:viewportWidth="108"
+  android:viewportHeight="108"
+  android:width="108dp"
+  android:height="108dp">
+  <path
+      android:pathData="M44.556 46.3997L44.556 44.5001C44.556 39.2533 48.7844 35 54.0005 35C59.2165 35 63.4449 39.2533 63.4449 44.5001L63.4444 46.4001L66.5738 46.3997C69.2445 46.3997 71.3066 48.8438 70.9624 51.6012L68.7933 68.9857C68.5068 71.2819 66.6283 73 64.4045 73L43.5297 73C41.2994 73 39.4177 71.272 39.1389 68.9681L37.0354 51.5836C36.7024 48.8318 38.7625 46.3997 41.4263 46.3997L44.556 46.3997ZM59.6671 44.5001C59.6671 41.3521 57.1301 38.8 54.0005 38.8C50.8708 38.8 48.3338 41.3521 48.3338 44.5001L48.3338 46.3997L59.6671 46.4001L59.6667 50.7076C58.5375 51.3647 57.7778 52.5928 57.7778 53.9993C57.7778 54.0436 57.7785 54.0877 57.78 54.1316L52.765 59.1762C51.5047 58.8377 50.1043 59.1658 49.1156 60.1603C47.6403 61.6443 47.6403 64.0504 49.1156 65.5344C50.5909 67.0184 52.9829 67.0184 54.4582 65.5344C55.447 64.5397 55.7731 63.1309 55.4364 61.8631L59.6667 57.6079L59.6667 64.0078C58.5375 64.6648 57.7778 65.8929 57.7778 67.2995C57.7778 69.3982 59.4691 71.0995 61.5556 71.0995C63.642 71.0995 65.3333 69.3982 65.3333 67.2995C65.3333 65.8929 64.5736 64.6648 63.4444 64.0078L63.4444 57.291C64.5736 56.6339 65.3333 55.4059 65.3333 53.9993C65.3333 52.5928 64.5736 51.3647 63.4444 50.7076L63.4444 46.4001L59.6671 46.4001L59.6671 44.5001Z"
+      android:fillColor="#FFFFFF" />
+</vector>
diff --git a/app/src/main/res/layout/activity_oreo_autofill_filter.xml b/app/src/main/res/layout/activity_oreo_autofill_filter.xml
index eca04f62b..215db4368 100644
--- a/app/src/main/res/layout/activity_oreo_autofill_filter.xml
+++ b/app/src/main/res/layout/activity_oreo_autofill_filter.xml
@@ -17,7 +17,7 @@
     android:layout_height="60dp"
     android:background="@android:color/transparent"
     android:contentDescription="@string/app_name"
-    android:src="@mipmap/ic_launcher_foreground"
+    android:src="@drawable/ic_launcher_foreground"
     app:layout_constraintBottom_toTopOf="@id/origin"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_oreo_autofill_publisher_changed.xml b/app/src/main/res/layout/activity_oreo_autofill_publisher_changed.xml
index 90b188446..0a2fb4d78 100644
--- a/app/src/main/res/layout/activity_oreo_autofill_publisher_changed.xml
+++ b/app/src/main/res/layout/activity_oreo_autofill_publisher_changed.xml
@@ -20,7 +20,7 @@
     android:layout_height="60dp"
     android:background="@android:color/transparent"
     android:contentDescription="@string/app_name"
-    android:src="@mipmap/ic_launcher_foreground"
+    android:src="@drawable/ic_launcher_foreground"
     app:layout_constraintBottom_toTopOf="@id/warningSign"
     app:layout_constraintEnd_toStartOf="@id/app_name"
     app:layout_constraintHorizontal_chainStyle="packed"
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 517ddcecc..6067a8c7a 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -5,5 +5,6 @@
 
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
   <background android:drawable="@drawable/ic_launcher_background" />
-  <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+  <foreground android:drawable="@drawable/ic_launcher_foreground" />
+  <monochrome android:drawable="@drawable/ic_launcher_foreground_monochrome" />
 </adaptive-icon>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 000000000..28204caa8
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,9 @@
+<?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
+  -->
+
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@drawable/ic_launcher_background" />
+  <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..a1133420e
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index cb3697efd..000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp
deleted file mode 100644
index f5ca8b008..000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 000000000..a1133420e
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..b9e28b181
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 000000000..b9e28b181
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..353fe9c4e
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
deleted file mode 100644
index 55f610eb7..000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp
deleted file mode 100644
index e97cfec85..000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 000000000..353fe9c4e
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..148db12b0
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
deleted file mode 100644
index df2ab1ffd..000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp
deleted file mode 100644
index 345018d60..000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 000000000..148db12b0
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..2c1e2b05d
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
deleted file mode 100644
index 33529fe01..000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp
deleted file mode 100644
index 909360eee..000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 000000000..2c1e2b05d
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/app/src/nonFree/res/layout/activity_oreo_autofill_sms.xml b/app/src/nonFree/res/layout/activity_oreo_autofill_sms.xml
index 69f8e6dca..73fbfb99d 100644
--- a/app/src/nonFree/res/layout/activity_oreo_autofill_sms.xml
+++ b/app/src/nonFree/res/layout/activity_oreo_autofill_sms.xml
@@ -17,7 +17,7 @@
     android:layout_height="50dp"
     android:layout_margin="10dp"
     android:contentDescription="@string/app_name"
-    android:src="@mipmap/ic_launcher_foreground"
+    android:src="@drawable/ic_launcher_foreground"
     app:layout_constraintBottom_toTopOf="@id/text"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"