diff --git a/res/drawable-notnight/home_activity_gradient.xml b/res/drawable-notnight/home_activity_gradient.xml
deleted file mode 100644
index 3f7d23f43f..0000000000
--- a/res/drawable-notnight/home_activity_gradient.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <gradient
-        android:startColor="@android:color/transparent"
-        android:endColor="#CCFCFCFC"
-        android:angle="270" />
-
-</shape>
\ No newline at end of file
diff --git a/res/drawable/default_bottom_sheet_background.xml b/res/drawable/default_bottom_sheet_background.xml
index 127fdb9645..24809b2d43 100644
--- a/res/drawable/default_bottom_sheet_background.xml
+++ b/res/drawable/default_bottom_sheet_background.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="@color/dialog_background" />
+    <solid android:color="?attr/dialog_background_color" />
 
     <corners android:topLeftRadius="24dp" android:topRightRadius="24dp" />
 
diff --git a/res/drawable/default_dialog_background.xml b/res/drawable/default_dialog_background.xml
index b97c837b83..c0937a9d1d 100644
--- a/res/drawable/default_dialog_background.xml
+++ b/res/drawable/default_dialog_background.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="@color/dialog_background" />
+    <solid android:color="?attr/dialog_background_color" />
 
     <corners android:radius="@dimen/dialog_corner_radius" />
 
diff --git a/res/drawable/home_activity_gradient.xml b/res/drawable/home_activity_gradient.xml
index 3392368a5c..b160d68fee 100644
--- a/res/drawable/home_activity_gradient.xml
+++ b/res/drawable/home_activity_gradient.xml
@@ -4,8 +4,8 @@
     android:shape="rectangle">
 
     <gradient
-        android:startColor="@android:color/transparent"
-        android:endColor="#CC000000"
+        android:centerColor="?attr/home_gradient_start"
+        android:endColor="?attr/home_gradient_end"
         android:angle="270" />
 
 </shape>
\ No newline at end of file
diff --git a/res/drawable/ic_baseline_block_24.xml b/res/drawable/ic_baseline_block_24.xml
new file mode 100644
index 0000000000..9fefeec67e
--- /dev/null
+++ b/res/drawable/ic_baseline_block_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM4,12c0,-4.42 3.58,-8 8,-8 1.85,0 3.55,0.63 4.9,1.69L5.69,16.9C4.63,15.55 4,13.85 4,12zM12,20c-1.85,0 -3.55,-0.63 -4.9,-1.69L18.31,7.1C19.37,8.45 20,10.15 20,12c0,4.42 -3.58,8 -8,8z"/>
+</vector>
diff --git a/res/drawable/ic_baseline_delete_24.xml b/res/drawable/ic_baseline_delete_24.xml
new file mode 100644
index 0000000000..3c4030b03e
--- /dev/null
+++ b/res/drawable/ic_baseline_delete_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
+</vector>
diff --git a/res/drawable/ic_phonelink_erase_white_24dp.xml b/res/drawable/ic_phonelink_erase_white_24dp.xml
index dc5c1b0260..fbd3ad6578 100644
--- a/res/drawable/ic_phonelink_erase_white_24dp.xml
+++ b/res/drawable/ic_phonelink_erase_white_24dp.xml
@@ -1,5 +1,11 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M13,8.2l-1,-1 -4,4 -4,-4 -1,1 4,4 -4,4 1,1 4,-4 4,4 1,-1 -4,-4 4,-4zM19,1H9c-1.1,0 -2,0.9 -2,2v3h2V4h10v16H9v-2H7v3c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3c0,-1.1 -0.9,-2 -2,-2z"/>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M13,8.2l-1,-1 -4,4 -4,-4 -1,1 4,4 -4,4 1,1 4,-4 4,4 1,-1 -4,-4 4,-4zM19,1H9c-1.1,0 -2,0.9 -2,2v3h2V4h10v16H9v-2H7v3c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3c0,-1.1 -0.9,-2 -2,-2z"/>
 </vector>
diff --git a/res/layout-sw400dp/activity_display_name.xml b/res/layout-sw400dp/activity_display_name.xml
index 1716f068f2..d0420ab46d 100644
--- a/res/layout-sw400dp/activity_display_name.xml
+++ b/res/layout-sw400dp/activity_display_name.xml
@@ -3,7 +3,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/default_session_background"
     android:orientation="vertical">
 
     <View
diff --git a/res/layout-sw400dp/activity_landing.xml b/res/layout-sw400dp/activity_landing.xml
index c87a549920..57bb03489f 100644
--- a/res/layout-sw400dp/activity_landing.xml
+++ b/res/layout-sw400dp/activity_landing.xml
@@ -3,7 +3,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/default_session_background"
     android:orientation="vertical">
 
     <View
diff --git a/res/layout-sw400dp/activity_pn_mode.xml b/res/layout-sw400dp/activity_pn_mode.xml
index 5efbf059bd..579e08cd2f 100644
--- a/res/layout-sw400dp/activity_pn_mode.xml
+++ b/res/layout-sw400dp/activity_pn_mode.xml
@@ -3,7 +3,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/default_session_background"
     android:orientation="vertical">
 
     <View
diff --git a/res/layout-sw400dp/activity_register.xml b/res/layout-sw400dp/activity_register.xml
index 28c9f532b2..21831bbbce 100644
--- a/res/layout-sw400dp/activity_register.xml
+++ b/res/layout-sw400dp/activity_register.xml
@@ -3,7 +3,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/default_session_background"
     android:orientation="vertical">
 
     <View
diff --git a/res/layout-sw400dp/activity_restore.xml b/res/layout-sw400dp/activity_restore.xml
index f011b04c4a..835a63cb7e 100644
--- a/res/layout-sw400dp/activity_restore.xml
+++ b/res/layout-sw400dp/activity_restore.xml
@@ -3,7 +3,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/default_session_background"
     android:orientation="vertical">
 
     <View
diff --git a/res/layout-sw400dp/activity_seed.xml b/res/layout-sw400dp/activity_seed.xml
index 3eeb46dbb2..15256b19f4 100644
--- a/res/layout-sw400dp/activity_seed.xml
+++ b/res/layout-sw400dp/activity_seed.xml
@@ -3,7 +3,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/default_session_background"
     android:gravity="center_horizontal"
     android:orientation="vertical">
 
