diff --git a/briar-android/src/main/res/drawable-hdpi/msg_in.9.png b/briar-android/src/main/res/drawable-hdpi/msg_in.9.png
new file mode 100644
index 000000000..9a8176354
Binary files /dev/null and b/briar-android/src/main/res/drawable-hdpi/msg_in.9.png differ
diff --git a/briar-android/src/main/res/drawable-hdpi/msg_in_top.9.png b/briar-android/src/main/res/drawable-hdpi/msg_in_top.9.png
new file mode 100644
index 000000000..bcff2b787
Binary files /dev/null and b/briar-android/src/main/res/drawable-hdpi/msg_in_top.9.png differ
diff --git a/briar-android/src/main/res/drawable-hdpi/msg_out.9.png b/briar-android/src/main/res/drawable-hdpi/msg_out.9.png
new file mode 100644
index 000000000..bd6a809ec
Binary files /dev/null and b/briar-android/src/main/res/drawable-hdpi/msg_out.9.png differ
diff --git a/briar-android/src/main/res/drawable-hdpi/msg_out_top.9.png b/briar-android/src/main/res/drawable-hdpi/msg_out_top.9.png
new file mode 100644
index 000000000..b6898258a
Binary files /dev/null and b/briar-android/src/main/res/drawable-hdpi/msg_out_top.9.png differ
diff --git a/briar-android/src/main/res/drawable-hdpi/notice_in.9.png b/briar-android/src/main/res/drawable-hdpi/notice_in.9.png
new file mode 100644
index 000000000..1bc46ba17
Binary files /dev/null and b/briar-android/src/main/res/drawable-hdpi/notice_in.9.png differ
diff --git a/briar-android/src/main/res/drawable-hdpi/notice_in_bottom.9.png b/briar-android/src/main/res/drawable-hdpi/notice_in_bottom.9.png
new file mode 100644
index 000000000..9c5916e12
Binary files /dev/null and b/briar-android/src/main/res/drawable-hdpi/notice_in_bottom.9.png differ
diff --git a/briar-android/src/main/res/drawable-hdpi/notice_out.9.png b/briar-android/src/main/res/drawable-hdpi/notice_out.9.png
new file mode 100644
index 000000000..0d08d9e3e
Binary files /dev/null and b/briar-android/src/main/res/drawable-hdpi/notice_out.9.png differ
diff --git a/briar-android/src/main/res/drawable-hdpi/notice_out_bottom.9.png b/briar-android/src/main/res/drawable-hdpi/notice_out_bottom.9.png
new file mode 100644
index 000000000..b94109764
Binary files /dev/null and b/briar-android/src/main/res/drawable-hdpi/notice_out_bottom.9.png differ
diff --git a/briar-android/src/main/res/drawable-mdpi/msg_in.9.png b/briar-android/src/main/res/drawable-mdpi/msg_in.9.png
new file mode 100644
index 000000000..8dcac8ebf
Binary files /dev/null and b/briar-android/src/main/res/drawable-mdpi/msg_in.9.png differ
diff --git a/briar-android/src/main/res/drawable-mdpi/msg_in_top.9.png b/briar-android/src/main/res/drawable-mdpi/msg_in_top.9.png
new file mode 100644
index 000000000..0307d2f68
Binary files /dev/null and b/briar-android/src/main/res/drawable-mdpi/msg_in_top.9.png differ
diff --git a/briar-android/src/main/res/drawable-mdpi/msg_out.9.png b/briar-android/src/main/res/drawable-mdpi/msg_out.9.png
new file mode 100644
index 000000000..a971fa9ee
Binary files /dev/null and b/briar-android/src/main/res/drawable-mdpi/msg_out.9.png differ
diff --git a/briar-android/src/main/res/drawable-mdpi/msg_out_top.9.png b/briar-android/src/main/res/drawable-mdpi/msg_out_top.9.png
new file mode 100644
index 000000000..526edd212
Binary files /dev/null and b/briar-android/src/main/res/drawable-mdpi/msg_out_top.9.png differ
diff --git a/briar-android/src/main/res/drawable-mdpi/notice_in.9.png b/briar-android/src/main/res/drawable-mdpi/notice_in.9.png
new file mode 100644
index 000000000..17344215d
Binary files /dev/null and b/briar-android/src/main/res/drawable-mdpi/notice_in.9.png differ
diff --git a/briar-android/src/main/res/drawable-mdpi/notice_in_bottom.9.png b/briar-android/src/main/res/drawable-mdpi/notice_in_bottom.9.png
new file mode 100644
index 000000000..f64d08347
Binary files /dev/null and b/briar-android/src/main/res/drawable-mdpi/notice_in_bottom.9.png differ
diff --git a/briar-android/src/main/res/drawable-mdpi/notice_out.9.png b/briar-android/src/main/res/drawable-mdpi/notice_out.9.png
new file mode 100644
index 000000000..600e2bcfa
Binary files /dev/null and b/briar-android/src/main/res/drawable-mdpi/notice_out.9.png differ
diff --git a/briar-android/src/main/res/drawable-mdpi/notice_out_bottom.9.png b/briar-android/src/main/res/drawable-mdpi/notice_out_bottom.9.png
new file mode 100644
index 000000000..674b59a31
Binary files /dev/null and b/briar-android/src/main/res/drawable-mdpi/notice_out_bottom.9.png differ
diff --git a/briar-android/src/main/res/drawable-night-hdpi/msg_in.9.png b/briar-android/src/main/res/drawable-night-hdpi/msg_in.9.png
new file mode 100644
index 000000000..008d7833b
Binary files /dev/null and b/briar-android/src/main/res/drawable-night-hdpi/msg_in.9.png differ
diff --git a/briar-android/src/main/res/drawable-night-hdpi/msg_in_top.9.png b/briar-android/src/main/res/drawable-night-hdpi/msg_in_top.9.png
new file mode 100644
index 000000000..4d34c5065
Binary files /dev/null and b/briar-android/src/main/res/drawable-night-hdpi/msg_in_top.9.png differ
diff --git a/briar-android/src/main/res/drawable-night-mdpi/msg_in.9.png b/briar-android/src/main/res/drawable-night-mdpi/msg_in.9.png
new file mode 100644
index 000000000..4b8904541
Binary files /dev/null and b/briar-android/src/main/res/drawable-night-mdpi/msg_in.9.png differ
diff --git a/briar-android/src/main/res/drawable-night-mdpi/msg_in_top.9.png b/briar-android/src/main/res/drawable-night-mdpi/msg_in_top.9.png
new file mode 100644
index 000000000..ebad24e9f
Binary files /dev/null and b/briar-android/src/main/res/drawable-night-mdpi/msg_in_top.9.png differ
diff --git a/briar-android/src/main/res/drawable-night-xhdpi/msg_in.9.png b/briar-android/src/main/res/drawable-night-xhdpi/msg_in.9.png
new file mode 100644
index 000000000..13597cfa4
Binary files /dev/null and b/briar-android/src/main/res/drawable-night-xhdpi/msg_in.9.png differ
diff --git a/briar-android/src/main/res/drawable-night-xhdpi/msg_in_top.9.png b/briar-android/src/main/res/drawable-night-xhdpi/msg_in_top.9.png
new file mode 100644
index 000000000..c3b950d4b
Binary files /dev/null and b/briar-android/src/main/res/drawable-night-xhdpi/msg_in_top.9.png differ
diff --git a/briar-android/src/main/res/drawable-night-xxhdpi/msg_in.9.png b/briar-android/src/main/res/drawable-night-xxhdpi/msg_in.9.png
new file mode 100644
index 000000000..cef3f185e
Binary files /dev/null and b/briar-android/src/main/res/drawable-night-xxhdpi/msg_in.9.png differ
diff --git a/briar-android/src/main/res/drawable-night-xxhdpi/msg_in_top.9.png b/briar-android/src/main/res/drawable-night-xxhdpi/msg_in_top.9.png
new file mode 100644
index 000000000..60ea93838
Binary files /dev/null and b/briar-android/src/main/res/drawable-night-xxhdpi/msg_in_top.9.png differ
diff --git a/briar-android/src/main/res/drawable-xhdpi/msg_in.9.png b/briar-android/src/main/res/drawable-xhdpi/msg_in.9.png
new file mode 100644
index 000000000..35e4f5309
Binary files /dev/null and b/briar-android/src/main/res/drawable-xhdpi/msg_in.9.png differ
diff --git a/briar-android/src/main/res/drawable-xhdpi/msg_in_top.9.png b/briar-android/src/main/res/drawable-xhdpi/msg_in_top.9.png
new file mode 100644
index 000000000..eba9138bc
Binary files /dev/null and b/briar-android/src/main/res/drawable-xhdpi/msg_in_top.9.png differ
diff --git a/briar-android/src/main/res/drawable-xhdpi/msg_out.9.png b/briar-android/src/main/res/drawable-xhdpi/msg_out.9.png
new file mode 100644
index 000000000..39ca327f4
Binary files /dev/null and b/briar-android/src/main/res/drawable-xhdpi/msg_out.9.png differ
diff --git a/briar-android/src/main/res/drawable-xhdpi/msg_out_top.9.png b/briar-android/src/main/res/drawable-xhdpi/msg_out_top.9.png
new file mode 100644
index 000000000..f06ff20ba
Binary files /dev/null and b/briar-android/src/main/res/drawable-xhdpi/msg_out_top.9.png differ
diff --git a/briar-android/src/main/res/drawable-xhdpi/notice_in.9.png b/briar-android/src/main/res/drawable-xhdpi/notice_in.9.png
new file mode 100644
index 000000000..3b3af4683
Binary files /dev/null and b/briar-android/src/main/res/drawable-xhdpi/notice_in.9.png differ
diff --git a/briar-android/src/main/res/drawable-xhdpi/notice_in_bottom.9.png b/briar-android/src/main/res/drawable-xhdpi/notice_in_bottom.9.png
new file mode 100644
index 000000000..5d7ba38cc
Binary files /dev/null and b/briar-android/src/main/res/drawable-xhdpi/notice_in_bottom.9.png differ
diff --git a/briar-android/src/main/res/drawable-xhdpi/notice_out.9.png b/briar-android/src/main/res/drawable-xhdpi/notice_out.9.png
new file mode 100644
index 000000000..2a4c85db1
Binary files /dev/null and b/briar-android/src/main/res/drawable-xhdpi/notice_out.9.png differ
diff --git a/briar-android/src/main/res/drawable-xhdpi/notice_out_bottom.9.png b/briar-android/src/main/res/drawable-xhdpi/notice_out_bottom.9.png
new file mode 100644
index 000000000..a9a19763d
Binary files /dev/null and b/briar-android/src/main/res/drawable-xhdpi/notice_out_bottom.9.png differ
diff --git a/briar-android/src/main/res/drawable-xxhdpi/msg_in.9.png b/briar-android/src/main/res/drawable-xxhdpi/msg_in.9.png
new file mode 100644
index 000000000..cee5a53b0
Binary files /dev/null and b/briar-android/src/main/res/drawable-xxhdpi/msg_in.9.png differ
diff --git a/briar-android/src/main/res/drawable-xxhdpi/msg_in_top.9.png b/briar-android/src/main/res/drawable-xxhdpi/msg_in_top.9.png
new file mode 100644
index 000000000..e9829962e
Binary files /dev/null and b/briar-android/src/main/res/drawable-xxhdpi/msg_in_top.9.png differ
diff --git a/briar-android/src/main/res/drawable-xxhdpi/msg_out.9.png b/briar-android/src/main/res/drawable-xxhdpi/msg_out.9.png
new file mode 100644
index 000000000..3f4603ad4
Binary files /dev/null and b/briar-android/src/main/res/drawable-xxhdpi/msg_out.9.png differ
diff --git a/briar-android/src/main/res/drawable-xxhdpi/msg_out_top.9.png b/briar-android/src/main/res/drawable-xxhdpi/msg_out_top.9.png
new file mode 100644
index 000000000..054f45de3
Binary files /dev/null and b/briar-android/src/main/res/drawable-xxhdpi/msg_out_top.9.png differ
diff --git a/briar-android/src/main/res/drawable-xxhdpi/notice_in.9.png b/briar-android/src/main/res/drawable-xxhdpi/notice_in.9.png
new file mode 100644
index 000000000..8d001ab0b
Binary files /dev/null and b/briar-android/src/main/res/drawable-xxhdpi/notice_in.9.png differ
diff --git a/briar-android/src/main/res/drawable-xxhdpi/notice_in_bottom.9.png b/briar-android/src/main/res/drawable-xxhdpi/notice_in_bottom.9.png
new file mode 100644
index 000000000..1a9a07a5e
Binary files /dev/null and b/briar-android/src/main/res/drawable-xxhdpi/notice_in_bottom.9.png differ
diff --git a/briar-android/src/main/res/drawable-xxhdpi/notice_out.9.png b/briar-android/src/main/res/drawable-xxhdpi/notice_out.9.png
new file mode 100644
index 000000000..0b1e403dd
Binary files /dev/null and b/briar-android/src/main/res/drawable-xxhdpi/notice_out.9.png differ
diff --git a/briar-android/src/main/res/drawable-xxhdpi/notice_out_bottom.9.png b/briar-android/src/main/res/drawable-xxhdpi/notice_out_bottom.9.png
new file mode 100644
index 000000000..c23063319
Binary files /dev/null and b/briar-android/src/main/res/drawable-xxhdpi/notice_out_bottom.9.png differ
diff --git a/briar-android/src/main/res/drawable/msg_in.xml b/briar-android/src/main/res/drawable/msg_in.xml
deleted file mode 100644
index be0e510dc..000000000
--- a/briar-android/src/main/res/drawable/msg_in.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:shape="rectangle">
-	<corners
-		android:bottomLeftRadius="@dimen/message_bubble_radius_big"
-		android:bottomRightRadius="@dimen/message_bubble_radius_big"
-		android:topLeftRadius="@dimen/message_bubble_radius_small"
-		android:topRightRadius="@dimen/message_bubble_radius_big"/>
-	<padding
-		android:bottom="@dimen/message_bubble_padding_bottom"
-		android:left="@dimen/message_bubble_padding_sides"
-		android:right="@dimen/message_bubble_padding_sides"
-		android:top="@dimen/message_bubble_padding_top"/>
-	<solid
-		android:color="@color/msg_in"/>
-</shape>
diff --git a/briar-android/src/main/res/drawable/msg_in_top.xml b/briar-android/src/main/res/drawable/msg_in_top.xml
deleted file mode 100644
index 3f8c52e40..000000000
--- a/briar-android/src/main/res/drawable/msg_in_top.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:shape="rectangle">
-	<corners
-		android:bottomLeftRadius="0dp"
-		android:bottomRightRadius="0dp"
-		android:topLeftRadius="@dimen/message_bubble_radius_small"
-		android:topRightRadius="@dimen/message_bubble_radius_big"/>
-	<padding
-		android:bottom="@dimen/message_bubble_padding_top"
-		android:left="@dimen/message_bubble_padding_sides"
-		android:right="@dimen/message_bubble_padding_sides"
-		android:top="@dimen/message_bubble_padding_top"/>
-	<solid
-		android:color="@color/msg_in"/>
-</shape>
diff --git a/briar-android/src/main/res/drawable/msg_out.xml b/briar-android/src/main/res/drawable/msg_out.xml
deleted file mode 100644
index 92db23ba4..000000000
--- a/briar-android/src/main/res/drawable/msg_out.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:shape="rectangle">
-	<corners
-		android:bottomLeftRadius="@dimen/message_bubble_radius_big"
-		android:bottomRightRadius="@dimen/message_bubble_radius_big"
-		android:topLeftRadius="@dimen/message_bubble_radius_big"
-		android:topRightRadius="@dimen/message_bubble_radius_small"/>
-	<padding
-		android:bottom="@dimen/message_bubble_padding_bottom"
-		android:left="@dimen/message_bubble_padding_sides"
-		android:right="@dimen/message_bubble_padding_sides"
-		android:top="@dimen/message_bubble_padding_top"/>
-	<solid
-		android:color="@color/msg_out"/>
-</shape>
diff --git a/briar-android/src/main/res/drawable/msg_out_top.xml b/briar-android/src/main/res/drawable/msg_out_top.xml
deleted file mode 100644
index c56165226..000000000
--- a/briar-android/src/main/res/drawable/msg_out_top.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:shape="rectangle">
-	<corners
-		android:bottomLeftRadius="0dp"
-		android:bottomRightRadius="0dp"
-		android:topLeftRadius="@dimen/message_bubble_radius_big"
-		android:topRightRadius="@dimen/message_bubble_radius_small"/>
-	<padding
-		android:bottom="@dimen/message_bubble_padding_top"
-		android:left="@dimen/message_bubble_padding_sides"
-		android:right="@dimen/message_bubble_padding_sides"
-		android:top="@dimen/message_bubble_padding_top"/>
-	<solid
-		android:color="@color/msg_out"/>
-</shape>
diff --git a/briar-android/src/main/res/drawable/notice_in.xml b/briar-android/src/main/res/drawable/notice_in.xml
deleted file mode 100644
index 4d031a626..000000000
--- a/briar-android/src/main/res/drawable/notice_in.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:shape="rectangle">
-	<corners
-		android:bottomLeftRadius="@dimen/message_bubble_radius_big"
-		android:bottomRightRadius="@dimen/message_bubble_radius_big"
-		android:topLeftRadius="@dimen/message_bubble_radius_small"
-		android:topRightRadius="@dimen/message_bubble_radius_big"/>
-	<padding
-		android:bottom="@dimen/message_bubble_padding_bottom"
-		android:left="@dimen/message_bubble_padding_sides"
-		android:right="@dimen/message_bubble_padding_sides"
-		android:top="@dimen/message_bubble_padding_top"/>
-	<solid
-		android:color="@color/notice_in"/>
-</shape>
diff --git a/briar-android/src/main/res/drawable/notice_in_bottom.xml b/briar-android/src/main/res/drawable/notice_in_bottom.xml
deleted file mode 100644
index f4053190e..000000000
--- a/briar-android/src/main/res/drawable/notice_in_bottom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:shape="rectangle">
-	<corners
-		android:bottomLeftRadius="@dimen/message_bubble_radius_big"
-		android:bottomRightRadius="@dimen/message_bubble_radius_big"
-		android:topLeftRadius="0dp"
-		android:topRightRadius="0dp"/>
-	<padding
-		android:bottom="@dimen/message_bubble_padding_bottom"
-		android:left="@dimen/message_bubble_padding_sides"
-		android:right="@dimen/message_bubble_padding_sides"
-		android:top="@dimen/message_bubble_padding_bottom"/>
-	<solid
-		android:color="@color/notice_in"/>
-</shape>
diff --git a/briar-android/src/main/res/drawable/notice_out.xml b/briar-android/src/main/res/drawable/notice_out.xml
deleted file mode 100644
index 1c9084ba4..000000000
--- a/briar-android/src/main/res/drawable/notice_out.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:shape="rectangle">
-	<corners
-		android:bottomLeftRadius="@dimen/message_bubble_radius_big"
-		android:bottomRightRadius="@dimen/message_bubble_radius_big"
-		android:topLeftRadius="@dimen/message_bubble_radius_big"
-		android:topRightRadius="@dimen/message_bubble_radius_small"/>
-	<padding
-		android:bottom="@dimen/message_bubble_padding_bottom"
-		android:left="@dimen/message_bubble_padding_sides"
-		android:right="@dimen/message_bubble_padding_sides"
-		android:top="@dimen/message_bubble_padding_top"/>
-	<solid
-		android:color="@color/notice_out"/>
-</shape>
diff --git a/briar-android/src/main/res/drawable/notice_out_bottom.xml b/briar-android/src/main/res/drawable/notice_out_bottom.xml
deleted file mode 100644
index b42740df4..000000000
--- a/briar-android/src/main/res/drawable/notice_out_bottom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:shape="rectangle">
-	<corners
-		android:bottomLeftRadius="@dimen/message_bubble_radius_big"
-		android:bottomRightRadius="@dimen/message_bubble_radius_big"
-		android:topLeftRadius="0dp"
-		android:topRightRadius="0dp"/>
-	<padding
-		android:bottom="@dimen/message_bubble_padding_bottom"
-		android:left="@dimen/message_bubble_padding_sides"
-		android:right="@dimen/message_bubble_padding_sides"
-		android:top="@dimen/message_bubble_padding_bottom"/>
-	<solid
-		android:color="@color/notice_out"/>
-</shape>
diff --git a/briar-android/src/main/res/layout/list_item_conversation_msg_in.xml b/briar-android/src/main/res/layout/list_item_conversation_msg_in.xml
index d2c83738c..3ef6f3a07 100644
--- a/briar-android/src/main/res/layout/list_item_conversation_msg_in.xml
+++ b/briar-android/src/main/res/layout/list_item_conversation_msg_in.xml
@@ -5,12 +5,9 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="wrap_content"
 	android:layout_height="wrap_content"
