diff --git a/briar-android/res/drawable-hdpi/alerts_and_states_error.png b/briar-android/res/drawable-hdpi/alerts_and_states_error.png
deleted file mode 100644
index 4ae44491e..000000000
Binary files a/briar-android/res/drawable-hdpi/alerts_and_states_error.png and /dev/null differ
diff --git a/briar-android/res/drawable-hdpi/message_notification_icon.png b/briar-android/res/drawable-hdpi/message_notification_icon.png
deleted file mode 100644
index 082c1000a..000000000
Binary files a/briar-android/res/drawable-hdpi/message_notification_icon.png and /dev/null differ
diff --git a/briar-android/res/drawable-hdpi/msg_in.9.png b/briar-android/res/drawable-hdpi/msg_in.9.png
index 20202244f..9a8176354 100644
Binary files a/briar-android/res/drawable-hdpi/msg_in.9.png and b/briar-android/res/drawable-hdpi/msg_in.9.png differ
diff --git a/briar-android/res/drawable-hdpi/msg_out.9.png b/briar-android/res/drawable-hdpi/msg_out.9.png
index f8cfdc726..bd6a809ec 100644
Binary files a/briar-android/res/drawable-hdpi/msg_out.9.png and b/briar-android/res/drawable-hdpi/msg_out.9.png differ
diff --git a/briar-android/res/drawable-hdpi/navigation_accept.png b/briar-android/res/drawable-hdpi/navigation_accept.png
deleted file mode 100644
index 58bf97217..000000000
Binary files a/briar-android/res/drawable-hdpi/navigation_accept.png and /dev/null differ
diff --git a/briar-android/res/drawable-hdpi/notice_in.9.png b/briar-android/res/drawable-hdpi/notice_in.9.png
index 5b8dd92ec..1bc46ba17 100644
Binary files a/briar-android/res/drawable-hdpi/notice_in.9.png and b/briar-android/res/drawable-hdpi/notice_in.9.png differ
diff --git a/briar-android/res/drawable-hdpi/notice_out.9.png b/briar-android/res/drawable-hdpi/notice_out.9.png
index 504fe64d6..0d08d9e3e 100644
Binary files a/briar-android/res/drawable-hdpi/notice_out.9.png and b/briar-android/res/drawable-hdpi/notice_out.9.png differ
diff --git a/briar-android/res/drawable-ldpi/message_notification_icon.png b/briar-android/res/drawable-ldpi/message_notification_icon.png
deleted file mode 100644
index a88b8f561..000000000
Binary files a/briar-android/res/drawable-ldpi/message_notification_icon.png and /dev/null differ
diff --git a/briar-android/res/drawable-mdpi/alerts_and_states_error.png b/briar-android/res/drawable-mdpi/alerts_and_states_error.png
deleted file mode 100644
index 097c3bc23..000000000
Binary files a/briar-android/res/drawable-mdpi/alerts_and_states_error.png and /dev/null differ
diff --git a/briar-android/res/drawable-mdpi/message_notification_icon.png b/briar-android/res/drawable-mdpi/message_notification_icon.png
deleted file mode 100644
index e2d666cc7..000000000
Binary files a/briar-android/res/drawable-mdpi/message_notification_icon.png and /dev/null differ
diff --git a/briar-android/res/drawable-mdpi/msg_in.9.png b/briar-android/res/drawable-mdpi/msg_in.9.png
index cedf69450..8dcac8ebf 100644
Binary files a/briar-android/res/drawable-mdpi/msg_in.9.png and b/briar-android/res/drawable-mdpi/msg_in.9.png differ
diff --git a/briar-android/res/drawable-mdpi/msg_out.9.png b/briar-android/res/drawable-mdpi/msg_out.9.png
index bfca75665..a971fa9ee 100644
Binary files a/briar-android/res/drawable-mdpi/msg_out.9.png and b/briar-android/res/drawable-mdpi/msg_out.9.png differ
diff --git a/briar-android/res/drawable-mdpi/navigation_accept.png b/briar-android/res/drawable-mdpi/navigation_accept.png
deleted file mode 100644
index cf5fab3ad..000000000
Binary files a/briar-android/res/drawable-mdpi/navigation_accept.png and /dev/null differ
diff --git a/briar-android/res/drawable-mdpi/notice_in.9.png b/briar-android/res/drawable-mdpi/notice_in.9.png
index afad3fe86..17344215d 100644
Binary files a/briar-android/res/drawable-mdpi/notice_in.9.png and b/briar-android/res/drawable-mdpi/notice_in.9.png differ
diff --git a/briar-android/res/drawable-mdpi/notice_out.9.png b/briar-android/res/drawable-mdpi/notice_out.9.png
index c84866764..600e2bcfa 100644
Binary files a/briar-android/res/drawable-mdpi/notice_out.9.png and b/briar-android/res/drawable-mdpi/notice_out.9.png differ
diff --git a/briar-android/res/drawable-xhdpi/alerts_and_states_error.png b/briar-android/res/drawable-xhdpi/alerts_and_states_error.png
deleted file mode 100644
index 3baea5587..000000000
Binary files a/briar-android/res/drawable-xhdpi/alerts_and_states_error.png and /dev/null differ
diff --git a/briar-android/res/drawable-xhdpi/message_notification_icon.png b/briar-android/res/drawable-xhdpi/message_notification_icon.png
deleted file mode 100644
index b965d9320..000000000
Binary files a/briar-android/res/drawable-xhdpi/message_notification_icon.png and /dev/null differ
diff --git a/briar-android/res/drawable-xhdpi/msg_in.9.png b/briar-android/res/drawable-xhdpi/msg_in.9.png
index 8bf845198..35e4f5309 100644
Binary files a/briar-android/res/drawable-xhdpi/msg_in.9.png and b/briar-android/res/drawable-xhdpi/msg_in.9.png differ
diff --git a/briar-android/res/drawable-xhdpi/msg_out.9.png b/briar-android/res/drawable-xhdpi/msg_out.9.png
index dd5521a5f..39ca327f4 100644
Binary files a/briar-android/res/drawable-xhdpi/msg_out.9.png and b/briar-android/res/drawable-xhdpi/msg_out.9.png differ
diff --git a/briar-android/res/drawable-xhdpi/navigation_accept.png b/briar-android/res/drawable-xhdpi/navigation_accept.png
deleted file mode 100644
index b8915716e..000000000
Binary files a/briar-android/res/drawable-xhdpi/navigation_accept.png and /dev/null differ
diff --git a/briar-android/res/drawable-xhdpi/notice_in.9.png b/briar-android/res/drawable-xhdpi/notice_in.9.png
index 9af342757..3b3af4683 100644
Binary files a/briar-android/res/drawable-xhdpi/notice_in.9.png and b/briar-android/res/drawable-xhdpi/notice_in.9.png differ
diff --git a/briar-android/res/drawable-xhdpi/notice_out.9.png b/briar-android/res/drawable-xhdpi/notice_out.9.png
index 3cd51f590..2a4c85db1 100644
Binary files a/briar-android/res/drawable-xhdpi/notice_out.9.png and b/briar-android/res/drawable-xhdpi/notice_out.9.png differ
diff --git a/briar-android/res/drawable-xxhdpi/msg_in.9.png b/briar-android/res/drawable-xxhdpi/msg_in.9.png
index 1330b80fa..cee5a53b0 100644
Binary files a/briar-android/res/drawable-xxhdpi/msg_in.9.png and b/briar-android/res/drawable-xxhdpi/msg_in.9.png differ
diff --git a/briar-android/res/drawable-xxhdpi/msg_out.9.png b/briar-android/res/drawable-xxhdpi/msg_out.9.png
index 866bc8c29..3f4603ad4 100644
Binary files a/briar-android/res/drawable-xxhdpi/msg_out.9.png and b/briar-android/res/drawable-xxhdpi/msg_out.9.png differ
diff --git a/briar-android/res/drawable-xxhdpi/notice_in.9.png b/briar-android/res/drawable-xxhdpi/notice_in.9.png
index 690bdd299..8d001ab0b 100644
Binary files a/briar-android/res/drawable-xxhdpi/notice_in.9.png and b/briar-android/res/drawable-xxhdpi/notice_in.9.png differ
diff --git a/briar-android/res/drawable-xxhdpi/notice_out.9.png b/briar-android/res/drawable-xxhdpi/notice_out.9.png
index d1a632b6e..0b1e403dd 100644
Binary files a/briar-android/res/drawable-xxhdpi/notice_out.9.png and b/briar-android/res/drawable-xxhdpi/notice_out.9.png differ
diff --git a/briar-android/res/drawable/alerts_and_states_error.xml b/briar-android/res/drawable/alerts_and_states_error.xml
new file mode 100644
index 000000000..b84f896b6
--- /dev/null
+++ b/briar-android/res/drawable/alerts_and_states_error.xml
@@ -0,0 +1,5 @@
+<vector android:alpha="0.54" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M15.73,3L8.27,3L3,8.27v7.46L8.27,21h7.46L21,15.73L21,8.27L15.73,3zM12,17.3c-0.72,0 -1.3,-0.58 -1.3,-1.3 0,-0.72 0.58,-1.3 1.3,-1.3 0.72,0 1.3,0.58 1.3,1.3 0,0.72 -0.58,1.3 -1.3,1.3zM13,13h-2L11,7h2v6z"/>
+</vector>
diff --git a/briar-android/res/drawable/message_notification_icon.xml b/briar-android/res/drawable/message_notification_icon.xml
new file mode 100644
index 000000000..c300537f6
--- /dev/null
+++ b/briar-android/res/drawable/message_notification_icon.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z"/>
+</vector>
diff --git a/briar-android/res/drawable/navigation_accept.xml b/briar-android/res/drawable/navigation_accept.xml
new file mode 100644
index 000000000..8dcd06dd6
--- /dev/null
+++ b/briar-android/res/drawable/navigation_accept.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:alpha="0.54"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0">
+	<path
+		android:fillColor="#FF000000"
+		android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
+</vector>
diff --git a/briar-android/res/layout/list_item_introduction_in.xml b/briar-android/res/layout/list_item_introduction_in.xml
index 8d197e6eb..db40b4786 100644
--- a/briar-android/res/layout/list_item_introduction_in.xml
+++ b/briar-android/res/layout/list_item_introduction_in.xml
@@ -14,29 +14,29 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="left|start"
-		android:background="@drawable/notice_in"
 		android:layout_marginLeft="@dimen/message_bubble_margin_tail"