diff --git a/res/layout-sw400dp/fragment_enter_chat_url.xml b/res/layout-sw400dp/fragment_enter_chat_url.xml
index 4755debf50..07da3c7bf3 100644
--- a/res/layout-sw400dp/fragment_enter_chat_url.xml
+++ b/res/layout-sw400dp/fragment_enter_chat_url.xml
@@ -4,7 +4,6 @@
     android:id="@+id/contentView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/default_session_background"
     android:gravity="center_horizontal"
     android:orientation="vertical">
 
diff --git a/res/layout-sw400dp/fragment_enter_public_key.xml b/res/layout-sw400dp/fragment_enter_public_key.xml
index cf74f40d22..b826a3aadf 100644
--- a/res/layout-sw400dp/fragment_enter_public_key.xml
+++ b/res/layout-sw400dp/fragment_enter_public_key.xml
@@ -4,7 +4,6 @@
     android:id="@+id/contentView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/default_session_background"
     android:gravity="center_horizontal"
     android:orientation="vertical">
 
diff --git a/res/layout-sw400dp/fragment_multi_device_removal_bottom_sheet.xml b/res/layout-sw400dp/fragment_multi_device_removal_bottom_sheet.xml
deleted file mode 100644
index f861c91246..0000000000
--- a/res/layout-sw400dp/fragment_multi_device_removal_bottom_sheet.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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"
-    android:orientation="vertical"
-    android:gravity="center_horizontal"
-    android:paddingLeft="@dimen/very_large_spacing"
-    android:paddingTop="@dimen/large_spacing"
-    android:paddingRight="@dimen/very_large_spacing"
-    android:paddingBottom="@dimen/very_large_spacing"
-    app:behavior_hideable="true"
-    app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
-    android:background="@drawable/default_bottom_sheet_background_inset">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Changes to Multi-Device"
-        android:textColor="@color/text"
-        android:textStyle="bold"
-        android:textSize="@dimen/very_large_font_size" />
-
-    <TextView
-        android:id="@+id/explanationTextView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/large_spacing"
-        android:text="You’re seeing this because you have a secondary device linked to your Session ID. To improve reliability and stability, we’ve decided to temporarily disable Session’s multi-device functionality. Device linking has been disabled, and existing secondary clients will be erased on %s.\n\nTo read more about this change, visit the Session FAQ at getsession.org/faq"
-        android:textColor="@color/text"
-        android:textSize="@dimen/small_font_size" />
-
-    <Button
-        style="@style/MediumProminentOutlineButton"
-        android:id="@+id/okButton"
-        android:layout_width="240dp"
-        android:layout_height="@dimen/medium_button_height"
-        android:layout_marginTop="@dimen/large_spacing"
-        android:text="@string/ok" />
-
-</LinearLayout>
diff --git a/res/layout-sw420dp/fragment_enter_session_id.xml b/res/layout-sw420dp/fragment_enter_session_id.xml
index 8a1ba7a044..a6496ed320 100644
--- a/res/layout-sw420dp/fragment_enter_session_id.xml
+++ b/res/layout-sw420dp/fragment_enter_session_id.xml
@@ -3,7 +3,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/default_session_background"
     android:gravity="center_horizontal"
     android:orientation="vertical">
 
diff --git a/res/layout/activity_create_closed_group.xml b/res/layout/activity_create_closed_group.xml
index 52a3300865..f8446309d1 100644
--- a/res/layout/activity_create_closed_group.xml
+++ b/res/layout/activity_create_closed_group.xml
@@ -2,8 +2,7 @@
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/default_session_background" >
+    android:layout_height="match_parent">
 
     <LinearLayout
         android:id="@+id/mainContentContainer"
diff --git a/res/layout/activity_display_name.xml b/res/layout/activity_display_name.xml
index 30ae679fb3..1e4b15feb6 100644
--- a/res/layout/activity_display_name.xml
+++ b/res/layout/activity_display_name.xml
@@ -3,7 +3,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/default_session_background"
     android:orientation="vertical">
 
     <View
diff --git a/res/layout/activity_edit_closed_group.xml b/res/layout/activity_edit_closed_group.xml
index c8877994b4..7fd0b7613c 100644
--- a/res/layout/activity_edit_closed_group.xml
+++ b/res/layout/activity_edit_closed_group.xml
@@ -4,7 +4,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
-    android:background="@drawable/default_session_background"
     tools:context="org.thoughtcrime.securesms.loki.activities.EditClosedGroupActivity">
 
     <LinearLayout
diff --git a/res/layout/activity_home.xml b/res/layout/activity_home.xml
index 9c02f2d41e..70ab8f85c3 100644
--- a/res/layout/activity_home.xml
+++ b/res/layout/activity_home.xml
@@ -7,7 +7,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="@drawable/default_session_background"
     tools:context="org.thoughtcrime.securesms.loki.activities.HomeActivity">
 
     <androidx.appcompat.widget.Toolbar
diff --git a/res/layout/activity_landing.xml b/res/layout/activity_landing.xml
index 3e3ba009dd..bd32c64e65 100644
--- a/res/layout/activity_landing.xml
+++ b/res/layout/activity_landing.xml
@@ -3,7 +3,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/default_session_background"
     android:orientation="vertical">
 
     <View
diff --git a/res/layout/activity_linked_devices.xml b/res/layout/activity_linked_devices.xml
index 39b467c7fb..bd96f715b2 100644
--- a/res/layout/activity_linked_devices.xml
+++ b/res/layout/activity_linked_devices.xml
@@ -2,8 +2,7 @@
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/default_session_background">
+    android:layout_height="match_parent">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"
diff --git a/res/layout/activity_path.xml b/res/layout/activity_path.xml
index 63d549c9b2..f7396f9cc9 100644
--- a/res/layout/activity_path.xml
+++ b/res/layout/activity_path.xml
@@ -4,7 +4,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="@drawable/default_session_background"
     android:orientation="vertical"
     android:gravity="center">
 
