diff --git a/mastodon/src/main/res/color/button_bg_primary_dark_on_light.xml b/mastodon/src/main/res/color/button_bg_primary_dark_on_light.xml
index a7b7babb4..c1fc97e0c 100644
--- a/mastodon/src/main/res/color/button_bg_primary_dark_on_light.xml
+++ b/mastodon/src/main/res/color/button_bg_primary_dark_on_light.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?android:colorPrimary" android:state_enabled="true"/>
-	<item android:color="?colorPollVoted"/>
+	<item android:color="?attr/colorButtonBackgroundPrimaryDarkOnLight" android:state_enabled="true"/>
+	<item android:color="?colorButtonBackgroundPrimaryDarkOnLightDisabled"/>
 </selector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/color/button_bg_primary_light_on_dark.xml b/mastodon/src/main/res/color/button_bg_primary_light_on_dark.xml
index df4f68ca9..f61fab9d4 100644
--- a/mastodon/src/main/res/color/button_bg_primary_light_on_dark.xml
+++ b/mastodon/src/main/res/color/button_bg_primary_light_on_dark.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?colorSecondary" android:state_enabled="true"/>
-	<item android:color="?colorPollVoted"/>
+	<item android:color="?colorButtonBackgroundPrimaryLightOnDark" android:state_enabled="true"/>
+	<item android:color="?colorButtonBackgroundPrimaryLightOnDarkDisabled"/>
 </selector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/color/button_bg_secondary_dark_on_light.xml b/mastodon/src/main/res/color/button_bg_secondary_dark_on_light.xml
index 79fd46559..33d3feb47 100644
--- a/mastodon/src/main/res/color/button_bg_secondary_dark_on_light.xml
+++ b/mastodon/src/main/res/color/button_bg_secondary_dark_on_light.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="@color/gray_25" android:state_enabled="true"/>
-	<item android:color="@color/gray_100"/>
+	<item android:color="?colorButtonBackgroundSecondaryDarkOnLight" android:state_enabled="true"/>
+	<item android:color="?colorButtonBackgroundSecondaryDarkOnLightDisabled"/>
 </selector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/color/button_bg_secondary_light_on_dark.xml b/mastodon/src/main/res/color/button_bg_secondary_light_on_dark.xml
index 57093c355..8fb77f290 100644
--- a/mastodon/src/main/res/color/button_bg_secondary_light_on_dark.xml
+++ b/mastodon/src/main/res/color/button_bg_secondary_light_on_dark.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?colorPollVoted" android:state_enabled="true"/>
-	<item android:color="?colorSearchHint"/>
+	<item android:color="?colorButtonBackgroundSecondaryLightOnDark" android:state_enabled="true"/>
+	<item android:color="?colorButtonBackgroundSecondaryLightOnDarkDisabled"/>
 </selector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/color/button_text_primary_dark_on_light.xml b/mastodon/src/main/res/color/button_text_primary_dark_on_light.xml
index 731181a08..0773dde12 100644
--- a/mastodon/src/main/res/color/button_text_primary_dark_on_light.xml
+++ b/mastodon/src/main/res/color/button_text_primary_dark_on_light.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="@color/gray_50" android:state_enabled="true"/>
-	<item android:color="?colorTabInactive"/>
+	<item android:color="?colorButtonTextPrimaryDarkOnLight" android:state_enabled="true"/>
+	<item android:color="?colorButtonTextPrimaryDarkOnLightDisabled"/>
 </selector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/color/button_text_primary_light_on_dark.xml b/mastodon/src/main/res/color/button_text_primary_light_on_dark.xml
index 685841e0a..407b98234 100644
--- a/mastodon/src/main/res/color/button_text_primary_light_on_dark.xml
+++ b/mastodon/src/main/res/color/button_text_primary_light_on_dark.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="@color/gray_800" android:state_enabled="true"/>
-	<item android:color="?colorTabInactive"/>
+	<item android:color="?colorButtonTextPrimaryLightOnDark" android:state_enabled="true"/>
+	<item android:color="?colorButtonTextPrimaryLightOnDarkDisabled"/>
 </selector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/color/button_text_secondary_dark_on_light.xml b/mastodon/src/main/res/color/button_text_secondary_dark_on_light.xml
