diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.kt
index 1dbb1d0184..207f88a5e8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.kt
@@ -15,7 +15,7 @@ import org.thoughtcrime.securesms.components.reminder.ReminderView
 import org.thoughtcrime.securesms.components.settings.app.subscription.DonationPaymentComponent
 import org.thoughtcrime.securesms.components.settings.app.subscription.DonationPaymentRepository
 import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme
+import org.thoughtcrime.securesms.util.DynamicNoActionBarTransparentNavigationBarTheme
 import org.thoughtcrime.securesms.util.DynamicTheme
 import org.thoughtcrime.securesms.util.concurrent.ListenableFuture
 import org.thoughtcrime.securesms.util.views.Stub
@@ -24,7 +24,7 @@ open class ConversationActivity : PassphraseRequiredActivity(), ConversationPare
 
   private lateinit var fragment: ConversationParentFragment
 
-  private val dynamicTheme: DynamicTheme = DynamicNoActionBarTheme()
+  private val dynamicTheme: DynamicTheme = DynamicNoActionBarTransparentNavigationBarTheme()
   override fun onPreCreate() {
     dynamicTheme.onCreate(this)
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
index 1b33f01d48..ec701cb866 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
@@ -2276,9 +2276,6 @@ public class ConversationParentFragment extends Fragment
       int toolbarTextAndIconColor = getResources().getColor(R.color.signal_colorNeutralInverse);
       toolbar.setTitleTextColor(toolbarTextAndIconColor);
       setToolbarActionItemTint(toolbar, toolbarTextAndIconColor);
-
-      WindowUtil.setNavigationBarColor(requireActivity().getWindow(), 0);
-      WindowUtil.setLightNavigationBar(requireActivity().getWindow());
     } else {
       wallpaper.setImageDrawable(null);
       wallpaperDim.setVisibility(View.GONE);
@@ -2291,9 +2288,6 @@ public class ConversationParentFragment extends Fragment
       int toolbarTextAndIconColor = getResources().getColor(R.color.signal_colorOnSurface);
       toolbar.setTitleTextColor(toolbarTextAndIconColor);
       setToolbarActionItemTint(toolbar, toolbarTextAndIconColor);
-
-      WindowUtil.setNavigationBarColor(requireActivity().getWindow(), ContextCompat.getColor(requireContext(), R.color.signal_colorBackground));
-      WindowUtil.setLightNavigationBarFromTheme(requireActivity());
     }
     fragment.onWallpaperChanged(chatWallpaper);
     messageRequestBottomView.setWallpaperEnabled(chatWallpaper != null);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/DynamicNoActionBarTransparentNavigationBarTheme.java b/app/src/main/java/org/thoughtcrime/securesms/util/DynamicNoActionBarTransparentNavigationBarTheme.java
new file mode 100644
index 0000000000..dbca773a1b
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/DynamicNoActionBarTransparentNavigationBarTheme.java
@@ -0,0 +1,12 @@
+package org.thoughtcrime.securesms.util;
+
+import androidx.annotation.StyleRes;
+
+import org.thoughtcrime.securesms.R;
+
+public class DynamicNoActionBarTransparentNavigationBarTheme extends DynamicTheme {
+
+  protected @StyleRes int getTheme() {
+    return R.style.Signal_DayNight_NoActionBar_TransparentNavigationBar;
+  }
+}
diff --git a/app/src/main/res/values-night/dark_themes.xml b/app/src/main/res/values-night/dark_themes.xml
index 09ca4376aa..0bbea874ee 100644
--- a/app/src/main/res/values-night/dark_themes.xml
+++ b/app/src/main/res/values-night/dark_themes.xml
@@ -6,6 +6,8 @@
 
     <style name="Signal.DayNight.NoActionBar" parent="TextSecure.DarkNoActionBar" />
 
+    <style name="Signal.DayNight.NoActionBar.TransparentNavigationBar" parent="TextSecure.DarkNoActionBar.TransparentNavigationBar" />
+
     <style name="Signal.DayNight.Invite" parent="Signal.NoActionBar.Invite" />
 
     <style name="Signal.DayNight.IntroTheme" parent="TextSecure.DarkIntroTheme" />
diff --git a/app/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml
index 1c736c3358..99e8808ad6 100644
--- a/app/src/main/res/values-v21/themes.xml
+++ b/app/src/main/res/values-v21/themes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <style name="TextSecure.LightTheme" parent="TextSecure.BaseLightTheme">
         <item name="android:statusBarColor">@color/core_grey_60</item>
@@ -85,4 +85,14 @@
 
     <style name="Signal.ConversationSettings.WindowAnimation" parent="android:style/Animation" >
     </style>
+
+    <style name="TextSecure.LightNoActionBar.TransparentNavigationBar">
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:enforceNavigationBarContrast" tools:ignore="NewApi">false</item>
+    </style>
+
+    <style name="TextSecure.DarkNoActionBar.TransparentNavigationBar">
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:enforceNavigationBarContrast" tools:ignore="NewApi">false</item>
+    </style>
 </resources>
diff --git a/app/src/main/res/values/light_themes.xml b/app/src/main/res/values/light_themes.xml
index 6eec2eb742..a001a78091 100644
--- a/app/src/main/res/values/light_themes.xml
+++ b/app/src/main/res/values/light_themes.xml
@@ -5,6 +5,8 @@
 
     <style name="Signal.DayNight.NoActionBar" parent="TextSecure.LightNoActionBar" />
 
+    <style name="Signal.DayNight.NoActionBar.TransparentNavigationBar" parent="TextSecure.LightNoActionBar.TransparentNavigationBar" />
+
     <style name="Signal.DayNight.Invite" parent="Signal.Light.NoActionBar.Invite" />
 
     <style name="Signal.DayNight.IntroTheme" parent="TextSecure.LightIntroTheme" />
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 9605c8b79a..7607fd2d94 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -20,6 +20,14 @@
         <!-- leave empty to allow overriding -->
     </style>
 
+    <style name="TextSecure.LightNoActionBar.TransparentNavigationBar">
+        <!-- leave empty to allow overriding -->
+    </style>
+
+    <style name="TextSecure.DarkNoActionBar.TransparentNavigationBar">
+        <!-- leave empty to allow overriding -->
+    </style>
+
     <style name="TextSecure.BaseLightNoActionBar" parent="@style/TextSecure.LightTheme">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>