diff --git a/res/drawable/prominent_filled_button_medium_background.xml b/res/drawable/prominent_filled_button_medium_background.xml
index 9e4eeed50c..a06a0d11e5 100644
--- a/res/drawable/prominent_filled_button_medium_background.xml
+++ b/res/drawable/prominent_filled_button_medium_background.xml
@@ -3,9 +3,9 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid  android:color="@color/accent" />
+    <solid  android:color="?colorAccent" />
 
-    <corners android:radius="22dp" />
+    <corners android:radius="@dimen/medium_button_corner_radius" />
 
-    <stroke android:width="@dimen/border_thickness" android:color="@color/accent" />
+    <stroke android:width="@dimen/border_thickness" android:color="?colorAccent" />
 </shape>
\ No newline at end of file
diff --git a/res/drawable/prominent_outline_button_medium_background.xml b/res/drawable/prominent_outline_button_medium_background.xml
index b5f3dc5355..183ed83282 100644
--- a/res/drawable/prominent_outline_button_medium_background.xml
+++ b/res/drawable/prominent_outline_button_medium_background.xml
@@ -5,7 +5,7 @@
 
     <solid  android:color="@color/transparent" />
 
-    <corners android:radius="22dp" />
+    <corners android:radius="@dimen/medium_button_corner_radius" />
 
-    <stroke android:width="@dimen/border_thickness" android:color="@color/accent" />
+    <stroke android:width="@dimen/border_thickness" android:color="?colorAccent" />
 </shape>
\ No newline at end of file
diff --git a/res/drawable/unimportant_filled_button_medium_background.xml b/res/drawable/unimportant_filled_button_medium_background.xml
index 4880fd4fed..dc3b8df238 100644
--- a/res/drawable/unimportant_filled_button_medium_background.xml
+++ b/res/drawable/unimportant_filled_button_medium_background.xml
@@ -5,7 +5,7 @@
 
     <solid  android:color="@color/unimportant_button_background" />
 
-    <corners android:radius="22dp" />
+    <corners android:radius="@dimen/medium_button_corner_radius" />
 
     <stroke android:width="@dimen/border_thickness" android:color="@color/unimportant_button_background" />
 </shape>
\ No newline at end of file
diff --git a/res/drawable/unimportant_outline_button_medium_background.xml b/res/drawable/unimportant_outline_button_medium_background.xml
index 81471826c3..183ed83282 100644
--- a/res/drawable/unimportant_outline_button_medium_background.xml
+++ b/res/drawable/unimportant_outline_button_medium_background.xml
@@ -5,7 +5,7 @@
 
     <solid  android:color="@color/transparent" />
 
-    <corners android:radius="22dp" />
+    <corners android:radius="@dimen/medium_button_corner_radius" />
 
-    <stroke android:width="@dimen/border_thickness" android:color="@color/text" />
+    <stroke android:width="@dimen/border_thickness" android:color="?colorAccent" />
 </shape>
\ No newline at end of file
diff --git a/res/layout-sw400dp/activity_display_name.xml b/res/layout-sw400dp/activity_display_name.xml
index d0420ab46d..ecb0a35967 100644
--- a/res/layout-sw400dp/activity_display_name.xml
+++ b/res/layout-sw400dp/activity_display_name.xml
@@ -49,7 +49,7 @@
         android:layout_weight="1"/>
 
     <Button
-        style="@style/MediumProminentFilledButton"
+        style="@style/Widget.Session.Button.Common.ProminentFilled"
         android:id="@+id/registerButton"
         android:layout_width="match_parent"
         android:layout_height="@dimen/medium_button_height"
diff --git a/res/layout-sw400dp/activity_landing.xml b/res/layout-sw400dp/activity_landing.xml
index 57bb03489f..559ebd36ee 100644
--- a/res/layout-sw400dp/activity_landing.xml
+++ b/res/layout-sw400dp/activity_landing.xml
@@ -32,7 +32,7 @@
         android:layout_weight="1" />
 
     <Button
-        style="@style/MediumProminentFilledButton"
+        style="@style/Widget.Session.Button.Common.ProminentFilled"
         android:id="@+id/registerButton"
         android:layout_width="match_parent"
         android:layout_height="@dimen/medium_button_height"
@@ -41,7 +41,7 @@
         android:text="@string/activity_landing_register_button_title" />
 
     <Button
-        style="@style/MediumProminentOutlineButton"
+        style="@style/Widget.Session.Button.Common.ProminentOutline"
         android:id="@+id/restoreButton"
         android:layout_width="match_parent"
         android:layout_height="@dimen/medium_button_height"
diff --git a/res/layout-sw400dp/activity_pn_mode.xml b/res/layout-sw400dp/activity_pn_mode.xml
index 579e08cd2f..649ef31eae 100644
--- a/res/layout-sw400dp/activity_pn_mode.xml
+++ b/res/layout-sw400dp/activity_pn_mode.xml
@@ -103,7 +103,7 @@
         android:layout_weight="1"/>
 
     <Button
-        style="@style/MediumProminentFilledButton"
+        style="@style/Widget.Session.Button.Common.ProminentFilled"
         android:id="@+id/registerButton"
         android:layout_width="match_parent"
         android:layout_height="@dimen/medium_button_height"
diff --git a/res/layout-sw400dp/activity_register.xml b/res/layout-sw400dp/activity_register.xml
index 21831bbbce..eaac89bcf9 100644
--- a/res/layout-sw400dp/activity_register.xml
+++ b/res/layout-sw400dp/activity_register.xml
@@ -46,7 +46,7 @@
         android:layout_weight="1"/>
 
     <Button
