diff --git a/res/drawable-hdpi/ic_document.png b/res/drawable-hdpi/ic_document.png
deleted file mode 100644
index c3d2ff8325..0000000000
Binary files a/res/drawable-hdpi/ic_document.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_document_large_dark.png b/res/drawable-hdpi/ic_document_large_dark.png
new file mode 100644
index 0000000000..f17a5078a6
Binary files /dev/null and b/res/drawable-hdpi/ic_document_large_dark.png differ
diff --git a/res/drawable-hdpi/ic_document_large_light.png b/res/drawable-hdpi/ic_document_large_light.png
new file mode 100644
index 0000000000..1c3bd34be6
Binary files /dev/null and b/res/drawable-hdpi/ic_document_large_light.png differ
diff --git a/res/drawable-hdpi/ic_document_small_dark.png b/res/drawable-hdpi/ic_document_small_dark.png
new file mode 100644
index 0000000000..4142741f31
Binary files /dev/null and b/res/drawable-hdpi/ic_document_small_dark.png differ
diff --git a/res/drawable-hdpi/ic_document_small_light.png b/res/drawable-hdpi/ic_document_small_light.png
new file mode 100644
index 0000000000..a68e1c5a66
Binary files /dev/null and b/res/drawable-hdpi/ic_document_small_light.png differ
diff --git a/res/drawable-mdpi/ic_document.png b/res/drawable-mdpi/ic_document.png
deleted file mode 100644
index 3ae0e719e9..0000000000
Binary files a/res/drawable-mdpi/ic_document.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_document_large_dark.png b/res/drawable-mdpi/ic_document_large_dark.png
new file mode 100644
index 0000000000..52f8d3654c
Binary files /dev/null and b/res/drawable-mdpi/ic_document_large_dark.png differ
diff --git a/res/drawable-mdpi/ic_document_large_light.png b/res/drawable-mdpi/ic_document_large_light.png
new file mode 100644
index 0000000000..d0b6f2a2ff
Binary files /dev/null and b/res/drawable-mdpi/ic_document_large_light.png differ
diff --git a/res/drawable-mdpi/ic_document_small_dark.png b/res/drawable-mdpi/ic_document_small_dark.png
new file mode 100644
index 0000000000..2dad4a5ddc
Binary files /dev/null and b/res/drawable-mdpi/ic_document_small_dark.png differ
diff --git a/res/drawable-mdpi/ic_document_small_light.png b/res/drawable-mdpi/ic_document_small_light.png
new file mode 100644
index 0000000000..8972c8b626
Binary files /dev/null and b/res/drawable-mdpi/ic_document_small_light.png differ
diff --git a/res/drawable-xhdpi/ic_document.png b/res/drawable-xhdpi/ic_document.png
deleted file mode 100644
index f1d0df1e0a..0000000000
Binary files a/res/drawable-xhdpi/ic_document.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_document_large_dark.png b/res/drawable-xhdpi/ic_document_large_dark.png
new file mode 100644
index 0000000000..cb4e3f6def
Binary files /dev/null and b/res/drawable-xhdpi/ic_document_large_dark.png differ
diff --git a/res/drawable-xhdpi/ic_document_large_light.png b/res/drawable-xhdpi/ic_document_large_light.png
new file mode 100644
index 0000000000..24027f5450
Binary files /dev/null and b/res/drawable-xhdpi/ic_document_large_light.png differ
diff --git a/res/drawable-xhdpi/ic_document_small_dark.png b/res/drawable-xhdpi/ic_document_small_dark.png
new file mode 100644
index 0000000000..801b63381f
Binary files /dev/null and b/res/drawable-xhdpi/ic_document_small_dark.png differ
diff --git a/res/drawable-xhdpi/ic_document_small_light.png b/res/drawable-xhdpi/ic_document_small_light.png
new file mode 100644
index 0000000000..d2378b1775
Binary files /dev/null and b/res/drawable-xhdpi/ic_document_small_light.png differ
diff --git a/res/drawable-xxhdpi/ic_document.png b/res/drawable-xxhdpi/ic_document.png
deleted file mode 100644
index 6c3c55ea4e..0000000000
Binary files a/res/drawable-xxhdpi/ic_document.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_document_large_dark.png b/res/drawable-xxhdpi/ic_document_large_dark.png
new file mode 100644
index 0000000000..f6f21a9cdb
Binary files /dev/null and b/res/drawable-xxhdpi/ic_document_large_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_document_large_light.png b/res/drawable-xxhdpi/ic_document_large_light.png
new file mode 100644
index 0000000000..26c2172dba
Binary files /dev/null and b/res/drawable-xxhdpi/ic_document_large_light.png differ
diff --git a/res/drawable-xxhdpi/ic_document_small_dark.png b/res/drawable-xxhdpi/ic_document_small_dark.png
new file mode 100644
index 0000000000..9b9e773af0
Binary files /dev/null and b/res/drawable-xxhdpi/ic_document_small_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_document_small_light.png b/res/drawable-xxhdpi/ic_document_small_light.png
new file mode 100644
index 0000000000..4bf082e0d8
Binary files /dev/null and b/res/drawable-xxhdpi/ic_document_small_light.png differ
diff --git a/res/drawable-xxxhdpi/ic_document.png b/res/drawable-xxxhdpi/ic_document.png
deleted file mode 100644
index 2a9c56c586..0000000000
Binary files a/res/drawable-xxxhdpi/ic_document.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_document_large_dark.png b/res/drawable-xxxhdpi/ic_document_large_dark.png
new file mode 100644
index 0000000000..911a1c2f49
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_document_large_dark.png differ
diff --git a/res/drawable-xxxhdpi/ic_document_large_light.png b/res/drawable-xxxhdpi/ic_document_large_light.png
new file mode 100644
index 0000000000..fdcf64d6bb
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_document_large_light.png differ
diff --git a/res/drawable-xxxhdpi/ic_document_small_dark.png b/res/drawable-xxxhdpi/ic_document_small_dark.png
new file mode 100644
index 0000000000..182067089d
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_document_small_dark.png differ
diff --git a/res/drawable-xxxhdpi/ic_document_small_light.png b/res/drawable-xxxhdpi/ic_document_small_light.png
new file mode 100644
index 0000000000..e3aaf73f68
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_document_small_light.png differ
diff --git a/res/drawable/compose_background.xml b/res/drawable/compose_background.xml
index b93c9edb7b..18b651b7f8 100644
--- a/res/drawable/compose_background.xml
+++ b/res/drawable/compose_background.xml
@@ -5,10 +5,10 @@
 
     <stroke
         android:width="1dp"
-        android:color="@color/core_light_10" />
+        android:color="?attr/conversation_input_outline_color" />
 
     <solid
-        android:color="@color/core_light_02" />
+        android:color="?attr/conversation_input_background_color" />
 
     <corners
         android:radius="20dp" />
diff --git a/res/drawable/message_bubble_background_received_alone.xml b/res/drawable/message_bubble_background.xml
similarity index 100%
rename from res/drawable/message_bubble_background_received_alone.xml
rename to res/drawable/message_bubble_background.xml
diff --git a/res/drawable/message_bubble_background_received_end.xml b/res/drawable/message_bubble_background_received_end.xml
deleted file mode 100644
index 3e4e2c0562..0000000000
--- a/res/drawable/message_bubble_background_received_end.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:top="2px"
-        android:bottom="2px">
-
-        <shape android:shape="rectangle">
-            <corners
-                android:topLeftRadius="@dimen/message_corner_collapse_radius"
-                android:topRightRadius="@dimen/message_corner_radius"
-                android:bottomRightRadius="@dimen/message_corner_radius"
-                android:bottomLeftRadius="@dimen/message_corner_radius" />
-            <solid android:color="@color/white" />
-        </shape>
-    </item>
-</layer-list>
diff --git a/res/drawable/message_bubble_background_received_middle.xml b/res/drawable/message_bubble_background_received_middle.xml
deleted file mode 100644
index e3888978ab..0000000000
--- a/res/drawable/message_bubble_background_received_middle.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:top="2px"
-        android:bottom="2px">
-
-        <shape android:shape="rectangle">
-            <corners
-                android:topLeftRadius="@dimen/message_corner_collapse_radius"
-                android:topRightRadius="@dimen/message_corner_radius"
-                android:bottomRightRadius="@dimen/message_corner_radius"
-                android:bottomLeftRadius="@dimen/message_corner_collapse_radius" />
-            <solid android:color="@color/white" />
-        </shape>
-    </item>
-</layer-list>
diff --git a/res/drawable/message_bubble_background_received_start.xml b/res/drawable/message_bubble_background_received_start.xml
deleted file mode 100644
index 4c30cc7565..0000000000
--- a/res/drawable/message_bubble_background_received_start.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:top="2px"
-        android:bottom="2px">
-
-        <shape android:shape="rectangle">
-            <corners
-                android:topLeftRadius="@dimen/message_corner_radius"
-                android:topRightRadius="@dimen/message_corner_radius"
-                android:bottomRightRadius="@dimen/message_corner_radius"
-                android:bottomLeftRadius="@dimen/message_corner_collapse_radius" />
-            <solid android:color="@color/white" />
-        </shape>
-    </item>
-</layer-list>
diff --git a/res/drawable/message_bubble_background_sent_alone.xml b/res/drawable/message_bubble_background_sent_alone.xml
deleted file mode 100644
index 6f19f4f16f..0000000000
--- a/res/drawable/message_bubble_background_sent_alone.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:top="2px"
-        android:bottom="2px">
-
-        <shape android:shape="rectangle">
-            <corners android:radius="@dimen/message_corner_radius"/>
-            <solid android:color="@color/white" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/res/drawable/message_bubble_background_sent_end.xml b/res/drawable/message_bubble_background_sent_end.xml
deleted file mode 100644
index 5bc4597c03..0000000000
--- a/res/drawable/message_bubble_background_sent_end.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:top="2px"
-        android:bottom="2px">
-
-        <shape android:shape="rectangle">
-            <corners
-                android:topLeftRadius="@dimen/message_corner_radius"
-                android:topRightRadius="@dimen/message_corner_collapse_radius"
-                android:bottomRightRadius="@dimen/message_corner_radius"
-                android:bottomLeftRadius="@dimen/message_corner_radius" />
-            <solid android:color="@color/white" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/res/drawable/message_bubble_background_sent_middle.xml b/res/drawable/message_bubble_background_sent_middle.xml
deleted file mode 100644
index aea4264539..0000000000
--- a/res/drawable/message_bubble_background_sent_middle.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:top="2px"
-        android:bottom="2px">
-
-        <shape android:shape="rectangle">
-            <corners
-                android:topLeftRadius="@dimen/message_corner_radius"
-                android:topRightRadius="@dimen/message_corner_collapse_radius"
-                android:bottomRightRadius="@dimen/message_corner_collapse_radius"
-                android:bottomLeftRadius="@dimen/message_corner_radius" />
-            <solid android:color="@color/white" />
-        </shape>
-    </item>
-</layer-list>
diff --git a/res/drawable/message_bubble_background_sent_start.xml b/res/drawable/message_bubble_background_sent_start.xml
deleted file mode 100644
index 4719d235f4..0000000000
--- a/res/drawable/message_bubble_background_sent_start.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:top="2px"
-        android:bottom="2px">
-
-        <shape android:shape="rectangle">
-            <corners
-                android:topLeftRadius="@dimen/message_corner_radius"
-                android:topRightRadius="@dimen/message_corner_radius"
-                android:bottomRightRadius="@dimen/message_corner_collapse_radius"
-                android:bottomLeftRadius="@dimen/message_corner_radius" />
-            <solid android:color="@color/white" />
-        </shape>
-    </item>
-</layer-list>
diff --git a/res/drawable/shared_contact_button_background_alone.xml b/res/drawable/shared_contact_button_background_alone.xml
deleted file mode 100644
index 06420aa624..0000000000
--- a/res/drawable/shared_contact_button_background_alone.xml
+++ /dev/null
@@ -1,12 +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_corner_radius"
-        android:bottomRightRadius="@dimen/message_corner_radius" />
-
-    <solid android:color="?attr/shared_contact_item_button_color" />
-
-</shape>
\ No newline at end of file
diff --git a/res/drawable/shared_contact_button_background_clustered_received.xml b/res/drawable/shared_contact_button_background_clustered_received.xml
deleted file mode 100644
index 7d69d919a0..0000000000
--- a/res/drawable/shared_contact_button_background_clustered_received.xml
+++ /dev/null
@@ -1,12 +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_corner_collapse_radius"
-        android:bottomRightRadius="@dimen/message_corner_radius" />
-
-    <solid android:color="?attr/shared_contact_item_button_color" />
-
-</shape>
\ No newline at end of file
diff --git a/res/drawable/shared_contact_button_background_clustered_sent.xml b/res/drawable/shared_contact_button_background_clustered_sent.xml
deleted file mode 100644
index a8be01e7a9..0000000000
--- a/res/drawable/shared_contact_button_background_clustered_sent.xml
+++ /dev/null
@@ -1,12 +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_corner_radius"
-        android:bottomRightRadius="@dimen/message_corner_collapse_radius" />
-
-    <solid android:color="?attr/shared_contact_item_button_color" />
-
-</shape>
\ No newline at end of file
diff --git a/res/drawable/sticky_date_header_background.xml b/res/drawable/sticky_date_header_background.xml
index b015b381ba..e4fa232676 100644
--- a/res/drawable/sticky_date_header_background.xml
+++ b/res/drawable/sticky_date_header_background.xml
@@ -4,5 +4,5 @@
     android:shape="rectangle">
 
     <corners android:radius="4dp" />
