diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index cf5c485ec..4434022ad 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -93,8 +93,7 @@
     <uses-permission android:name="org.thoughtcrime.securesms.permission.C2D_MESSAGE" />
 
     <application android:name=".ApplicationContext"
-                 android:icon="@drawable/icon"
-                 android:roundIcon="@drawable/icon_circle"
+                 android:icon="@mipmap/ic_launcher"
                  android:label="@string/app_name"
                  android:supportsRtl="true"
                  tools:replace="android:allowBackup"
diff --git a/res/drawable-hdpi/icon_circle.png b/res/drawable-hdpi/icon_circle.png
deleted file mode 100644
index a467775c2..000000000
Binary files a/res/drawable-hdpi/icon_circle.png and /dev/null differ
diff --git a/res/drawable-mdpi/icon_circle.png b/res/drawable-mdpi/icon_circle.png
deleted file mode 100644
index 7cf00a905..000000000
Binary files a/res/drawable-mdpi/icon_circle.png and /dev/null differ
diff --git a/res/drawable-xhdpi/icon_circle.png b/res/drawable-xhdpi/icon_circle.png
deleted file mode 100644
index e57371a52..000000000
Binary files a/res/drawable-xhdpi/icon_circle.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/icon_circle.png b/res/drawable-xxhdpi/icon_circle.png
deleted file mode 100644
index b471f4b1f..000000000
Binary files a/res/drawable-xxhdpi/icon_circle.png and /dev/null differ
diff --git a/res/mipmap-anydpi-v26/ic_launcher.xml b/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 000000000..3c28396ce
--- /dev/null
+++ b/res/mipmap-anydpi-v26/ic_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="@color/signal_primary"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/res/drawable-hdpi/icon.png b/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from res/drawable-hdpi/icon.png
rename to res/mipmap-hdpi/ic_launcher.png
diff --git a/res/mipmap-hdpi/ic_launcher_foreground.png b/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 000000000..2423d3ea1
Binary files /dev/null and b/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/res/drawable-mdpi/icon.png b/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from res/drawable-mdpi/icon.png
rename to res/mipmap-mdpi/ic_launcher.png
diff --git a/res/mipmap-mdpi/ic_launcher_foreground.png b/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 000000000..e8828d95d
Binary files /dev/null and b/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/res/drawable-xhdpi/icon.png b/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from res/drawable-xhdpi/icon.png
rename to res/mipmap-xhdpi/ic_launcher.png
diff --git a/res/mipmap-xhdpi/ic_launcher_foreground.png b/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 000000000..4b85936b3
Binary files /dev/null and b/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/res/drawable-xxhdpi/icon.png b/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from res/drawable-xxhdpi/icon.png
rename to res/mipmap-xxhdpi/ic_launcher.png
diff --git a/res/mipmap-xxhdpi/ic_launcher_foreground.png b/res/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 000000000..5b25391bd
Binary files /dev/null and b/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/res/drawable-xxxhdpi/icon.png b/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from res/drawable-xxxhdpi/icon.png
rename to res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/res/mipmap-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 000000000..9ebb4911a
Binary files /dev/null and b/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