-	android:layout_marginBottom="@dimen/message_bubble_margin"
 	android:layout_marginLeft="@dimen/message_bubble_margin_tail"
 	android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
-	android:layout_marginTop="@dimen/message_bubble_margin"
 	android:background="@drawable/msg_in"
-	android:elevation="@dimen/message_bubble_elevation"
 	android:orientation="vertical">
 
 	<org.thoughtcrime.securesms.components.emoji.EmojiTextView
@@ -28,6 +25,7 @@
 		android:layout_height="wrap_content"
 		android:layout_gravity="right|end"
 		android:layout_marginTop="@dimen/message_bubble_timestamp_margin"
+		android:textColor="?android:attr/textColorSecondary"
 		tools:text="Dec 24, 13:37"/>
 
 </LinearLayout>
diff --git a/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml b/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml
index 58f9ad862..ab0f325ed 100644
--- a/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml
+++ b/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml
@@ -11,12 +11,9 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="right|end"
-		android:layout_marginBottom="@dimen/message_bubble_margin"
 		android:layout_marginLeft="@dimen/message_bubble_margin_non_tail"
 		android:layout_marginRight="@dimen/message_bubble_margin_tail"
-		android:layout_marginTop="@dimen/message_bubble_margin"
-		android:background="@drawable/msg_out"
-		android:elevation="@dimen/message_bubble_elevation">
+		android:background="@drawable/msg_out">
 
 		<org.thoughtcrime.securesms.components.emoji.EmojiTextView
 			android:id="@+id/text"