-    <solid android:color="@color/core_light_02" />
+    <solid android:color="?attr/conversation_item_sticky_date_background_color" />
 </shape>
\ No newline at end of file
diff --git a/res/drawable/thumbnail_background.xml b/res/drawable/thumbnail_background.xml
deleted file mode 100644
index 0aca471c00..0000000000
--- a/res/drawable/thumbnail_background.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <corners android:radius="@dimen/message_corner_radius" />
-    <solid android:color="@color/white" />
-
-</shape>
\ No newline at end of file
diff --git a/res/layout/conversation_activity_attachment_editor_stub.xml b/res/layout/conversation_activity_attachment_editor_stub.xml
index a03fce40ea..5d6821b831 100644
--- a/res/layout/conversation_activity_attachment_editor_stub.xml
+++ b/res/layout/conversation_activity_attachment_editor_stub.xml
@@ -43,14 +43,25 @@
                 app:foregroundTintColor="@color/grey_500"
                 app:backgroundTintColor="?conversation_item_bubble_background"/>
 
-        <org.thoughtcrime.securesms.components.DocumentView
+        <org.thoughtcrime.securesms.components.CornerMaskingView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:cmv_radius="@dimen/message_corner_radius">
+
+            <org.thoughtcrime.securesms.components.DocumentView
                 android:id="@+id/attachment_document"
                 android:layout_width="210dp"
                 android:layout_height="wrap_content"
                 android:visibility="gone"
-                android:paddingTop="15dp"
-                android:paddingBottom="15dp" />
+                android:paddingTop="8dp"
+                android:paddingBottom="8dp"
+                android:paddingLeft="@dimen/message_bubble_horizontal_padding"
+                android:paddingRight="@dimen/message_bubble_horizontal_padding"
+                android:background="?attr/conversation_item_bubble_background"
+                app:doc_titleColor="?attr/conversation_item_sent_text_primary_color"
+                app:doc_captionColor="?attr/conversation_item_sent_text_secondary_color"/>
 
+        </org.thoughtcrime.securesms.components.CornerMaskingView>
 
     </org.thoughtcrime.securesms.components.RemovableEditableMediaView>
 
diff --git a/res/layout/conversation_fragment.xml b/res/layout/conversation_fragment.xml
index 5915ac2821..41eac4b702 100644
--- a/res/layout/conversation_fragment.xml
+++ b/res/layout/conversation_fragment.xml
@@ -9,6 +9,7 @@
             android:id="@android:id/list"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:paddingBottom="24dp"
             android:scrollbars="vertical"
             android:cacheColorHint="?conversation_background"
             android:clipChildren="false"
@@ -25,7 +26,7 @@
               android:paddingBottom="4dp"
               android:layout_marginTop="8dp"
               style="@style/Signal.Text.Caption"
-              android:textColor="@color/core_light_60"
+              android:textColor="?attr/conversation_item_sticky_date_text_color"
               android:textAllCaps="true"
               android:background="@drawable/sticky_date_header_background"
               android:elevation="9dp"
diff --git a/res/layout/conversation_input_panel.xml b/res/layout/conversation_input_panel.xml
index fed3003140..70e43f2207 100644
--- a/res/layout/conversation_input_panel.xml
+++ b/res/layout/conversation_input_panel.xml
@@ -62,8 +62,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:layout_gravity="center_vertical"
-                        android:paddingLeft="14dp"
-                        android:paddingStart="14dp"
+                        android:layout_marginLeft="14dp"
+                        android:layout_marginStart="14dp"
                         android:background="@drawable/touch_highlight_background"
                         android:contentDescription="@string/conversation_activity__emoji_toggle_description" />
 
@@ -72,8 +72,12 @@
                         android:id="@+id/embedded_text_editor"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_marginLeft="6dp"
+                        android:layout_marginStart="6dp"
+                        android:layout_marginRight="6dp"
+                        android:layout_marginEnd="6dp"
                         android:layout_marginTop="9dp"
-                        android:layout_marginBottom="7dp"
+                        android:layout_marginBottom="9dp"
                         android:layout_gravity="center_vertical"
                         android:layout_weight="1"
                         android:nextFocusForward="@+id/send_button"
diff --git a/res/layout/conversation_item_footer.xml b/res/layout/conversation_item_footer.xml
index 41bcf973da..6d32daff5e 100644
--- a/res/layout/conversation_item_footer.xml
+++ b/res/layout/conversation_item_footer.xml
@@ -14,8 +14,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:layout_marginRight="3dp"
-        android:layout_marginEnd="3dp"
+        android:layout_marginRight="6dp"
+        android:layout_marginEnd="6dp"
         android:linksClickable="false"
         style="@style/Signal.Text.Caption.MessageSent"
         android:textColor="?conversation_item_sent_text_secondary_color"
@@ -41,8 +41,10 @@
     <org.thoughtcrime.securesms.components.ExpirationTimerView
         android:id="@+id/footer_expiration_timer"
         android:layout_gravity="center_vertical|end"
-        android:layout_marginLeft="6dp"
-        android:layout_marginStart="6dp"
+        android:layout_marginLeft="3dp"
+        android:layout_marginStart="3dp"
+        android:layout_marginRight="3dp"
+        android:layout_marginEnd="3dp"
         android:layout_width="12dp"
         android:layout_height="12dp"
         android:visibility="gone"
@@ -56,8 +58,6 @@
         android:visibility="gone"
         android:layout_gravity="center_vertical|end"
         android:alpha=".6"
-        android:layout_marginLeft="3dp"
-        android:layout_marginStart="3dp"
         android:contentDescription="@string/conversation_item__secure_message_description"
         tools:visibility="visible"/>
 
@@ -65,8 +65,7 @@
         android:id="@+id/footer_delivery_status"
         android:layout_width="20dp"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="6dp"
-        android:layout_marginStart="6dp"
-        android:layout_gravity="center_vertical" />
+        android:layout_gravity="center_vertical"
+        app:iconColor="?attr/conversation_item_delivery_icon_color"/>
 
 </merge>
diff --git a/res/layout/conversation_item_header.xml b/res/layout/conversation_item_header.xml
index 9189f14964..7cccc8995b 100644
--- a/res/layout/conversation_item_header.xml
+++ b/res/layout/conversation_item_header.xml
@@ -1,16 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/text"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingLeft="@dimen/message_bubble_horizontal_padding"
-    android:paddingRight="@dimen/message_bubble_horizontal_padding"
-    android:paddingTop="24dp"
+    android:orientation="vertical"
+    android:paddingTop="20dp"
     android:paddingBottom="21dp"
-    android:gravity="center"
-    style="@style/Signal.Text.Caption"
-    android:textColor="?conversation_item_update_text_color"
-    android:textAllCaps="true"
-    tools:text="March 1, 2015" />
+    android:paddingLeft="28dp"
+    android:paddingRight="28dp">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="?attr/conversation_item_date_line_color"
+        android:layout_marginBottom="3dp"/>
+
+    <TextView
+        android:id="@+id/text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        style="@style/Signal.Text.Caption"
+        android:textColor="?conversation_item_update_text_color"
+        android:textAllCaps="true"
+        tools:text="March 1, 2015" />
+
+</LinearLayout>
diff --git a/res/layout/conversation_item_last_seen.xml b/res/layout/conversation_item_last_seen.xml
index 5066a57dc0..e36d452d7d 100644
--- a/res/layout/conversation_item_last_seen.xml
+++ b/res/layout/conversation_item_last_seen.xml
@@ -7,12 +7,12 @@
     android:orientation="vertical"
     android:paddingTop="24dp"
     android:paddingBottom="20dp">
-    
+
     <View
         android:layout_width="match_parent"
         android:layout_height="4dp"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
+        android:layout_marginLeft="28dp"
+        android:layout_marginRight="28dp"
         android:layout_marginBottom="3dp"
         android:background="?attr/conversation_item_last_seen_line_color" />
 
diff --git a/res/layout/conversation_item_received.xml b/res/layout/conversation_item_received.xml
index aae2d8199e..91870ed9aa 100644
--- a/res/layout/conversation_item_received.xml
+++ b/res/layout/conversation_item_received.xml
@@ -36,23 +36,29 @@
             android:cropToPadding="true"
             android:contentDescription="@string/conversation_item_received__contact_photo_description" />
 
-        <LinearLayout
+        <org.thoughtcrime.securesms.components.CornerMaskingView
             android:id="@+id/body_bubble"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginRight="@dimen/message_bubble_edge_margin"
             android:layout_marginEnd="@dimen/message_bubble_edge_margin"
-            android:orientation="vertical"
-            android:paddingTop="@dimen/message_bubble_top_padding"
-            android:background="@drawable/message_bubble_background_received_alone"
+            android:background="@color/white"
             android:clipToPadding="false"
             android:clipChildren="false"
             tools:backgroundTint="@color/conversation_blue">
 
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:clipToPadding="false"
+            android:clipChildren="false">
+
             <LinearLayout
                 android:id="@+id/group_sender_holder"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/message_bubble_top_padding"
                 android:layout_marginBottom="2dp"
                 android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
                 android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
@@ -94,14 +100,13 @@
                 android:id="@+id/quote_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/message_bubble_quote_padding"
-                android:layout_marginBottom="@dimen/message_bubble_quote_padding"
-                android:layout_marginLeft="@dimen/message_bubble_quote_padding"
-                android:layout_marginRight="@dimen/message_bubble_quote_padding"
+                android:layout_marginTop="@dimen/message_bubble_top_padding"
+                android:layout_marginLeft="6dp"
+                android:layout_marginRight="6dp"
                 android:visibility="gone"
                 app:message_type="incoming"
-                app:quote_colorPrimary="?attr/conversation_item_received_text_primary_color"
-                app:quote_colorSecondary="?attr/conversation_item_received_text_primary_color"
+                app:quote_colorPrimary="?attr/conversation_item_quote_text_color"
+                app:quote_colorSecondary="?attr/conversation_item_quote_text_color"
                 tools:visibility="visible"/>
 
             <ViewStub
@@ -109,6 +114,7 @@
                 android:layout="@layout/conversation_item_received_shared_contact"
                 android:layout_width="@dimen/media_bubble_default_dimens"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/message_bubble_top_padding"
                 android:visibility="gone"/>
 
             <ViewStub
@@ -122,6 +128,8 @@
                 android:layout="@layout/conversation_item_received_audio"
                 android:layout_width="210dp"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/message_bubble_top_padding"
+                android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
                 android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
                 android:layout_marginRight="@dimen/message_bubble_horizontal_padding" />
 
@@ -130,6 +138,8 @@
                 android:layout="@layout/conversation_item_received_document"
                 android:layout_width="210dp"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/message_bubble_top_padding"
+                android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
                 android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
                 android:layout_marginRight="@dimen/message_bubble_horizontal_padding" />
 
@@ -137,6 +147,8 @@
                 android:id="@+id/conversation_item_body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/message_bubble_top_padding"
+                android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
                 android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
                 android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
                 style="@style/Signal.Text.Body"
@@ -149,14 +161,17 @@
                 android:id="@+id/conversation_item_footer"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="-4dp"
                 android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
                 android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginTop="@dimen/message_bubble_footer_top_padding"
-                android:elevation="9dp"
                 android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
+                android:clipChildren="false"
+                android:clipToPadding="false"
                 app:footer_color="?conversation_item_received_text_secondary_color"/>
 
-        </LinearLayout>
+            </LinearLayout>
+
+        </org.thoughtcrime.securesms.components.CornerMaskingView>
 
         <org.thoughtcrime.securesms.components.AlertView
             android:id="@+id/indicators_parent"
diff --git a/res/layout/conversation_item_received_thumbnail.xml b/res/layout/conversation_item_received_thumbnail.xml
index f73d125d15..3d93f459af 100644
--- a/res/layout/conversation_item_received_thumbnail.xml
+++ b/res/layout/conversation_item_received_thumbnail.xml
@@ -11,7 +11,6 @@
         android:contentDescription="@string/conversation_item__mms_image_description"
         android:visibility="gone"
         android:elevation="8dp"
-        android:background="@drawable/thumbnail_background"
         app:conversationThumbnail_minWidth="@dimen/media_bubble_min_width"
         app:conversationThumbnail_maxWidth="@dimen/media_bubble_max_width"
         app:conversationThumbnail_minHeight="@dimen/media_bubble_min_height"
diff --git a/res/layout/conversation_item_sent.xml b/res/layout/conversation_item_sent.xml
index 1f82eb08a6..ba74c587e8 100644
--- a/res/layout/conversation_item_sent.xml
+++ b/res/layout/conversation_item_sent.xml
@@ -23,7 +23,7 @@
         android:clipToPadding="false"
         android:clipChildren="false">
 
