diff --git a/mastodon/src/main/res/values/attrs.xml b/mastodon/src/main/res/values/attrs.xml
index 64a7ba199..d7c044fe5 100644
--- a/mastodon/src/main/res/values/attrs.xml
+++ b/mastodon/src/main/res/values/attrs.xml
@@ -17,6 +17,7 @@
 	<attr name="colorTabInactive" format="color"/>
 	<attr name="colorAccentLightest" format="color"/>
 	<attr name="profileHeaderBackground" format="color"/>
+	<attr name="toolbarBackground" format="color"/>
 
 	<attr name="colorButtonBackgroundPrimaryDarkOnLight" format="color"/>
 	<attr name="colorButtonBackgroundPrimaryDarkOnLightDisabled" format="color"/>
diff --git a/mastodon/src/main/res/values/palettes.xml b/mastodon/src/main/res/values/palettes.xml
index 77a7c416f..6bc8eb36c 100644
--- a/mastodon/src/main/res/values/palettes.xml
+++ b/mastodon/src/main/res/values/palettes.xml
@@ -84,7 +84,7 @@
 		<item name="colorBackgroundLightest">?colorGray900</item>
 		<item name="android:colorBackground">?colorGray800</item>
 		<item name="android:statusBarColor">?colorGray900</item>
-		<item name="android:navigationBarColor">?colorGray900</item>
+		<item name="toolbarBackground">?colorGray900</item>
 	</style>
 
 	<style name="ColorPalette.Pink">
diff --git a/mastodon/src/main/res/values/styles.xml b/mastodon/src/main/res/values/styles.xml
index c03f83788..d4bffc103 100644
--- a/mastodon/src/main/res/values/styles.xml
+++ b/mastodon/src/main/res/values/styles.xml
@@ -37,6 +37,7 @@
 		<item name="colorTabInactive">?colorGray400</item>
 		<item name="colorAccentLightest">?colorPrimary100</item>
 		<item name="profileHeaderBackground">?colorGray500</item>
+		<item name="toolbarBackground">?colorGray50</item>
 
 		<item name="buttonBackground">@drawable/bg_button_primary_dark_on_light</item>
 		<item name="android:editTextBackground">@drawable/bg_edittext_light</item>
@@ -112,6 +113,7 @@
 		<item name="profileHeaderBackground">?colorWindowBackground</item>
 		<item name="colorSearchField">?colorGray700</item>
 		<item name="colorSearchHint">?colorGray300</item>
+		<item name="toolbarBackground">?colorGray800</item>
 
 		<item name="buttonBackground">@drawable/bg_button_primary_light_on_dark</item>
 		<item name="android:editTextBackground">@drawable/bg_edittext_dark</item>
@@ -170,14 +172,14 @@
 	<style name="Theme.Mastodon.AutoLightDark.TrueBlack" parent="Theme.Mastodon.Light"/>
 
 	<style name="Theme.Mastodon.Toolbar" parent="android:ThemeOverlay.Material.ActionBar">
-		<item name="android:colorPrimary">?colorGray50</item>
+		<item name="android:colorPrimary">?toolbarBackground</item>
 		<item name="android:toolbarStyle">@style/Widget.Mastodon.Toolbar</item>
 		<item name="android:textColorPrimary">?colorGray800</item>
 		<item name="android:textColorSecondary">?colorGray800</item>
 	</style>
 
 	<style name="Theme.Mastodon.Toolbar.Dark" parent="android:ThemeOverlay.Material.Dark.ActionBar">
-		<item name="android:colorPrimary">?colorGray800</item>
+		<item name="android:colorPrimary">?toolbarBackground</item>
 		<item name="android:textColorPrimary">?colorGray50</item>
 		<item name="android:textColorSecondary">?colorGray50</item>
 		<item name="android:toolbarStyle">@style/Widget.Mastodon.Toolbar</item>