diff --git a/briar-android/src/main/res/layout/list_item_conversation_notice_in.xml b/briar-android/src/main/res/layout/list_item_conversation_notice_in.xml
index c504e9704..afd04392d 100644
--- a/briar-android/src/main/res/layout/list_item_conversation_notice_in.xml
+++ b/briar-android/src/main/res/layout/list_item_conversation_notice_in.xml
@@ -4,7 +4,6 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:layout_marginTop="@dimen/message_bubble_margin"
 	android:orientation="vertical">
 
 	<org.thoughtcrime.securesms.components.emoji.EmojiTextView
@@ -16,18 +15,16 @@
 		android:layout_marginLeft="@dimen/message_bubble_margin_tail"
 		android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
 		android:background="@drawable/msg_in_top"
-		android:elevation="@dimen/message_bubble_elevation"
+		android:textColor="?android:attr/textColorPrimary"
 		tools:text="Short message"/>
 
 	<RelativeLayout
 		android:id="@+id/layout"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/message_bubble_margin"
 		android:layout_marginLeft="@dimen/message_bubble_margin_tail"
 		android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
-		android:background="@drawable/notice_in_bottom"
-		android:elevation="@dimen/message_bubble_elevation">
+		android:background="@drawable/notice_in_bottom">
 
 		<org.thoughtcrime.securesms.components.emoji.EmojiTextView
 			android:id="@+id/text"