index 131384b06..a8cbd7677 100644
--- a/mastodon/src/main/res/color/button_text_secondary_dark_on_light.xml
+++ b/mastodon/src/main/res/color/button_text_secondary_dark_on_light.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?android:colorPrimary" android:state_enabled="true"/>
-	<item android:color="?colorTabInactive"/>
+	<item android:color="?colorButtonTextSecondaryDarkOnLight" android:state_enabled="true"/>
+	<item android:color="?colorButtonTextSecondaryDarkOnLightDisabled"/>
 </selector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/color/button_text_secondary_light_on_dark.xml b/mastodon/src/main/res/color/button_text_secondary_light_on_dark.xml
index 6393e4041..4a6b1e796 100644
--- a/mastodon/src/main/res/color/button_text_secondary_light_on_dark.xml
+++ b/mastodon/src/main/res/color/button_text_secondary_light_on_dark.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?colorSecondary"/>
+	<item android:color="@color/gray_50"/>
 </selector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values/attrs.xml b/mastodon/src/main/res/values/attrs.xml
index abc05a969..602607e09 100644
--- a/mastodon/src/main/res/values/attrs.xml
+++ b/mastodon/src/main/res/values/attrs.xml
@@ -17,6 +17,26 @@
 	<attr name="colorTabInactive" format="color"/>
 	<attr name="colorAccentLightest" format="color"/>
 	<attr name="profileHeaderBackground" format="color"/>
+
+	<attr name="colorButtonBackgroundPrimaryDarkOnLight" format="color"/>
+	<attr name="colorButtonBackgroundPrimaryDarkOnLightDisabled" format="color"/>
+	<attr name="colorButtonTextPrimaryDarkOnLight" format="color"/>
+	<attr name="colorButtonTextPrimaryDarkOnLightDisabled" format="color"/>
+
+	<attr name="colorButtonBackgroundPrimaryLightOnDark" format="color"/>
+	<attr name="colorButtonBackgroundPrimaryLightOnDarkDisabled" format="color"/>
+	<attr name="colorButtonTextPrimaryLightOnDark" format="color"/>
+	<attr name="colorButtonTextPrimaryLightOnDarkDisabled" format="color"/>
+
+	<attr name="colorButtonBackgroundSecondaryDarkOnLight" format="color"/>
+	<attr name="colorButtonBackgroundSecondaryDarkOnLightDisabled" format="color"/>
+	<attr name="colorButtonTextSecondaryDarkOnLight" format="color"/>
+	<attr name="colorButtonTextSecondaryDarkOnLightDisabled" format="color"/>
+
+	<attr name="colorButtonBackgroundSecondaryLightOnDark" format="color"/>
+	<attr name="colorButtonBackgroundSecondaryLightOnDarkDisabled" format="color"/>
+	<attr name="colorButtonTextSecondaryLightOnDark" format="color"/>
+	<attr name="colorButtonTextSecondaryLightOnDarkDisabled" format="color"/>
 	
 	<attr name="colorM3Primary" format="color"/>
 	<attr name="colorM3OnPrimary" format="color"/>
diff --git a/mastodon/src/main/res/values/styles.xml b/mastodon/src/main/res/values/styles.xml
index 472753f75..5a9095440 100644
--- a/mastodon/src/main/res/values/styles.xml
+++ b/mastodon/src/main/res/values/styles.xml
@@ -38,6 +38,27 @@
 		<item name="colorAccentLightest">@color/primary_100</item>
 		<item name="profileHeaderBackground">@color/gray_500</item>
 
