diff --git a/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java b/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
index b1b34bc39..873b956ae 100644
--- a/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
@@ -77,6 +77,7 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
 
     //noinspection ConstantConditions
     this.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+    getSupportActionBar().setElevation(0); // TODO: use custom toolbar instead
 
     if (icicle == null) {
       initFragment(R.id.fragment, new ApplicationPreferenceFragment());
diff --git a/src/main/java/org/thoughtcrime/securesms/BlockedContactsActivity.java b/src/main/java/org/thoughtcrime/securesms/BlockedContactsActivity.java
index 0767ef385..aef21c16a 100644
--- a/src/main/java/org/thoughtcrime/securesms/BlockedContactsActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/BlockedContactsActivity.java
@@ -33,6 +33,7 @@ public class BlockedContactsActivity extends PassphraseRequiredActionBarActivity
     setContentView(R.layout.activity_blocked_contacts);
     getSupportActionBar().setDisplayHomeAsUpEnabled(true);
     getSupportActionBar().setTitle(R.string.pref_blocked_contacts);
+    getSupportActionBar().setElevation(0); // TODO: use custom toolbar instead
     initFragment(R.id.fragment, new BlockedAndShareContactsFragment(), getIntent().getExtras());
   }
 
diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
index 681f82a95..08d0bd12e 100644
--- a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
@@ -920,6 +920,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     supportActionBar.setCustomView(R.layout.conversation_title_view);
     supportActionBar.setDisplayShowCustomEnabled(true);
     supportActionBar.setDisplayShowTitleEnabled(false);
+    supportActionBar.setElevation(0); // TODO: use custom toolbar instead
 
     Toolbar parent = (Toolbar) supportActionBar.getCustomView().getParent();
     parent.setPadding(0,0,0,0);
diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationListArchiveActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationListArchiveActivity.java
index b5e6ecdee..68a29ff78 100644
--- a/src/main/java/org/thoughtcrime/securesms/ConversationListArchiveActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/ConversationListArchiveActivity.java
@@ -23,6 +23,7 @@ public class ConversationListArchiveActivity extends PassphraseRequiredActionBar
   protected void onCreate(Bundle icicle, boolean ready) {
     setContentView(R.layout.activity_conversation_list_archive);
     getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+    getSupportActionBar().setElevation(0); // TODO: use custom toolbar instead
     if (isRelayingMessageContent(this)) {
       getSupportActionBar().setTitle(isSharing(this) ? R.string.chat_share_with_title : R.string.forward_to);
       getSupportActionBar().setSubtitle(R.string.chat_archived_label);
diff --git a/src/main/java/org/thoughtcrime/securesms/CreateProfileActivity.java b/src/main/java/org/thoughtcrime/securesms/CreateProfileActivity.java
index 5f5fbca4d..3f018f935 100644
--- a/src/main/java/org/thoughtcrime/securesms/CreateProfileActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/CreateProfileActivity.java
@@ -76,6 +76,7 @@ public class CreateProfileActivity extends BaseActionBarActivity {
     getSupportActionBar().setTitle(R.string.pref_profile_info_headline);
     getSupportActionBar().setDisplayHomeAsUpEnabled(!this.fromWelcome);
     getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_close_white_24dp);
+    getSupportActionBar().setElevation(0); // TODO: use custom toolbar instead
 
     attachmentManager = new AttachmentManager(this, () -> {});
     avatarChanged = false;
diff --git a/src/main/java/org/thoughtcrime/securesms/GroupCreateActivity.java b/src/main/java/org/thoughtcrime/securesms/GroupCreateActivity.java
index 58d041ca8..f85a525cd 100644
--- a/src/main/java/org/thoughtcrime/securesms/GroupCreateActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/GroupCreateActivity.java
@@ -80,6 +80,7 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
     unencrypted = getIntent().getBooleanExtra(UNENCRYPTED, false);
     Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
     getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_close_white_24dp);
+    getSupportActionBar().setElevation(0); // TODO: use custom toolbar instead
 
     groupChatId = getIntent().getIntExtra(EDIT_GROUP_CHAT_ID, 0);
     attachmentManager = new AttachmentManager(this, () -> {});
diff --git a/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java b/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java
index bdc6b96fc..28b5257f2 100644
--- a/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java
@@ -98,6 +98,7 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
 
     Objects.requireNonNull(getSupportActionBar()).setTitle(R.string.onboarding_create_instant_account);
     getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+    getSupportActionBar().setElevation(0); // TODO: use custom toolbar instead
 
     boolean fromWelcome  = getIntent().getBooleanExtra(FROM_WELCOME, false);
     if (DcHelper.getContext(this).isConfigured() == 1) {
diff --git a/src/main/java/org/thoughtcrime/securesms/LogViewActivity.java b/src/main/java/org/thoughtcrime/securesms/LogViewActivity.java
index 0f6ff0b6c..4a08e35a9 100644
--- a/src/main/java/org/thoughtcrime/securesms/LogViewActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/LogViewActivity.java
@@ -36,6 +36,7 @@ public class LogViewActivity extends BaseActionBarActivity {
     transaction.commit();
 
     getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+    getSupportActionBar().setElevation(0); // TODO: use custom toolbar instead
   }
 
   @Override
diff --git a/src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java b/src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java
index 7b6a405d4..019cedd33 100644
--- a/src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java
@@ -135,6 +135,7 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
             actionBar.setTitle(R.string.login_header);
             actionBar.setDisplayHomeAsUpEnabled(true);
             actionBar.setHomeAsUpIndicator(R.drawable.ic_close_white_24dp);
+            actionBar.setElevation(0); // TODO: use custom toolbar instead
         }
 
         emailInput.addTextChangedListener(new TextWatcher() {
diff --git a/src/main/java/org/thoughtcrime/securesms/WebViewActivity.java b/src/main/java/org/thoughtcrime/securesms/WebViewActivity.java
index e6e870343..7cc852310 100644
--- a/src/main/java/org/thoughtcrime/securesms/WebViewActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/WebViewActivity.java
@@ -55,6 +55,7 @@ public class WebViewActivity extends PassphraseRequiredActionBarActivity
     ActionBar actionBar = getSupportActionBar();
     if (actionBar != null) {
       actionBar.setDisplayHomeAsUpEnabled(true);
+      actionBar.setElevation(0); // TODO: use custom toolbar instead
     }
 
     webView = findViewById(R.id.webview);
diff --git a/src/main/java/org/thoughtcrime/securesms/WebxdcStoreActivity.java b/src/main/java/org/thoughtcrime/securesms/WebxdcStoreActivity.java
index 2c840ceec..2bb90a7e4 100644
--- a/src/main/java/org/thoughtcrime/securesms/WebxdcStoreActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/WebxdcStoreActivity.java
@@ -48,6 +48,7 @@ public class WebxdcStoreActivity extends PassphraseRequiredActionBarActivity {
     if (actionBar != null) {
       actionBar.setDisplayHomeAsUpEnabled(true);
       actionBar.setTitle(R.string.webxdc_apps);
+      actionBar.setElevation(0); // TODO: use custom toolbar instead
     }
 
     webView.setWebViewClient(new WebViewClient() {
diff --git a/src/main/java/org/thoughtcrime/securesms/WelcomeActivity.java b/src/main/java/org/thoughtcrime/securesms/WelcomeActivity.java
index 54760723b..8f0231a01 100644
--- a/src/main/java/org/thoughtcrime/securesms/WelcomeActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/WelcomeActivity.java
@@ -107,6 +107,7 @@ public class WelcomeActivity extends BaseActionBarActivity implements DcEventCen
         boolean canGoBack = AccountManager.getInstance().canRollbackAccountCreation(this);
         supportActionBar.setDisplayHomeAsUpEnabled(canGoBack);
         getSupportActionBar().setTitle(canGoBack? R.string.add_account : R.string.welcome_desktop);
+        getSupportActionBar().setElevation(0); // TODO: use custom toolbar instead
     }
 
     private void registerForEvents() {
diff --git a/src/main/java/org/thoughtcrime/securesms/contacts/NewContactActivity.java b/src/main/java/org/thoughtcrime/securesms/contacts/NewContactActivity.java
index ae5a44eb9..b76151cb8 100644
--- a/src/main/java/org/thoughtcrime/securesms/contacts/NewContactActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/contacts/NewContactActivity.java
@@ -42,6 +42,7 @@ public class NewContactActivity extends PassphraseRequiredActionBarActivity
       actionBar.setTitle(R.string.menu_new_classic_contact);
       actionBar.setDisplayHomeAsUpEnabled(true);
       actionBar.setHomeAsUpIndicator(R.drawable.ic_close_white_24dp);
+      actionBar.setElevation(0); // TODO: use custom toolbar instead
     }
 
     nameInput = ViewUtil.findById(this, R.id.name_text);
diff --git a/src/main/java/org/thoughtcrime/securesms/preferences/ChatBackgroundActivity.java b/src/main/java/org/thoughtcrime/securesms/preferences/ChatBackgroundActivity.java
index f4b58b581..b2d85c0d5 100644
--- a/src/main/java/org/thoughtcrime/securesms/preferences/ChatBackgroundActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/preferences/ChatBackgroundActivity.java
@@ -71,6 +71,7 @@ public class ChatBackgroundActivity extends PassphraseRequiredActionBarActivity
             actionBar.setTitle(R.string.pref_background);
             actionBar.setDisplayHomeAsUpEnabled(true);
             actionBar.setHomeAsUpIndicator(R.drawable.ic_close_white_24dp);
+            actionBar.setElevation(0); // TODO: use custom toolbar instead
         }
 
     }
diff --git a/src/main/java/org/thoughtcrime/securesms/proxy/ProxySettingsActivity.java b/src/main/java/org/thoughtcrime/securesms/proxy/ProxySettingsActivity.java
index 6a9e8b63c..e21fe2404 100644
--- a/src/main/java/org/thoughtcrime/securesms/proxy/ProxySettingsActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/proxy/ProxySettingsActivity.java
@@ -50,6 +50,7 @@ public class ProxySettingsActivity extends BaseActionBarActivity
     if (actionBar != null) {
       actionBar.setTitle(R.string.proxy_settings);
       actionBar.setDisplayHomeAsUpEnabled(true);
+      actionBar.setElevation(0); // TODO: use custom toolbar instead
     }
 
     adapter = new ProxyListAdapter(this);
diff --git a/src/main/java/org/thoughtcrime/securesms/qr/BackupTransferActivity.java b/src/main/java/org/thoughtcrime/securesms/qr/BackupTransferActivity.java
index c42c85533..6673c5999 100644
--- a/src/main/java/org/thoughtcrime/securesms/qr/BackupTransferActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/qr/BackupTransferActivity.java
@@ -85,6 +85,7 @@ public class BackupTransferActivity extends BaseActionBarActivity {
         supportActionBar.setDisplayHomeAsUpEnabled(true);
         supportActionBar.setHomeAsUpIndicator(R.drawable.ic_close_white_24dp);
         supportActionBar.setTitle(title);
+        supportActionBar.setElevation(0); // TODO: use custom toolbar instead
     }
 
     @Override
diff --git a/src/main/java/org/thoughtcrime/securesms/qr/RegistrationQrActivity.java b/src/main/java/org/thoughtcrime/securesms/qr/RegistrationQrActivity.java
index ba27ce4a1..20d76ace3 100644
--- a/src/main/java/org/thoughtcrime/securesms/qr/RegistrationQrActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/qr/RegistrationQrActivity.java
@@ -42,6 +42,7 @@ public class RegistrationQrActivity extends BaseActionBarActivity {
             getSupportActionBar().setTitle(R.string.scan_invitation_code);
         }
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        getSupportActionBar().setElevation(0); // TODO: use custom toolbar instead
 
         barcodeScannerView = findViewById(R.id.zxing_barcode_scanner);
         barcodeScannerView.setStatusText(getString(R.string.qrscan_hint) + "\n ");
diff --git a/src/main/res/layout/activity_application_preferences.xml b/src/main/res/layout/activity_application_preferences.xml
index 87e25a8d2..5dc280304 100644
--- a/src/main/res/layout/activity_application_preferences.xml
+++ b/src/main/res/layout/activity_application_preferences.xml
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<FrameLayout
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:background="?attr/colorPrimary"
     android:fitsSystemWindows="true"
-	android:id="@+id/fragment" />
\ No newline at end of file
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+  <FrameLayout
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:background="?android:attr/windowBackground"
+	  android:id="@+id/fragment" />
+
+</RelativeLayout>
diff --git a/src/main/res/layout/activity_blocked_contacts.xml b/src/main/res/layout/activity_blocked_contacts.xml
index 3413157ec..5dc280304 100644
--- a/src/main/res/layout/activity_blocked_contacts.xml
+++ b/src/main/res/layout/activity_blocked_contacts.xml
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<FrameLayout
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:background="?attr/colorPrimary"
     android:fitsSystemWindows="true"
-	android:id="@+id/fragment" />
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+  <FrameLayout
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:background="?android:attr/windowBackground"
+	  android:id="@+id/fragment" />
+
+</RelativeLayout>
diff --git a/src/main/res/layout/activity_conversation_list_archive.xml b/src/main/res/layout/activity_conversation_list_archive.xml
index 3413157ec..5dc280304 100644
--- a/src/main/res/layout/activity_conversation_list_archive.xml
+++ b/src/main/res/layout/activity_conversation_list_archive.xml
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<FrameLayout
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:background="?attr/colorPrimary"
     android:fitsSystemWindows="true"
-	android:id="@+id/fragment" />
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+  <FrameLayout
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:background="?android:attr/windowBackground"
+	  android:id="@+id/fragment" />
+
+</RelativeLayout>
diff --git a/src/main/res/layout/activity_qr.xml b/src/main/res/layout/activity_qr.xml
index cd8cca61b..5420180f9 100644
--- a/src/main/res/layout/activity_qr.xml
+++ b/src/main/res/layout/activity_qr.xml
@@ -4,11 +4,13 @@
     android:layout_height="match_parent"
     android:layout_width="match_parent"
     android:fitsSystemWindows="true"
+    android:background="?attr/colorPrimary"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        app:elevation="0dp">
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
diff --git a/src/main/res/layout/activity_registration_2nd_device_qr.xml b/src/main/res/layout/activity_registration_2nd_device_qr.xml
index 27c0347e3..f29318f1c 100644
--- a/src/main/res/layout/activity_registration_2nd_device_qr.xml
+++ b/src/main/res/layout/activity_registration_2nd_device_qr.xml
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fitsSystemWindows="true"
+    android:background="?attr/colorPrimary"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+<LinearLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
+    android:background="?android:attr/windowBackground"
     android:orientation="vertical"
-    android:gravity="center_horizontal"
-    tools:context=".WelcomeActivity">
+    android:gravity="center_horizontal">
 
     <LinearLayout
         android:id="@+id/top_text"
@@ -88,3 +93,5 @@
         android:layout_height="0dp"/>
 
 </LinearLayout>
+
+</RelativeLayout>
diff --git a/src/main/res/layout/activity_registration_qr.xml b/src/main/res/layout/activity_registration_qr.xml
index 97febea4e..a55cec9a3 100644
--- a/src/main/res/layout/activity_registration_qr.xml
+++ b/src/main/res/layout/activity_registration_qr.xml
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:background="?attr/colorPrimary"
+    android:fitsSystemWindows="true"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+<LinearLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
+    android:background="?android:attr/windowBackground"
     android:orientation="vertical"
-    android:gravity="center_horizontal"
-    tools:context=".WelcomeActivity">
+    android:gravity="center_horizontal">
 
     <androidx.legacy.widget.Space
         android:layout_weight="2"
@@ -35,3 +40,5 @@
         android:layout_height="0dp"/>
 
 </LinearLayout>
+
+</RelativeLayout>
diff --git a/src/main/res/layout/activity_select_chat_background.xml b/src/main/res/layout/activity_select_chat_background.xml
index 4c70aac14..aaec2e2d3 100644
--- a/src/main/res/layout/activity_select_chat_background.xml
+++ b/src/main/res/layout/activity_select_chat_background.xml
@@ -3,6 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/layout_container"
     android:fitsSystemWindows="true"
+    android:background="?attr/colorPrimary"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
diff --git a/src/main/res/layout/all_media_activity.xml b/src/main/res/layout/all_media_activity.xml
index 7d17ede36..d09463246 100644
--- a/src/main/res/layout/all_media_activity.xml
+++ b/src/main/res/layout/all_media_activity.xml
@@ -4,11 +4,13 @@
         android:layout_height="match_parent"
         android:layout_width="match_parent"
         android:fitsSystemWindows="true"
+        android:background="?attr/colorPrimary"
         xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            app:elevation="0dp">
 
         <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
diff --git a/src/main/res/layout/backup_provider_activity.xml b/src/main/res/layout/backup_provider_activity.xml
index f77c3e7de..41852e1a3 100644
--- a/src/main/res/layout/backup_provider_activity.xml
+++ b/src/main/res/layout/backup_provider_activity.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:background="?attr/colorPrimary"
     android:fitsSystemWindows="true"
-	android:id="@+id/backup_provider_fragment" />
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+  <FrameLayout
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:background="?android:attr/windowBackground"
+	  android:id="@+id/backup_provider_fragment" />
+
+</RelativeLayout>
diff --git a/src/main/res/layout/contact_selection_activity.xml b/src/main/res/layout/contact_selection_activity.xml
index 8df56e0b6..34b7c13cb 100644
--- a/src/main/res/layout/contact_selection_activity.xml
+++ b/src/main/res/layout/contact_selection_activity.xml
@@ -3,6 +3,7 @@
               android:layout_height="fill_parent"
               android:layout_width="fill_parent"
               android:fitsSystemWindows="true"
+              android:background="?attr/colorPrimary"
               android:orientation="vertical"
               xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:app="http://schemas.android.com/apk/res-auto">
@@ -17,9 +18,16 @@
             android:theme="?attr/actionBarStyle"
             app:contentInsetStartWithNavigation="0dp"/>
 
-        <fragment android:id="@+id/contact_selection_list_fragment"
+    <FrameLayout
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:background="?android:attr/windowBackground">
+
+      <fragment android:id="@+id/contact_selection_list_fragment"
                   android:layout_width="match_parent"
                   android:layout_height="match_parent"
                   android:name="org.thoughtcrime.securesms.ContactSelectionListFragment" />
 
+    </FrameLayout>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/conversation_activity.xml b/src/main/res/layout/conversation_activity.xml
index 0c4839b26..dff2668e4 100644
--- a/src/main/res/layout/conversation_activity.xml
+++ b/src/main/res/layout/conversation_activity.xml
@@ -3,6 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:fitsSystemWindows="true"
+    android:background="?attr/colorPrimary"
     android:layout_height="match_parent" android:layout_width="match_parent">
 
     <org.thoughtcrime.securesms.components.ScaleStableImageView
@@ -21,7 +22,6 @@
                       android:layout_width="match_parent"
                       android:layout_height="match_parent"
                       android:orientation="vertical"
-                      android:paddingTop="?attr/actionBarSize"
                       android:gravity="bottom"
                       android:clipToPadding="false"
                       android:clipChildren="false">
diff --git a/src/main/res/layout/conversation_list_activity.xml b/src/main/res/layout/conversation_list_activity.xml
index eb37c5dd3..78e5b568c 100644
--- a/src/main/res/layout/conversation_list_activity.xml
+++ b/src/main/res/layout/conversation_list_activity.xml
@@ -4,6 +4,7 @@
                 xmlns:tools="http://schemas.android.com/tools"
                 android:id="@id/container"
                 android:orientation="vertical"
+                android:background="?attr/colorPrimary"
                 android:fitsSystemWindows="true"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
@@ -94,7 +95,9 @@
     <FrameLayout android:id="@+id/fragment_container"
                  android:layout_below="@id/toolbar"
                  android:layout_width="match_parent"
-                 android:layout_height="match_parent"/>
+                 android:layout_height="match_parent"
+                 android:background="?android:attr/windowBackground"
+                 />
 
     <org.thoughtcrime.securesms.components.SearchToolbar
             android:id="@+id/search_toolbar"
diff --git a/src/main/res/layout/group_create_activity.xml b/src/main/res/layout/group_create_activity.xml
index 9058eae35..7aae73928 100644
--- a/src/main/res/layout/group_create_activity.xml
+++ b/src/main/res/layout/group_create_activity.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:background="?attr/colorPrimary"
+    android:fitsSystemWindows="true"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:fitsSystemWindows="true"
-              android:orientation="vertical">
+<LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?android:attr/windowBackground"
+    android:orientation="vertical">
 
     <LinearLayout
         android:id="@+id/group_image_holder"
@@ -55,3 +61,5 @@
         android:divider="@null" />
 
 </LinearLayout>
+
+</RelativeLayout>
diff --git a/src/main/res/layout/instant_onboarding_activity.xml b/src/main/res/layout/instant_onboarding_activity.xml
index f5a51ef5e..6921c8b6b 100644
--- a/src/main/res/layout/instant_onboarding_activity.xml
+++ b/src/main/res/layout/instant_onboarding_activity.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout android:layout_width="match_parent"
-    android:layout_height="match_parent"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:background="?attr/colorPrimary"
     android:fitsSystemWindows="true"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+<FrameLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?android:attr/windowBackground">
 
   <LinearLayout
       android:layout_width="match_parent"
@@ -86,3 +93,5 @@
   </LinearLayout>
 
 </FrameLayout>
+
+</RelativeLayout>
diff --git a/src/main/res/layout/log_view_activity.xml b/src/main/res/layout/log_view_activity.xml
index 0d2c5b6ee..9d6e1f4eb 100644
--- a/src/main/res/layout/log_view_activity.xml
+++ b/src/main/res/layout/log_view_activity.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/fragment_container"
-    android:orientation="vertical"
+    android:background="?attr/colorPrimary"
     android:fitsSystemWindows="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-</LinearLayout>
\ No newline at end of file
+<LinearLayout
+    android:id="@+id/fragment_container"
+    android:orientation="vertical"
+    android:background="?android:attr/windowBackground"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"/>
+
+</RelativeLayout>
diff --git a/src/main/res/layout/new_contact_activity.xml b/src/main/res/layout/new_contact_activity.xml
index ecb15fcd4..52bd86423 100644
--- a/src/main/res/layout/new_contact_activity.xml
+++ b/src/main/res/layout/new_contact_activity.xml
@@ -5,14 +5,16 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
+    android:background="?attr/colorPrimary"
     android:fillViewport="true"
     tools:context=".contacts.NewContactActivity">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="16dp"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp"
+        android:background="?android:attr/windowBackground"
         android:animateLayoutChanges="true">
 
         <androidx.constraintlayout.widget.Guideline
diff --git a/src/main/res/layout/profile_activity.xml b/src/main/res/layout/profile_activity.xml
index 92fa87066..cbcf3e9e8 100644
--- a/src/main/res/layout/profile_activity.xml
+++ b/src/main/res/layout/profile_activity.xml
@@ -4,11 +4,13 @@
         android:layout_height="match_parent"
         android:layout_width="match_parent"
         android:fitsSystemWindows="true"
+        android:background="?attr/colorPrimary"
         xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            app:elevation="0dp">
 
         <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
@@ -24,6 +26,7 @@
 
     <FrameLayout
             android:id="@+id/fragment_container"
+            android:background="?android:attr/windowBackground"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
diff --git a/src/main/res/layout/profile_create_activity.xml b/src/main/res/layout/profile_create_activity.xml
index b51b1b5fd..4bebd6258 100644
--- a/src/main/res/layout/profile_create_activity.xml
+++ b/src/main/res/layout/profile_create_activity.xml
@@ -3,14 +3,16 @@
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:fitsSystemWindows="true"
+    android:background="?attr/colorPrimary"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
 <org.thoughtcrime.securesms.components.InputAwareLayout
         android:id="@+id/container"
+        android:background="?android:attr/windowBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="20dp"
+        android:paddingTop="20dp"
         android:orientation="vertical">
 
     <TextView
diff --git a/src/main/res/layout/proxy_settings_activity.xml b/src/main/res/layout/proxy_settings_activity.xml
index ff9731e71..45dae97a3 100644
--- a/src/main/res/layout/proxy_settings_activity.xml
+++ b/src/main/res/layout/proxy_settings_activity.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:background="?attr/colorPrimary"
     android:fitsSystemWindows="true"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+<LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?android:attr/windowBackground"
     android:orientation="vertical"
     tools:context=".proxy.ProxySettingsActivity">
 
@@ -22,3 +28,5 @@
       android:layout_height="wrap_content" />
 
 </LinearLayout>
+
+</RelativeLayout>
diff --git a/src/main/res/layout/registration_activity.xml b/src/main/res/layout/registration_activity.xml
index fdb287c44..500387aae 100644
--- a/src/main/res/layout/registration_activity.xml
+++ b/src/main/res/layout/registration_activity.xml
@@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+    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:fitsSystemWindows="true"
+    android:background="?attr/colorPrimary"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+<ScrollView
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
     android:fillViewport="true"
+    android:background="?android:attr/windowBackground"
     tools:context=".RegistrationActivity">
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -421,3 +428,5 @@
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </ScrollView>
+
+</RelativeLayout>
diff --git a/src/main/res/layout/share_activity.xml b/src/main/res/layout/share_activity.xml
index b3a3e0d69..6eb480227 100644
--- a/src/main/res/layout/share_activity.xml
+++ b/src/main/res/layout/share_activity.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:background="?attr/colorPrimary"
+    android:fitsSystemWindows="true"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:wheel="http://schemas.android.com/apk/res-auto"
-                android:orientation="vertical"
-                android:fitsSystemWindows="true"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
+<RelativeLayout
+    android:orientation="vertical"
+    android:background="?android:attr/windowBackground"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
@@ -41,3 +46,5 @@
         android:textSize="20sp"
         android:text="@string/one_moment" />
 </RelativeLayout>
+
+</RelativeLayout>
diff --git a/src/main/res/layout/web_view_activity.xml b/src/main/res/layout/web_view_activity.xml
index 2d59077fd..7dccdb72a 100644
--- a/src/main/res/layout/web_view_activity.xml
+++ b/src/main/res/layout/web_view_activity.xml
@@ -4,6 +4,7 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:fitsSystemWindows="true"
+              android:background="?attr/colorPrimary"
               android:orientation="vertical">
 
     <WebView android:id="@+id/webview"
diff --git a/src/main/res/layout/welcome_activity.xml b/src/main/res/layout/welcome_activity.xml
index fab950fc8..9f308165e 100644
--- a/src/main/res/layout/welcome_activity.xml
+++ b/src/main/res/layout/welcome_activity.xml
@@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:background="?attr/colorPrimary"
+    android:fitsSystemWindows="true"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+<LinearLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
     android:orientation="vertical"
     android:gravity="center_horizontal"
+    android:background="?android:attr/windowBackground"
     tools:context=".WelcomeActivity">
 
     <androidx.legacy.widget.Space
@@ -72,3 +79,4 @@
 
 </LinearLayout>
 
+</RelativeLayout>