-        <LinearLayout
+        <org.thoughtcrime.securesms.components.CornerMaskingView
             android:id="@+id/body_bubble"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -32,98 +32,112 @@
             android:layout_alignWithParentIfMissing="true"
             android:layout_marginLeft="@dimen/message_bubble_edge_margin"
             android:layout_marginStart="@dimen/message_bubble_edge_margin"
-            android:orientation="vertical"
-            android:paddingTop="@dimen/message_bubble_top_padding"
-            android:background="@drawable/message_bubble_background_sent_alone"
+            android:background="@color/white"
             android:clipToPadding="false"
             android:clipChildren="false"
             tools:backgroundTint="@color/core_light_10">
 
-            <org.thoughtcrime.securesms.components.QuoteView
-                android:id="@+id/quote_view"
+            <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/message_bubble_quote_padding"
-                android:layout_marginBottom="@dimen/message_bubble_quote_padding"
-                android:layout_marginLeft="@dimen/message_bubble_quote_padding"
-                android:layout_marginRight="@dimen/message_bubble_quote_padding"
-                android:visibility="gone"
-                app:message_type="outgoing"
-                app:quote_colorPrimary="?attr/conversation_item_sent_text_primary_color"
-                app:quote_colorSecondary="?attr/conversation_item_sent_text_primary_color"
-                tools:visibility="visible"/>
+                android:orientation="vertical"
+                android:clipToPadding="false"
+                android:clipChildren="false">
 
-            <ViewStub
-                android:id="@+id/shared_contact_view_stub"
-                android:layout="@layout/conversation_item_sent_shared_contact"
-                android:layout_width="@dimen/media_bubble_default_dimens"
-                android:layout_height="wrap_content"
-                android:visibility="gone"/>
+                <org.thoughtcrime.securesms.components.QuoteView
+                    android:id="@+id/quote_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/message_bubble_top_padding"
+                    android:layout_marginLeft="6dp"
+                    android:layout_marginRight="6dp"
+                    android:visibility="gone"
+                    app:message_type="outgoing"
+                    app:quote_colorPrimary="?attr/conversation_item_quote_text_color"
+                    app:quote_colorSecondary="?attr/conversation_item_quote_text_color"
+                    tools:visibility="visible"/>
 
-            <ViewStub
-                android:id="@+id/image_view_stub"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout="@layout/conversation_item_sent_thumbnail" />
+                <ViewStub
+                    android:id="@+id/shared_contact_view_stub"
+                    android:layout="@layout/conversation_item_sent_shared_contact"
+                    android:layout_width="@dimen/media_bubble_default_dimens"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/message_bubble_top_padding"
+                    android:visibility="gone"/>
 
-            <ViewStub
-                android:id="@+id/audio_view_stub"
-                android:layout="@layout/conversation_item_sent_audio"
-                android:layout_width="210dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginRight="@dimen/message_bubble_horizontal_padding" />
+                <ViewStub
+                    android:id="@+id/image_view_stub"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout="@layout/conversation_item_sent_thumbnail" />
 
-            <ViewStub
-                android:id="@+id/document_view_stub"
-                android:layout="@layout/conversation_item_sent_document"
-                android:layout_width="210dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginRight="@dimen/message_bubble_horizontal_padding" />
+                <ViewStub
+                    android:id="@+id/audio_view_stub"
+                    android:layout="@layout/conversation_item_sent_audio"
+                    android:layout_width="210dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/message_bubble_top_padding"
+                    android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
+                    android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginRight="@dimen/message_bubble_horizontal_padding" />
 
-            <org.thoughtcrime.securesms.components.emoji.EmojiTextView
-                android:id="@+id/conversation_item_body"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
-                style="@style/Signal.Text.Body"
-                android:textColor="?conversation_item_sent_text_primary_color"
-                android:textColorLink="?conversation_item_sent_text_primary_color"
-                app:scaleEmojis="true"
-                tools:text="Mango pickle lorem ipsum"/>
+                <ViewStub
+                    android:id="@+id/document_view_stub"
+                    android:layout="@layout/conversation_item_sent_document"
+                    android:layout_width="210dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/message_bubble_top_padding"
+                    android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
+                    android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginRight="@dimen/message_bubble_horizontal_padding" />
 
-            <View
-                android:id="@+id/group_sender_holder"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:visibility="gone"/>
+                <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+                    android:id="@+id/conversation_item_body"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/message_bubble_top_padding"
+                    android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
+                    style="@style/Signal.Text.Body"
+                    android:textColor="?conversation_item_sent_text_primary_color"
+                    android:textColorLink="?conversation_item_sent_text_primary_color"
+                    app:scaleEmojis="true"
+                    tools:text="Mango pickle lorem ipsum"/>
 
-            <TextView
-                android:id="@+id/group_message_sender"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:visibility="gone" />
+                <View
+                    android:id="@+id/group_sender_holder"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone"/>
 
-            <TextView
-                android:id="@+id/group_message_sender_profile"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:visibility="gone" />
+                <TextView
+                    android:id="@+id/group_message_sender"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone" />
 
-            <org.thoughtcrime.securesms.components.ConversationItemFooter
-                android:id="@+id/conversation_item_footer"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginTop="@dimen/message_bubble_footer_top_padding"
-                android:elevation="9dp"
-                android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
-                app:footer_color="?conversation_item_sent_text_secondary_color"/>
+                <TextView
+                    android:id="@+id/group_message_sender_profile"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone" />
 
-        </LinearLayout>
+                <org.thoughtcrime.securesms.components.ConversationItemFooter
+                    android:id="@+id/conversation_item_footer"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="-4dp"
+                    android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
+                    android:clipChildren="false"
+                    android:clipToPadding="false"
+                    app:footer_color="?conversation_item_sent_text_secondary_color"/>
+
+            </LinearLayout>
+
+        </org.thoughtcrime.securesms.components.CornerMaskingView>
 
         <org.thoughtcrime.securesms.components.AlertView
             android:id="@+id/indicators_parent"
diff --git a/res/layout/conversation_item_sent_thumbnail.xml b/res/layout/conversation_item_sent_thumbnail.xml
index cdf1a3e430..fc7af1b517 100644
--- a/res/layout/conversation_item_sent_thumbnail.xml
+++ b/res/layout/conversation_item_sent_thumbnail.xml
@@ -13,7 +13,6 @@
         android:contentDescription="@string/conversation_item__mms_image_description"
         android:visibility="gone"
         android:elevation="8dp"
-        android:background="@drawable/thumbnail_background"
         app:conversationThumbnail_minWidth="@dimen/media_bubble_min_width"
         app:conversationThumbnail_maxWidth="@dimen/media_bubble_max_width"
         app:conversationThumbnail_minHeight="@dimen/media_bubble_min_height"
diff --git a/res/layout/conversation_item_thumbnail.xml b/res/layout/conversation_item_thumbnail.xml
index e8d9c73fce..e5fcb7f706 100644
--- a/res/layout/conversation_item_thumbnail.xml
+++ b/res/layout/conversation_item_thumbnail.xml
@@ -3,39 +3,33 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <org.thoughtcrime.securesms.components.CornerMaskingView
-        android:id="@+id/conversation_thumbnail_corner_mask"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+    <org.thoughtcrime.securesms.components.ThumbnailView
+        android:id="@+id/conversation_thumbnail_image"
+        android:layout_width="@dimen/media_bubble_default_dimens"
+        android:layout_height="@dimen/media_bubble_default_dimens"
+        android:adjustViewBounds="true"
+        android:clickable="false"
+        android:longClickable="false"
+        android:scaleType="fitCenter"
+        android:contentDescription="@string/conversation_item__mms_image_description"
+        app:thumbnail_radius="1dp"/>
 
-        <org.thoughtcrime.securesms.components.ThumbnailView
-            android:id="@+id/conversation_thumbnail_image"
-            android:layout_width="@dimen/media_bubble_default_dimens"
-            android:layout_height="@dimen/media_bubble_default_dimens"
-            android:adjustViewBounds="true"
-            android:clickable="false"
-            android:longClickable="false"
-            android:scaleType="fitCenter"
-            android:contentDescription="@string/conversation_item__mms_image_description" />
+    <ImageView
+        android:id="@+id/conversation_thumbnail_shade"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:layout_gravity="bottom"
+        android:visibility="gone"
+        android:src="@drawable/image_shade" />
 
-        <ImageView
-            android:id="@+id/conversation_thumbnail_shade"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:layout_gravity="bottom"
-            android:visibility="gone"
-            android:src="@drawable/image_shade" />
-
-        <org.thoughtcrime.securesms.components.ConversationItemFooter
-            android:id="@+id/conversation_thumbnail_footer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
-            android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
-            android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
-            app:footer_color="@color/core_white"/>
-
-    </org.thoughtcrime.securesms.components.CornerMaskingView>
+    <org.thoughtcrime.securesms.components.ConversationItemFooter
+        android:id="@+id/conversation_thumbnail_footer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
+        android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
+        android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
+        app:footer_color="@color/core_white"/>
 
 </merge>
diff --git a/res/layout/conversation_list_item_view.xml b/res/layout/conversation_list_item_view.xml
index eb322f3f7f..203cbd872f 100644
--- a/res/layout/conversation_list_item_view.xml
+++ b/res/layout/conversation_list_item_view.xml
@@ -107,7 +107,7 @@
                   android:layout_width="wrap_content"
                   android:layout_alignParentRight="true"
                   android:layout_alignParentEnd="true"
-                  android:layout_alignParentTop="true"
+                  android:layout_alignBaseline="@+id/from"
                   android:layout_above="@id/subject"
                   style="@style/Signal.Text.Caption"
                   android:textColor="?attr/conversation_list_item_date_color"
@@ -149,7 +149,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    app:iconColor="?attr/conversation_list_item_subject_color"/>
+                    app:iconColor="?attr/conversation_list_item_delivery_icon_color"/>
 
             <ImageView android:id="@+id/unread_indicator"
                        android:layout_width="24dp"
diff --git a/res/layout/conversation_shared_contact_item_received.xml b/res/layout/conversation_shared_contact_item_received.xml
deleted file mode 100644
index 5430f98645..0000000000
--- a/res/layout/conversation_shared_contact_item_received.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<org.thoughtcrime.securesms.ConversationSharedContactItem
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content" 
-    android:layout_height="wrap_content"
-    android:background="@drawable/conversation_item_background">
-
-    <org.thoughtcrime.securesms.components.CornerMaskingView
-        android:id="@+id/contact_bubble"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/conversation_individual_left_gutter"
-        android:layout_marginStart="@dimen/conversation_individual_left_gutter"
-        android:layout_marginRight="@dimen/message_bubble_edge_margin"
-        android:layout_marginEnd="@dimen/message_bubble_edge_margin"
-        android:paddingTop="12dp"
-        android:background="@color/core_blue">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
-                android:orientation="horizontal"
-                android:gravity="center_vertical">
-
-                <ImageView
-                    android:id="@+id/contact_avatar"
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"/>
-
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:orientation="vertical">
-
-                    <org.thoughtcrime.securesms.components.emoji.EmojiTextView
-                        android:id="@+id/contact_name"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="4dp"
-                        style="@style/Signal.Text.Body"
-                        android:maxLines="1"
-                        android:ellipsize="end"
-                        android:fontFamily="sans-serif-medium"
-                        android:textColor="?conversation_item_received_text_primary_color"
-                        android:textSize="16sp"
-                        tools:text="Peter Parker"/>
-
-                    <TextView
-                        android:id="@+id/contact_number"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        style="@style/Signal.Text.Caption"
-                        android:textColor="?conversation_item_received_text_secondary_color"
-                        android:maxLines="1"
-                        android:ellipsize="end"
-                        tools:text="(610) 555-5555"/>
-
-                </LinearLayout>
-
-            </LinearLayout>
-
-
-            <TextView
-                android:id="@+id/contact_action_button"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:padding="10dp"
-                style="@style/Signal.Text.Preview"
-                android:fontFamily="sans-serif-medium"
-                android:textColor="@color/core_blue"
-                android:background="@color/core_light_02"
-                android:foreground="?attr/selectableItemBackground"
-                tools:text="Add to Contacts"/>
-
-        </LinearLayout>
-
-    </org.thoughtcrime.securesms.components.CornerMaskingView>
-
-</org.thoughtcrime.securesms.ConversationSharedContactItem>
\ No newline at end of file
diff --git a/res/layout/conversation_shared_contact_item_sent.xml b/res/layout/conversation_shared_contact_item_sent.xml
deleted file mode 100644
index f06585770d..0000000000
--- a/res/layout/conversation_shared_contact_item_sent.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<org.thoughtcrime.securesms.ConversationSharedContactItem
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content" 
-    android:layout_height="wrap_content"
-    android:background="@drawable/conversation_item_background">
-
-    <org.thoughtcrime.securesms.components.CornerMaskingView
-        android:id="@+id/contact_bubble"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:layout_marginLeft="@dimen/message_bubble_edge_margin"
-        android:layout_marginStart="@dimen/message_bubble_edge_margin"
-        android:layout_marginRight="@dimen/conversation_individual_right_gutter"
-        android:layout_marginEnd="@dimen/conversation_individual_right_gutter"
-        android:paddingTop="12dp"
-        android:background="@color/core_light_10">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
-                android:orientation="horizontal"
-                android:gravity="center_vertical">
-
-                <ImageView
-                    android:id="@+id/contact_avatar"
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"/>
-
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:orientation="vertical">
-
-                    <org.thoughtcrime.securesms.components.emoji.EmojiTextView
-                        android:id="@+id/contact_name"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="4dp"
-                        style="@style/Signal.Text.Body"
-                        android:maxLines="1"
-                        android:ellipsize="end"
-                        android:fontFamily="sans-serif-medium"
-                        android:textColor="?conversation_item_sent_text_primary_color"
-                        tools:text="Peter Parker"/>
-
-                    <TextView
-                        android:id="@+id/contact_number"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        style="@style/Signal.Text.Caption"
-                        android:textColor="?conversation_item_sent_text_secondary_color"
-                        android:maxLines="1"
-                        android:ellipsize="end"
-                        tools:text="(610) 555-5555"/>
-
-                </LinearLayout>
-
-            </LinearLayout>
-
-
-            <TextView
-                android:id="@+id/contact_action_button"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:padding="10dp"
-                style="@style/Signal.Text.Preview"
-                android:fontFamily="sans-serif-medium"
-                android:textColor="@color/core_blue"
-                android:background="@color/core_light_02"
-                android:foreground="?attr/selectableItemBackground"
-                tools:text="Add to Contacts"/>
-
-        </LinearLayout>
-
-    </org.thoughtcrime.securesms.components.CornerMaskingView>
-
-</org.thoughtcrime.securesms.ConversationSharedContactItem>
\ No newline at end of file
diff --git a/res/layout/delivery_status_view.xml b/res/layout/delivery_status_view.xml
index 1a94495770..4a1433f19b 100644
--- a/res/layout/delivery_status_view.xml
+++ b/res/layout/delivery_status_view.xml
@@ -2,7 +2,7 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:tools="http://schemas.android.com/tools">
 
