diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index a0eb77b17..cd4a458fd 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -90,7 +90,7 @@
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_content"
         android:hardwareAccelerated="true"
-        android:icon="@mipmap/new_launcher"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:largeHeap="true"
         android:localeConfig="@xml/locales_config"
diff --git a/src/main/java/eu/siacs/conversations/services/AvatarService.java b/src/main/java/eu/siacs/conversations/services/AvatarService.java
index 839672004..6233d85c1 100644
--- a/src/main/java/eu/siacs/conversations/services/AvatarService.java
+++ b/src/main/java/eu/siacs/conversations/services/AvatarService.java
@@ -186,7 +186,7 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded {
 
 	private static Bitmap getRoundLauncherIcon(Resources resources) {
 
-		final Drawable drawable = ResourcesCompat.getDrawable(resources, R.mipmap.new_launcher_round,null);
+		final Drawable drawable = ResourcesCompat.getDrawable(resources, R.mipmap.ic_launcher_round,null);
 		if (drawable == null) {
 			return null;
 		}
diff --git a/src/main/res/drawable-v24/ic_launcher_background.xml b/src/main/res/drawable-v24/ic_launcher_background.xml
deleted file mode 100644
index ec3c58ad5..000000000
--- a/src/main/res/drawable-v24/ic_launcher_background.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<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.68"
-      android:scaleY="0.68"
-      android:translateX="17.28"
-      android:translateY="17.28">
-    <path
-        android:pathData="M0,0h108v108h-108z"
-        android:fillColor="#4BAE4F"/>
-    <group>
-      <clip-path
-          android:pathData="M0,0h108v108h-108z"/>
-      <path
-          android:pathData="M176.75,102.5m-143.5,0a143.5,143.5 0,1 1,287 0a143.5,143.5 0,1 1,-287 0">
-        <aapt:attr name="android:fillColor">
-          <gradient 
-              android:startX="176.75"
-              android:startY="-41"
-              android:endX="176.75"
-              android:endY="246"
-              android:type="linear">
-            <item android:offset="0.11" android:color="#0CD9D9D9"/>
-            <item android:offset="0.94" android:color="#7FFFFFFF"/>
-          </gradient>
-        </aapt:attr>
-      </path>
-    </group>
-  </group>
-</vector>
diff --git a/src/main/res/drawable/ic_launcher_background.xml b/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 000000000..7a4514aa8
--- /dev/null
+++ b/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/white" />
+    <corners android:radius="0dp" />
+</shape>
diff --git a/src/main/res/mipmap-anydpi-v26/new_launcher.xml b/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 72%
rename from src/main/res/mipmap-anydpi-v26/new_launcher.xml
rename to src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index b070c763d..1413a3145 100644
--- a/src/main/res/mipmap-anydpi-v26/new_launcher.xml
+++ b/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
     <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/src/main/res/mipmap-anydpi-v26/new_launcher_round.xml b/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 74%
rename from src/main/res/mipmap-anydpi-v26/new_launcher_round.xml
rename to src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 04091bd10..bbd3e0212 100644
--- a/src/main/res/mipmap-anydpi-v26/new_launcher_round.xml
+++ b/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -2,5 +2,4 @@
 <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_monochrome"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/src/main/res/mipmap-hdpi/ic_launcher.webp b/src/main/res/mipmap-hdpi/ic_launcher.webp
new file mode 100644
index 000000000..163735aeb
Binary files /dev/null and b/src/main/res/mipmap-hdpi/ic_launcher.webp differ
diff --git a/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 000000000..7b3e3701c
Binary files /dev/null and b/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/src/main/res/mipmap-hdpi/ic_launcher_round.webp
new file mode 100644
index 000000000..163735aeb
Binary files /dev/null and b/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ
diff --git a/src/main/res/mipmap-hdpi/new_launcher.png b/src/main/res/mipmap-hdpi/new_launcher.png
deleted file mode 100644
index 400171d4c..000000000
Binary files a/src/main/res/mipmap-hdpi/new_launcher.png and /dev/null differ
diff --git a/src/main/res/mipmap-hdpi/new_launcher_round.png b/src/main/res/mipmap-hdpi/new_launcher_round.png
deleted file mode 100644
index c79e3de75..000000000
Binary files a/src/main/res/mipmap-hdpi/new_launcher_round.png and /dev/null differ
diff --git a/src/monocleschat/res/mipmap-anydpi-v26/ic_launcher.xml b/src/monocleschat/res/mipmap-anydpi-v26/ic_launcher.xml
index 34468ac81..dce6d279f 100644
--- a/src/monocleschat/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/src/monocleschat/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/white"/>
+    <background android:drawable="@drawable/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
     <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
 </adaptive-icon>
\ No newline at end of file