-        style="@style/MediumProminentFilledButton"
+        style="@style/Widget.Session.Button.Common.ProminentFilled"
         android:id="@+id/registerButton"
         android:layout_width="match_parent"
         android:layout_height="@dimen/medium_button_height"
@@ -55,7 +55,7 @@
         android:text="@string/continue_2" />
 
     <Button
-        style="@style/MediumProminentOutlineButton"
+        style="@style/Widget.Session.Button.Common.ProminentOutline"
         android:id="@+id/copyButton"
         android:layout_width="match_parent"
         android:layout_height="@dimen/medium_button_height"
diff --git a/res/layout-sw400dp/activity_restore.xml b/res/layout-sw400dp/activity_restore.xml
index 835a63cb7e..1025380523 100644
--- a/res/layout-sw400dp/activity_restore.xml
+++ b/res/layout-sw400dp/activity_restore.xml
@@ -48,7 +48,7 @@
         android:layout_weight="1"/>
 
     <Button
-        style="@style/MediumProminentFilledButton"
+        style="@style/Widget.Session.Button.Common.ProminentFilled"
         android:id="@+id/restoreButton"
         android:layout_width="match_parent"
         android:layout_height="@dimen/medium_button_height"
diff --git a/res/layout-sw400dp/activity_seed.xml b/res/layout-sw400dp/activity_seed.xml
index 15256b19f4..74f44a79d4 100644
--- a/res/layout-sw400dp/activity_seed.xml
+++ b/res/layout-sw400dp/activity_seed.xml
@@ -66,7 +66,7 @@
         android:layout_weight="1"/>
 
     <Button
-        style="@style/MediumProminentOutlineButton"
+        style="@style/Widget.Session.Button.Common.ProminentOutline"
         android:id="@+id/copyButton"
         android:layout_width="196dp"
         android:layout_height="@dimen/medium_button_height"
diff --git a/res/layout-sw400dp/fragment_enter_chat_url.xml b/res/layout-sw400dp/fragment_enter_chat_url.xml
index 07da3c7bf3..f1a0feb4a0 100644
--- a/res/layout-sw400dp/fragment_enter_chat_url.xml
+++ b/res/layout-sw400dp/fragment_enter_chat_url.xml
@@ -23,7 +23,7 @@
         android:layout_weight="1" />
 
     <Button
-        style="@style/MediumProminentOutlineButton"
+        style="@style/Widget.Session.Button.Common.ProminentOutline"
         android:id="@+id/joinPublicChatButton"
         android:layout_width="196dp"
         android:layout_height="@dimen/medium_button_height"
diff --git a/res/layout-sw400dp/fragment_enter_public_key.xml b/res/layout-sw400dp/fragment_enter_public_key.xml
index b826a3aadf..a278272f1b 100644
--- a/res/layout-sw400dp/fragment_enter_public_key.xml
+++ b/res/layout-sw400dp/fragment_enter_public_key.xml
@@ -65,7 +65,7 @@
         android:orientation="horizontal">
 
         <Button
-            style="@style/MediumUnimportantFilledButton"
+            style="@style/Widget.Session.Button.Common.UnimportantFilled"
             android:id="@+id/copyButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/medium_button_height"
@@ -73,7 +73,7 @@
             android:text="@string/copy" />
 
         <Button
-            style="@style/MediumUnimportantFilledButton"
+            style="@style/Widget.Session.Button.Common.UnimportantFilled"
             android:id="@+id/shareButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/medium_button_height"
@@ -89,7 +89,7 @@
         android:layout_weight="1" />
 
     <Button
-        style="@style/MediumProminentOutlineButton"
+        style="@style/Widget.Session.Button.Common.ProminentOutline"
         android:id="@+id/createPrivateChatButton"
         android:layout_width="196dp"
         android:layout_height="@dimen/medium_button_height"
diff --git a/res/layout-sw400dp/view_seed_reminder.xml b/res/layout-sw400dp/view_seed_reminder.xml
index e9bb3bbe81..4d30b0d74b 100644
--- a/res/layout-sw400dp/view_seed_reminder.xml
+++ b/res/layout-sw400dp/view_seed_reminder.xml
@@ -58,7 +58,7 @@
             android:layout_marginLeft="4dp" />
 
         <Button
-            style="@style/MediumProminentOutlineButton"
+            style="@style/Widget.Session.Button.Common.ProminentOutline"
             android:id="@+id/button"
             android:layout_width="wrap_content"
             android:layout_height="28dp"
diff --git a/res/layout-sw420dp/fragment_enter_session_id.xml b/res/layout-sw420dp/fragment_enter_session_id.xml
index a6496ed320..990e057d75 100644
--- a/res/layout-sw420dp/fragment_enter_session_id.xml
+++ b/res/layout-sw420dp/fragment_enter_session_id.xml
@@ -47,7 +47,7 @@
         android:layout_weight="1"/>
 
     <Button
-        style="@style/MediumProminentOutlineButton"
+        style="@style/Widget.Session.Button.Common.ProminentOutline"
         android:id="@+id/requestDeviceLinkButton"
         android:layout_width="196dp"
         android:layout_height="@dimen/medium_button_height"
