diff --git a/briar-android/src/main/AndroidManifest.xml b/briar-android/src/main/AndroidManifest.xml
index d09cdd086fc6e1e0eaac3daba90e3c259355a1fb..5053da673735c56971e491e7ba56a5491b4ebe9a 100644
--- a/briar-android/src/main/AndroidManifest.xml
+++ b/briar-android/src/main/AndroidManifest.xml
@@ -23,7 +23,7 @@
 	<application
 		android:name=".android.BriarApplicationImpl"
 		android:allowBackup="false"
-		android:icon="@drawable/ic_launcher"
+		android:icon="@mipmap/ic_launcher_round"
 		android:label="@string/app_name"
 		android:logo="@mipmap/ic_launcher_round"
 		android:theme="@style/BriarTheme">
diff --git a/briar-android/src/main/res/drawable-hdpi/ic_launcher.png b/briar-android/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 477172115ccbd10cfe0a01c3a2230c5fa4200019..0000000000000000000000000000000000000000
Binary files a/briar-android/src/main/res/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-ldpi/ic_launcher.png b/briar-android/src/main/res/drawable-ldpi/ic_launcher.png
deleted file mode 100644
index 9a0cec489e5948107221bc1841ba8e34e514a4da..0000000000000000000000000000000000000000
Binary files a/briar-android/src/main/res/drawable-ldpi/ic_launcher.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-mdpi/ic_launcher.png b/briar-android/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 4844b3d79f50c1a3b3965b41a6285d6b0522e6ef..0000000000000000000000000000000000000000
Binary files a/briar-android/src/main/res/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-xhdpi/ic_launcher.png b/briar-android/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 44158b1a4f7c5f1ca71d8b5f86be3c7860fff8db..0000000000000000000000000000000000000000
Binary files a/briar-android/src/main/res/drawable-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/briar-android/src/main/res/layout/author_view.xml b/briar-android/src/main/res/layout/author_view.xml
index ad614ab5341d318321796b8a61fa1b009cac0500..5812a7f43bffe8bf2d50a295ac4813a458c5ef5e 100644
--- a/briar-android/src/main/res/layout/author_view.xml
+++ b/briar-android/src/main/res/layout/author_view.xml
@@ -11,7 +11,7 @@
 		android:layout_height="@dimen/blogs_avatar_normal_size"
 		android:layout_alignTop="@+id/authorName"
 		android:layout_marginRight="@dimen/margin_medium"
-		tools:src="@drawable/ic_launcher"/>
+		tools:src="@mipmap/ic_launcher_round"/>
 
 	<ImageView
 		android:id="@+id/avatarIcon"
diff --git a/briar-android/src/main/res/layout/contact_avatar_status.xml b/briar-android/src/main/res/layout/contact_avatar_status.xml
index 9f6ca42b4582fd10b63f93da03f43cd834038e12..0d47e786e6451d0231a944b4e81da7827fb220c2 100644
--- a/briar-android/src/main/res/layout/contact_avatar_status.xml
+++ b/briar-android/src/main/res/layout/contact_avatar_status.xml
@@ -13,7 +13,7 @@
 		android:layout_width="30dp"
 		android:layout_height="30dp"
 		app:civ_border_color="@color/action_bar_text"
-		tools:src="@drawable/ic_launcher"/>
+		tools:src="@mipmap/ic_launcher_round"/>
 
 	<ImageView
 		android:id="@+id/contactStatus"
diff --git a/briar-android/src/main/res/layout/introduction_message.xml b/briar-android/src/main/res/layout/introduction_message.xml
index 3ca9cfa519617610883ac6c200ad2e2425464ca3..d7c5c9a33a26ea27a032fc5549ad6b5c0f3ba0f0 100644
--- a/briar-android/src/main/res/layout/introduction_message.xml
+++ b/briar-android/src/main/res/layout/introduction_message.xml
@@ -38,7 +38,7 @@
 						android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 						android:layout_marginRight="@dimen/listitem_horizontal_margin"
 						android:layout_marginStart="@dimen/listitem_horizontal_margin"