diff --git a/res/layout/activity_pn_mode.xml b/res/layout/activity_pn_mode.xml
index 1b4897ae7d..af743ea2a0 100644
--- a/res/layout/activity_pn_mode.xml
+++ b/res/layout/activity_pn_mode.xml
@@ -3,7 +3,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/default_session_background"
     android:orientation="vertical">
 
     <View
diff --git a/res/layout/activity_register.xml b/res/layout/activity_register.xml
index fdd15c93a0..185fdd5065 100644
--- a/res/layout/activity_register.xml
+++ b/res/layout/activity_register.xml
@@ -3,7 +3,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/default_session_background"
     android:orientation="vertical">
 
     <View
diff --git a/res/layout/activity_restore.xml b/res/layout/activity_restore.xml
index eb385b3cd2..e02a1ff336 100644
--- a/res/layout/activity_restore.xml
+++ b/res/layout/activity_restore.xml
@@ -3,7 +3,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/default_session_background"
     android:orientation="vertical">
 
     <View
diff --git a/res/layout/activity_seed.xml b/res/layout/activity_seed.xml
index 625801d3c6..580450153e 100644
--- a/res/layout/activity_seed.xml
+++ b/res/layout/activity_seed.xml
@@ -3,7 +3,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/default_session_background"
     android:gravity="center_horizontal"
     android:orientation="vertical">
 
diff --git a/res/layout/activity_select_contacts.xml b/res/layout/activity_select_contacts.xml
index df6338b16f..a8a47171c7 100644
--- a/res/layout/activity_select_contacts.xml
+++ b/res/layout/activity_select_contacts.xml
@@ -2,8 +2,7 @@
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/default_session_background" >
+    android:layout_height="match_parent">
 
     <LinearLayout
         android:id="@+id/mainContentContainer"
diff --git a/res/layout/activity_settings.xml b/res/layout/activity_settings.xml
index f4512b9a97..782d6553de 100644
--- a/res/layout/activity_settings.xml
+++ b/res/layout/activity_settings.xml
@@ -5,7 +5,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/default_session_background"
     tools:context="org.thoughtcrime.securesms.loki.activities.SettingsActivity"
     tools:theme="@style/Session.DarkTheme.NoActionBar"
     tools:menu="@menu/settings_general">
diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
index 447f32520a..f2aeb4907d 100644
--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@@ -4,8 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/rootView"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/default_session_background">
+    android:layout_height="match_parent">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
@@ -210,7 +209,7 @@
                 android:id="@+id/space_left"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:windowBackground"
+                android:background="?android:attr/windowBackground"
                 android:paddingStart="5dip"
                 android:text="160/160 (1)"
                 android:visibility="gone" />
diff --git a/res/layout/create_passphrase_activity.xml b/res/layout/create_passphrase_activity.xml
index 2df7ef51aa..43b310aec1 100644
--- a/res/layout/create_passphrase_activity.xml
+++ b/res/layout/create_passphrase_activity.xml
@@ -1,28 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:id="@+id/prompt_layout"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@drawable/default_session_background">
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/prompt_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
+    <ProgressBar
+        android:id="@+id/passphrase_edit"
+        style="?android:attr/progressBarStyleLargeInverse"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
+        android:layout_centerInParent="true"
+        android:indeterminate="true"
+        android:padding="10dp"
+        android:visibility="gone"
+        tools:visibility="visible"/>
 
-  <ProgressBar android:id="@+id/passphrase_edit"
-               android:layout_width="75dp"
-               android:layout_height="75dp"
-               android:indeterminate="true"
-               android:padding="10dp"
-               android:layout_centerInParent="true"
-               android:visibility="gone"
-               style="?android:attr/progressBarStyleLargeInverse"/>
-
-  <ImageView android:id="@+id/watermark"
-             android:layout_width="wrap_content"
-             android:layout_height="128dp"
-             android:layout_centerInParent="true"
-             android:layout_marginBottom="20dp"
-             android:layout_above="@id/passphrase_edit"
-             android:src="@drawable/ic_launcher_foreground"
-             android:contentDescription="@string/PassphrasePromptActivity_watermark_content_description"/>
+    <ImageView
+        android:id="@+id/watermark"
+        android:layout_width="wrap_content"
+        android:layout_height="128dp"
+        android:layout_above="@id/passphrase_edit"
+        android:layout_centerInParent="true"
+        android:layout_marginBottom="20dp"
+        android:contentDescription="@string/PassphrasePromptActivity_watermark_content_description"
+        android:src="@drawable/ic_launcher_foreground" />
 
 </RelativeLayout>
diff --git a/res/layout/fragment_closed_group_edit_bottom_sheet.xml b/res/layout/fragment_closed_group_edit_bottom_sheet.xml
index cc68d18380..3ec2b6b988 100644
--- a/res/layout/fragment_closed_group_edit_bottom_sheet.xml
+++ b/res/layout/fragment_closed_group_edit_bottom_sheet.xml
@@ -6,15 +6,12 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     app:behavior_hideable="true"
-    app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
-    android:background="@color/dialog_background">
+    app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
     <TextView
         android:id="@+id/removeFromGroup"
-        style="@style/ActionItem"
+        style="@style/BottomSheetActionItem"
         android:drawableStart="@drawable/ic_phonelink_erase_white_24dp"
-        android:textSize="@dimen/medium_font_size"
-        android:textColor="@color/text"
         android:text="@string/fragment_edit_group_bottom_sheet_remove"/>
 
 </LinearLayout>
diff --git a/res/layout/fragment_conversation_bottom_sheet.xml b/res/layout/fragment_conversation_bottom_sheet.xml
index 2727ec8a3b..274417418a 100644
--- a/res/layout/fragment_conversation_bottom_sheet.xml
+++ b/res/layout/fragment_conversation_bottom_sheet.xml
@@ -2,27 +2,33 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
     app:behavior_hideable="true"
-    app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
-    android:background="@color/dialog_background">
+    app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
     <TextView
