diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 86560f8bea4ecb444388a2a3c202cbd2c0864cfa..83d950f846900fbdb05225e4860c39bc08d6975a 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -52,7 +52,7 @@
     <application
         android:allowBackup="true"
         android:appCategory="social"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@mipmap/new_launcher"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_configuration"
         android:theme="@style/ConversationsTheme"
diff --git a/src/main/java/eu/siacs/conversations/services/AvatarService.java b/src/main/java/eu/siacs/conversations/services/AvatarService.java
index 012be5793cbbab4099fd6b97a33985c86258771a..0ae38edf5655bc01fa6f7de5e36d164fc084a974 100644
--- a/src/main/java/eu/siacs/conversations/services/AvatarService.java
+++ b/src/main/java/eu/siacs/conversations/services/AvatarService.java
@@ -115,7 +115,7 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded {
 		BitmapFactory.Options opts = new BitmapFactory.Options();
 		opts.inSampleSize = 2;
 		Resources resources = mXmppConnectionService.getResources();
-		Bitmap icon = BitmapFactory.decodeResource(resources, R.drawable.ic_launcher, opts);
+		Bitmap icon = BitmapFactory.decodeResource(resources, R.mipmap.new_launcher_round, opts);
 		paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_OVER));
 
 		int iconSize = Math.round(canvas.getHeight() / 2.6f);