diff --git a/res/layout/activity_create_closed_group.xml b/res/layout/activity_create_closed_group.xml
index 4c773cc6ad..3a108b6f4d 100644
--- a/res/layout/activity_create_closed_group.xml
+++ b/res/layout/activity_create_closed_group.xml
@@ -49,7 +49,7 @@
             android:text="@string/activity_create_closed_group_empty_state_message" />
 
         <Button
-            style="@style/MediumProminentOutlineButton"
+            style="@style/Widget.Session.Button.Common.ProminentOutline"
             android:id="@+id/btnCreateNewPrivateChat"
             android:layout_width="196dp"
             android:layout_height="@dimen/medium_button_height"
diff --git a/res/layout/activity_display_name.xml b/res/layout/activity_display_name.xml
index 1e4b15feb6..5c215384c4 100644
--- a/res/layout/activity_display_name.xml
+++ b/res/layout/activity_display_name.xml
@@ -47,7 +47,7 @@
         android:layout_weight="1"/>
 
     <Button
-        style="@style/MediumProminentFilledButton"
+        style="@style/Widget.Session.Button.Common.ProminentFilled"
         android:id="@+id/registerButton"
         android:layout_width="match_parent"
         android:layout_height="@dimen/medium_button_height"
diff --git a/res/layout/activity_edit_closed_group.xml b/res/layout/activity_edit_closed_group.xml
index e665a74e12..16ecefc339 100644
--- a/res/layout/activity_edit_closed_group.xml
+++ b/res/layout/activity_edit_closed_group.xml
@@ -110,7 +110,7 @@
 
             <Button
                 android:id="@+id/addMembersClosedGroupButton"
-                style="@style/MediumProminentOutlineButton"
+                style="@style/Widget.Session.Button.Common.ProminentOutline"
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/small_button_height"
                 android:layout_marginTop="@dimen/small_spacing"
@@ -131,7 +131,8 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
+            android:layout_height="match_parent"
+            tools:listitem="@layout/view_user"/>
 
     </LinearLayout>
 
diff --git a/res/layout/activity_home.xml b/res/layout/activity_home.xml
index 70ab8f85c3..f164a88708 100644
--- a/res/layout/activity_home.xml
+++ b/res/layout/activity_home.xml
@@ -74,7 +74,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:paddingBottom="172dp"
-            android:clipToPadding="false" />
+            android:clipToPadding="false"
+            tools:listitem="@layout/view_conversation"/>
 
         <View
             android:id="@+id/gradientView"
@@ -106,7 +107,7 @@
                 android:text="@string/activity_home_empty_state_message" />
 
             <Button
-                style="@style/MediumProminentOutlineButton"
+                style="@style/Widget.Session.Button.Common.ProminentOutline"
                 android:id="@+id/btnCreateNewPrivateChat"
                 android:layout_width="196dp"
                 android:layout_height="@dimen/medium_button_height"
diff --git a/res/layout/activity_landing.xml b/res/layout/activity_landing.xml
index bd32c64e65..1eab2bf48e 100644
--- a/res/layout/activity_landing.xml
+++ b/res/layout/activity_landing.xml
@@ -32,7 +32,7 @@
         android:layout_weight="1" />
 
     <Button
-        style="@style/MediumProminentFilledButton"
+        style="@style/Widget.Session.Button.Common.ProminentFilled"
         android:id="@+id/registerButton"
         android:layout_width="match_parent"
         android:layout_height="@dimen/medium_button_height"
@@ -41,7 +41,7 @@
         android:text="@string/activity_landing_register_button_title" />
 
     <Button
-        style="@style/MediumProminentOutlineButton"
+        style="@style/Widget.Session.Button.Common.ProminentOutline"
         android:id="@+id/restoreButton"
         android:layout_width="match_parent"
         android:layout_height="@dimen/medium_button_height"
diff --git a/res/layout/activity_linked_devices.xml b/res/layout/activity_linked_devices.xml
index bd96f715b2..5a4e9e8f6e 100644
--- a/res/layout/activity_linked_devices.xml
+++ b/res/layout/activity_linked_devices.xml
@@ -25,7 +25,7 @@
             android:text="@string/activity_linked_devices_empty_state_message" />
 
         <Button
-            style="@style/MediumProminentOutlineButton"
+            style="@style/Widget.Session.Button.Common.ProminentOutline"
             android:id="@+id/linkDeviceButton"
             android:layout_width="196dp"
             android:layout_height="@dimen/medium_button_height"
diff --git a/res/layout/activity_path.xml b/res/layout/activity_path.xml
index f7396f9cc9..a0fa1c20a8 100644
--- a/res/layout/activity_path.xml
+++ b/res/layout/activity_path.xml
@@ -43,7 +43,7 @@
     </RelativeLayout>
 
     <Button
-        style="@style/MediumProminentOutlineButton"
+        style="@style/Widget.Session.Button.Common.ProminentOutline"
         android:id="@+id/learnMoreButton"
         android:layout_width="196dp"
         android:layout_height="@dimen/medium_button_height"
diff --git a/res/layout/activity_pn_mode.xml b/res/layout/activity_pn_mode.xml
index af743ea2a0..559c78d1f3 100644
--- a/res/layout/activity_pn_mode.xml
+++ b/res/layout/activity_pn_mode.xml
@@ -103,7 +103,7 @@
         android:layout_weight="1"/>
 
     <Button
-        style="@style/MediumProminentFilledButton"
+        style="@style/Widget.Session.Button.Common.ProminentFilled"
         android:id="@+id/registerButton"
         android:layout_width="match_parent"
         android:layout_height="@dimen/medium_button_height"