-        android:id="@+id/blockOrUnblockTextView"
-        style="@style/ActionItem"
-        android:drawableStart="@drawable/ic_block_white_24dp"
-        android:textSize="@dimen/medium_font_size"
-        android:textColor="@color/text"
-        android:text="@string/RecipientPreferenceActivity_block"/>
+        android:id="@+id/blockTextView"
+        style="@style/BottomSheetActionItem"
+        android:drawableStart="?attr/menu_block_icon"
+        android:text="@string/RecipientPreferenceActivity_block"
+        android:visibility="gone"
+        tools:visibility="visible"/>
+
+    <TextView
+        android:id="@+id/unblockTextView"
+        style="@style/BottomSheetActionItem"
+        android:drawableStart="?attr/menu_accept_icon"
+        android:text="@string/RecipientPreferenceActivity_unblock"
+        android:visibility="gone"
+        tools:visibility="visible"/>
 
     <TextView
         android:id="@+id/deleteTextView"
-        style="@style/ActionItem"
-        android:drawableStart="@drawable/ic_delete_white_24dp"
-        android:textSize="@dimen/medium_font_size"
-        android:textColor="@color/text"
+        style="@style/BottomSheetActionItem"
+        android:drawableStart="?attr/menu_trash_icon"
         android:text="@string/delete" />
 
 </LinearLayout>
diff --git a/res/layout/fragment_device_list_bottom_sheet.xml b/res/layout/fragment_device_list_bottom_sheet.xml
index 4360e56d9b..11917e65b3 100644
--- a/res/layout/fragment_device_list_bottom_sheet.xml
+++ b/res/layout/fragment_device_list_bottom_sheet.xml
@@ -6,23 +6,18 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     app:behavior_hideable="true"
-    app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
-    android:background="@color/dialog_background">
+    app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
     <TextView
         android:id="@+id/editDisplayNameText"
-        style="@style/ActionItem"
-        android:drawableStart="@drawable/ic_edit_white_24dp"
-        android:textSize="@dimen/medium_font_size"
-        android:textColor="@color/text"
+        style="@style/BottomSheetActionItem"
+        android:drawableStart="@drawable/ic_baseline_edit_24"
         android:text="@string/fragment_device_list_bottom_sheet_change_name_button_title"/>
 
     <TextView
         android:id="@+id/unlinkDeviceText"
-        style="@style/ActionItem"
+        style="@style/BottomSheetActionItem"
         android:drawableStart="@drawable/ic_phonelink_erase_white_24dp"
-        android:textSize="@dimen/medium_font_size"
-        android:textColor="@color/text"
         android:text="@string/fragment_device_list_bottom_sheet_unlink_device_button_title" />
 
 </LinearLayout>
diff --git a/res/layout/fragment_enter_chat_url.xml b/res/layout/fragment_enter_chat_url.xml
index 8620c51fea..e27755008b 100644
--- a/res/layout/fragment_enter_chat_url.xml
+++ b/res/layout/fragment_enter_chat_url.xml
@@ -4,7 +4,6 @@
     android:id="@+id/contentView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/default_session_background"
     android:gravity="center_horizontal"
     android:orientation="vertical">
 
diff --git a/res/layout/fragment_enter_public_key.xml b/res/layout/fragment_enter_public_key.xml
index 4abafd17d9..ebfc742c7b 100644
--- a/res/layout/fragment_enter_public_key.xml
+++ b/res/layout/fragment_enter_public_key.xml
@@ -4,7 +4,6 @@
     android:id="@+id/contentView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/default_session_background"
     android:gravity="center_horizontal"
     android:orientation="vertical">
 
diff --git a/res/layout/fragment_enter_session_id.xml b/res/layout/fragment_enter_session_id.xml
index c2257adfcc..926b24ccd8 100644
--- a/res/layout/fragment_enter_session_id.xml
+++ b/res/layout/fragment_enter_session_id.xml
@@ -3,7 +3,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/default_session_background"
     android:gravity="center_horizontal"
     android:orientation="vertical">
 
diff --git a/res/layout/fragment_multi_device_removal_bottom_sheet.xml b/res/layout/fragment_multi_device_removal_bottom_sheet.xml
index 2d0c9aef29..d7f746677b 100644
--- a/res/layout/fragment_multi_device_removal_bottom_sheet.xml
+++ b/res/layout/fragment_multi_device_removal_bottom_sheet.xml
@@ -11,8 +11,7 @@
     android:paddingRight="@dimen/very_large_spacing"
     android:paddingBottom="@dimen/very_large_spacing"
     app:behavior_hideable="true"
-    app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
-    android:background="@drawable/default_bottom_sheet_background_inset">
+    app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
     <TextView
         android:layout_width="wrap_content"
diff --git a/res/layout/fragment_scan_qr_code_placeholder.xml b/res/layout/fragment_scan_qr_code_placeholder.xml
index dc63d7a139..37dc70416b 100644
--- a/res/layout/fragment_scan_qr_code_placeholder.xml
+++ b/res/layout/fragment_scan_qr_code_placeholder.xml
@@ -2,8 +2,7 @@
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/default_session_background">
+    android:layout_height="match_parent">
 
     <LinearLayout
         android:layout_width="wrap_content"
diff --git a/res/layout/fragment_view_my_qr_code.xml b/res/layout/fragment_view_my_qr_code.xml
index c0aea06bbb..f1b5b36102 100644
--- a/res/layout/fragment_view_my_qr_code.xml
+++ b/res/layout/fragment_view_my_qr_code.xml
@@ -2,8 +2,7 @@
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/default_session_background" >
+    android:layout_height="match_parent">
 
     <ScrollView
         android:layout_width="match_parent"
diff --git a/res/layout/media_overview_activity.xml b/res/layout/media_overview_activity.xml
index ab36f3303d..3e7238559b 100644
--- a/res/layout/media_overview_activity.xml
+++ b/res/layout/media_overview_activity.xml
@@ -3,7 +3,6 @@
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_height="match_parent"
         android:layout_width="match_parent"
-        android:background="@drawable/default_session_background"
         xmlns:tools="http://schemas.android.com/tools"
         xmlns:app="http://schemas.android.com/apk/res-auto">
 