@@ -35,6 +32,7 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:minWidth="80dp"
+			android:textColor="?android:attr/textColorSecondary"
 			tools:text="@string/forum_invitation_received"/>
 
 		<TextView
@@ -46,6 +44,7 @@
 			android:layout_alignRight="@+id/text"
 			android:layout_below="@+id/text"
 			android:layout_marginTop="@dimen/message_bubble_timestamp_margin"
+			android:textColor="?android:attr/textColorTertiary"
 			tools:text="Dec 24, 13:37"/>
 
 	</RelativeLayout>
diff --git a/briar-android/src/main/res/layout/list_item_conversation_notice_out.xml b/briar-android/src/main/res/layout/list_item_conversation_notice_out.xml
index 50e369a77..a1aadd1df 100644
--- a/briar-android/src/main/res/layout/list_item_conversation_notice_out.xml
+++ b/briar-android/src/main/res/layout/list_item_conversation_notice_out.xml
@@ -5,7 +5,6 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:layout_marginTop="@dimen/message_bubble_margin"
 	android:orientation="vertical">
 
 	<org.thoughtcrime.securesms.components.emoji.EmojiTextView
@@ -16,7 +15,6 @@
 		android:layout_marginLeft="@dimen/message_bubble_margin_non_tail"
 		android:layout_marginRight="@dimen/message_bubble_margin_tail"
 		android:background="@drawable/msg_out_top"