diff --git a/res/layout/activity_register.xml b/res/layout/activity_register.xml
index 185fdd5065..7340e9d825 100644
--- a/res/layout/activity_register.xml
+++ b/res/layout/activity_register.xml
@@ -47,7 +47,7 @@
         android:layout_weight="1"/>
 
     <Button
-        style="@style/MediumProminentFilledButton"
+        style="@style/Widget.Session.Button.Common.ProminentFilled"
         android:id="@+id/registerButton"
         android:layout_width="match_parent"
         android:layout_height="@dimen/medium_button_height"
@@ -56,7 +56,7 @@
         android:text="@string/continue_2" />
 
     <Button
-        style="@style/MediumProminentOutlineButton"
+        style="@style/Widget.Session.Button.Common.ProminentOutline"
         android:id="@+id/copyButton"
         android:layout_width="match_parent"
         android:layout_height="@dimen/medium_button_height"
diff --git a/res/layout/activity_restore.xml b/res/layout/activity_restore.xml
index e02a1ff336..e289e2c541 100644
--- a/res/layout/activity_restore.xml
+++ b/res/layout/activity_restore.xml
@@ -46,7 +46,7 @@
         android:layout_weight="1"/>
 
     <Button
-        style="@style/MediumProminentFilledButton"
+        style="@style/Widget.Session.Button.Common.ProminentFilled"
         android:id="@+id/restoreButton"
         android:layout_width="match_parent"
         android:layout_height="@dimen/medium_button_height"
diff --git a/res/layout/activity_seed.xml b/res/layout/activity_seed.xml
index 580450153e..8aacbf3df3 100644
--- a/res/layout/activity_seed.xml
+++ b/res/layout/activity_seed.xml
@@ -67,7 +67,7 @@
         android:layout_weight="1"/>
 
     <Button
-        style="@style/MediumProminentOutlineButton"
+        style="@style/Widget.Session.Button.Common.ProminentOutline"
         android:id="@+id/copyButton"
         android:layout_width="196dp"
         android:layout_height="@dimen/medium_button_height"
diff --git a/res/layout/activity_settings.xml b/res/layout/activity_settings.xml
index 56f5998c97..7e0805cec6 100644
--- a/res/layout/activity_settings.xml
+++ b/res/layout/activity_settings.xml
@@ -87,7 +87,7 @@
                 android:orientation="horizontal">
 
                 <Button
-                    style="@style/MediumProminentOutlineButton"
+                    style="@style/Widget.Session.Button.Common.ProminentOutline"
                     android:id="@+id/copyButton"
                     android:layout_width="0dp"
                     android:layout_height="@dimen/medium_button_height"
@@ -95,7 +95,7 @@
                     android:text="@string/copy" />
 
                 <Button
-                    style="@style/MediumUnimportantOutlineButton"
+                    style="@style/Widget.Session.Button.Common.UnimportantOutline"
                     android:id="@+id/shareButton"
                     android:layout_width="0dp"
                     android:layout_height="@dimen/medium_button_height"
diff --git a/res/layout/dialog_clear_all_data.xml b/res/layout/dialog_clear_all_data.xml
index 86e9924fa9..a4c94c2e84 100644
--- a/res/layout/dialog_clear_all_data.xml
+++ b/res/layout/dialog_clear_all_data.xml
@@ -36,7 +36,7 @@
         android:orientation="horizontal">
 
         <Button
-            style="@style/UnimportantDialogButton"
+            style="@style/Widget.Session.Button.Dialog.Unimportant"
             android:id="@+id/cancelButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
@@ -44,7 +44,7 @@
             android:text="@string/cancel" />
 
         <Button
-            style="@style/DestructiveDialogButton"
+            style="@style/Widget.Session.Button.Dialog.Destructive"
             android:id="@+id/clearAllDataButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
diff --git a/res/layout/dialog_edit_device_name.xml b/res/layout/dialog_edit_device_name.xml
index a63395415a..c2468ff243 100644
--- a/res/layout/dialog_edit_device_name.xml
+++ b/res/layout/dialog_edit_device_name.xml
@@ -39,7 +39,7 @@
         android:orientation="horizontal">
 
         <Button
-            style="@style/UnimportantDialogButton"
+            style="@style/Widget.Session.Button.Dialog.Unimportant"
             android:id="@+id/cancelButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
@@ -47,7 +47,7 @@
             android:text="@string/cancel" />
 
         <Button
-            style="@style/UnimportantDialogButton"
+            style="@style/Widget.Session.Button.Dialog.Unimportant"
             android:id="@+id/okButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
diff --git a/res/layout/dialog_link_device_master_mode.xml b/res/layout/dialog_link_device_master_mode.xml
index 76113b3200..105fbc1cf5 100644
--- a/res/layout/dialog_link_device_master_mode.xml
+++ b/res/layout/dialog_link_device_master_mode.xml
@@ -74,7 +74,7 @@
         android:orientation="horizontal">
 
         <Button
-            style="@style/UnimportantDialogButton"
+            style="@style/Widget.Session.Button.Dialog.Unimportant"
             android:id="@+id/cancelButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
@@ -82,7 +82,7 @@
             android:text="@string/cancel" />
 
         <Button
-            style="@style/ProminentDialogButton"
+            style="@style/Widget.Session.Button.Dialog.Prominent"
             android:id="@+id/authorizeButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