+		<!-- colors for button_bg|text_primary|secondary_dark|light_on_light|dark.xml -->
+		<item name="colorButtonBackgroundPrimaryDarkOnLight">@color/gray_800</item>
+		<item name="colorButtonBackgroundPrimaryDarkOnLightDisabled">@color/gray_300</item>
+		<item name="colorButtonTextPrimaryDarkOnLight">@color/gray_50</item>
+		<item name="colorButtonTextPrimaryDarkOnLightDisabled">@color/gray_400</item>
+
+		<item name="colorButtonBackgroundPrimaryLightOnDark">@color/gray_100</item>
+		<item name="colorButtonBackgroundPrimaryLightOnDarkDisabled">@color/gray_800</item>
+		<item name="colorButtonTextPrimaryLightOnDark">@color/gray_800</item>
+		<item name="colorButtonTextPrimaryLightOnDarkDisabled">@color/gray_400</item>
+
+		<item name="colorButtonBackgroundSecondaryDarkOnLight">@color/gray_25</item>
+		<item name="colorButtonBackgroundSecondaryDarkOnLightDisabled">@color/gray_100</item>
+		<item name="colorButtonTextSecondaryDarkOnLight">?colorButtonTextPrimaryLightOnDark</item>
+		<item name="colorButtonTextSecondaryDarkOnLightDisabled">?colorButtonTextPrimaryLightOnDarkDisabled</item>
+
+		<item name="colorButtonBackgroundSecondaryLightOnDark">@color/gray_600</item>
+		<item name="colorButtonBackgroundSecondaryLightOnDarkDisabled">@color/gray_300</item>
+		<item name="colorButtonTextSecondaryLightOnDark">?colorButtonTextPrimaryDarkOnLight</item>
+		<item name="colorButtonTextSecondaryLightOnDarkDisabled">?colorButtonTextPrimaryDarkOnLightDisabled</item>
+
 		<item name="buttonBackground">@drawable/bg_button_primary_dark_on_light</item>
 		<item name="android:editTextBackground">@drawable/bg_edittext_light</item>
 
@@ -111,6 +132,27 @@
 		<item name="colorSearchField">@color/gray_700</item>
 		<item name="colorSearchHint">@color/gray_300</item>
 
+		<!-- colors for button_bg|text_primary|secondary_dark|light_on_light|dark.xml -->
+		<item name="colorButtonBackgroundPrimaryDarkOnLight">@color/gray_800</item>
+		<item name="colorButtonBackgroundPrimaryDarkOnLightDisabled">@color/gray_300</item>
+		<item name="colorButtonTextPrimaryDarkOnLight">@color/gray_50</item>
+		<item name="colorButtonTextPrimaryDarkOnLightDisabled">@color/gray_400</item>
+
+		<item name="colorButtonBackgroundPrimaryLightOnDark">@color/gray_100</item>
+		<item name="colorButtonBackgroundPrimaryLightOnDarkDisabled">@color/gray_800</item>
+		<item name="colorButtonTextPrimaryLightOnDark">@color/gray_800</item>
+		<item name="colorButtonTextPrimaryLightOnDarkDisabled">@color/gray_400</item>
+
+		<item name="colorButtonBackgroundSecondaryDarkOnLight">@color/gray_25</item>
+		<item name="colorButtonBackgroundSecondaryDarkOnLightDisabled">@color/gray_100</item>
+		<item name="colorButtonTextSecondaryDarkOnLight">?colorButtonTextPrimaryLightOnDark</item>
+		<item name="colorButtonTextSecondaryDarkOnLightDisabled">?colorButtonTextPrimaryLightOnDarkDisabled</item>
+
+		<item name="colorButtonBackgroundSecondaryLightOnDark">@color/gray_600</item>
+		<item name="colorButtonBackgroundSecondaryLightOnDarkDisabled">@color/gray_300</item>
+		<item name="colorButtonTextSecondaryLightOnDark">?colorButtonTextPrimaryDarkOnLight</item>
+		<item name="colorButtonTextSecondaryLightOnDarkDisabled">?colorButtonTextPrimaryDarkOnLightDisabled</item>
+
 		<item name="buttonBackground">@drawable/bg_button_primary_light_on_dark</item>
 		<item name="android:editTextBackground">@drawable/bg_edittext_dark</item>
 
@@ -230,6 +272,27 @@
 		<item name="colorTabInactive">@color/m3_gray_400</item>
 		<item name="colorAccentLightest">@color/m3_primary_100</item>
 		<item name="colorSecondary">@color/m3_gray_50</item>
