diff --git a/src/main/java/org/thoughtcrime/securesms/AllMediaDocumentsFragment.java b/src/main/java/org/thoughtcrime/securesms/AllMediaDocumentsFragment.java
index 32b8acdcd..96446d6f8 100644
--- a/src/main/java/org/thoughtcrime/securesms/AllMediaDocumentsFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/AllMediaDocumentsFragment.java
@@ -11,7 +11,6 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.Window;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -221,16 +220,11 @@ public class AllMediaDocumentsFragment
 
   private class ActionModeCallback implements ActionMode.Callback {
 
-    private int originalStatusBarColor;
-
     @Override
     public boolean onCreateActionMode(ActionMode mode, Menu menu) {
       mode.getMenuInflater().inflate(R.menu.profile_context, menu);
       mode.setTitle("1");
 
-      Window window = getActivity().getWindow();
-      originalStatusBarColor = window.getStatusBarColor();
-      window.setStatusBarColor(getResources().getColor(R.color.action_mode_status_bar));
       setCorrectMenuVisibility(menu);
       return true;
     }
@@ -279,8 +273,6 @@ public class AllMediaDocumentsFragment
     public void onDestroyActionMode(ActionMode mode) {
       actionMode = null;
       getListAdapter().clearSelection();
-
-      getActivity().getWindow().setStatusBarColor(originalStatusBarColor);
     }
   }
 }
diff --git a/src/main/java/org/thoughtcrime/securesms/AllMediaGalleryFragment.java b/src/main/java/org/thoughtcrime/securesms/AllMediaGalleryFragment.java
index a3c742027..e9b533699 100644
--- a/src/main/java/org/thoughtcrime/securesms/AllMediaGalleryFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/AllMediaGalleryFragment.java
@@ -11,7 +11,6 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.Window;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -212,16 +211,11 @@ public class AllMediaGalleryFragment
 
   private class ActionModeCallback implements ActionMode.Callback {
 
-    private int originalStatusBarColor;
-
     @Override
     public boolean onCreateActionMode(ActionMode mode, Menu menu) {
       mode.getMenuInflater().inflate(R.menu.profile_context, menu);
       mode.setTitle("1");
 
-      Window window = getActivity().getWindow();
-      originalStatusBarColor = window.getStatusBarColor();
-      window.setStatusBarColor(getResources().getColor(R.color.action_mode_status_bar));
       setCorrectMenuVisibility(menu);
       return true;
     }
@@ -266,8 +260,6 @@ public class AllMediaGalleryFragment
     public void onDestroyActionMode(ActionMode mode) {
       actionMode = null;
       getListAdapter().clearSelection();
-
-      getActivity().getWindow().setStatusBarColor(originalStatusBarColor);
     }
   }
 }
diff --git a/src/main/java/org/thoughtcrime/securesms/BaseConversationListFragment.java b/src/main/java/org/thoughtcrime/securesms/BaseConversationListFragment.java
index b6cca750f..e2f347f44 100644
--- a/src/main/java/org/thoughtcrime/securesms/BaseConversationListFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/BaseConversationListFragment.java
@@ -10,9 +10,7 @@ import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.content.res.TypedArray;
 import android.graphics.Bitmap;
-import android.graphics.Color;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.view.Menu;
@@ -401,8 +399,6 @@ public abstract class BaseConversationListFragment extends Fragment implements A
 
     mode.setTitle("1");
 
-    requireActivity().getWindow().setStatusBarColor(getResources().getColor(R.color.action_mode_status_bar));
-
     return true;
   }
 
@@ -445,10 +441,6 @@ public abstract class BaseConversationListFragment extends Fragment implements A
     actionMode = null;
     getListAdapter().initializeBatchMode(false);
 
-    TypedArray color = requireActivity().getTheme().obtainStyledAttributes(new int[]{android.R.attr.statusBarColor});
-    requireActivity().getWindow().setStatusBarColor(color.getColor(0, Color.BLACK));
-    color.recycle();
-
     Context context = getContext();
     if (context != null) {
       fab.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_add_white_24dp));