diff --git a/res/layout/dialog_link_device_slave_mode.xml b/res/layout/dialog_link_device_slave_mode.xml
index 1e4578d1ab..828a1ac956 100644
--- a/res/layout/dialog_link_device_slave_mode.xml
+++ b/res/layout/dialog_link_device_slave_mode.xml
@@ -51,7 +51,7 @@
         android:textAlignment="center" />
 
     <Button
-        style="@style/UnimportantDialogButton"
+        style="@style/Widget.Session.Button.Dialog.Unimportant"
         android:id="@+id/cancelButton"
         android:layout_width="match_parent"
         android:layout_height="@dimen/small_button_height"
diff --git a/res/layout/dialog_seed.xml b/res/layout/dialog_seed.xml
index 300f910810..718f902507 100644
--- a/res/layout/dialog_seed.xml
+++ b/res/layout/dialog_seed.xml
@@ -47,7 +47,7 @@
         android:orientation="horizontal">
 
         <Button
-            style="@style/UnimportantDialogButton"
+            style="@style/Widget.Session.Button.Dialog.Unimportant"
             android:id="@+id/cancelButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
@@ -55,7 +55,7 @@
             android:text="@string/cancel" />
 
         <Button
-            style="@style/UnimportantDialogButton"
+            style="@style/Widget.Session.Button.Dialog.Unimportant"
             android:id="@+id/copyButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
diff --git a/res/layout/fragment_enter_chat_url.xml b/res/layout/fragment_enter_chat_url.xml
index e27755008b..a477981590 100644
--- a/res/layout/fragment_enter_chat_url.xml
+++ b/res/layout/fragment_enter_chat_url.xml
@@ -23,7 +23,7 @@
         android:layout_weight="1" />
 
     <Button
-        style="@style/MediumProminentOutlineButton"
+        style="@style/Widget.Session.Button.Common.ProminentOutline"
         android:id="@+id/joinPublicChatButton"
         android:layout_width="196dp"
         android:layout_height="@dimen/medium_button_height"
diff --git a/res/layout/fragment_enter_public_key.xml b/res/layout/fragment_enter_public_key.xml
index ebfc742c7b..92e27cf260 100644
--- a/res/layout/fragment_enter_public_key.xml
+++ b/res/layout/fragment_enter_public_key.xml
@@ -65,7 +65,7 @@
         android:orientation="horizontal">
 
         <Button
-            style="@style/MediumUnimportantFilledButton"
+            style="@style/Widget.Session.Button.Common.UnimportantFilled"
             android:id="@+id/copyButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/medium_button_height"
@@ -73,7 +73,7 @@
             android:text="@string/copy" />
 
         <Button
-            style="@style/MediumUnimportantFilledButton"
+            style="@style/Widget.Session.Button.Common.UnimportantFilled"
             android:id="@+id/shareButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/medium_button_height"
@@ -89,7 +89,7 @@
         android:layout_weight="1" />
 
     <Button
-        style="@style/MediumProminentOutlineButton"
+        style="@style/Widget.Session.Button.Common.ProminentOutline"
         android:id="@+id/createPrivateChatButton"
         android:layout_width="196dp"
         android:layout_height="@dimen/medium_button_height"
diff --git a/res/layout/fragment_enter_session_id.xml b/res/layout/fragment_enter_session_id.xml
index 926b24ccd8..12642d6b80 100644
--- a/res/layout/fragment_enter_session_id.xml
+++ b/res/layout/fragment_enter_session_id.xml
@@ -47,7 +47,7 @@
         android:layout_weight="1"/>
 
     <Button
-        style="@style/MediumProminentOutlineButton"
+        style="@style/Widget.Session.Button.Common.ProminentOutline"
         android:id="@+id/requestDeviceLinkButton"
         android:layout_width="196dp"
         android:layout_height="@dimen/medium_button_height"
diff --git a/res/layout/fragment_multi_device_removal_bottom_sheet.xml b/res/layout/fragment_multi_device_removal_bottom_sheet.xml
index d7f746677b..76a983de9a 100644
--- a/res/layout/fragment_multi_device_removal_bottom_sheet.xml
+++ b/res/layout/fragment_multi_device_removal_bottom_sheet.xml
@@ -31,7 +31,7 @@
         android:textSize="@dimen/small_font_size" />
 
     <Button
-        style="@style/MediumProminentOutlineButton"
+        style="@style/Widget.Session.Button.Common.ProminentOutline"
         android:id="@+id/okButton"
         android:layout_width="240dp"
         android:layout_height="@dimen/medium_button_height"
diff --git a/res/layout/fragment_open_group_suggestion_bottom_sheet.xml b/res/layout/fragment_open_group_suggestion_bottom_sheet.xml
index d586f461c2..20920e6964 100644
--- a/res/layout/fragment_open_group_suggestion_bottom_sheet.xml
+++ b/res/layout/fragment_open_group_suggestion_bottom_sheet.xml
@@ -35,7 +35,7 @@
         android:textAlignment="center" />
 
     <Button
-        style="@style/MediumProminentOutlineButton"
+        style="@style/Widget.Session.Button.Common.ProminentOutline"
         android:id="@+id/joinButton"
         android:layout_width="240dp"
         android:layout_height="@dimen/medium_button_height"
@@ -43,7 +43,7 @@
         android:text="Join Public Chat" />
 
     <Button