-		android:layout_marginRight="@dimen/message_bubble_margin_non_tail">
+		android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
+		android:background="@drawable/notice_in">
 
 		<TextView
 			android:id="@+id/introductionText"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:minWidth="80dp"
+			android:textColor="@color/briar_text_secondary"
 			android:textIsSelectable="true"
 			android:textSize="@dimen/text_size_medium"
 			android:textStyle="italic"
-			android:textColor="@color/briar_text_secondary"
 			tools:text="@string/introduction_request_received"/>
 
 		<TextView
 			android:id="@+id/introductionTime"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_marginTop="@dimen/message_bubble_timestamp_margin"
 			android:layout_alignEnd="@+id/introductionText"
 			android:layout_alignRight="@+id/introductionText"
 			android:layout_below="@+id/declineButton"
+			android:layout_marginTop="@dimen/message_bubble_timestamp_margin"
 			android:textColor="@color/private_message_date"
 			android:textSize="@dimen/text_size_tiny"
 			tools:text="Dec 24, 13:37"/>
@@ -56,8 +56,8 @@
 			style="@style/BriarButtonFlat.Negative"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_marginBottom="-15dp"
 			android:layout_below="@+id/introductionText"
+			android:layout_marginBottom="-15dp"
 			android:layout_toLeftOf="@+id/acceptButton"
 			android:layout_toStartOf="@+id/acceptButton"
 			android:text="@string/decline"/>