-		android:elevation="@dimen/message_bubble_elevation"
 		android:textColor="@color/briar_text_primary_inverse"
 		tools:text="This is a long long long message that spans over several lines.\n\nIt ends here."/>
 
@@ -24,18 +22,16 @@
 		android:id="@+id/layout"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/message_bubble_margin"
 		android:layout_marginLeft="@dimen/message_bubble_margin_non_tail"
 		android:layout_marginRight="@dimen/message_bubble_margin_tail"
-		android:background="@drawable/notice_out_bottom"
-		android:elevation="@dimen/message_bubble_elevation">
+		android:background="@drawable/notice_out_bottom">
 
 		<org.thoughtcrime.securesms.components.emoji.EmojiTextView
 			android:id="@+id/text"
 			style="@style/TextMessage.Notice"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:textColor="@color/private_message_date_inverse"
+			android:textColor="?android:attr/textColorSecondary"
 			tools:text="@string/introduction_request_received"/>
 
 		<TextView
@@ -47,7 +43,7 @@
 			android:layout_alignParentStart="true"
 			android:layout_below="@+id/text"
 			android:layout_marginTop="@dimen/message_bubble_timestamp_margin"
-			android:textColor="@color/private_message_date_inverse"
+			android:textColor="?android:attr/textColorTertiary"
 			tools:text="Dec 24, 13:37"/>
 
 		<android.support.v7.widget.AppCompatImageView