-        style="@style/MediumUnimportantOutlineButton"
+        style="@style/Widget.Session.Button.Common.UnimportantOutline"
         android:id="@+id/dismissButton"
         android:layout_width="240dp"
         android:layout_height="@dimen/medium_button_height"
diff --git a/res/layout/fragment_scan_qr_code_placeholder.xml b/res/layout/fragment_scan_qr_code_placeholder.xml
index 37dc70416b..acf7260cce 100644
--- a/res/layout/fragment_scan_qr_code_placeholder.xml
+++ b/res/layout/fragment_scan_qr_code_placeholder.xml
@@ -22,7 +22,7 @@
             android:text="@string/fragment_scan_qr_code_camera_access_explanation" />
 
         <Button
-            style="@style/MediumProminentOutlineButton"
+            style="@style/Widget.Session.Button.Common.ProminentOutline"
             android:id="@+id/grantCameraAccessButton"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/medium_button_height"
diff --git a/res/layout/fragment_view_my_qr_code.xml b/res/layout/fragment_view_my_qr_code.xml
index f1b5b36102..95379f3885 100644
--- a/res/layout/fragment_view_my_qr_code.xml
+++ b/res/layout/fragment_view_my_qr_code.xml
@@ -56,7 +56,7 @@
                 android:text="This is your QR code. Other users can scan it to start a session with you." />
 
             <Button
-                style="@style/MediumUnimportantOutlineButton"
+                style="@style/Widget.Session.Button.Common.UnimportantOutline"
                 android:id="@+id/shareButton"
                 android:layout_width="196dp"
                 android:layout_height="@dimen/medium_button_height"
diff --git a/res/layout/prompt_passphrase_activity.xml b/res/layout/prompt_passphrase_activity.xml
index ff315c0d98..28789c8d3d 100644
--- a/res/layout/prompt_passphrase_activity.xml
+++ b/res/layout/prompt_passphrase_activity.xml
@@ -69,7 +69,7 @@
             tools:visibility="visible"/>
 
         <Button
-            style="@style/MediumProminentOutlineButton"
+            style="@style/Widget.Session.Button.Common.ProminentOutline"
             android:id="@+id/lock_screen_auth_container"
             android:layout_width="196dp"
             android:layout_height="@dimen/medium_button_height"
diff --git a/res/layout/session_restore_banner.xml b/res/layout/session_restore_banner.xml
index 4d402326e2..5905f830c3 100644
--- a/res/layout/session_restore_banner.xml
+++ b/res/layout/session_restore_banner.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/sessionRestoreBanner"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/dialog_background"
+    android:background="?dialog_background_color"
     android:orientation="vertical"
     android:elevation="10dp">
 
@@ -33,19 +34,19 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/small_spacing"
-            android:text="@string/session_reset_banner_message"
             android:textColor="@color/text"
             android:textSize="@dimen/small_font_size"
-            android:textAlignment="center" />
+            android:textAlignment="center"
+            tools:text="@string/session_reset_banner_message"/>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/small_spacing"
+            android:layout_marginTop="@dimen/medium_spacing"
             android:orientation="horizontal">
 
             <Button
-                style="@style/UnimportantDialogButton"
+                style="@style/Widget.Session.Button.Dialog.Unimportant"
                 android:id="@+id/dismissButton"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/small_button_height"
@@ -53,7 +54,7 @@
                 android:text="@string/session_reset_banner_dismiss_button_title" />
 
             <Button
-                style="@style/ProminentDialogButton"
+                style="@style/Widget.Session.Button.Dialog.Prominent"
                 android:id="@+id/restoreButton"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/small_button_height"
diff --git a/res/layout/view_conversation.xml b/res/layout/view_conversation.xml
index 26e9647fdb..ef630ee682 100644
--- a/res/layout/view_conversation.xml
+++ b/res/layout/view_conversation.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@drawable/conversation_view_background"
-    android:orientation="horizontal"
-    android:gravity="center_vertical">
+    android:gravity="center_vertical"
+    android:orientation="horizontal">
 
     <View
         android:id="@+id/accentView"
         android:layout_width="@dimen/accent_line_thickness"
         android:layout_height="match_parent"
         android:background="@color/accent" />
-    
+
     <org.thoughtcrime.securesms.loki.views.ProfilePictureView
         android:id="@+id/profilePictureView"
         android:layout_width="@dimen/medium_profile_picture_size"
@@ -21,97 +21,111 @@
         android:layout_marginStart="@dimen/medium_spacing"
         android:layout_marginBottom="@dimen/medium_spacing" />
 
-    <LinearLayout
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/medium_spacing"
-        android:layout_marginEnd="@dimen/medium_spacing"
-        android:orientation="vertical">
+        android:layout_height="match_parent">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:gravity="center_vertical">
+            android:layout_marginStart="@dimen/medium_spacing"
+            android:layout_marginEnd="@dimen/medium_spacing"
+            android:layout_gravity="center_vertical"
+            android:orientation="vertical">
 