diff --git a/res/layout/media_overview_documents_fragment.xml b/res/layout/media_overview_documents_fragment.xml
index d8f5791bd0..9f9aaa3ff8 100644
--- a/res/layout/media_overview_documents_fragment.xml
+++ b/res/layout/media_overview_documents_fragment.xml
@@ -2,8 +2,7 @@
 <RelativeLayout 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="match_parent"
-                android:background="@drawable/default_session_background">
+                android:layout_height="match_parent">
 
     <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recycler_view"
diff --git a/res/layout/media_overview_gallery_fragment.xml b/res/layout/media_overview_gallery_fragment.xml
index caa33fa594..1c3b127fc9 100644
--- a/res/layout/media_overview_gallery_fragment.xml
+++ b/res/layout/media_overview_gallery_fragment.xml
@@ -2,8 +2,7 @@
 <RelativeLayout 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="match_parent"
-                android:background="@drawable/default_session_background">
+                android:layout_height="match_parent">
 
     <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/media_grid"
diff --git a/res/layout/media_preview_activity.xml b/res/layout/media_preview_activity.xml
index 231e386e57..53023d2283 100644
--- a/res/layout/media_preview_activity.xml
+++ b/res/layout/media_preview_activity.xml
@@ -5,8 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/default_session_background">
+    android:layout_height="match_parent">
 
     <org.thoughtcrime.securesms.components.viewpager.HackyViewPager
         android:id="@+id/media_pager"
diff --git a/res/layout/mediapicker_folder_fragment.xml b/res/layout/mediapicker_folder_fragment.xml
index ccd49b0177..d3bc0add5c 100644
--- a/res/layout/mediapicker_folder_fragment.xml
+++ b/res/layout/mediapicker_folder_fragment.xml
@@ -3,8 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="@drawable/default_session_background">
+    android:orientation="vertical">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/mediapicker_toolbar"
@@ -16,7 +15,7 @@
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/mediapicker_folder_list"
-        android:background="@drawable/default_session_background"
+        android:background="?android:windowBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginStart="2dp"
diff --git a/res/layout/mediapicker_item_fragment.xml b/res/layout/mediapicker_item_fragment.xml
index 9fd2422c93..dd49c1e993 100644
--- a/res/layout/mediapicker_item_fragment.xml
+++ b/res/layout/mediapicker_item_fragment.xml
@@ -3,8 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="@drawable/default_session_background">
+    android:orientation="vertical">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/mediapicker_toolbar"
@@ -16,7 +15,7 @@
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/mediapicker_item_list"
-        android:background="@drawable/default_session_background"
+        android:background="?android:attr/windowBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginStart="2dp"
diff --git a/res/layout/mediasend_activity.xml b/res/layout/mediasend_activity.xml
index 24a25d371e..bdfc0446ca 100644
--- a/res/layout/mediasend_activity.xml
+++ b/res/layout/mediasend_activity.xml
@@ -4,8 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/default_session_background">
+    android:layout_height="match_parent">
 
     <FrameLayout
         android:id="@+id/mediasend_fragment_container"
diff --git a/res/layout/message_details_activity.xml b/res/layout/message_details_activity.xml
index 6f51965693..88cfb1061f 100644
--- a/res/layout/message_details_activity.xml
+++ b/res/layout/message_details_activity.xml
@@ -2,7 +2,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:tools="http://schemas.android.com/tools"
               android:id="@+id/container"
-              android:background="@drawable/default_session_background"
               android:orientation="vertical"
               android:layout_width="match_parent"
               android:layout_height="match_parent">
diff --git a/res/layout/prompt_passphrase_activity.xml b/res/layout/prompt_passphrase_activity.xml
index fbd937e11f..ff315c0d98 100644
--- a/res/layout/prompt_passphrase_activity.xml
+++ b/res/layout/prompt_passphrase_activity.xml
@@ -6,7 +6,6 @@
                 android:id="@+id/prompt_layout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@drawable/default_session_background"
                 android:orientation="vertical">
 
     <View android:id="@+id/shim"
diff --git a/res/layout/share_activity.xml b/res/layout/share_activity.xml
index b85ed37af2..c2338cfbaa 100644
--- a/res/layout/share_activity.xml
+++ b/res/layout/share_activity.xml
@@ -5,8 +5,7 @@
                 xmlns:tools="http://schemas.android.com/tools"
                 android:orientation="vertical"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@drawable/default_session_background">
+                android:layout_height="match_parent">
 
     <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
diff --git a/res/layout/unknown_sender_view.xml b/res/layout/unknown_sender_view.xml
index 30c3bda45e..7eec7fb6bf 100644
--- a/res/layout/unknown_sender_view.xml
+++ b/res/layout/unknown_sender_view.xml
@@ -27,7 +27,7 @@
 
         <ImageView android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
-                   android:src="@drawable/ic_block_white_24dp"
+                   android:src="?attr/menu_block_icon"
                    android:tint="@color/signal_primary"/>
 
         <TextView android:layout_marginStart="15dp"
diff --git a/res/menu/conversation_block.xml b/res/menu/conversation_block.xml
index 14dfea3546..fb4184d59a 100644
--- a/res/menu/conversation_block.xml
+++ b/res/menu/conversation_block.xml
@@ -3,6 +3,6 @@
 
     <item android:title="@string/recipient_preferences__block"
           android:id="@+id/menu_block"
-          android:icon="@drawable/ic_block_white_24dp" />
+          android:icon="?attr/menu_block_icon" />
 
 </menu>
\ No newline at end of file
diff --git a/res/menu/media_overview_context.xml b/res/menu/media_overview_context.xml
index d9f6b7d580..5ebdf2b524 100644
--- a/res/menu/media_overview_context.xml
+++ b/res/menu/media_overview_context.xml
@@ -7,7 +7,7 @@
 
     <item android:id="@+id/delete"
         android:title="@string/delete"
-        android:icon="@drawable/ic_delete_white_24dp"
+        android:icon="?attr/menu_trash_icon"
         app:showAsAction="always"/>
 
     <item android:id="@+id/select_all"
diff --git a/res/menu/media_preview.xml b/res/menu/media_preview.xml
index 0494165551..df7f7cebcb 100644
--- a/res/menu/media_preview.xml
+++ b/res/menu/media_preview.xml
@@ -15,6 +15,6 @@
           app:showAsAction="ifRoom"/>
     <item android:id="@+id/delete"
           android:title="@string/delete"
