diff --git a/app/src/main/res/color-v23/colored_button.xml b/app/src/main/res/color-v23/colored_button.xml
new file mode 100644
index 000000000..fce774b1a
--- /dev/null
+++ b/app/src/main/res/color-v23/colored_button.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:alpha="0.08" android:color="?attr/elevationOverlayColor" />
+</selector>
diff --git a/app/src/main/res/color/colored_button.xml b/app/src/main/res/color/colored_button.xml
new file mode 100644
index 000000000..a585251c3
--- /dev/null
+++ b/app/src/main/res/color/colored_button.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:alpha="0.08" android:color="@color/kotatsu_onSurface" />
+</selector>
diff --git a/app/src/main/res/drawable/toolbar_background.xml b/app/src/main/res/drawable/toolbar_background.xml
index 9869007c6..32b28bd70 100644
--- a/app/src/main/res/drawable/toolbar_background.xml
+++ b/app/src/main/res/drawable/toolbar_background.xml
@@ -2,6 +2,6 @@
 <shape
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:shape="rectangle">
-	<solid android:color="@color/toolbar_background_scrim" />
+	<solid android:color="@color/colored_button" />
 	<corners android:radius="100dp" />
 </shape>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 841f36517..9d48d40aa 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -164,9 +164,10 @@
 		<item name="iconGravity">start</item>
 		<item name="android:insetTop">2dp</item>
 		<item name="android:insetBottom">2dp</item>
-		<item name="iconTint">?attr/colorSecondary</item>
+		<item name="iconTint">?attr/colorPrimaryDark</item>
 		<item name="android:gravity">start|center_vertical</item>
 		<item name="android:textAppearance">?textAppearanceButton</item>
+		<item name="backgroundTint">@color/colored_button</item>
 	</style>
 
 	<style name="Widget.Kotatsu.TextView.Indicator" parent="Widget.MaterialComponents.TextView">