-            <TextView
-                android:id="@+id/btnGroupNameDisplay"
-                android:layout_width="0dp"
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:maxLines="1"
-                android:ellipsize="end"
-                android:textAlignment="viewStart"
-                android:textSize="@dimen/medium_font_size"
-                android:textStyle="bold"
-                android:textColor="@color/text"
-                android:text="I'm a very long display name. What are you going to do about it?" />
-
-            <TextView
-                android:id="@+id/timestampTextView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/medium_spacing"
-                android:maxLines="1"
-                android:ellipsize="end"
-                android:textSize="@dimen/small_font_size"
-                android:textColor="@color/text"
-                android:alpha="0.4"
-                android:text="9:41 AM" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:gravity="center_vertical">
-
-            <ImageView
-                android:id="@+id/muteIndicatorImageView"
-                android:layout_width="18dp"
-                android:layout_height="18dp"
-                android:layout_gravity="center"
-                android:src="@drawable/ic_outline_notifications_off_24"
-                android:layout_marginTop="1dp"
-                android:layout_marginEnd="6dp" />
-
-            <RelativeLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
+                android:orientation="horizontal"
+                android:gravity="center_vertical">
 
                 <TextView
-                    android:id="@+id/snippetTextView"
-                    android:layout_width="wrap_content"
+                    android:id="@+id/btnGroupNameDisplay"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:maxLines="1"
                     android:ellipsize="end"
+                    android:textAlignment="viewStart"
                     android:textSize="@dimen/medium_font_size"
+                    android:textStyle="bold"
                     android:textColor="@color/text"
-                    android:text="Sorry, gotta go fight crime again" />
+                    android:text="I'm a very long display name. What are you going to do about it?" />
 
-                <org.thoughtcrime.securesms.components.TypingIndicatorView
-                    android:id="@+id/typingIndicatorView"
+                <TextView
+                    android:id="@+id/timestampTextView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    app:typingIndicator_tint="@color/text" />
+                    android:layout_marginStart="@dimen/medium_spacing"
+                    android:maxLines="1"
+                    android:ellipsize="end"
+                    android:textSize="@dimen/small_font_size"
+                    android:textColor="@color/text"
+                    android:alpha="0.4"
+                    android:text="9:41 AM" />
 
-            </RelativeLayout>
+            </LinearLayout>
 
-            <View
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_weight="1" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:gravity="center_vertical">
 
-            <ImageView
-                android:id="@+id/statusIndicatorImageView"
-                android:layout_width="@dimen/conversation_view_status_indicator_size"
-                android:layout_height="@dimen/conversation_view_status_indicator_size"
-                android:layout_marginStart="@dimen/medium_spacing" />
+                <ImageView
+                    android:id="@+id/muteIndicatorImageView"
+                    android:layout_width="18dp"
+                    android:layout_height="18dp"
+                    android:layout_gravity="center"
+                    android:src="@drawable/ic_outline_notifications_off_24"
+                    android:layout_marginTop="1dp"
+                    android:layout_marginEnd="6dp" />
+
+                <RelativeLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:id="@+id/snippetTextView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:maxLines="1"
+                        android:ellipsize="end"
+                        android:textSize="@dimen/medium_font_size"
+                        android:textColor="@color/text"
+                        android:text="Sorry, gotta go fight crime again" />
+
+                    <org.thoughtcrime.securesms.components.TypingIndicatorView
+                        android:id="@+id/typingIndicatorView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="4dp"
+                        app:typingIndicator_tint="@color/text" />
+
+                </RelativeLayout>
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:layout_weight="1" />
+
+                <ImageView
+                    android:id="@+id/statusIndicatorImageView"
+                    android:layout_width="@dimen/conversation_view_status_indicator_size"
+                    android:layout_height="@dimen/conversation_view_status_indicator_size"
+                    android:layout_marginStart="@dimen/medium_spacing" />
+
+            </LinearLayout>
 
         </LinearLayout>
 
-    </LinearLayout>
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:layout_gravity="bottom"
+            android:layout_marginStart="@dimen/medium_spacing"
+            android:background="?android:dividerHorizontal" />
+
+    </FrameLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/view_seed_reminder.xml b/res/layout/view_seed_reminder.xml
index 02258d49b1..fb18a1c072 100644
--- a/res/layout/view_seed_reminder.xml
+++ b/res/layout/view_seed_reminder.xml
@@ -58,7 +58,7 @@
             android:layout_marginLeft="4dp" />
 
         <Button
-            style="@style/MediumProminentOutlineButton"
+            style="@style/Widget.Session.Button.Common.ProminentOutline"
             android:id="@+id/button"
             android:layout_width="wrap_content"
             android:layout_height="28dp"
diff --git a/res/layout/view_user.xml b/res/layout/view_user.xml
index f213e59972..23b51b1ebd 100644
--- a/res/layout/view_user.xml
+++ b/res/layout/view_user.xml
@@ -30,7 +30,6 @@
             android:textSize="@dimen/medium_font_size"
             android:textStyle="bold"
             android:layout_weight="1"
-            android:textColor="?android:textColorPrimary"
             tools:text="Spiderman" />
 
         <ImageView
@@ -38,8 +37,7 @@
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:layout_marginStart="@dimen/medium_spacing"
-            android:src="@drawable/ic_circle"
-            android:tint="?android:textColorPrimary"/>
+            android:src="@drawable/ic_circle"/>
 
     </LinearLayout>
 
diff --git a/res/values-notnight/colors.xml b/res/values-notnight/colors.xml
index 7d45b1d65d..8eba70e437 100644
--- a/res/values-notnight/colors.xml
+++ b/res/values-notnight/colors.xml
@@ -10,6 +10,7 @@
 <color name="navigation_bar_background">#FCFCFC</color>
 <color name="separator">#B0B0B0</color>
 <color name="unimportant_button_background">@color/transparent</color>