@@ -58,7 +54,7 @@
 			android:layout_marginLeft="@dimen/margin_medium"
 			android:layout_toEndOf="@+id/time"
 			android:layout_toRightOf="@+id/time"
-			app:tint="@color/private_message_date_inverse"
+			app:tint="?attr/colorControlNormal"
 			tools:ignore="ContentDescription"
 			tools:src="@drawable/message_delivered"/>
 
diff --git a/briar-android/src/main/res/layout/list_item_conversation_request.xml b/briar-android/src/main/res/layout/list_item_conversation_request.xml
index 16c1f8649..d84e1f16f 100644
--- a/briar-android/src/main/res/layout/list_item_conversation_request.xml
+++ b/briar-android/src/main/res/layout/list_item_conversation_request.xml
@@ -4,7 +4,6 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:layout_marginTop="@dimen/message_bubble_margin"
 	android:orientation="vertical">
 
 	<org.thoughtcrime.securesms.components.emoji.EmojiTextView
@@ -15,7 +14,6 @@
 		android:layout_marginLeft="@dimen/message_bubble_margin_tail"
 		android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
 		android:background="@drawable/msg_in_top"
-		android:elevation="@dimen/message_bubble_elevation"
 		android:textColor="?android:attr/textColorPrimary"
 		tools:text="Short message"/>
 
