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 207f88a5e..1dbb1d018 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.DynamicNoActionBarTransparentNavigationBarTheme
+import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme
 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 = DynamicNoActionBarTransparentNavigationBarTheme()
+  private val dynamicTheme: DynamicTheme = DynamicNoActionBarTheme()
   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 21d673211..4d1ccce55 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
@@ -2281,6 +2281,7 @@ public class ConversationParentFragment extends Fragment
       int toolbarTextAndIconColor = getResources().getColor(R.color.signal_colorNeutralInverse);
       toolbar.setTitleTextColor(toolbarTextAndIconColor);
       setToolbarActionItemTint(toolbar, toolbarTextAndIconColor);
+      WindowUtil.setNavigationBarColor(requireActivity().getWindow(), getResources().getColor(R.color.conversation_navigation_wallpaper));
     } else {
       wallpaper.setImageDrawable(null);
       wallpaperDim.setVisibility(View.GONE);
@@ -2293,6 +2294,7 @@ public class ConversationParentFragment extends Fragment
       int toolbarTextAndIconColor = getResources().getColor(R.color.signal_colorOnSurface);
       toolbar.setTitleTextColor(toolbarTextAndIconColor);
       setToolbarActionItemTint(toolbar, toolbarTextAndIconColor);
+      WindowUtil.setNavigationBarColor(requireActivity().getWindow(), getResources().getColor(R.color.signal_colorBackground));
     }
     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
deleted file mode 100644
index dbca773a1..000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/util/DynamicNoActionBarTransparentNavigationBarTheme.java
+++ /dev/null
@@ -1,12 +0,0 @@
-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_colors.xml b/app/src/main/res/values-night/dark_colors.xml
index 78e2d4377..bf6744e66 100644
--- a/app/src/main/res/values-night/dark_colors.xml
+++ b/app/src/main/res/values-night/dark_colors.xml
@@ -102,6 +102,7 @@
     <color name="conversation_item_sent_view_once_opened">@color/transparent_white_80</color>
     <color name="conversation_typing_indicator_foreground_tint_normal">@color/signal_colorOnSurfaceVariant</color>
     <color name="conversation_typing_indicator_foreground_tint_wallpaper">@color/signal_colorNeutralVariantInverse</color>
+    <color name="conversation_navigation_wallpaper">#80000000</color>
 
     <color name="wallpaper_bubble_color">@color/signal_colorTransparentInverse4</color>
 
diff --git a/app/src/main/res/values/light_colors.xml b/app/src/main/res/values/light_colors.xml
index b07e82e58..3c76b3eb1 100644
--- a/app/src/main/res/values/light_colors.xml
+++ b/app/src/main/res/values/light_colors.xml
@@ -104,6 +104,7 @@
     <color name="conversation_item_sent_view_once_opened">@color/transparent_white_90</color>
     <color name="conversation_typing_indicator_foreground_tint_normal">@color/signal_colorOnSurfaceVariant</color>
     <color name="conversation_typing_indicator_foreground_tint_wallpaper">@color/signal_colorNeutralVariantInverse</color>
+    <color name="conversation_navigation_wallpaper">#80FFFFFF</color>
 
     <color name="wallpaper_bubble_color">@color/signal_colorTransparent4</color>
     <color name="sticky_header_foreground_wallpaper">@color/signal_colorNeutralVariantInverse</color>