-          android:icon="@drawable/ic_delete_white_24dp"
+          android:icon="@drawable/ic_baseline_delete_24"
           app:showAsAction="ifRoom"/>
 </menu>
diff --git a/res/menu/menu_apply.xml b/res/menu/menu_apply.xml
index 71c825176c..0a73b83e3b 100644
--- a/res/menu/menu_apply.xml
+++ b/res/menu/menu_apply.xml
@@ -7,6 +7,6 @@
         android:title="@string/menu_apply_button"
         android:id="@+id/applyButton"
         android:icon="?menu_accept_icon"
-        app:showAsAction="always" />
+        app:showAsAction="always|withText"/>
 
 </menu>
diff --git a/res/menu/menu_edit_closed_group.xml b/res/menu/menu_edit_closed_group.xml
new file mode 100644
index 0000000000..0c6b915d05
--- /dev/null
+++ b/res/menu/menu_edit_closed_group.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:title="@string/menu_apply_button"
+        android:id="@+id/action_apply"
+        app:showAsAction="always|withText"/>
+
+</menu>
diff --git a/res/values-notnight/colors.xml b/res/values-notnight/colors.xml
index f2674f5824..5bfda6a1c5 100644
--- a/res/values-notnight/colors.xml
+++ b/res/values-notnight/colors.xml
@@ -19,7 +19,7 @@
 <color name="fake_chat_bubble_background">#F5F5F5</color>
 
 
-<color name="default_background_start">#fcfcfd</color>
+<color name="default_background_start">#ffffff</color>
 <color name="default_background_end">#fcfcfd</color>
 <color name="action_bar_background">#fcfcfd</color>
 
diff --git a/res/values-notnight/styles.xml b/res/values-notnight/styles.xml
index 47f3411671..e3941a2ffa 100644
--- a/res/values-notnight/styles.xml
+++ b/res/values-notnight/styles.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
 
+    <style name="SessionBottomSheetDialogTheme" parent="Theme.Design.Light.BottomSheetDialog">
+        <item name="bottomSheetStyle">@style/SessionBottomSheetStyle</item>
+    </style>
+
     <style name="Session.DarkActionBar" parent="@style/Widget.AppCompat.ActionBar">
         <item name="background">@color/action_bar_background</item>
 
diff --git a/res/values-notnight/themes.xml b/res/values-notnight/themes.xml
index 898e3edfed..2d9f02f206 100644
--- a/res/values-notnight/themes.xml
+++ b/res/values-notnight/themes.xml
@@ -6,6 +6,9 @@
         <item name="android:statusBarColor">@color/accent</item>
         <item name="titleTextColor">@color/text</item>
         <item name="android:textColorHint">@color/gray50</item>
+
+        <item name="home_gradient_start">#00FFFFFF</item>
+        <item name="home_gradient_end">#FFFFFFFF</item>
     </style>
 
     <style name="TextSecure.DarkNoActionBar" parent="@style/TextSecure.BaseDarkNoActionBar">
@@ -20,7 +23,6 @@
         <item name="colorControlActivated">@color/accent</item>
         <item name="colorControlNormal">@color/text</item>
         <item name="colorControlHighlight">@color/accent</item>
-        <item name="android:windowBackground">@color/loki_darkest_gray</item>
         <item name="alertDialogTheme">@style/AppCompatAlertDialogStyleLight</item>
         <item name="android:alertDialogTheme">@style/AppCompatDialogStyleLight</item>
         <item name="bottomSheetDialogTheme">@style/Theme.MaterialComponents.Light.BottomSheetDialog</item>
@@ -140,7 +142,6 @@
         <item name="menu_unlock_icon">@drawable/ic_unlocked_white_24dp</item>
         <item name="menu_lock_icon">@drawable/ic_lock_white_24dp</item>
         <item name="menu_lock_icon_small">@drawable/ic_lock_white_18dp</item>
-        <item name="menu_trash_icon">@drawable/ic_delete_white_24dp</item>
         <item name="menu_selectall_icon">@drawable/ic_select_all_white_24dp</item>
         <item name="menu_split_icon">@drawable/ic_call_split_white_24dp</item>
         <item name="menu_accept_icon">@drawable/ic_check_white_24dp</item>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 74468f35b8..d214178e77 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -144,6 +144,7 @@
     <attr name="menu_forward_icon" format="reference" />
     <attr name="menu_save_icon" format="reference" />
     <attr name="menu_reply_icon" format="reference" />
+    <attr name="menu_block_icon" format="reference" />
 
     <attr name="pref_icon_tint" format="color"/>
 
@@ -151,6 +152,9 @@
 
     <attr name="quote_missing_icon_color" format="color" />
 
+    <attr name="home_gradient_start" format="color|reference" />
+    <attr name="home_gradient_end" format="color|reference" />
+
     <declare-styleable name="CustomDefaultPreference">
         <attr name="custom_pref_toggle" format="string"/>
     </declare-styleable>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index dcbe287776..4fd1096aa7 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -45,12 +45,12 @@
         <item name="buttonBarPositiveButtonStyle">@style/Session.AlertDialog.PositiveButtonStyle</item>
     </style>
 
-    <style name="SessionBottomSheetDialogTheme" parent="Theme.Design.Light.BottomSheetDialog">
+    <style name="SessionBottomSheetDialogTheme" parent="Theme.Design.BottomSheetDialog">
         <item name="bottomSheetStyle">@style/SessionBottomSheetStyle</item>
     </style>
 
     <style name="SessionBottomSheetStyle" parent="Widget.Design.BottomSheet.Modal">
-        <item name="android:background">@android:color/transparent</item>
+        <item name="android:background">@drawable/default_bottom_sheet_background</item>
     </style>
 
     <style name="Session.AlertDialog.NegativeButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
@@ -435,11 +435,11 @@
         <item name="colorControlActivated">@color/white</item>
     </style>
 
