Layouts' default background replaced with a proper theme level window background.

Bottom sheet style unified.

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"

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

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

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

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

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"

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">
 

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

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

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

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">
 

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"

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">

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" />

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>

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>

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>

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>

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">
 

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">
 

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">
 

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"

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"

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"

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">
 

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"

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"

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"

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"

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"

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"

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">

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"

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"

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"