diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java b/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java
index 58a90bdf0..fdd34a138 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java
@@ -329,11 +329,11 @@ public class InputPanel extends LinearLayout
     final int textHintColor;
 
     if (enabled) {
-      iconTint = getContext().getResources().getColor(R.color.signal_colorNeutralInverse);
-      textColor = getContext().getResources().getColor(R.color.signal_colorNeutralInverse);
-      textHintColor = getContext().getResources().getColor(R.color.signal_colorNeutralVariantInverse);
+      iconTint = getContext().getResources().getColor(R.color.signal_colorOnSurface);
+      textColor = getContext().getResources().getColor(R.color.signal_colorOnSurface);
+      textHintColor = getContext().getResources().getColor(R.color.signal_colorOnSurfaceVariant);
 
-      setBackground(new ColorDrawable(getContext().getResources().getColor(R.color.wallpaper_compose_background)));
+      setBackground(null);
       composeContainer.setBackground(Objects.requireNonNull(ContextCompat.getDrawable(getContext(), R.drawable.compose_background_wallpaper)));
       quickAudioToggle.setColorFilter(iconTint);
       quickCameraToggle.setColorFilter(iconTint);
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 8dba0e50e..1b33f01d4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
@@ -2277,6 +2277,8 @@ public class ConversationParentFragment extends Fragment
       toolbar.setTitleTextColor(toolbarTextAndIconColor);
       setToolbarActionItemTint(toolbar, toolbarTextAndIconColor);
 
+      WindowUtil.setNavigationBarColor(requireActivity().getWindow(), 0);
+      WindowUtil.setLightNavigationBar(requireActivity().getWindow());
     } else {
       wallpaper.setImageDrawable(null);
       wallpaperDim.setVisibility(View.GONE);
@@ -2289,6 +2291,9 @@ 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/res/drawable-night/compose_background_wallpaper.xml b/app/src/main/res/drawable-night/compose_background_wallpaper.xml
deleted file mode 100644
index 5303a3085..000000000
--- a/app/src/main/res/drawable-night/compose_background_wallpaper.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid
-        android:color="@color/signal_colorTransparent1" />
-
-    <corners
-        android:radius="20dp" />
-
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/compose_background_wallpaper.xml b/app/src/main/res/drawable/compose_background_wallpaper.xml
index 8ccc5c626..8d8069c39 100644
--- a/app/src/main/res/drawable/compose_background_wallpaper.xml
+++ b/app/src/main/res/drawable/compose_background_wallpaper.xml
@@ -4,7 +4,7 @@
     android:shape="rectangle">
 
     <solid
-        android:color="@color/signal_colorTransparent5" />
+        android:color="@color/conversation_item_recv_bubble_color_wallpaper" />
 
     <corners
         android:radius="20dp" />
diff --git a/app/src/main/res/values-night/dark_colors.xml b/app/src/main/res/values-night/dark_colors.xml
index ed48d6b07..78e2d4377 100644
--- a/app/src/main/res/values-night/dark_colors.xml
+++ b/app/src/main/res/values-night/dark_colors.xml
@@ -86,7 +86,7 @@
     <color name="conversation_item_recv_icon_color">@color/core_grey_25</color>
     <color name="conversation_item_quote_text_color">@color/core_grey_05</color>
     <color name="conversation_item_recv_bubble_color_normal">@color/signal_colorSurfaceVariant</color>
-    <color name="conversation_item_recv_bubble_color_wallpaper">@color/signal_colorNeutral</color>
+    <color name="conversation_item_recv_bubble_color_wallpaper">#242424</color>
     <color name="conversation_item_outgoing_audio_foreground_tint">@color/signal_colorNeutralInverse</color>
     <color name="conversation_item_incoming_audio_foreground_tint_normal">@color/signal_colorOnSurface</color>
     <color name="conversation_item_incoming_audio_foreground_tint_wallpaper">@color/signal_colorNeutralInverse</color>