-    <org.thoughtcrime.securesms.components.SpinningImageView
+    <ImageView
         android:id="@+id/pending_indicator"
         android:layout_width="12dp"
         android:layout_height="12dp"
diff --git a/res/layout/document_view.xml b/res/layout/document_view.xml
index 306cc89645..fda0411886 100644
--- a/res/layout/document_view.xml
+++ b/res/layout/document_view.xml
@@ -9,6 +9,7 @@
                       android:layout_height="wrap_content"
                       android:clickable="false"
                       android:focusable="false"
+                      android:gravity="center_vertical"
                       android:orientation="horizontal">
 
             <org.thoughtcrime.securesms.components.AnimatingToggle
@@ -45,9 +46,10 @@
                         android:focusable="false">
 
                     <ImageView
+                        android:id="@+id/icon"
                         android:layout_width="38dp"
                         android:layout_height="50dp"
-                        android:src="@drawable/ic_document"/>
+                        android:src="?attachment_document_icon_large"/>
 
                     <TextView android:id="@+id/document"
                               android:layout_width="wrap_content"
@@ -56,7 +58,6 @@
                               android:gravity="center"
                               android:clickable="false"
                               android:visibility="visible"
-                              android:background="@drawable/ic_insert_drive_file_white_24dp"
                               android:textAlignment="center"
                               android:scaleType="centerInside"
                               style="@style/Signal.Text.Caption"
@@ -82,7 +83,8 @@
 
             <LinearLayout android:layout_width="match_parent"
                           android:layout_height="wrap_content"
-                          android:layout_marginLeft="6dp"
+                          android:layout_marginLeft="2dp"
+                          android:layout_marginStart="2dp"
                           android:orientation="vertical"
                           android:focusable="false"
                           android:clickable="false">
diff --git a/res/layout/invite_activity.xml b/res/layout/invite_activity.xml
index f534a9edc9..c9f4b0c16c 100644
--- a/res/layout/invite_activity.xml
+++ b/res/layout/invite_activity.xml
@@ -40,7 +40,7 @@
                       android:layout_height="wrap_content"
                       android:minLines="2"
                       tools:text="Let's switch to Signal: https://sgnl.link/asdfdfsa"
-                      android:background="@drawable/message_bubble_background_received_alone"
+                      android:background="@drawable/message_bubble_background"
                       android:paddingTop="10dp"
                       android:paddingBottom="10dp"
                       android:paddingLeft="10dp"
diff --git a/res/layout/message_recipient_list_item.xml b/res/layout/message_recipient_list_item.xml
index 6544c591d3..42e02a31b4 100644
--- a/res/layout/message_recipient_list_item.xml
+++ b/res/layout/message_recipient_list_item.xml
@@ -29,6 +29,7 @@
                   android:layout_toRightOf="@id/contact_photo_image"
                   android:layout_toEndOf="@id/contact_photo_image"
                   android:layout_centerVertical="true"
+                  android:gravity="center_vertical"
                   android:orientation="horizontal">
 
         <LinearLayout android:layout_width="0dp"
@@ -97,6 +98,7 @@
                 android:id="@+id/delivery_status"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                app:iconColor="?attr/conversation_item_sent_text_secondary_color"
                 android:visibility="gone"/>
 
     </LinearLayout>
diff --git a/res/layout/quote_view.xml b/res/layout/quote_view.xml
index 60d1149b36..942922aa4e 100644
--- a/res/layout/quote_view.xml
+++ b/res/layout/quote_view.xml
@@ -14,10 +14,10 @@
     <org.thoughtcrime.securesms.components.CornerMaskingView
         android:id="@+id/quote_root"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#c0ffffff">
+        android:layout_height="wrap_content">
 
         <LinearLayout
+            android:id="@+id/quote_background"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal">
@@ -69,7 +69,7 @@
                         android:layout_marginEnd="4dp"
                         android:paddingLeft="-4dp"
                         android:paddingStart="-4dp"
-                        android:src="@drawable/ic_document" />
+                        android:src="?attr/attachment_document_icon_small" />
 
                     <TextView
                         android:id="@+id/quote_attachment_name"
diff --git a/res/layout/shared_contact_view.xml b/res/layout/shared_contact_view.xml
index 6826213cd4..993adefa91 100644
--- a/res/layout/shared_contact_view.xml
+++ b/res/layout/shared_contact_view.xml
@@ -62,7 +62,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
             android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
-            android:layout_marginTop="@dimen/message_bubble_footer_top_padding"
+            android:layout_marginTop="4dp"
             android:elevation="9dp"
             android:orientation="horizontal" />
 
@@ -78,7 +78,7 @@
             android:ellipsize="end"
             android:fontFamily="sans-serif-medium"
             android:textColor="@color/core_blue"
-            android:background="@drawable/shared_contact_button_background_alone"
+            android:background="?attr/shared_contact_item_button_color"
             android:foreground="?attr/selectableItemBackground"
             tools:text="Add to Contacts"/>
 
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 1335f8f737..0b6db57e42 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <attr name="theme_type" format="string"/>
+
     <attr name="attachment_type_selector_background" format="color"/>
+    <attr name="attachment_document_icon_small" format="reference" />
+    <attr name="attachment_document_icon_large" format="reference" />
+
     <attr name="conversation_list_item_background" format="reference"/>
     <attr name="conversation_list_item_contact_color" format="reference|color"/>
     <attr name="conversation_list_item_subject_color" format="reference|color"/>
+    <attr name="conversation_list_item_delivery_icon_color" format="reference|color"/>
     <attr name="conversation_list_item_date_color" format="reference|color"/>
     <attr name="conversation_list_item_divider" format="reference"/>
 
@@ -23,6 +28,8 @@
     <attr name="conversation_background" format="reference|color"/>
     <attr name="conversation_editor_background" format="reference|color"/>
     <attr name="conversation_editor_text_color" format="reference|color"/>
+    <attr name="conversation_input_background_color" format="color"/>
+    <attr name="conversation_input_outline_color" format="color"/>
     <attr name="conversation_transport_sms_indicator" format="reference"/>
     <attr name="conversation_transport_push_indicator" format="reference"/>
     <attr name="conversation_transport_popup_background" format="reference"/>
@@ -68,6 +75,11 @@
     <attr name="conversation_item_update_text_color" format="reference"/>
     <attr name="conversation_item_last_seen_text_color" format="reference"/>
     <attr name="conversation_item_last_seen_line_color" format="reference"/>
+    <attr name="conversation_item_date_line_color" format="reference"/>
+    <attr name="conversation_item_quote_text_color" format="reference"/>
+    <attr name="conversation_item_sticky_date_background_color" format="color" />
+    <attr name="conversation_item_sticky_date_text_color" format="color" />
+    <attr name="conversation_item_delivery_icon_color" format="color" />
 
     <attr name="dialog_info_icon" format="reference" />
     <attr name="dialog_alert_icon" format="reference" />
@@ -158,6 +170,7 @@
         <attr name="maxWidth" format="dimension" />
         <attr name="minHeight" format="dimension" />
         <attr name="maxHeight" format="dimension" />
+        <attr name="thumbnail_radius" format="dimension" />
     </declare-styleable>
 
     <declare-styleable name="DeliveryStatusView">
@@ -271,4 +284,7 @@
         <attr name="conversationThumbnail_maxHeight" format="dimension" />
     </declare-styleable>
 
+    <declare-styleable name="CornerMaskingView">
+        <attr name="cmv_radius" format="dimension" />
+    </declare-styleable>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 97dff6ad7c..114af1dd36 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -23,11 +23,9 @@
     <dimen name="message_bubble_shadow_distance">1.5dp</dimen>
     <dimen name="message_bubble_horizontal_padding">12dp</dimen>
     <dimen name="message_bubble_top_padding">6dp</dimen>
-    <dimen name="message_bubble_quote_padding">6dp</dimen>
     <dimen name="message_bubble_collapsed_footer_padding">6dp</dimen>
-    <dimen name="message_bubble_edge_margin">48dp</dimen>
+    <dimen name="message_bubble_edge_margin">32dp</dimen>
     <dimen name="message_bubble_bottom_padding">8dp</dimen>
-    <dimen name="message_bubble_footer_top_padding">4dp</dimen>
     <dimen name="media_bubble_remove_button_size">24dp</dimen>
     <dimen name="media_bubble_edit_button_size">24dp</dimen>
     <dimen name="media_bubble_default_dimens">210dp</dimen>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index a1a6286e69..95936da31d 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -126,10 +126,15 @@
         <item name="alertDialogTheme">@style/AppCompatAlertDialogStyleLight</item>
         <item name="android:alertDialogTheme">@style/AppCompatDialogStyleLight</item>
         <!--<item name="android:windowContentOverlay">@drawable/compat_actionbar_shadow_background</item>-->
+
         <item name="attachment_type_selector_background">@color/white</item>
+        <item name="attachment_document_icon_small">@drawable/ic_document_small_light</item>
+        <item name="attachment_document_icon_large">@drawable/ic_document_large_light</item>
+
         <item name="conversation_list_item_background">@drawable/conversation_list_item_background</item>
         <item name="conversation_list_item_contact_color">@color/core_light_90</item>
         <item name="conversation_list_item_subject_color">@color/core_light_60</item>
+        <item name="conversation_list_item_delivery_icon_color">@color/core_light_35</item>
         <item name="conversation_list_item_date_color">@color/core_light_60</item>
         <item name="conversation_list_item_divider">@drawable/conversation_list_divider_shape</item>
 
@@ -141,6 +146,8 @@
         <item name="conversation_background">@color/core_white</item>
         <item name="conversation_editor_background">#22000000</item>
         <item name="conversation_editor_text_color">#ff111111</item>
+        <item name="conversation_input_background_color">@color/core_light_02</item>
+        <item name="conversation_input_outline_color">@color/core_light_10</item>
         <item name="conversation_transport_sms_indicator">@drawable/ic_send_sms_insecure</item>
         <item name="conversation_transport_push_indicator">@drawable/ic_send_push</item>
         <item name="conversation_transport_popup_background">@color/white</item>
@@ -186,6 +193,11 @@
         <item name="conversation_item_update_text_color">@color/core_light_60</item>
         <item name="conversation_item_last_seen_text_color">@color/core_light_90</item>
         <item name="conversation_item_last_seen_line_color">@color/core_light_60</item>
+        <item name="conversation_item_date_line_color">@color/core_light_45</item>
+        <item name="conversation_item_quote_text_color">@color/core_light_90</item>
+        <item name="conversation_item_sticky_date_background_color">@color/core_light_02</item>
+        <item name="conversation_item_sticky_date_text_color">@color/core_light_60</item>
+        <item name="conversation_item_delivery_icon_color">@color/core_light_45</item>
 
         <item name="quick_camera_icon">@drawable/quick_camera_light</item>
         <item name="quick_mic_icon">@drawable/ic_mic_grey600_24dp</item>
@@ -244,7 +256,6 @@
 
     <style name="TextSecure.DarkTheme" parent="@style/Theme.AppCompat">
         <item name="theme_type">dark</item>
-        <item name="attachment_type_selector_background">@color/gray95</item>
         <item name="actionBarStyle">@style/TextSecure.DarkActionBar</item>
         <item name="actionBarTabBarStyle">@style/TextSecure.DarkActionBar.TabBar</item>
         <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