-    <style name="ActionItem">
-        <item name="android:textSize">@dimen/text_size</item>
-        <item name="android:drawablePadding">@dimen/drawable_padding</item>
+    <style name="BottomSheetActionItem">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">@dimen/action_item_height</item>
+        <item name="android:textSize">@dimen/medium_font_size</item>
+        <item name="android:drawablePadding">@dimen/drawable_padding</item>
         <item name="android:padding">@dimen/normal_padding</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:selectable">true</item>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 5a63b2db9a..add1507ed1 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -7,11 +7,14 @@
         <item name="colorPrimary">@color/action_bar_background</item>
         <item name="colorPrimaryDark">@color/action_bar_background</item>
         <item name="colorAccent">@color/accent</item>
+        <item name="android:windowBackground">@drawable/default_session_background</item>
+        <item name="android:colorBackground">@color/default_background_start</item>
+        <item name="android:navigationBarColor">@color/compose_view_background</item>
+        <!-- TODO Separate action bar theme/style -->
 <!--        <item name="actionBarStyle">@style/Session.DarkActionBar</item>-->
         <item name="actionBarTheme">@style/Session.DarkActionBar</item>
         <item name="alertDialogTheme">@style/Session.AlertDialog</item>
-        <item name="android:navigationBarColor">@color/compose_view_background</item>
-        <item name="android:windowBackground">@drawable/default_session_background</item>
+        <item name="bottomSheetDialogTheme">@style/SessionBottomSheetDialogTheme</item>
         <item name="preferenceTheme">@style/Session.SettingsTheme</item>
         <item name="actionModeBackground">@color/compose_view_background</item>
         <item name="statusBarBackground">@color/accent</item>
@@ -26,7 +29,14 @@
         <item name="actionModeCloseDrawable">@drawable/ic_baseline_clear_24</item>
 
         <!-- App specific attributes -->
+        <item name="dialog_background_color">@color/dialog_background</item>
+
+        <item name="home_gradient_start">#00000000</item>
+        <item name="home_gradient_end">#FF000000</item>
+
         <item name="menu_accept_icon">@drawable/ic_baseline_done_24</item>
+        <item name="menu_trash_icon">@drawable/ic_baseline_delete_24</item>
+        <item name="menu_block_icon">@drawable/ic_baseline_block_24</item>
     </style>
 
     <style name="Session.DarkTheme" parent="Session.BaseDarkTheme">
@@ -166,7 +176,6 @@
 
     <style name="TextSecure.LightTheme" parent="@style/Theme.AppCompat.Light.DarkActionBar">
         <item name="theme_type">light</item>
-        <item name="actionBarStyle">@style/Session.DarkActionBar</item>
         <item name="searchViewStyle">@style/TextSecure.BaseDarkTheme.SearchView</item>
         <item name="actionBarTabBarStyle">@style/TextSecure.LightActionBar.TabBar</item>
         <item name="actionModeBackground">@color/compose_view_background</item>
@@ -276,7 +285,7 @@
 
         <item name="dialog_info_icon">@drawable/ic_info_outline_light</item>
         <item name="dialog_alert_icon">@drawable/ic_warning_light</item>
-        <item name="dialog_background_color">@color/background_material_light</item>
+<!--        <item name="dialog_background_color">@color/background_material_light</item>-->
 
         <item name="device_link_item_card_background">@color/device_link_item_background_light</item>
 
@@ -366,9 +375,8 @@
         <item name="colorControlActivated">@color/accent</item>
         <item name="colorControlNormal">@color/text</item>
         <item name="colorControlHighlight">@color/accent</item>
-        <item name="android:windowBackground">@color/loki_darkest_gray</item>
-        <item name="alertDialogTheme">@style/Session.AlertDialog</item>
-        <item name="bottomSheetDialogTheme">@style/Theme.MaterialComponents.BottomSheetDialog</item>
+<!--        <item name="alertDialogTheme">@style/Session.AlertDialog</item>-->
+<!--        <item name="bottomSheetDialogTheme">@style/Theme.MaterialComponents.BottomSheetDialog</item>-->
         <item name="android:navigationBarColor">@color/compose_view_background</item>
 
         <item name="attachment_type_selector_background">@color/gray95</item>
@@ -414,7 +422,7 @@
 
         <item name="dialog_info_icon">@drawable/ic_info_outline_dark</item>
         <item name="dialog_alert_icon">@drawable/ic_warning_dark</item>
-        <item name="dialog_background_color">@color/background_material_dark</item>
+<!--        <item name="dialog_background_color">@color/background_material_dark</item>-->
 
         <item name="device_link_item_card_background">@color/device_link_item_background_dark</item>
 
@@ -487,7 +495,6 @@
         <item name="menu_unlock_icon">@drawable/ic_unlocked_white_24dp</item>
         <item name="menu_lock_icon">@drawable/ic_lock_white_24dp</item>
         <item name="menu_lock_icon_small">@drawable/ic_lock_white_18dp</item>
-        <item name="menu_trash_icon">@drawable/ic_delete_white_24dp</item>
         <item name="menu_selectall_icon">@drawable/ic_select_all_white_24dp</item>
         <item name="menu_split_icon">@drawable/ic_call_split_white_24dp</item>
         <item name="menu_accept_icon">@drawable/ic_check_white_24dp</item>
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index 507f8df7e8..8b2486eb01 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -19,7 +19,6 @@ package org.thoughtcrime.securesms.conversation;
 import android.Manifest;
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
-import androidx.lifecycle.ViewModelProviders;
 import android.content.ActivityNotFoundException;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -27,12 +26,8 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
-import android.content.res.TypedArray;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.graphics.Color;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.ColorDrawable;
 import android.hardware.Camera;
 import android.net.Uri;
 import android.os.AsyncTask;
@@ -42,17 +37,6 @@ import android.os.Handler;
 import android.os.Vibrator;
 import android.provider.Browser;
 import android.provider.Telephony;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-import androidx.core.content.pm.ShortcutInfoCompat;