+<color name="unimportant_dialog_button_background">@color/dialog_background</color>
 <color name="dialog_background">#FCFCFC</color>
 <color name="dialog_border">#212121</color>
 <color name="compose_view_background">#FCFCFC</color>
@@ -26,7 +27,6 @@
 <color name="action_bar_background">#fcfcfd</color>
 
 
-<color name="unimportant_dialog_button_background">#1B1B1B</color>
 <color name="app_icon_background">#333132</color>
 <color name="progress_bar_background">#0AFFFFFF</color>
 <color name="quote_not_found_background">#99FFFFFF</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 81794200db..d255ee2585 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -14,6 +14,7 @@
     <!-- Element Sizes -->
     <dimen name="small_button_height">34dp</dimen>
     <dimen name="medium_button_height">38dp</dimen>
+    <dimen name="medium_button_corner_radius">22dp</dimen>
     <dimen name="accent_line_thickness">4dp</dimen>
     <dimen name="very_small_profile_picture_size">26dp</dimen>
     <dimen name="small_profile_picture_size">36dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 7fc706df54..4bfe7db53e 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -73,57 +73,49 @@
         <item name="textAllCaps">false</item>
     </style>
 
-    <style name="MediumProminentFilledButton">
-        <item name="android:background">@drawable/prominent_filled_button_medium_background</item>
+    <!--  TODO These button styles require proper background selectors for up/down visual state.  -->
+    <style name="Widget.Session.Button.Common" parent="">
         <item name="android:textAllCaps">false</item>
         <item name="android:textSize">@dimen/medium_font_size</item>
         <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:textColor">@color/text</item>
     </style>
 
-    <style name="MediumProminentOutlineButton">
+    <style name="Widget.Session.Button.Common.ProminentFilled">
+        <item name="android:background">@drawable/prominent_filled_button_medium_background</item>
+        <item name="android:textColor">?colorPrimary</item>
+    </style>
+
+    <style name="Widget.Session.Button.Common.ProminentOutline">
         <item name="android:background">@drawable/prominent_outline_button_medium_background</item>
-        <item name="android:textAllCaps">false</item>
-        <item name="android:textSize">@dimen/medium_font_size</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textColor">@color/accent</item>
     </style>
 
-    <style name="MediumUnimportantFilledButton">
+    <style name="Widget.Session.Button.Common.UnimportantFilled">
         <item name="android:background">@drawable/unimportant_filled_button_medium_background</item>
-        <item name="android:textAllCaps">false</item>
-        <item name="android:textSize">@dimen/medium_font_size</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:textColor">@color/text</item>
+        <item name="android:textColor">?colorPrimary</item>
     </style>
 
-    <style name="MediumUnimportantOutlineButton">
+    <style name="Widget.Session.Button.Common.UnimportantOutline">
         <item name="android:background">@drawable/unimportant_outline_button_medium_background</item>
-        <item name="android:textAllCaps">false</item>
-        <item name="android:textSize">@dimen/medium_font_size</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:textColor">@color/text</item>
+        <item name="android:textColor">?colorPrimary</item>
     </style>
 
-    <style name="UnimportantDialogButton">
+    <style name="Widget.Session.Button.Dialog" parent="">
+        <item name="android:textAllCaps">false</item>
+        <item name="android:textSize">@dimen/small_font_size</item>
+        <item name="android:textColor">?android:textColorPrimary</item>
+    </style>
+
+    <style name="Widget.Session.Button.Dialog.Unimportant">
         <item name="android:background">@drawable/unimportant_dialog_button_background</item>
-        <item name="android:textAllCaps">false</item>
-        <item name="android:textSize">@dimen/small_font_size</item>
-        <item name="android:textColor">@color/text</item>
     </style>
 
-    <style name="ProminentDialogButton">
+    <style name="Widget.Session.Button.Dialog.Prominent">
         <item name="android:background">@drawable/prominent_dialog_button_background</item>
-        <item name="android:textAllCaps">false</item>
-        <item name="android:textSize">@dimen/small_font_size</item>
-        <item name="android:textColor">@color/text</item>
     </style>
 
-    <style name="DestructiveDialogButton">
+    <style name="Widget.Session.Button.Dialog.Destructive">
         <item name="android:background">@drawable/destructive_dialog_button_background</item>
-        <item name="android:textAllCaps">false</item>
-        <item name="android:textSize">@dimen/small_font_size</item>
-        <item name="android:textColor">@color/text</item>
     </style>
 
     <style name="SessionIDTextView">
diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt
index 384368a9dd..53e36cd39a 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt
@@ -13,6 +13,7 @@ class EditClosedGroupMembersAdapter(
     private val glide: GlideRequests,
     private val memberClickListener: ((String) -> Unit)? = null
 ) : RecyclerView.Adapter<EditClosedGroupMembersAdapter.ViewHolder>() {
+
     private val members = ArrayList<String>()
     private val lockedMembers = HashSet<String>()
 
diff --git a/src/org/thoughtcrime/securesms/loki/views/UserView.kt b/src/org/thoughtcrime/securesms/loki/views/UserView.kt
index 43cd12cf4c..9619a90389 100644
--- a/src/org/thoughtcrime/securesms/loki/views/UserView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/UserView.kt
@@ -39,7 +39,7 @@ class UserView : LinearLayout {
     }
 
     private fun setUpViewHierarchy() {
-        val inflater = context.applicationContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
+        val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
         val contentView = inflater.inflate(R.layout.view_user, null)
         addView(contentView)
     }