@@ -258,9 +269,15 @@
         <item name="android:windowBackground">@color/black</item>
         <item name="alertDialogTheme">@style/AppCompatAlertDialogStyleDark</item>
         <item name="android:alertDialogTheme">@style/AppCompatDialogStyleDark</item>
+
+        <item name="attachment_type_selector_background">@color/gray95</item>
+        <item name="attachment_document_icon_small">@drawable/ic_document_small_dark</item>
+        <item name="attachment_document_icon_large">@drawable/ic_document_large_dark</item>
+
         <item name="conversation_list_item_background">@drawable/conversation_list_item_background_dark</item>
         <item name="conversation_list_item_contact_color">#ffdddddd</item>
         <item name="conversation_list_item_subject_color">#ffdddddd</item>
+        <item name="conversation_list_item_delivery_icon_color">@color/core_dark_55</item>
         <item name="conversation_list_item_date_color">#ffdddddd</item>
         <item name="conversation_list_item_divider">@drawable/conversation_list_divider_shape_dark</item>
 
@@ -274,8 +291,13 @@
         <item name="conversation_item_received_text_secondary_color">#b3efefef</item>
         <item name="conversation_item_sent_indicator_text_background">@drawable/conversation_item_sent_indicator_text_shape_dark</item>
         <item name="conversation_item_update_text_color">@color/core_light_35</item>
-        <item name="conversation_item_last_seen_text_color">@color/core_light_02</item>
-        <item name="conversation_item_last_seen_line_color">@color/core_light_10</item>
+        <item name="conversation_item_last_seen_text_color">@color/core_dark_30</item>
+        <item name="conversation_item_last_seen_line_color">@color/core_dark_30</item>
+        <item name="conversation_item_date_line_color">@color/core_dark_55</item>
+        <item name="conversation_item_quote_text_color">@color/core_dark_05</item>
+        <item name="conversation_item_sticky_date_background_color">@color/core_dark_85</item>
+        <item name="conversation_item_sticky_date_text_color">@color/core_dark_30</item>
+        <item name="conversation_item_delivery_icon_color">@color/core_dark_60</item>
 
         <item name="contact_list_divider">@drawable/contact_list_divider_dark</item>
 
@@ -297,6 +319,8 @@
         <item name="conversation_background">@color/black</item>
         <item name="conversation_editor_background">#22ffffff</item>
         <item name="conversation_editor_text_color">#ffeeeeee</item>
+        <item name="conversation_input_background_color">@color/core_dark_85</item>
+        <item name="conversation_input_outline_color">@color/core_dark_70</item>
         <item name="conversation_transport_sms_indicator">@drawable/ic_send_sms_insecure_dark</item>
         <item name="conversation_transport_push_indicator">@drawable/ic_send_push</item>
         <item name="conversation_transport_popup_background">@color/black</item>
diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index cd4eea23a8..97b6d3fa36 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -1240,18 +1240,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     inputPanel            = ViewUtil.findById(this, R.id.bottom_panel);
 
     ImageButton quickCameraToggle = ViewUtil.findById(this, R.id.quick_camera_toggle);
-    View        composeBubble     = ViewUtil.findById(this, R.id.compose_bubble);
 
     container.addOnKeyboardShownListener(this);
     inputPanel.setListener(this);
     inputPanel.setMediaListener(this);
 
-    int[]      attributes   = new int[]{R.attr.conversation_item_bubble_background};
-    TypedArray colors       = obtainStyledAttributes(attributes);
-    int        defaultColor = colors.getColor(0, Color.WHITE);
-    composeBubble.getBackground().setColorFilter(defaultColor, PorterDuff.Mode.MULTIPLY);
-    colors.recycle();
-
     attachmentTypeSelector = null;
     attachmentManager      = new AttachmentManager(this, this);
     audioRecorder          = new AudioRecorder(this);
diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java
index b358c2316e..5cad022cfa 100644
--- a/src/org/thoughtcrime/securesms/ConversationItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationItem.java
@@ -49,6 +49,7 @@ import org.thoughtcrime.securesms.components.AudioView;
 import org.thoughtcrime.securesms.components.AvatarImageView;
 import org.thoughtcrime.securesms.components.ConversationItemFooter;
 import org.thoughtcrime.securesms.components.ConversationItemThumbnail;
+import org.thoughtcrime.securesms.components.CornerMaskingView;
 import org.thoughtcrime.securesms.components.DocumentView;
 import org.thoughtcrime.securesms.components.QuoteView;
 import org.thoughtcrime.securesms.components.SharedContactView;
@@ -99,7 +100,9 @@ import java.util.Set;
 public class ConversationItem extends LinearLayout
     implements RecipientModifiedListener, BindableConversationItem
 {
-  private final static String TAG = ConversationItem.class.getSimpleName();
+  private static final String TAG = ConversationItem.class.getSimpleName();
+
+  private static final int MAX_MEASURE_CALLS = 3;
 
   private MessageRecord messageRecord;
   private Locale        locale;
@@ -107,7 +110,7 @@ public class ConversationItem extends LinearLayout
   private Recipient     recipient;
   private GlideRequests glideRequests;
 
-  protected View                 bodyBubble;
+  protected CornerMaskingView    bodyBubble;
   private QuoteView              quoteView;
   private TextView               bodyText;
   private ConversationItemFooter footer;
@@ -127,6 +130,7 @@ public class ConversationItem extends LinearLayout
   private @Nullable EventListener                   eventListener;
 
   private int defaultBubbleColor;
+  private int measureCalls;
 
   private final PassthroughClickListener        passthroughClickListener   = new PassthroughClickListener();
   private final AttachmentDownloadClickListener downloadClickListener      = new AttachmentDownloadClickListener();
@@ -199,18 +203,19 @@ public class ConversationItem extends LinearLayout
     this.recipient.addListener(this);
     this.conversationRecipient.addListener(this);
 
-    presentMessageBackground(messageRecord, previousMessageRecord, nextMessageRecord, groupThread);
-    presentMedia(messageRecord, previousMessageRecord, nextMessageRecord, conversationRecipient, groupThread);
-    presentInteractionState(messageRecord, pulseHighlight);
-    presentBodyText(messageRecord);
-    presentBubbleState(messageRecord);
-    presentStatusIcons(messageRecord);
-    presentContactPhoto(recipient);
-    presentGroupMessageStatus(messageRecord, recipient);
-    presentAuthor(messageRecord, previousMessageRecord, nextMessageRecord, groupThread);
-    presentQuote(messageRecord, previousMessageRecord, nextMessageRecord, groupThread);
-    presentMessageSpacing(messageRecord, nextMessageRecord, groupThread);
-    presentFooter(messageRecord, nextMessageRecord, locale, groupThread);
+    setMediaAttributes(messageRecord, nextMessageRecord, previousMessageRecord, conversationRecipient, groupThread);
+    setInteractionState(messageRecord, pulseHighlight);
+    setBodyText(messageRecord);
+    setBubbleState(messageRecord);
+    setStatusIcons(messageRecord);
+    setContactPhoto(recipient);
+    setGroupMessageStatus(messageRecord, recipient);
+    setAuthor(messageRecord, previousMessageRecord, nextMessageRecord, groupThread);
+    setQuote(messageRecord, previousMessageRecord, nextMessageRecord, groupThread);
+    setMessageSpacing(context, messageRecord, nextMessageRecord);
+    setGutterSizes(messageRecord, groupThread);
+    setFooter(messageRecord, nextMessageRecord, locale, groupThread);
+    setMessageShape(messageRecord, previousMessageRecord, nextMessageRecord, groupThread);
   }
 
   @Override
@@ -247,7 +252,14 @@ public class ConversationItem extends LinearLayout
     }
 
     if (needsMeasure) {
-      measure(widthMeasureSpec, heightMeasureSpec);
+      if (measureCalls < MAX_MEASURE_CALLS) {
+        measure(widthMeasureSpec, heightMeasureSpec);
+        measureCalls++;
+      } else {
+        Log.w(TAG, "Hit measure() cap of " + MAX_MEASURE_CALLS);
+      }
+    } else {
+      measureCalls = 0;
     }
   }
 
@@ -287,7 +299,7 @@ public class ConversationItem extends LinearLayout
 
   /// MessageRecord Attribute Parsers
 