+
+		<!-- colors for button_bg|text_primary|secondary_dark|light_on_light|dark.xml -->
+		<item name="colorButtonBackgroundPrimaryDarkOnLight">@color/m3_gray_800</item>
+		<item name="colorButtonBackgroundPrimaryDarkOnLightDisabled">@color/m3_gray_300</item>
+		<item name="colorButtonTextPrimaryDarkOnLight">@color/m3_gray_50</item>
+		<item name="colorButtonTextPrimaryDarkOnLightDisabled">@color/m3_gray_400</item>
+
+		<item name="colorButtonBackgroundPrimaryLightOnDark">@color/m3_gray_100</item>
+		<item name="colorButtonBackgroundPrimaryLightOnDarkDisabled">@color/m3_gray_800</item>
+		<item name="colorButtonTextPrimaryLightOnDark">@color/m3_gray_800</item>
+		<item name="colorButtonTextPrimaryLightOnDarkDisabled">@color/m3_gray_400</item>
+
+		<item name="colorButtonBackgroundSecondaryDarkOnLight">@color/m3_gray_25</item>
+		<item name="colorButtonBackgroundSecondaryDarkOnLightDisabled">@color/m3_gray_100</item>
+		<item name="colorButtonTextSecondaryDarkOnLight">?colorButtonTextPrimaryLightOnDark</item>
+		<item name="colorButtonTextSecondaryDarkOnLightDisabled">?colorButtonTextPrimaryLightOnDarkDisabled</item>
+
+		<item name="colorButtonBackgroundSecondaryLightOnDark">@color/m3_gray_600</item>
+		<item name="colorButtonBackgroundSecondaryLightOnDarkDisabled">@color/m3_gray_300</item>
+		<item name="colorButtonTextSecondaryLightOnDark">?colorButtonTextPrimaryDarkOnLight</item>
+		<item name="colorButtonTextSecondaryLightOnDarkDisabled">?colorButtonTextPrimaryDarkOnLightDisabled</item>
 	</style>
 
 	<style name="Theme.Mastodon.Dark.Material3" parent="Theme.Mastodon.Dark">
@@ -261,9 +324,30 @@
 
 		<!-- TODO dark colors -->
 		<item name="colorSearchField">@color/m3_gray_700</item>
+
+		<!-- colors for button_bg|text_primary|secondary_dark|light_on_light|dark.xml -->
+		<item name="colorButtonBackgroundPrimaryDarkOnLight">@color/m3_gray_800</item>
+		<item name="colorButtonBackgroundPrimaryDarkOnLightDisabled">@color/m3_gray_300</item>
+		<item name="colorButtonTextPrimaryDarkOnLight">@color/m3_gray_50</item>
+		<item name="colorButtonTextPrimaryDarkOnLightDisabled">@color/m3_gray_400</item>
+
+		<item name="colorButtonBackgroundPrimaryLightOnDark">@color/m3_gray_100</item>
+		<item name="colorButtonBackgroundPrimaryLightOnDarkDisabled">@color/m3_gray_800</item>
+		<item name="colorButtonTextPrimaryLightOnDark">@color/m3_gray_800</item>
+		<item name="colorButtonTextPrimaryLightOnDarkDisabled">@color/m3_gray_400</item>
+
+		<item name="colorButtonBackgroundSecondaryDarkOnLight">@color/m3_gray_25</item>
+		<item name="colorButtonBackgroundSecondaryDarkOnLightDisabled">@color/m3_gray_100</item>
+		<item name="colorButtonTextSecondaryDarkOnLight">?colorButtonTextPrimaryLightOnDark</item>
+		<item name="colorButtonTextSecondaryDarkOnLightDisabled">?colorButtonTextPrimaryLightOnDarkDisabled</item>
+
+		<item name="colorButtonBackgroundSecondaryLightOnDark">@color/m3_gray_600</item>
+		<item name="colorButtonBackgroundSecondaryLightOnDarkDisabled">@color/m3_gray_300</item>
+		<item name="colorButtonTextSecondaryLightOnDark">?colorButtonTextPrimaryDarkOnLight</item>
+		<item name="colorButtonTextSecondaryLightOnDarkDisabled">?colorButtonTextPrimaryDarkOnLightDisabled</item>
 	</style>
 
-	<style name="Theme.Mastodon.Dark.TrueBlack.Material3">
+	<style name="Theme.Mastodon.Dark.TrueBlack.Material3" parent="Theme.Mastodon.Dark.Material3">
 		<item name="android:colorAccent">@color/m3_primary_400</item>
 		<item name="colorPollMostVoted">@color/m3_primary_700</item>
 		<item name="colorAccentLight">@color/m3_primary_600</item>