diff --git a/src/main/new_launcher-web.png b/src/main/new_launcher-web.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d9c493d68e4a555e94b0beb3d05f992cc3ade65
Binary files /dev/null and b/src/main/new_launcher-web.png differ
diff --git a/src/main/res/drawable-hdpi/ic_launcher.png b/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index f0df4dd37deb35d47143854539cf9dade293bf2b..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_launcher.png b/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 66145e297c4fbc1d25a664a96aa5c7c87db6314f..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_launcher.png b/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 7e3010641e12e75e348e3fdad169e72f07b8e8c9..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_launcher.png b/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index 1b10d1f919e2856073a18ca2a253bb89518d5c8b..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_launcher.png b/src/main/res/drawable-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 0358c924d09a0dd963d76bead64d9d0ab53775c4..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_launcher_foreground.xml b/src/main/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ae9905e04f163565f8724ab65ef2b8f4bbf2e941
--- /dev/null
+++ b/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,24 @@
+<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="1163.6364"
+        android:viewportHeight="1163.6364">
+    <group android:translateX="325.81818"
+            android:translateY="325.81818">
+      <path
+          android:pathData="M253.219,17.719C126.144,17.719 22.469,118.884 22.469,243.75C22.469,368.616 126.138,469.844 253.219,469.844C292.739,469.844 323.216,461.736 358,449.094L468.469,493.625A14.556,14.562 0,0 0,488.063 476.625L458.125,355.656C477.356,321.886 483.938,283.416 483.938,243.75C483.938,118.887 380.293,17.719 253.219,17.719zM143.844,222C157.651,222 168.844,233.193 168.844,247C168.844,260.807 157.651,272 143.844,272C130.037,272 118.844,260.807 118.844,247C118.844,233.193 130.037,222 143.844,222zM253.563,222C267.37,222 278.563,233.193 278.563,247C278.563,260.807 267.37,272 253.563,272C239.755,272 228.563,260.807 228.563,247C228.563,233.193 239.755,222 253.563,222zM363.563,222C377.37,222 388.563,233.193 388.563,247C388.563,260.807 377.37,272 363.563,272C349.755,272 338.563,260.807 338.563,247C338.563,233.193 349.755,222 363.563,222z"
+          android:fillColor="#ffffff"
+          android:strokeColor="#00000000"
+          android:fillAlpha="1"/>
+      <path
+          android:pathData="M478.641,484.856 L447.361,358.245c19.89,-31.998 26.743,-69.572 26.743,-109.762 0,-116.817 -96.799,-211.484 -216.184,-211.484 -119.384,0 -216.184,94.667 -216.184,211.484 0,116.817 96.799,211.554 216.184,211.554 39.636,0 68.588,-8.142 105.194,-21.761z"
+          android:strokeAlpha="0"
+          android:strokeLineJoin="round"
+          android:strokeWidth="23.55835724"
+          android:fillColor="#00000000"
+          android:strokeColor="#000000"
+          android:fillAlpha="0"
+          android:strokeLineCap="butt"/>
+    </group>
+</vector>
diff --git a/src/main/res/mipmap-anydpi-v26/new_launcher.xml b/src/main/res/mipmap-anydpi-v26/new_launcher.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6f2acb4f09f227d8b16a1fb47495a06444a3279a
--- /dev/null
+++ b/src/main/res/mipmap-anydpi-v26/new_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</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/new_launcher_round.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6f2acb4f09f227d8b16a1fb47495a06444a3279a
--- /dev/null
+++ b/src/main/res/mipmap-anydpi-v26/new_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/src/main/res/mipmap-hdpi/ic_launcher_background.png b/src/main/res/mipmap-hdpi/ic_launcher_background.png
new file mode 100644
index 0000000000000000000000000000000000000000..9fc23759729b9eb27c4705c1f666666499afcf7a
Binary files /dev/null and b/src/main/res/mipmap-hdpi/ic_launcher_background.png differ
diff --git a/src/main/res/mipmap-hdpi/new_launcher.png b/src/main/res/mipmap-hdpi/new_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..400171d4ca3fc3ba556854a977fdb239b9d61c44
Binary files /dev/null and b/src/main/res/mipmap-hdpi/new_launcher.png differ
diff --git a/src/main/res/mipmap-hdpi/new_launcher_round.png b/src/main/res/mipmap-hdpi/new_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..c79e3de75974e1a1c398f88b7de4b43bf000e6bc
Binary files /dev/null and b/src/main/res/mipmap-hdpi/new_launcher_round.png differ
diff --git a/src/main/res/mipmap-mdpi/ic_launcher_background.png b/src/main/res/mipmap-mdpi/ic_launcher_background.png
new file mode 100644
index 0000000000000000000000000000000000000000..e15a5c98d5e893407592c43c392554da2a8e75a8
Binary files /dev/null and b/src/main/res/mipmap-mdpi/ic_launcher_background.png differ
diff --git a/src/main/res/mipmap-mdpi/new_launcher.png b/src/main/res/mipmap-mdpi/new_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e88d856e5163fc1018b101ec75caddbbe03fa2b
Binary files /dev/null and b/src/main/res/mipmap-mdpi/new_launcher.png differ
diff --git a/src/main/res/mipmap-mdpi/new_launcher_round.png b/src/main/res/mipmap-mdpi/new_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e507e7613c45115d79aa10c5aa1c60132c74c36
Binary files /dev/null and b/src/main/res/mipmap-mdpi/new_launcher_round.png differ
diff --git a/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/src/main/res/mipmap-xhdpi/ic_launcher_background.png
new file mode 100644
index 0000000000000000000000000000000000000000..02e2693e74a74aff321ac4f11b0146b49e50ba59
Binary files /dev/null and b/src/main/res/mipmap-xhdpi/ic_launcher_background.png differ
diff --git a/src/main/res/mipmap-xhdpi/new_launcher.png b/src/main/res/mipmap-xhdpi/new_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..5970148ebdd8a808f238dd44f850f7a0afd9f4d4
Binary files /dev/null and b/src/main/res/mipmap-xhdpi/new_launcher.png differ
diff --git a/src/main/res/mipmap-xhdpi/new_launcher_round.png b/src/main/res/mipmap-xhdpi/new_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec3319e28552db8d71c4071caad7310cef5bc613
Binary files /dev/null and b/src/main/res/mipmap-xhdpi/new_launcher_round.png differ
diff --git a/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
new file mode 100644
index 0000000000000000000000000000000000000000..d099bcd1612d517481036a07485742c7bf5bf789
Binary files /dev/null and b/src/main/res/mipmap-xxhdpi/ic_launcher_background.png differ
diff --git a/src/main/res/mipmap-xxhdpi/new_launcher.png b/src/main/res/mipmap-xxhdpi/new_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..91b23c3a8ddeb74363d6419e8ea0e330184a8b8a
Binary files /dev/null and b/src/main/res/mipmap-xxhdpi/new_launcher.png differ
diff --git a/src/main/res/mipmap-xxhdpi/new_launcher_round.png b/src/main/res/mipmap-xxhdpi/new_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3210f44ae9534fbe586b7a03d32a91f0934cffd
Binary files /dev/null and b/src/main/res/mipmap-xxhdpi/new_launcher_round.png differ
diff --git a/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
new file mode 100644
index 0000000000000000000000000000000000000000..52166eae8e3c90bb15f1c99ef08ab4d07bf40f3c
Binary files /dev/null and b/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png differ
diff --git a/src/main/res/mipmap-xxxhdpi/new_launcher.png b/src/main/res/mipmap-xxxhdpi/new_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f762030681aa0c550cb9822252b823ee8e99886
Binary files /dev/null and b/src/main/res/mipmap-xxxhdpi/new_launcher.png differ
diff --git a/src/main/res/mipmap-xxxhdpi/new_launcher_round.png b/src/main/res/mipmap-xxxhdpi/new_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..d006aeef92a48c54ac19ca584eaeb754fd660b88
Binary files /dev/null and b/src/main/res/mipmap-xxxhdpi/new_launcher_round.png differ