diff --git a/briar-android/res/layout/list_item_msg_in.xml b/briar-android/res/layout/list_item_msg_in.xml
index e75ede049..1858c1cc8 100644
--- a/briar-android/res/layout/list_item_msg_in.xml
+++ b/briar-android/res/layout/list_item_msg_in.xml
@@ -14,9 +14,9 @@
 		android:id="@+id/msgBody"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
+		android:textColor="@color/briar_text_primary"
 		android:textIsSelectable="true"
 		android:textSize="@dimen/text_size_medium"
-		android:textColor="@color/briar_text_primary"
 		tools:text="Short message"/>
 
 	<TextView
diff --git a/briar-android/res/layout/list_item_msg_out.xml b/briar-android/res/layout/list_item_msg_out.xml
index 5902b7381..34de5a9dd 100644
--- a/briar-android/res/layout/list_item_msg_out.xml
+++ b/briar-android/res/layout/list_item_msg_out.xml
@@ -11,9 +11,9 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="right|end"
-		android:background="@drawable/msg_out"
 		android:layout_marginLeft="@dimen/message_bubble_margin_non_tail"
-		android:layout_marginRight="@dimen/message_bubble_margin_tail">
+		android:layout_marginRight="@dimen/message_bubble_margin_tail"
+		android:background="@drawable/msg_out">
 
 		<TextView
 			android:id="@+id/msgBody"
@@ -28,11 +28,11 @@
 			android:id="@+id/msgTime"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_marginTop="@dimen/message_bubble_timestamp_margin"
 			android:layout_alignParentLeft="true"
 			android:layout_alignParentStart="true"
 			android:layout_below="@+id/msgBody"
-			android:singleLine="true"
+			android:layout_marginTop="@dimen/message_bubble_timestamp_margin"
+			android:maxLines="1"
 			android:textColor="@color/private_message_date_inverse"
 			android:textSize="@dimen/text_size_tiny"
 			tools:text="Dec 24, 13:37"/>
diff --git a/briar-android/res/values/dimens.xml b/briar-android/res/values/dimens.xml
index de80d0880..7c676e61a 100644
--- a/briar-android/res/values/dimens.xml
+++ b/briar-android/res/values/dimens.xml
@@ -36,9 +36,9 @@
 	<dimen name="unread_bubble_padding_horizontal">6dp</dimen>
 	<dimen name="unread_bubble_size">19dp</dimen>
 
-	<dimen name="message_bubble_margin_tail">14dp</dimen>
-	<dimen name="message_bubble_margin_non_tail">51dp</dimen>
-	<dimen name="message_bubble_timestamp_margin">15dp</dimen>
+	<dimen name="message_bubble_margin_tail">3dp</dimen>
+	<dimen name="message_bubble_margin_non_tail">30dp</dimen>
+	<dimen name="message_bubble_timestamp_margin">7dp</dimen>
 	<dimen name="forum_nested_line_width">2dp</dimen>
 	<dimen name="forum_nested_indicator">24dp</dimen>
 	<dimen name="forum_avatar_size">20dp</dimen>