-  private void presentBubbleState(MessageRecord messageRecord) {
+  private void setBubbleState(MessageRecord messageRecord) {
     if (messageRecord.isOutgoing()) {
       bodyBubble.getBackground().setColorFilter(defaultBubbleColor, PorterDuff.Mode.MULTIPLY);
     } else {
@@ -312,7 +324,7 @@ public class ConversationItem extends LinearLayout
     }
   }
 
-  private void presentInteractionState(MessageRecord messageRecord, boolean pulseHighlight) {
+  private void setInteractionState(MessageRecord messageRecord, boolean pulseHighlight) {
     if (batchSelected.contains(messageRecord)) {
       setBackgroundResource(R.drawable.conversation_item_background);
       setSelected(true);
@@ -370,7 +382,7 @@ public class ConversationItem extends LinearLayout
     return messageRecord.isMms() && !((MmsMessageRecord)messageRecord).getSharedContacts().isEmpty();
   }
 
-  private void presentBodyText(MessageRecord messageRecord) {
+  private void setBodyText(MessageRecord messageRecord) {
     bodyText.setClickable(false);
     bodyText.setFocusable(false);
     bodyText.setTextSize(TypedValue.COMPLEX_UNIT_SP, TextSecurePreferences.getMessageBodyTextSize(context));
@@ -383,67 +395,62 @@ public class ConversationItem extends LinearLayout
     }
   }
 
-  private void presentMedia(@NonNull MessageRecord           currentMessage,
-                            @NonNull Optional<MessageRecord> previousMessage,
-                            @NonNull Optional<MessageRecord> nextMessage,
-                            @NonNull Recipient               conversationRecipient,
-                            boolean                 isGroupThread)
+  private void setMediaAttributes(@NonNull MessageRecord           messageRecord,
+                                  @NonNull Optional<MessageRecord> previousRecord,
+                                  @NonNull Optional<MessageRecord> nextRecord,
+                                  @NonNull Recipient               conversationRecipient,
+                                           boolean                 isGroupThread)
   {
-    boolean showControls = !currentMessage.isFailed() && !Util.isOwnNumber(context, conversationRecipient.getAddress());
+    boolean showControls = !messageRecord.isFailed() && !Util.isOwnNumber(context, conversationRecipient.getAddress());
 
-    ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-    ViewUtil.setPaddingTop(bodyBubble, readDimen(R.dimen.message_bubble_top_padding));
-    ViewUtil.setPaddingBottom(bodyBubble, 0);
-
-    if (mediaThumbnailStub.resolved()) mediaThumbnailStub.get().showShade(false);
-
-    footer.setVisibility(VISIBLE);
-
-    if (hasSharedContact(currentMessage)) {
+    if (hasSharedContact(messageRecord)) {
       sharedContactStub.get().setVisibility(VISIBLE);
       if (audioViewStub.resolved())      mediaThumbnailStub.get().setVisibility(View.GONE);
       if (mediaThumbnailStub.resolved()) mediaThumbnailStub.get().setVisibility(View.GONE);
       if (documentViewStub.resolved())   documentViewStub.get().setVisibility(View.GONE);
 
-      sharedContactStub.get().setContact(((MediaMmsMessageRecord) currentMessage).getSharedContacts().get(0), glideRequests, locale);
+      sharedContactStub.get().setContact(((MediaMmsMessageRecord) messageRecord).getSharedContacts().get(0), glideRequests, locale);
       sharedContactStub.get().setEventListener(sharedContactEventListener);
       sharedContactStub.get().setOnClickListener(sharedContactClickListener);
       sharedContactStub.get().setOnLongClickListener(passthroughClickListener);
 
-      setSharedContactCorners(currentMessage, previousMessage, nextMessage, isGroupThread);
-
+      ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
       footer.setVisibility(GONE);
-    } else if (hasAudio(currentMessage)) {
+    } else if (hasAudio(messageRecord)) {
       audioViewStub.get().setVisibility(View.VISIBLE);
       if (mediaThumbnailStub.resolved()) mediaThumbnailStub.get().setVisibility(View.GONE);
       if (documentViewStub.resolved())   documentViewStub.get().setVisibility(View.GONE);
       if (sharedContactStub.resolved())  sharedContactStub.get().setVisibility(GONE);
 
       //noinspection ConstantConditions
-      audioViewStub.get().setAudio(((MediaMmsMessageRecord) currentMessage).getSlideDeck().getAudioSlide(), showControls);
+      audioViewStub.get().setAudio(((MediaMmsMessageRecord) messageRecord).getSlideDeck().getAudioSlide(), showControls);
       audioViewStub.get().setDownloadClickListener(downloadClickListener);
       audioViewStub.get().setOnLongClickListener(passthroughClickListener);
-    } else if (hasDocument(currentMessage)) {
+
+      ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+      footer.setVisibility(VISIBLE);
+    } else if (hasDocument(messageRecord)) {
       documentViewStub.get().setVisibility(View.VISIBLE);
       if (mediaThumbnailStub.resolved()) mediaThumbnailStub.get().setVisibility(View.GONE);
       if (audioViewStub.resolved())      audioViewStub.get().setVisibility(View.GONE);
       if (sharedContactStub.resolved())  sharedContactStub.get().setVisibility(GONE);
 
       //noinspection ConstantConditions
-      documentViewStub.get().setDocument(((MediaMmsMessageRecord)currentMessage).getSlideDeck().getDocumentSlide(), showControls);
+      documentViewStub.get().setDocument(((MediaMmsMessageRecord)messageRecord).getSlideDeck().getDocumentSlide(), showControls);
       documentViewStub.get().setDocumentClickListener(new ThumbnailClickListener());
       documentViewStub.get().setDownloadClickListener(downloadClickListener);
       documentViewStub.get().setOnLongClickListener(passthroughClickListener);
-    } else if (hasThumbnail(currentMessage)) {
+
+      ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+      footer.setVisibility(VISIBLE);
+    } else if (hasThumbnail(messageRecord)) {
       mediaThumbnailStub.get().setVisibility(View.VISIBLE);
       if (audioViewStub.resolved())    audioViewStub.get().setVisibility(View.GONE);
       if (documentViewStub.resolved()) documentViewStub.get().setVisibility(View.GONE);
       if (sharedContactStub.resolved())  sharedContactStub.get().setVisibility(GONE);
 
-      setThumbnailCorners(currentMessage, previousMessage, nextMessage, isGroupThread);
-
       //noinspection ConstantConditions
-      Slide      thumbnailSlide = ((MmsMessageRecord) currentMessage).getSlideDeck().getThumbnailSlide();
+      Slide      thumbnailSlide = ((MmsMessageRecord) messageRecord).getSlideDeck().getThumbnailSlide();
       Attachment attachment     = thumbnailSlide.asAttachment();
       mediaThumbnailStub.get().setImageResource(glideRequests,
                                                 thumbnailSlide,
@@ -455,31 +462,27 @@ public class ConversationItem extends LinearLayout
       mediaThumbnailStub.get().setDownloadClickListener(downloadClickListener);
       mediaThumbnailStub.get().setOnLongClickListener(passthroughClickListener);
       mediaThumbnailStub.get().setOnClickListener(passthroughClickListener);
+      mediaThumbnailStub.get().showShade(TextUtils.isEmpty(messageRecord.getDisplayBody()));
+
+      setThumbnailOutlineCorners(messageRecord, nextRecord, previousRecord, isGroupThread);
 
       ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-
-      if (!hasQuote(currentMessage)) {
-        ViewUtil.setPaddingTop(bodyBubble, 0);
-      } else {
-        ViewUtil.setPaddingTop(bodyBubble, readDimen(R.dimen.message_bubble_top_padding));
-      }
-
-      if (TextUtils.isEmpty(currentMessage.getDisplayBody())) {
-        mediaThumbnailStub.get().showShade(true);
-        mediaThumbnailStub.get().setBackgroundResource(getCornerBackgroundRes(currentMessage, previousMessage, nextMessage, isGroupThread));
-      }
+      footer.setVisibility(VISIBLE);
     } else {
       if (mediaThumbnailStub.resolved()) mediaThumbnailStub.get().setVisibility(View.GONE);
       if (audioViewStub.resolved())      audioViewStub.get().setVisibility(View.GONE);
       if (documentViewStub.resolved())   documentViewStub.get().setVisibility(View.GONE);
       if (sharedContactStub.resolved())  sharedContactStub.get().setVisibility(GONE);
+
+      ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+      footer.setVisibility(VISIBLE);
     }
   }
 
-  private void setThumbnailCorners(@NonNull MessageRecord           current,
-                                   @NonNull Optional<MessageRecord> previous,
-                                   @NonNull Optional<MessageRecord> next,
-                                            boolean                 isGroupThread)
+  private void setThumbnailOutlineCorners(@NonNull MessageRecord           current,
+                                          @NonNull Optional<MessageRecord> previous,
+                                          @NonNull Optional<MessageRecord> next,
+                                                   boolean                 isGroupThread)
   {
     int defaultRadius  = readDimen(R.dimen.message_corner_radius);
     int collapseRadius = readDimen(R.dimen.message_corner_collapse_radius);
@@ -531,22 +534,10 @@ public class ConversationItem extends LinearLayout
       topRight = 0;
     }
 
-    mediaThumbnailStub.get().setCornerRadii(topLeft, topRight, bottomRight, bottomLeft);
+    mediaThumbnailStub.get().setOutlineCorners(topLeft, topRight, bottomRight, bottomLeft);
   }
 
-  private void setSharedContactCorners(@NonNull MessageRecord current, @NonNull Optional<MessageRecord> previous, @NonNull Optional<MessageRecord> next, boolean isGroupThread) {
-    if (isSingularMessage(current, previous, next, isGroupThread) || isEndOfMessageCluster(current, next, isGroupThread)) {
-      sharedContactStub.get().setSingularStyle();
-    } else {
-      if (current.isOutgoing()) {
-        sharedContactStub.get().setClusteredOutgoingStyle();
-      } else {
-        sharedContactStub.get().setClusteredIncomingStyle();
-      }
-    }
-  }
-
-  private void presentContactPhoto(@NonNull Recipient recipient) {
+  private void setContactPhoto(@NonNull Recipient recipient) {
     if (contactPhoto == null) return;
 
     if (messageRecord.isOutgoing() || !groupThread) {
@@ -571,19 +562,19 @@ public class ConversationItem extends LinearLayout
     return messageBody;
   }
 
-  private void presentStatusIcons(MessageRecord messageRecord) {
+  private void setStatusIcons(MessageRecord messageRecord) {
     bodyText.setCompoundDrawablesWithIntrinsicBounds(0, 0, messageRecord.isKeyExchange() ? R.drawable.ic_menu_login : 0, 0);
 
     if (messageRecord.isFailed()) {
-      setFailedStatusIcons();
+      alertView.setFailed();
     } else if (messageRecord.isPendingInsecureSmsFallback()) {
-      setFallbackStatusIcons();
+      alertView.setPendingApproval();
     } else {
       alertView.setNone();
     }
   }
 
-  private void presentQuote(@NonNull MessageRecord current, @NonNull Optional<MessageRecord> previous, @NonNull Optional<MessageRecord> next, boolean isGroupThread) {
+  private void setQuote(@NonNull MessageRecord current, @NonNull Optional<MessageRecord> previous, @NonNull Optional<MessageRecord> next, boolean isGroupThread) {
     if (current.isMms() && !current.isMmsNotification() && ((MediaMmsMessageRecord)current).getQuote() != null) {
       Quote quote = ((MediaMmsMessageRecord)current).getQuote();
       assert quote != null;
@@ -598,8 +589,8 @@ public class ConversationItem extends LinearLayout
           passthroughClickListener.onClick(view);
         }
       });
+
       quoteView.setOnLongClickListener(passthroughClickListener);
-      ViewUtil.setPaddingTop(bodyBubble, 0);
 
       if (isStartOfMessageCluster(current, previous, isGroupThread)) {
         if (current.isOutgoing()) {
@@ -616,14 +607,20 @@ public class ConversationItem extends LinearLayout
           quoteView.setTopCornerSizes(false, true);
         }
       }
+
+      if (mediaThumbnailStub.resolved()) {
+        ViewUtil.setTopMargin(mediaThumbnailStub.get(), readDimen(R.dimen.message_bubble_top_padding));
+      }
     } else {
       quoteView.dismiss();
+
+      if (mediaThumbnailStub.resolved()) {
+        ViewUtil.setTopMargin(mediaThumbnailStub.get(), 0);
+      }
     }
   }
 
-  private void presentMessageSpacing(@NonNull MessageRecord current, @NonNull Optional<MessageRecord> next, boolean isGroupThread) {
-    ViewUtil.setPaddingBottom(this, getMessageSpacing(context, current, next));
-
+  private void setGutterSizes(@NonNull MessageRecord current, boolean isGroupThread) {
     if (isGroupThread) {
       if (current.isOutgoing()) {
         ViewUtil.setLeftMargin(container, readDimen(R.dimen.conversation_group_left_gutter));
@@ -639,17 +636,8 @@ public class ConversationItem extends LinearLayout
     }
   }
 
-  private void presentMessageBackground(@NonNull MessageRecord           current,
-                                        @NonNull Optional<MessageRecord> previous,
-                                        @NonNull Optional<MessageRecord> next,
-                                        boolean                 isGroupThread)
-  {
-    bodyBubble.setBackgroundResource(getCornerBackgroundRes(current, previous, next, isGroupThread));
-  }
-
-  private void presentFooter(@NonNull MessageRecord current, @NonNull Optional<MessageRecord> next, @NonNull Locale locale, boolean isGroupThread) {
+  private void setFooter(@NonNull MessageRecord current, @NonNull Optional<MessageRecord> next, @NonNull Locale locale, boolean isGroupThread) {
     ViewUtil.updateLayoutParams(footer, LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
-    ViewUtil.setPaddingBottom(bodyBubble, 0);
 
     footer.setVisibility(GONE);
     if (sharedContactStub.resolved()) sharedContactStub.get().getFooter().setVisibility(GONE);
@@ -660,8 +648,6 @@ public class ConversationItem extends LinearLayout
       ConversationItemFooter activeFooter = getActiveFooter(current);
       activeFooter.setVisibility(VISIBLE);
       activeFooter.setMessageRecord(current, locale);
-    } else if (!TextUtils.isEmpty(messageRecord.getDisplayBody())) {
-      ViewUtil.setPaddingBottom(bodyBubble, readDimen(R.dimen.message_bubble_collapsed_footer_padding));
     }
   }
 
@@ -679,14 +665,6 @@ public class ConversationItem extends LinearLayout
     return context.getResources().getDimensionPixelOffset(dimenId);
   }
 
-  private void setFailedStatusIcons() {
-    alertView.setFailed();
-  }
-
-  private void setFallbackStatusIcons() {
-    alertView.setPendingApproval();
-  }
-
   private boolean shouldInterceptClicks(MessageRecord messageRecord) {
     return batchSelected.isEmpty() &&
             ((messageRecord.isFailed() && !messageRecord.isMmsNotification()) ||
@@ -695,23 +673,24 @@ public class ConversationItem extends LinearLayout
   }
 
   @SuppressLint("SetTextI18n")
-  private void presentGroupMessageStatus(@NonNull MessageRecord current, @NonNull Recipient recipient) {
-    this.groupSender.setText(recipient.toShortString());
+  private void setGroupMessageStatus(MessageRecord messageRecord, Recipient recipient) {
+    if (groupThread && !messageRecord.isOutgoing()) {
+      this.groupSender.setText(recipient.toShortString());
 
-    if (recipient.getName() == null && !TextUtils.isEmpty(recipient.getProfileName()) && !current.isOutgoing()) {
-      this.groupSenderProfileName.setText("~" + recipient.getProfileName());
-      this.groupSenderProfileName.setVisibility(View.VISIBLE);
-    } else {
-      this.groupSenderProfileName.setText(null);
-      this.groupSenderProfileName.setVisibility(View.GONE);
+      if (recipient.getName() == null && !TextUtils.isEmpty(recipient.getProfileName())) {
+        this.groupSenderProfileName.setText("~" + recipient.getProfileName());
+        this.groupSenderProfileName.setVisibility(View.VISIBLE);
+      } else {
+        this.groupSenderProfileName.setText(null);
+        this.groupSenderProfileName.setVisibility(View.GONE);
+      }
     }
   }
 
-  private void presentAuthor(@NonNull MessageRecord current, @NonNull Optional<MessageRecord> previous, @NonNull Optional<MessageRecord> next, boolean isGroupThread) {
+  private void setAuthor(@NonNull MessageRecord current, @NonNull Optional<MessageRecord> previous, @NonNull Optional<MessageRecord> next, boolean isGroupThread) {
     if (isGroupThread && !current.isOutgoing()) {
       if (!previous.isPresent() || previous.get().isUpdate() || !current.getRecipient().getAddress().equals(previous.get().getRecipient().getAddress())) {
         groupSenderHolder.setVisibility(VISIBLE);
-        ViewUtil.setPaddingTop(bodyBubble, readDimen(R.dimen.message_bubble_top_padding));
       } else {
         groupSenderHolder.setVisibility(GONE);
       }
@@ -730,19 +709,45 @@ public class ConversationItem extends LinearLayout
     }
   }
 
-  private int getCornerBackgroundRes(@NonNull MessageRecord current, @NonNull Optional<MessageRecord> previous, @NonNull Optional<MessageRecord> next, boolean isGroupThread) {
+  private void setMessageShape(@NonNull MessageRecord current, @NonNull Optional<MessageRecord> previous, @NonNull Optional<MessageRecord> next, boolean isGroupThread) {
     if (isSingularMessage(current, previous, next, isGroupThread)) {
-      return current.isOutgoing() ? R.drawable.message_bubble_background_sent_alone
-                                  : R.drawable.message_bubble_background_received_alone;
+      bodyBubble.setRadius(readDimen(R.dimen.message_corner_radius));
     } else if (isStartOfMessageCluster(current, previous, isGroupThread)) {
-      return current.isOutgoing() ? R.drawable.message_bubble_background_sent_start
-                                  : R.drawable.message_bubble_background_received_start;
+      if (current.isOutgoing()) {
+        bodyBubble.setRadii(readDimen(R.dimen.message_corner_radius),
+                            readDimen(R.dimen.message_corner_radius),
+                            readDimen(R.dimen.message_corner_collapse_radius),
+                            readDimen(R.dimen.message_corner_radius));
+      } else {
+        bodyBubble.setRadii(readDimen(R.dimen.message_corner_radius),
+                            readDimen(R.dimen.message_corner_radius),
+                            readDimen(R.dimen.message_corner_radius),
+                            readDimen(R.dimen.message_corner_collapse_radius));
+      }
     } else if (isEndOfMessageCluster(current, next, isGroupThread)) {
-      return current.isOutgoing() ? R.drawable.message_bubble_background_sent_end
-                                  : R.drawable.message_bubble_background_received_end;
+      if (current.isOutgoing()) {
+        bodyBubble.setRadii(readDimen(R.dimen.message_corner_radius),
+                            readDimen(R.dimen.message_corner_collapse_radius),
+                            readDimen(R.dimen.message_corner_radius),
+                            readDimen(R.dimen.message_corner_radius));
+      } else {
+        bodyBubble.setRadii(readDimen(R.dimen.message_corner_collapse_radius),
+                            readDimen(R.dimen.message_corner_radius),
+                            readDimen(R.dimen.message_corner_radius),
+                            readDimen(R.dimen.message_corner_radius));
+      }
     } else {
-      return current.isOutgoing() ? R.drawable.message_bubble_background_sent_middle
-                                  : R.drawable.message_bubble_background_received_middle;
+      if (current.isOutgoing()) {
+        bodyBubble.setRadii(readDimen(R.dimen.message_corner_radius),
+                            readDimen(R.dimen.message_corner_collapse_radius),
+                            readDimen(R.dimen.message_corner_collapse_radius),
+                            readDimen(R.dimen.message_corner_radius));
+      } else {
+        bodyBubble.setRadii(readDimen(R.dimen.message_corner_collapse_radius),
+                            readDimen(R.dimen.message_corner_radius),
+                            readDimen(R.dimen.message_corner_radius),
+                            readDimen(R.dimen.message_corner_collapse_radius));
+      }
     }
   }
 
@@ -770,16 +775,19 @@ public class ConversationItem extends LinearLayout
     return isStartOfMessageCluster(current, previous, isGroupThread) && isEndOfMessageCluster(current, next, isGroupThread);
   }
 
-  private int getMessageSpacing(@NonNull Context context, @NonNull MessageRecord current, @NonNull Optional<MessageRecord> next) {
+  private void setMessageSpacing(@NonNull Context context, @NonNull MessageRecord current, @NonNull Optional<MessageRecord> next) {
+    int spacing = readDimen(context, R.dimen.conversation_vertical_message_spacing_collapse);
+
     if (next.isPresent()) {
       boolean recipientsMatch = current.getRecipient().getAddress().equals(next.get().getRecipient().getAddress());
       boolean outgoingMatch   = current.isOutgoing() == next.get().isOutgoing();
 
       if (!recipientsMatch || !outgoingMatch) {
-        return readDimen(context, R.dimen.conversation_vertical_message_spacing_default);
+        spacing = readDimen(context, R.dimen.conversation_vertical_message_spacing_default);
       }
     }
-    return readDimen(context, R.dimen.conversation_vertical_message_spacing_collapse);
+
+    ViewUtil.setPaddingBottom(this, spacing);
   }
 
   private int readDimen(@NonNull Context context, @DimenRes int dimenId) {
@@ -801,9 +809,9 @@ public class ConversationItem extends LinearLayout
   @Override
   public void onModified(final Recipient modified) {
     Util.runOnMain(() -> {
-      presentBubbleState(messageRecord);
-      presentContactPhoto(recipient);
-      presentGroupMessageStatus(messageRecord, recipient);
+      setBubbleState(messageRecord);
+      setContactPhoto(recipient);
+      setGroupMessageStatus(messageRecord, recipient);
       setAudioViewTint(messageRecord, conversationRecipient);
     });
   }
diff --git a/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java b/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java
index 7a70a789ba..790c8a9dc5 100644
--- a/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java
+++ b/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java
@@ -84,7 +84,6 @@ public class ConversationItemFooter extends LinearLayout {
     simView.setTextColor(color);
     timerView.setColorFilter(color);
     insecureIndicatorView.setColorFilter(color);
-    deliveryStatusView.setTint(color);
   }
 
   private void presentDate(@NonNull MessageRecord messageRecord, @NonNull Locale locale) {
diff --git a/src/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java b/src/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java
index 3c21348e75..83148e460f 100644
--- a/src/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java
+++ b/src/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java
@@ -2,15 +2,16 @@ package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
 import android.content.res.TypedArray;
+import android.graphics.Canvas;
 import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.RectF;
 import android.net.Uri;
-import android.support.annotation.DrawableRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.UiThread;
 import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 
@@ -18,17 +19,35 @@ import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.Slide;
 import org.thoughtcrime.securesms.mms.SlideClickListener;
-
-import static com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions.withCrossFade;
+import org.thoughtcrime.securesms.util.ThemeUtil;
 
 public class ConversationItemThumbnail extends FrameLayout {
 
   private static final String TAG = ConversationItemThumbnail.class.getSimpleName();
 
+  private static final Paint LIGHT_THEME_OUTLINE_PAINT = new Paint();
+  private static final Paint DARK_THEME_OUTLINE_PAINT = new Paint();
+
+  static {
+    LIGHT_THEME_OUTLINE_PAINT.setColor(Color.argb((int) (255 * 0.2), 0, 0, 0));
+    LIGHT_THEME_OUTLINE_PAINT.setStyle(Paint.Style.STROKE);
+    LIGHT_THEME_OUTLINE_PAINT.setStrokeWidth(1f);
+    LIGHT_THEME_OUTLINE_PAINT.setAntiAlias(true);
+
+    DARK_THEME_OUTLINE_PAINT.setColor(Color.argb((int) (255 * 0.2), 255, 255, 255));
+    DARK_THEME_OUTLINE_PAINT.setStyle(Paint.Style.STROKE);
+    DARK_THEME_OUTLINE_PAINT.setStrokeWidth(1f);
+    DARK_THEME_OUTLINE_PAINT.setAntiAlias(true);
+  }
+
+  private final float[] radii   = new float[8];
+  private final RectF   bounds  = new RectF();
+  private final Path    corners = new Path();
+
   private ThumbnailView          thumbnail;
   private ImageView              shade;
-  private CornerMaskingView      cornerMask;
   private ConversationItemFooter footer;
+  private Paint                  outlinePaint;
 
   public ConversationItemThumbnail(Context context) {
     super(context);
@@ -48,12 +67,11 @@ public class ConversationItemThumbnail extends FrameLayout {
   private void init(@Nullable AttributeSet attrs) {
     inflate(getContext(), R.layout.conversation_item_thumbnail, this);
 
-    this.thumbnail  = findViewById(R.id.conversation_thumbnail_image);
-    this.shade      = findViewById(R.id.conversation_thumbnail_shade);
-    this.cornerMask = findViewById(R.id.conversation_thumbnail_corner_mask);
-    this.footer     = findViewById(R.id.conversation_thumbnail_footer);
+    this.thumbnail    = findViewById(R.id.conversation_thumbnail_image);
+    this.shade        = findViewById(R.id.conversation_thumbnail_shade);
+    this.footer       = findViewById(R.id.conversation_thumbnail_footer);
+    this.outlinePaint = ThemeUtil.isDarkTheme(getContext()) ? DARK_THEME_OUTLINE_PAINT : LIGHT_THEME_OUTLINE_PAINT;
 
-    setCornerRadius(getResources().getDimensionPixelSize(R.dimen.message_corner_radius));
     setTouchDelegate(thumbnail.getTouchDelegate());
 
     if (attrs != null) {
@@ -66,6 +84,24 @@ public class ConversationItemThumbnail extends FrameLayout {
     }
   }
 
+  @SuppressWarnings("SuspiciousNameCombination")
+  @Override
+  protected void dispatchDraw(Canvas canvas) {
+    super.dispatchDraw(canvas);
+
+    final float halfStrokeWidth = outlinePaint.getStrokeWidth() / 2;
+
+    bounds.left   = halfStrokeWidth;
+    bounds.top    = halfStrokeWidth;
+    bounds.right  = canvas.getWidth() - halfStrokeWidth;
+    bounds.bottom = canvas.getHeight() - halfStrokeWidth;
+
+    corners.reset();
+    corners.addRoundRect(bounds, radii, Path.Direction.CW);
+
+    canvas.drawPath(corners, outlinePaint);
+  }
+
   @Override
   protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
     super.onMeasure(widthMeasureSpec, heightMeasureSpec);
@@ -96,22 +132,17 @@ public class ConversationItemThumbnail extends FrameLayout {
     forceLayout();
   }
 
+  public void setOutlineCorners(int topLeft, int topRight, int bottomRight, int bottomLeft) {
+    radii[0] = radii[1] = topLeft;
+    radii[2] = radii[3] = topRight;
+    radii[4] = radii[5] = bottomRight;
+    radii[6] = radii[7] = bottomLeft;
+  }
+
   public ConversationItemFooter getFooter() {
     return footer;
   }
 
-  public void setCornerRadius(int radius) {
-    setCornerRadii(radius, radius, radius, radius);
-  }
-
-  public void setCornerRadii(int topLeft, int topRight, int bottomRight, int bottomLeft) {
-    cornerMask.setRadii(topLeft, topRight, bottomRight, bottomLeft);
-  }
-
-  public void setImageBackground(@DrawableRes int resId) {
-    thumbnail.setImageBackground(resId);
-  }
-
   @UiThread
   public void setImageResource(@NonNull GlideRequests glideRequests, @NonNull Slide slide,
                                boolean showControls, boolean isPreview)
diff --git a/src/org/thoughtcrime/securesms/components/CornerMaskingView.java b/src/org/thoughtcrime/securesms/components/CornerMaskingView.java
index d3473f491e..1e0a8f0a94 100644
--- a/src/org/thoughtcrime/securesms/components/CornerMaskingView.java
+++ b/src/org/thoughtcrime/securesms/components/CornerMaskingView.java
@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
+import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
@@ -8,40 +9,56 @@ import android.graphics.Path;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffXfermode;
 import android.graphics.RectF;
+import android.os.Build;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.widget.FrameLayout;
 
+import org.thoughtcrime.securesms.R;
+
 public class CornerMaskingView extends FrameLayout {
 
-  private final float[] radii   = new float[8];
-  private final Paint   paint   = new Paint();
-  private final Path    corners = new Path();
-  private final RectF   bounds  = new RectF();
+  private final float[] radii      = new float[8];
+  private final Paint   dstPaint   = new Paint();
+  private final Paint   clearPaint = new Paint();
+  private final Path    outline    = new Path();
+  private final Path    corners    = new Path();
+  private final RectF   bounds     = new RectF();
 
   public CornerMaskingView(@NonNull Context context) {
     super(context);
-    init();
+    init(null);
   }
 
   public CornerMaskingView(@NonNull Context context, @Nullable AttributeSet attrs) {
     super(context, attrs);
-    init();
+    init(attrs);
   }
 
   public CornerMaskingView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
     super(context, attrs, defStyleAttr);
-    init();
+    init(attrs);
   }
 
-  private void init() {
+  private void init(@Nullable AttributeSet attrs) {
     setLayerType(LAYER_TYPE_HARDWARE, null);
 
-    paint.setColor(Color.BLACK);
-    paint.setStyle(Paint.Style.FILL);
-    paint.setAntiAlias(true);
-    paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.DST_IN));
+    dstPaint.setColor(Color.BLACK);
+    dstPaint.setStyle(Paint.Style.FILL);
+    dstPaint.setAntiAlias(true);
+    dstPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.DST_IN));
+
+    clearPaint.setColor(Color.BLACK);
+    clearPaint.setStyle(Paint.Style.FILL);
+    clearPaint.setAntiAlias(true);
+    clearPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.CLEAR));
+
+    if (attrs != null) {
+      TypedArray typedArray = getContext().getTheme().obtainStyledAttributes(attrs, R.styleable.CornerMaskingView, 0, 0);
+      setRadius(typedArray.getDimensionPixelOffset(R.styleable.CornerMaskingView_cmv_radius, 0));
+      typedArray.recycle();
+    }
   }
 
   @Override
@@ -56,7 +73,18 @@ public class CornerMaskingView extends FrameLayout {
     corners.reset();
     corners.addRoundRect(bounds, radii, Path.Direction.CW);
 
-    canvas.drawPath(corners, paint);
+    // Note: There's a bug in the P beta where most PorterDuff modes aren't working. But CLEAR does.
+    //       So we find and inverse path and use Mode.CLEAR for versions that support Path.op().
+    //       See issue https://issuetracker.google.com/issues/111394085.
+    if (Build.VERSION.SDK_INT >= 19) {
+      outline.reset();
+      outline.addRect(bounds, Path.Direction.CW);
+      outline.op(corners, Path.Op.DIFFERENCE);
+      canvas.drawPath(outline, clearPaint);
+    } else {
+      corners.addRoundRect(bounds, radii, Path.Direction.CW);
+      canvas.drawPath(corners, dstPaint);
+    }
   }
 
   public void setRadius(int radius) {
diff --git a/src/org/thoughtcrime/securesms/components/DeliveryStatusView.java b/src/org/thoughtcrime/securesms/components/DeliveryStatusView.java
index 0faf95103d..a5b6ce70b5 100644
--- a/src/org/thoughtcrime/securesms/components/DeliveryStatusView.java
+++ b/src/org/thoughtcrime/securesms/components/DeliveryStatusView.java
@@ -7,6 +7,9 @@ import android.os.Build;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.animation.Animation;
+import android.view.animation.LinearInterpolator;
+import android.view.animation.RotateAnimation;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -19,6 +22,15 @@ public class DeliveryStatusView extends FrameLayout {
 
   private static final String TAG = DeliveryStatusView.class.getSimpleName();
 
+  private static final RotateAnimation ROTATION_ANIMATION = new RotateAnimation(0, 360f,
+                                                                                Animation.RELATIVE_TO_SELF, 0.5f,
+                                                                                Animation.RELATIVE_TO_SELF, 0.5f);
+  static {
+    ROTATION_ANIMATION.setInterpolator(new LinearInterpolator());
+    ROTATION_ANIMATION.setDuration(1500);
+    ROTATION_ANIMATION.setRepeatCount(Animation.INFINITE);
+  }
+
   private final ImageView pendingIndicator;
   private final ImageView sentIndicator;
   private final ImageView deliveredIndicator;
@@ -56,6 +68,7 @@ public class DeliveryStatusView extends FrameLayout {
   public void setPending() {
     this.setVisibility(View.VISIBLE);
     pendingIndicator.setVisibility(View.VISIBLE);
+    pendingIndicator.startAnimation(ROTATION_ANIMATION);
     sentIndicator.setVisibility(View.GONE);
     deliveredIndicator.setVisibility(View.GONE);
     readIndicator.setVisibility(View.GONE);
@@ -64,6 +77,7 @@ public class DeliveryStatusView extends FrameLayout {
   public void setSent() {
     this.setVisibility(View.VISIBLE);
     pendingIndicator.setVisibility(View.GONE);
+    pendingIndicator.clearAnimation();
     sentIndicator.setVisibility(View.VISIBLE);
     deliveredIndicator.setVisibility(View.GONE);
     readIndicator.setVisibility(View.GONE);
@@ -72,6 +86,7 @@ public class DeliveryStatusView extends FrameLayout {
   public void setDelivered() {
     this.setVisibility(View.VISIBLE);
     pendingIndicator.setVisibility(View.GONE);
+    pendingIndicator.clearAnimation();
     sentIndicator.setVisibility(View.GONE);
     deliveredIndicator.setVisibility(View.VISIBLE);
     readIndicator.setVisibility(View.GONE);
@@ -80,6 +95,7 @@ public class DeliveryStatusView extends FrameLayout {
   public void setRead() {
     this.setVisibility(View.VISIBLE);
     pendingIndicator.setVisibility(View.GONE);
+    pendingIndicator.clearAnimation();
     sentIndicator.setVisibility(View.GONE);
     deliveredIndicator.setVisibility(View.GONE);
     readIndicator.setVisibility(View.VISIBLE);
diff --git a/src/org/thoughtcrime/securesms/components/ExpirationTimerView.java b/src/org/thoughtcrime/securesms/components/ExpirationTimerView.java
index f2b863cb86..33c7a85860 100644
--- a/src/org/thoughtcrime/securesms/components/ExpirationTimerView.java
+++ b/src/org/thoughtcrime/securesms/components/ExpirationTimerView.java
@@ -77,7 +77,7 @@ public class ExpirationTimerView extends android.support.v7.widget.AppCompatImag
     long  progressed      = System.currentTimeMillis() - startedAt;
     float percentComplete = (float)progressed / (float)expiresIn;
 
-    return percentComplete;
+    return Math.min(percentComplete, 1);
   }
 
   private long calculateAnimationDelay(long startedAt, long expiresIn) {
diff --git a/src/org/thoughtcrime/securesms/components/QuoteView.java b/src/org/thoughtcrime/securesms/components/QuoteView.java
index bd563e6f1e..c2dbcbc995 100644
--- a/src/org/thoughtcrime/securesms/components/QuoteView.java
+++ b/src/org/thoughtcrime/securesms/components/QuoteView.java
@@ -41,6 +41,7 @@ public class QuoteView extends LinearLayout implements RecipientModifiedListener
   private static final int MESSAGE_TYPE_INCOMING = 2;
 
   private CornerMaskingView rootView;
+  private View              backgroundView;
   private TextView          authorView;
   private TextView          bodyView;
   private ImageView         quoteBarView;
@@ -85,6 +86,7 @@ public class QuoteView extends LinearLayout implements RecipientModifiedListener
     inflate(getContext(), R.layout.quote_view, this);
 
     this.rootView                     = findViewById(R.id.quote_root);
+    this.backgroundView               = findViewById(R.id.quote_background);
     this.authorView                   = findViewById(R.id.quote_author);
     this.bodyView                     = findViewById(R.id.quote_text);
     this.quoteBarView                 = findViewById(R.id.quote_bar);
@@ -172,11 +174,10 @@ public class QuoteView extends LinearLayout implements RecipientModifiedListener
 
     authorView.setText(isOwnNumber ? getContext().getString(R.string.QuoteView_you)
                                    : author.toShortString());
-    authorView.setTextColor(author.getColor().toActionBarColor(getContext()));
 
     // We use the raw color resource because Android 4.x was struggling with tints here
     quoteBarView.setImageResource(author.getColor().toQuoteBarColorResource(getContext(), outgoing));
-    rootView.setBackgroundColor(author.getColor().toQuoteBackgroundColor(getContext(), outgoing));
+    backgroundView.setBackgroundColor(author.getColor().toQuoteBackgroundColor(getContext(), outgoing));
   }
 
   private void setQuoteText(@Nullable String body, @NonNull SlideDeck attachments) {
diff --git a/src/org/thoughtcrime/securesms/components/RemovableEditableMediaView.java b/src/org/thoughtcrime/securesms/components/RemovableEditableMediaView.java
index edf3022360..b31828ce04 100644
--- a/src/org/thoughtcrime/securesms/components/RemovableEditableMediaView.java
+++ b/src/org/thoughtcrime/securesms/components/RemovableEditableMediaView.java
@@ -56,7 +56,7 @@ public class RemovableEditableMediaView extends FrameLayout {
     if (current != null) current.setVisibility(View.GONE);
 
     if (view != null) {
-      view.setPadding(0, removeSize / 2, removeSize / 2, 0);
+      view.setPadding(view.getPaddingLeft(), removeSize / 2, removeSize / 2, view.getPaddingRight());
       edit.setPadding(0, 0, removeSize / 2, 0);
 
       view.setVisibility(View.VISIBLE);
diff --git a/src/org/thoughtcrime/securesms/components/SharedContactView.java b/src/org/thoughtcrime/securesms/components/SharedContactView.java
index d6af47a2af..30af4c725c 100644
--- a/src/org/thoughtcrime/securesms/components/SharedContactView.java
+++ b/src/org/thoughtcrime/securesms/components/SharedContactView.java
@@ -104,18 +104,6 @@ public class SharedContactView extends LinearLayout implements RecipientModified
     presentActionButtons(ContactUtil.getRecipients(getContext(), contact));
   }
 
-  public void setSingularStyle() {
-    actionButtonView.setBackgroundResource(R.drawable.shared_contact_button_background_alone);
-  }
-
-  public void setClusteredIncomingStyle() {
-    actionButtonView.setBackgroundResource(R.drawable.shared_contact_button_background_clustered_received);
-  }
-
-  public void setClusteredOutgoingStyle() {
-    actionButtonView.setBackgroundResource(R.drawable.shared_contact_button_background_clustered_sent);
-  }
-
   public void setEventListener(@NonNull EventListener eventListener) {
     this.eventListener = eventListener;
   }
diff --git a/src/org/thoughtcrime/securesms/components/SpinningImageView.java b/src/org/thoughtcrime/securesms/components/SpinningImageView.java
deleted file mode 100644
index c3f9354034..0000000000
--- a/src/org/thoughtcrime/securesms/components/SpinningImageView.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.thoughtcrime.securesms.components;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.AppCompatImageView;
-import android.util.AttributeSet;
-
-public class SpinningImageView extends AppCompatImageView {
-
-  private static final float DEGREES_PER_SECOND = 180;
-
-  private long  lastDrawTime;
-  private float currentRotation;
-
-  public SpinningImageView(Context context) {
-    super(context);
-    init();
-  }
-
-  public SpinningImageView(Context context, @Nullable AttributeSet attrs) {
-    super(context, attrs);
-    init();
-  }
-
-  public SpinningImageView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
-    super(context, attrs, defStyleAttr);
-    init();
-  }
-
-  private void init() {
-    lastDrawTime = System.currentTimeMillis();
-    setWillNotDraw(false);
-  }
-
-  @Override
-  protected void onDraw(Canvas canvas) {
-    long  currentTime = System.currentTimeMillis();
-    long  elapsedTime = currentTime - lastDrawTime;
-    float rotate      = ((float) elapsedTime / 1000) * DEGREES_PER_SECOND;
-
-    currentRotation += rotate;
-    canvas.rotate(currentRotation, canvas.getWidth() / 2, canvas.getHeight() / 2);
-    lastDrawTime = currentTime;
-
-    super.onDraw(canvas);
-    invalidate();
-  }
-}
diff --git a/src/org/thoughtcrime/securesms/components/ThumbnailView.java b/src/org/thoughtcrime/securesms/components/ThumbnailView.java
index 4ea4c54ab2..6c8de12cb6 100644
--- a/src/org/thoughtcrime/securesms/components/ThumbnailView.java
+++ b/src/org/thoughtcrime/securesms/components/ThumbnailView.java
@@ -84,10 +84,12 @@ public class ThumbnailView extends FrameLayout {
       bounds[MAX_WIDTH]  = typedArray.getDimensionPixelSize(R.styleable.ThumbnailView_maxWidth, 0);
       bounds[MIN_HEIGHT] = typedArray.getDimensionPixelSize(R.styleable.ThumbnailView_minHeight, 0);
       bounds[MAX_HEIGHT] = typedArray.getDimensionPixelSize(R.styleable.ThumbnailView_maxHeight, 0);
+      radius             = typedArray.getDimensionPixelSize(R.styleable.ThumbnailView_thumbnail_radius, getResources().getDimensionPixelSize(R.dimen.message_corner_collapse_radius));
       typedArray.recycle();
+    } else {
+      radius = getResources().getDimensionPixelSize(R.dimen.message_corner_collapse_radius);
     }
 
-    radius = getResources().getDimensionPixelOffset(R.dimen.message_corner_collapse_radius);
   }
 
   @Override
@@ -218,10 +220,6 @@ public class ThumbnailView extends FrameLayout {
     forceLayout();
   }
 
-  public void setImageBackground(@DrawableRes int resId) {
-    image.setBackgroundResource(resId);
-  }
-
   @UiThread
   public void setImageResource(@NonNull GlideRequests glideRequests, @NonNull Slide slide,
                                boolean showControls, boolean isPreview)
diff --git a/src/org/thoughtcrime/securesms/util/DateUtils.java b/src/org/thoughtcrime/securesms/util/DateUtils.java
index 1e7ffc7198..0b9f66e6d0 100644
--- a/src/org/thoughtcrime/securesms/util/DateUtils.java
+++ b/src/org/thoughtcrime/securesms/util/DateUtils.java
@@ -34,7 +34,7 @@ import java.util.concurrent.TimeUnit;
 public class DateUtils extends android.text.format.DateUtils {
 
   @SuppressWarnings("unused")
-  private static final String TAG = DateUtils.class.getSimpleName();
+  private static final String           TAG         = DateUtils.class.getSimpleName();
   private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyyMMdd");
 
   private static boolean isWithin(final long millis, final long span, final TimeUnit unit) {
diff --git a/src/org/thoughtcrime/securesms/util/ViewUtil.java b/src/org/thoughtcrime/securesms/util/ViewUtil.java
index 8bd7666673..b52cd6b192 100644
--- a/src/org/thoughtcrime/securesms/util/ViewUtil.java
+++ b/src/org/thoughtcrime/securesms/util/ViewUtil.java
@@ -232,15 +232,6 @@ public class ViewUtil {
     view.requestLayout();
   }
 
-  public static void setBottomMargin(@NonNull View view, int margin) {
-    ((ViewGroup.MarginLayoutParams) view.getLayoutParams()).bottomMargin = margin;
-    view.requestLayout();
-  }
-
-  public static void setPaddingTop(@NonNull View view, int padding) {
-    view.setPadding(view.getPaddingLeft(), padding, view.getPaddingRight(), view.getPaddingBottom());
-  }
-
   public static void setPaddingBottom(@NonNull View view, int padding) {
     view.setPadding(view.getPaddingLeft(), view.getPaddingTop(), view.getPaddingRight(), padding);
   }