-						tools:src="@drawable/ic_launcher"/>
+						tools:src="@mipmap/ic_launcher_round"/>
 
 					<org.thoughtcrime.securesms.components.emoji.EmojiTextView
 						android:id="@+id/nameContact1"
@@ -77,7 +77,7 @@
 						android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 						android:layout_marginRight="@dimen/listitem_horizontal_margin"
 						android:layout_marginStart="@dimen/listitem_horizontal_margin"
-						tools:src="@drawable/ic_launcher"/>
+						tools:src="@mipmap/ic_launcher_round"/>
 
 					<org.thoughtcrime.securesms.components.emoji.EmojiTextView
 						android:id="@+id/nameContact2"
diff --git a/briar-android/src/main/res/layout/list_item_contact.xml b/briar-android/src/main/res/layout/list_item_contact.xml
index 732cb2109ed9b9af7e2dcf2140bd27e2b7c3624c..bb297ef433aa38ca5af3d43cbe698bf787faeaaa 100644
--- a/briar-android/src/main/res/layout/list_item_contact.xml
+++ b/briar-android/src/main/res/layout/list_item_contact.xml
@@ -29,7 +29,7 @@
 				android:layout_width="@dimen/listitem_picture_size"
 				android:layout_height="@dimen/listitem_picture_size"
 				android:layout_gravity="bottom|left"
-				tools:src="@drawable/ic_launcher"/>
+				tools:src="@mipmap/ic_launcher_round"/>
 
 			<TextView
 				android:id="@+id/unreadCountView"
diff --git a/briar-android/src/main/res/layout/list_item_contact_small.xml b/briar-android/src/main/res/layout/list_item_contact_small.xml
index 742c56c465070f9e18f66151d4a34db3c5fdcd74..1415b1e39443ea9e7e4522f728453521f181fc33 100644
--- a/briar-android/src/main/res/layout/list_item_contact_small.xml
+++ b/briar-android/src/main/res/layout/list_item_contact_small.xml
@@ -16,7 +16,7 @@
 		android:layout_gravity="center_vertical"
 		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		android:layout_marginStart="@dimen/listitem_horizontal_margin"
-		tools:src="@drawable/ic_launcher"/>
+		tools:src="@mipmap/ic_launcher_round"/>
 
 	<org.thoughtcrime.securesms.components.emoji.EmojiTextView
 		android:id="@+id/nameView"
diff --git a/briar-android/src/main/res/layout/list_item_revealable_contact.xml b/briar-android/src/main/res/layout/list_item_revealable_contact.xml
index 040410f7029a2001754ea87940b1241590ff1fd3..f00838fcc32183bacb5c0851762b3efa08aadadd 100644
--- a/briar-android/src/main/res/layout/list_item_revealable_contact.xml
+++ b/briar-android/src/main/res/layout/list_item_revealable_contact.xml
@@ -25,7 +25,7 @@
 			android:layout_alignParentStart="true"
 			android:layout_marginEnd="@dimen/listitem_horizontal_margin"
 			android:layout_marginRight="@dimen/listitem_horizontal_margin"
-			tools:src="@drawable/ic_launcher"/>
+			tools:src="@mipmap/ic_launcher_round"/>
 
 		<org.thoughtcrime.securesms.components.emoji.EmojiTextView
 			android:id="@+id/nameView"
diff --git a/briar-android/src/main/res/layout/list_item_selectable_contact.xml b/briar-android/src/main/res/layout/list_item_selectable_contact.xml
index 09fd1aaa804472e28d35a1407472dac5fe132bd5..4073eb00eaff777dc76adfd3818ed30f9876dc6c 100644
--- a/briar-android/src/main/res/layout/list_item_selectable_contact.xml
+++ b/briar-android/src/main/res/layout/list_item_selectable_contact.xml
@@ -20,7 +20,7 @@
 			android:layout_alignParentLeft="true"
 			android:layout_alignParentStart="true"
 			android:layout_centerVertical="true"
-			tools:src="@drawable/ic_launcher"/>
+			tools:src="@mipmap/ic_launcher_round"/>
 
 		<LinearLayout
 			android:layout_width="wrap_content"