@@ -23,17 +21,16 @@
 		android:id="@+id/layout"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/message_bubble_margin"
 		android:layout_marginLeft="@dimen/message_bubble_margin_tail"
 		android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
-		android:background="@drawable/notice_in_bottom"
-		android:elevation="@dimen/message_bubble_elevation">
+		android:background="@drawable/notice_in_bottom">
 
 		<org.thoughtcrime.securesms.components.emoji.EmojiTextView
 			android:id="@+id/text"
 			style="@style/TextMessage.Notice"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
+			android:textColor="?android:attr/textColorSecondary"
 			tools:text="@string/introduction_request_received"/>
 
 		<TextView
@@ -45,6 +42,7 @@
 			android:layout_alignRight="@+id/text"
 			android:layout_below="@+id/acceptButton"
 			android:layout_marginTop="@dimen/message_bubble_timestamp_margin"
+			android:textColor="?android:attr/textColorTertiary"
 			tools:text="Dec 24, 13:37"/>
 
 		<Button
diff --git a/briar-android/src/main/res/values-night/color.xml b/briar-android/src/main/res/values-night/color.xml
index 420a5fdf5..52da2643f 100644
--- a/briar-android/src/main/res/values-night/color.xml
+++ b/briar-android/src/main/res/values-night/color.xml
@@ -8,11 +8,6 @@
 
 	<color name="color_primary">@color/briar_white</color>
 
