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 0000000000000000000000000000000000000000..9a81763546e95b6934b49f2abc1bd9b1781f8202
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 0000000000000000000000000000000000000000..bcff2b787928c06f490cdbc77b85eaf411fd81b5
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 0000000000000000000000000000000000000000..bd6a809ec3d17c9bb49d25bfd9e7c4f6c7ee1aba
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 0000000000000000000000000000000000000000..b6898258a9b40c45dcf5432be4bdad69e8bfa94e
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 0000000000000000000000000000000000000000..1bc46ba174fb2aa0584a66b2438a6abbca83e487
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 0000000000000000000000000000000000000000..9c5916e12bfad69105ad0704505fb26969641fe1
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 0000000000000000000000000000000000000000..0d08d9e3efd3a6b7c41fc059944cc6a97d8c930e
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 0000000000000000000000000000000000000000..b941097643c79bdffe74edb04ffca9f4baad799d
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 0000000000000000000000000000000000000000..8dcac8ebf635798e78ffca26afbec5a659af5110
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 0000000000000000000000000000000000000000..0307d2f6818e235b947ca2473a26dabb88adcef5
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 0000000000000000000000000000000000000000..a971fa9ee52a0afd90ed7c905bc1d21ed0801ce7
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 0000000000000000000000000000000000000000..526edd212be689c540547304450c4a6dae1dd77e
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 0000000000000000000000000000000000000000..17344215d96729aac28d52e837e1b1609340369e
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 0000000000000000000000000000000000000000..f64d08347c3473dfc38e7b082e8dd629327fce6a
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 0000000000000000000000000000000000000000..600e2bcfac66c9d153d801962eb8ea5519fd14e6
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 0000000000000000000000000000000000000000..674b59a31bdbb79f63c751184e9fbb2951fd96a1
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 0000000000000000000000000000000000000000..008d7833b1e82d1c4a3a0712bd0950f98d67dbef
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 0000000000000000000000000000000000000000..4d34c50659e80df651b330f5302aae551170b7f2
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 0000000000000000000000000000000000000000..4b8904541f8a268642590d7936a26bbd1531487d
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 0000000000000000000000000000000000000000..ebad24e9f486147a8e13530ab92f20e84ac131d2
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 0000000000000000000000000000000000000000..13597cfa4ea0bdb67d162cfdd7cc06ef3381272f
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 0000000000000000000000000000000000000000..c3b950d4bd36d2ba2af61b19e2331ea9ade8f311
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 0000000000000000000000000000000000000000..cef3f185e0daca7c700b160dd38f313909a9eaf4
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 0000000000000000000000000000000000000000..60ea93838e90612c838e4974865aaa917c448738
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 0000000000000000000000000000000000000000..35e4f5309ccaf730e48611430c9d2fcdee1bb710
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 0000000000000000000000000000000000000000..eba9138bca21366f395907b0dab1180f4bd1e40a
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 0000000000000000000000000000000000000000..39ca327f4fb0ccc7810f296ae2a0ed36c5f7c2a4
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 0000000000000000000000000000000000000000..f06ff20ba279e444ee59f86fa34c0fcec6bb5300
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 0000000000000000000000000000000000000000..3b3af46839122a4c3473afd4b155e203b2e09077
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 0000000000000000000000000000000000000000..5d7ba38cc5ad5c5bcd6bfcfda30d9b9f659036e7
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 0000000000000000000000000000000000000000..2a4c85db1244cc5b14e4b18378e72a3e3940961b
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 0000000000000000000000000000000000000000..a9a19763db7ca9334d4ed2e584b1fd9a5564c5b5
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 0000000000000000000000000000000000000000..cee5a53b031ba82db68e6683c43e5f5c10b54762
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 0000000000000000000000000000000000000000..e9829962e5a21490a451ade82181225b99fa7353
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 0000000000000000000000000000000000000000..3f4603ad4280357ad8ca3823c4db78c73dffd328
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 0000000000000000000000000000000000000000..054f45de3fc0f1c87bf6ed7a5a39db4c8426aa39
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 0000000000000000000000000000000000000000..8d001ab0b6e20df77531fe1ca19a507a5fafb4a9
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 0000000000000000000000000000000000000000..1a9a07a5e78d2b1925d8bdbe1710f4297899d1e0
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 0000000000000000000000000000000000000000..0b1e403dd1c4f5c492123e380d4c8488d91d402f
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 0000000000000000000000000000000000000000..c23063319f6059ff80db15204d763724ec86375c
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 be0e510dcc0a232f0a10f481855b7090f77de7f1..0000000000000000000000000000000000000000
--- 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 3f8c52e4085a26db98771568ff07265a75b23de0..0000000000000000000000000000000000000000
--- 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 92db23ba4deb23cafce238aadef765d14751e180..0000000000000000000000000000000000000000
--- 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 c56165226871b7d520a258855401b5383483bc5a..0000000000000000000000000000000000000000
--- 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 4d031a62603b2cc9f0660934d182e427b8c4b829..0000000000000000000000000000000000000000
--- 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 f4053190e392d0c5ca62408afff1d93f007d4bdf..0000000000000000000000000000000000000000
--- 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 1c9084ba4992fa8d23f14376c122f40fd4456199..0000000000000000000000000000000000000000
--- 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 b42740df48f194cc3ede933508a5417acdda2d63..0000000000000000000000000000000000000000
--- 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 d2c83738cde78227ce0197994a3ddd0b76d3a313..3ef6f3a07a3715f1a1412c5ba62132ba5ce52a0c 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 58f9ad862d42678558ae07ef5443fd27820c2343..ab0f325ed22ff96e233194bc0c7d728939110329 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 c504e9704235eebfa2922cb0c84f73b7f35d45a5..afd04392d3498a64e2cc200a046fbce94a7398c9 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 50e369a77ca209196b75ff67520b4cef7e083ff9..a1aadd1df41cf6e1f2b9d3854218dbac4e32bdde 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 16c1f8649d9124536fb0a3d545eaaef83c282580..d84e1f16f8af5a129004d1538b08c4d8339abdd0 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 420a5fdf5d392559e95c06c22edab03c1afda46d..52da2643f3ea930028899b36017682b03f745de0 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 86f7345596e6e6eaf2b4c4913af1f7f3228172e9..725ab397a2b191b5b92d1d888b840041c6692f98 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 4d925f9e6bf2d89fd1aacd17edc5713e0bf8d3d7..c92f335dbbb3d9300849c347e0a3281645d8c72e 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>