diff --git a/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java b/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java
index c93ffcb07..24d1adaf5 100644
--- a/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java
@@ -23,8 +23,6 @@ import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Intent;
-import android.content.res.TypedArray;
-import android.graphics.Color;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.util.Log;
@@ -35,7 +33,6 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
@@ -136,7 +133,6 @@ public class ContactSelectionListFragment extends    Fragment
       public boolean onCreateActionMode(ActionMode actionMode, Menu menu) {
         MenuInflater inflater = getActivity().getMenuInflater();
         inflater.inflate(R.menu.contact_list, menu);
-        getActivity().getWindow().setStatusBarColor(getResources().getColor(R.color.action_mode_status_bar));
         setCorrectMenuVisibility(menu);
         actionMode.setTitle("1");
         return true;
@@ -167,10 +163,6 @@ public class ContactSelectionListFragment extends    Fragment
       public void onDestroyActionMode(ActionMode actionMode) {
         ContactSelectionListFragment.this.actionMode = null;
         getContactSelectionListAdapter().resetActionModeSelection();
-
-        TypedArray color = getActivity().getTheme().obtainStyledAttributes(new int[]{android.R.attr.statusBarColor});
-        getActivity().getWindow().setStatusBarColor(color.getColor(0, Color.BLACK));
-        color.recycle();
       }
     };
 
diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java b/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java
index dcb88abf2..6e3bd7905 100644
--- a/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java
@@ -32,7 +32,6 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.Window;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.widget.TextView;
@@ -854,8 +853,6 @@ public class ConversationFragment extends MessageSelectorFragment
 
     private class ActionModeCallback implements ActionMode.Callback {
 
-        private int statusBarColor;
-
         @Override
         public boolean onCreateActionMode(ActionMode mode, Menu menu) {
             MenuInflater inflater = mode.getMenuInflater();
@@ -863,10 +860,6 @@ public class ConversationFragment extends MessageSelectorFragment
 
             mode.setTitle("1");
 
-            Window window = getActivity().getWindow();
-            statusBarColor = window.getStatusBarColor();
-            window.setStatusBarColor(getResources().getColor(R.color.action_mode_status_bar));
-
             Util.redMenuItem(menu, R.id.menu_context_delete_message);
             setCorrectMenuVisibility(menu);
             ConversationAdaptiveActionsToolbar.adjustMenuActions(menu, 10, requireActivity().getWindow().getDecorView().getMeasuredWidth());
@@ -883,8 +876,6 @@ public class ConversationFragment extends MessageSelectorFragment
             ((ConversationAdapter)list.getAdapter()).clearSelection();
             list.getAdapter().notifyDataSetChanged();
 
-            getActivity().getWindow().setStatusBarColor(statusBarColor);
-
             actionMode = null;
             hideAddReactionView();
         }
diff --git a/src/main/java/org/thoughtcrime/securesms/ProfileFragment.java b/src/main/java/org/thoughtcrime/securesms/ProfileFragment.java
index fd63c3a0c..8f072a3cb 100644
--- a/src/main/java/org/thoughtcrime/securesms/ProfileFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/ProfileFragment.java
@@ -3,14 +3,12 @@ package org.thoughtcrime.securesms;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.content.res.Configuration;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.Window;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
@@ -249,8 +247,6 @@ public class ProfileFragment extends Fragment
 
   private class ActionModeCallback implements ActionMode.Callback {
 
-    private int originalStatusBarColor;
-
     @Override
     public boolean onCreateActionMode(ActionMode mode, Menu menu) {
       mode.getMenuInflater().inflate(R.menu.profile_context, menu);
@@ -263,9 +259,6 @@ public class ProfileFragment extends Fragment
       menu.findItem(R.id.menu_select_all).setVisible(false);
       mode.setTitle("1");
 
-      Window window = requireActivity().getWindow();
-      originalStatusBarColor = window.getStatusBarColor();
-      window.setStatusBarColor(getResources().getColor(R.color.action_mode_status_bar));
       return true;
     }
 
@@ -306,7 +299,6 @@ public class ProfileFragment extends Fragment
     public void onDestroyActionMode(ActionMode mode) {
       actionMode = null;
       adapter.clearSelection();
-      requireActivity().getWindow().setStatusBarColor(originalStatusBarColor);
     }
   }
 
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 1d665fc92..a79ef236d 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -37,7 +37,7 @@
         <item name="theme_type">light</item>
         <item name="actionBarStyle">@style/TextSecure.LightActionBar</item>
         <item name="actionBarTabBarStyle">@style/TextSecure.LightActionBar.TabBar</item>
-        <item name="actionModeBackground">@color/action_mode_status_bar</item>
+        <item name="actionModeBackground">@color/delta_primary</item>
         <item name="colorPrimary">@color/delta_primary</item>
         <item name="colorPrimaryDark">@color/delta_primary</item>
 
@@ -152,7 +152,7 @@
         <item name="colorPrimary">@color/gray95</item>
         <item name="colorPrimaryDark">@color/gray95</item>
         <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
-        <item name="actionModeBackground">@color/action_mode_status_bar</item>
+        <item name="actionModeBackground">@color/gray95</item>
         <item name="android:textColor">@color/text_color_dark_theme</item>
         <item name="android:textColorSecondary">@color/text_color_secondary_dark_theme</item>