-	<color name="msg_in">@color/briar_blue</color>
-	<color name="msg_out">@color/briar_blue_elio_light</color>
-	<color name="notice_in">@color/briar_blue_dark</color>
-	<color name="notice_out">@color/briar_blue_elio</color>
-
 	<color name="window_background">@color/briar_blue_very_dark</color>
 	<color name="card_background">@color/briar_blue_dark</color>
 	<color name="item_background_highlight">@color/briar_blue</color>
diff --git a/briar-android/src/main/res/values/color.xml b/briar-android/src/main/res/values/color.xml
index 86f734559..725ab397a 100644
--- a/briar-android/src/main/res/values/color.xml
+++ b/briar-android/src/main/res/values/color.xml
@@ -4,10 +4,7 @@
 	<color name="briar_blue_dark">#222E3C</color>
 	<color name="briar_blue_very_dark">#0F1720</color>
 	<color name="briar_blue_medium">#4F6C8C</color>
-	<color name="briar_blue_elio">#236087</color>
-	<color name="briar_blue_elio_light">#3C80A9</color>
 	<color name="briar_blue_light">#2A93C6</color>
-	<color name="briar_blue_grey">#EBEFF2</color>
 	<color name="briar_green">#5C940D</color>
 	<color name="briar_green_light">#95D220</color>
 	<color name="briar_red">#ff0000</color>
@@ -33,11 +30,6 @@
 
 	<color name="color_primary">#dd000000</color>
 
-	<color name="msg_in">@color/briar_white</color>
-	<color name="msg_out">@color/briar_blue_elio_light</color>
-	<color name="notice_in">@color/briar_blue_grey</color>
-	<color name="notice_out">@color/briar_blue_elio</color>
-
 	<!-- text colors -->
 	<color name="briar_text_link">@color/briar_blue_light</color>
 	<color name="briar_text_primary">#df000000</color>
diff --git a/briar-android/src/main/res/values/dimens.xml b/briar-android/src/main/res/values/dimens.xml
index 4d925f9e6..c92f335db 100644
--- a/briar-android/src/main/res/values/dimens.xml
+++ b/briar-android/src/main/res/values/dimens.xml
@@ -38,16 +38,9 @@
 	<dimen name="unread_bubble_padding_horizontal">6dp</dimen>
 	<dimen name="unread_bubble_size">19dp</dimen>
 
-	<dimen name="message_bubble_radius_big">16dp</dimen>
-	<dimen name="message_bubble_radius_small">4dp</dimen>
-	<dimen name="message_bubble_margin">6dp</dimen>
-	<dimen name="message_bubble_padding_sides">12dp</dimen>
-	<dimen name="message_bubble_padding_top">6dp</dimen>
-	<dimen name="message_bubble_padding_bottom">4dp</dimen>
-	<dimen name="message_bubble_timestamp_margin">4dp</dimen>
-	<dimen name="message_bubble_elevation">2dp</dimen>
-	<dimen name="message_bubble_margin_tail">8dp</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>