-import androidx.core.content.pm.ShortcutManagerCompat;
-import androidx.core.graphics.drawable.IconCompat;
-import androidx.core.view.MenuItemCompat;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.SearchView;
-import androidx.appcompat.widget.Toolbar;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -75,6 +59,19 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.SearchView;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.pm.ShortcutInfoCompat;
+import androidx.core.content.pm.ShortcutManagerCompat;
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.core.view.MenuItemCompat;
+import androidx.lifecycle.ViewModelProviders;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
 import com.annimon.stream.Stream;
 
 import org.greenrobot.eventbus.EventBus;
@@ -145,7 +142,6 @@ import org.thoughtcrime.securesms.database.model.StickerRecord;
 import org.thoughtcrime.securesms.events.ReminderUpdateEvent;
 import org.thoughtcrime.securesms.giph.ui.GiphyActivity;
 import org.thoughtcrime.securesms.jobs.MultiDeviceBlockedUpdateJob;
-import org.thoughtcrime.securesms.jobs.RetrieveProfileJob;
 import org.thoughtcrime.securesms.jobs.ServiceOutageDetectionJob;
 import org.thoughtcrime.securesms.linkpreview.LinkPreview;
 import org.thoughtcrime.securesms.linkpreview.LinkPreviewRepository;
@@ -208,7 +204,6 @@ import org.thoughtcrime.securesms.util.CommunicationActions;
 import org.thoughtcrime.securesms.util.DateUtils;
 import org.thoughtcrime.securesms.util.Dialogs;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
-import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
 import org.thoughtcrime.securesms.util.ExpirationUtil;
 import org.thoughtcrime.securesms.util.IdentityUtil;
 import org.thoughtcrime.securesms.util.MediaUtil;
@@ -373,12 +368,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
     setContentView(R.layout.conversation_activity);
 
-    TypedArray typedArray = obtainStyledAttributes(new int[] {R.attr.conversation_background});
-    int color = typedArray.getColor(0, Color.WHITE);
-    typedArray.recycle();
-
-    getWindow().getDecorView().setBackgroundColor(color);
-
     fragment = initFragment(R.id.fragment_content, new ConversationFragment(), dynamicLanguage.getCurrentLocale());
 
     registerMessageStatusObserver("calculatingPoW");
@@ -2084,7 +2073,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 //    setStatusBarColor(getResources().getColor(R.color.action_bar_background));
   }
 
-  // FIXME: This name is confusing because we also have updateInputPanel and setInputPanelEnabled
   private void updateInputUI(Recipient recipient, boolean isSecureText, boolean isDefaultSms) {
     if (recipient.isGroupRecipient() && !isActiveGroup()) {
       unblockButton.setVisibility(View.GONE);
diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
index 88c088ddb5..4d7b14a894 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
@@ -110,8 +110,8 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
         })
     }
 
-    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
-        menuInflater.inflate(R.menu.menu_apply, menu)
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        menuInflater.inflate(R.menu.menu_edit_closed_group, menu)
         return members.isNotEmpty()
     }
     // endregion
@@ -163,7 +163,7 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
     // region Interaction
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when(item.itemId) {
-            R.id.applyButton -> commitChanges()
+            R.id.action_apply -> commitChanges()
         }
         return super.onOptionsItemSelected(item)
     }
diff --git a/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
index b69f05d934..6f88f01e9a 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
@@ -259,12 +259,16 @@ class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListe
         val thread = view.thread ?: return
         val bottomSheet = ConversationOptionsBottomSheet()
         bottomSheet.recipient = thread.recipient
-        bottomSheet.onBlockOrUnblockTapped = {
+        bottomSheet.onBlockTapped = {
+            bottomSheet.dismiss()
+            if (!thread.recipient.isBlocked) {
+                blockConversation(thread)
+            }
+        }
+        bottomSheet.onUnblockTapped = {
             bottomSheet.dismiss()
             if (thread.recipient.isBlocked) {
                 unblockConversation(thread)
-            } else {
-                blockConversation(thread)
             }
         }
         bottomSheet.onDeleteTapped = {
diff --git a/src/org/thoughtcrime/securesms/loki/dialogs/ConversationOptionsBottomSheet.kt b/src/org/thoughtcrime/securesms/loki/dialogs/ConversationOptionsBottomSheet.kt
index 7229cb5df2..228d17eef2 100644
--- a/src/org/thoughtcrime/securesms/loki/dialogs/ConversationOptionsBottomSheet.kt
+++ b/src/org/thoughtcrime/securesms/loki/dialogs/ConversationOptionsBottomSheet.kt
@@ -12,7 +12,8 @@ import org.thoughtcrime.securesms.recipients.Recipient
 
 public class ConversationOptionsBottomSheet : BottomSheetDialogFragment() {
     lateinit var recipient: Recipient
-    var onBlockOrUnblockTapped: (() -> Unit)? = null
+    var onBlockTapped: (() -> Unit)? = null
+    var onUnblockTapped: (() -> Unit)? = null
     var onDeleteTapped: (() -> Unit)? = null
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
@@ -22,14 +23,11 @@ public class ConversationOptionsBottomSheet : BottomSheetDialogFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         if (!recipient.isGroupRecipient && !recipient.isLocalNumber) {
-            val textID = if (recipient.isBlocked) R.string.RecipientPreferenceActivity_unblock else R.string.RecipientPreferenceActivity_block
-            blockOrUnblockTextView.setText(textID)
-            val iconID = if (recipient.isBlocked) R.drawable.ic_check_white_24dp else R.drawable.ic_block_white_24dp
-            val icon = context!!.resources.getDrawable(iconID, context!!.theme)
-            blockOrUnblockTextView.setCompoundDrawablesRelativeWithIntrinsicBounds(icon, null, null, null)
-            blockOrUnblockTextView.setOnClickListener { onBlockOrUnblockTapped?.invoke() }
-        } else {
-            blockOrUnblockTextView.visibility = View.GONE
+            unblockTextView.visibility = if (recipient.isBlocked) View.VISIBLE else View.GONE
+            blockTextView.visibility = if (recipient.isBlocked) View.GONE else View.VISIBLE
+
+            blockTextView.setOnClickListener { onBlockTapped?.invoke() }
+            unblockTextView.setOnClickListener { onUnblockTapped?.invoke() }
         }
         deleteTextView.setOnClickListener { onDeleteTapped?.invoke() }
     }