diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportDoneFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportDoneFragment.java
index 2dda2d609..1b7e9f01c 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportDoneFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportDoneFragment.java
@@ -34,7 +34,6 @@ import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.imageloader.ViewImageLoader;
 import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
-import me.grishka.appkit.utils.CubicBezierInterpolator;
 import me.grishka.appkit.utils.V;
 
 public class ReportDoneFragment extends MastodonToolbarFragment{
diff --git a/mastodon/src/main/res/drawable/bg_button_m3_tonal.xml b/mastodon/src/main/res/drawable/bg_button_m3_tonal.xml
index e529cc6a6..4d731c481 100644
--- a/mastodon/src/main/res/drawable/bg_button_m3_tonal.xml
+++ b/mastodon/src/main/res/drawable/bg_button_m3_tonal.xml
@@ -3,19 +3,13 @@
 	android:color="@color/m3_primary_overlay">
 	<item android:gravity="center_vertical" android:height="40dp">
 		<selector>
-			<item android:state_enabled="true" android:state_selected="true">
+			<item android:state_enabled="true">
 				<shape>
 					<solid android:color="?colorM3SecondaryContainer"/>
 					<corners android:radius="20dp"/>
 				</shape>
 			</item>
-			<item android:state_selected="false">
-				<shape>
-					<stroke android:color="@color/m3_on_surface_overlay" android:width="1dp"/>
-					<corners android:radius="20dp"/>
-				</shape>
-			</item>
-			<item android:state_enabled="false">
+			<item>
 				<shape>
 					<solid android:color="?colorM3DisabledBackground"/>
 					<corners android:radius="20dp"/>
diff --git a/mastodon/src/main/res/drawable/bg_button_m3_tonal_circle.xml b/mastodon/src/main/res/drawable/bg_button_m3_tonal_circle.xml
index 82140c91f..ac0c9dbe2 100644
--- a/mastodon/src/main/res/drawable/bg_button_m3_tonal_circle.xml
+++ b/mastodon/src/main/res/drawable/bg_button_m3_tonal_circle.xml
@@ -3,19 +3,13 @@
 	android:color="@color/m3_primary_overlay">
 	<item android:gravity="center" android:height="40dp" android:width="40dp">
 		<selector>
-			<item android:state_enabled="true" android:state_selected="true">
+			<item android:state_enabled="true">
 				<shape>
 					<solid android:color="?colorM3SecondaryContainer"/>
 					<corners android:radius="20dp"/>
 				</shape>
 			</item>
-			<item android:state_selected="false">
-				<shape>
-					<stroke android:color="@color/m3_on_surface_overlay" android:width="1dp"/>
-					<corners android:radius="20dp"/>
-				</shape>
-			</item>
-			<item android:state_enabled="false">
+			<item>
 				<shape>
 					<solid android:color="?colorM3DisabledBackground"/>
 					<corners android:radius="20dp"/>
diff --git a/mastodon/src/main/res/drawable/bg_button_m3_tonal_circle_selector.xml b/mastodon/src/main/res/drawable/bg_button_m3_tonal_circle_selector.xml
new file mode 100644
index 000000000..82140c91f
--- /dev/null
+++ b/mastodon/src/main/res/drawable/bg_button_m3_tonal_circle_selector.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+	android:color="@color/m3_primary_overlay">
+	<item android:gravity="center" android:height="40dp" android:width="40dp">
+		<selector>
+			<item android:state_enabled="true" android:state_selected="true">
+				<shape>
+					<solid android:color="?colorM3SecondaryContainer"/>
+					<corners android:radius="20dp"/>
+				</shape>
+			</item>
+			<item android:state_selected="false">
+				<shape>
+					<stroke android:color="@color/m3_on_surface_overlay" android:width="1dp"/>
+					<corners android:radius="20dp"/>
+				</shape>
+			</item>
+			<item android:state_enabled="false">
+				<shape>
+					<solid android:color="?colorM3DisabledBackground"/>
+					<corners android:radius="20dp"/>
+				</shape>
+			</item>
+		</selector>
+	</item>
+	<item android:id="@android:id/mask" android:gravity="center" android:height="40dp" android:width="40dp">
+		<shape>
+			<solid android:color="#000"/>
+			<corners android:radius="20dp"/>
+		</shape>
+	</item>
+</ripple>
diff --git a/mastodon/src/main/res/drawable/bg_button_m3_tonal_selector.xml b/mastodon/src/main/res/drawable/bg_button_m3_tonal_selector.xml
new file mode 100644
index 000000000..e529cc6a6
--- /dev/null
+++ b/mastodon/src/main/res/drawable/bg_button_m3_tonal_selector.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+	android:color="@color/m3_primary_overlay">
+	<item android:gravity="center_vertical" android:height="40dp">
+		<selector>
+			<item android:state_enabled="true" android:state_selected="true">
+				<shape>
+					<solid android:color="?colorM3SecondaryContainer"/>
+					<corners android:radius="20dp"/>
+				</shape>
+			</item>
+			<item android:state_selected="false">
+				<shape>
+					<stroke android:color="@color/m3_on_surface_overlay" android:width="1dp"/>
+					<corners android:radius="20dp"/>
+				</shape>
+			</item>
+			<item android:state_enabled="false">
+				<shape>
+					<solid android:color="?colorM3DisabledBackground"/>
+					<corners android:radius="20dp"/>
+				</shape>
+			</item>
+		</selector>
+	</item>
+	<item android:id="@android:id/mask" android:gravity="center_vertical" android:height="40dp">
+		<shape>
+			<solid android:color="#000"/>
+			<corners android:radius="20dp"/>
+		</shape>
+	</item>
+</ripple>
diff --git a/mastodon/src/main/res/layout/display_item_emoji_reactions.xml b/mastodon/src/main/res/layout/display_item_emoji_reactions.xml
index a6627ba8c..3479357d5 100644
--- a/mastodon/src/main/res/layout/display_item_emoji_reactions.xml
+++ b/mastodon/src/main/res/layout/display_item_emoji_reactions.xml
@@ -30,7 +30,7 @@
 				android:layout_height="wrap_content"
 				android:minHeight="48dp"
 				android:minWidth="48dp"
-				android:background="@drawable/bg_button_m3_tonal_circle"
+				android:background="@drawable/bg_button_m3_tonal_circle_selector"
 				android:tooltipText="@string/sk_button_react"
 				android:contentDescription="@string/sk_button_react"
 				android:src="@drawable/ic_fluent_add_24_filled" />
diff --git a/mastodon/src/main/res/layout/edit_timeline.xml b/mastodon/src/main/res/layout/edit_timeline.xml
index 31db6543d..d754d28e5 100644
--- a/mastodon/src/main/res/layout/edit_timeline.xml
+++ b/mastodon/src/main/res/layout/edit_timeline.xml
@@ -49,7 +49,7 @@
 		<Button
 			android:id="@+id/advanced"
 			style="@style/Widget.Mastodon.M3.Button.Outlined"
-			android:background="@drawable/bg_button_m3_tonal"
+			android:background="@drawable/bg_button_m3_tonal_selector"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_marginHorizontal="24dp"
diff --git a/mastodon/src/main/res/layout/fragment_compose.xml b/mastodon/src/main/res/layout/fragment_compose.xml
index fa0c628fe..a49f90834 100644
--- a/mastodon/src/main/res/layout/fragment_compose.xml
+++ b/mastodon/src/main/res/layout/fragment_compose.xml
@@ -366,6 +366,7 @@
 
 				<Button
 					style="@style/Widget.Mastodon.M3.Button.Tonal.Icon"
+					android:background="@drawable/bg_button_m3_tonal_selector"
 					android:id="@+id/sensitive_item"
 					android:orientation="horizontal"
 					android:layout_width="wrap_content"
diff --git a/mastodon/src/main/res/layout/fragment_profile.xml b/mastodon/src/main/res/layout/fragment_profile.xml
index 67b7884e2..e79bdc0f2 100644
--- a/mastodon/src/main/res/layout/fragment_profile.xml
+++ b/mastodon/src/main/res/layout/fragment_profile.xml
@@ -93,7 +93,7 @@
 								android:layout_width="48dp"
 								android:layout_height="48dp"
 								style="@style/Widget.Mastodon.M3.Button.Tonal"
-								android:background="@drawable/bg_button_m3_tonal_circle"
+								android:background="@drawable/bg_button_m3_tonal_circle_selector"
 								android:paddingStart="12dp"
 								android:drawableStart="@drawable/ic_fluent_alert_24_selector" />
 
diff --git a/mastodon/src/main/res/layout/item_emoji_reaction.xml b/mastodon/src/main/res/layout/item_emoji_reaction.xml
index 4108df4ad..b5e9882c4 100644
--- a/mastodon/src/main/res/layout/item_emoji_reaction.xml
+++ b/mastodon/src/main/res/layout/item_emoji_reaction.xml
@@ -23,5 +23,5 @@
 		android:layout_marginEnd="8dp"
 		android:drawableTint="@null"
 		android:drawableStart="@drawable/image_placeholder"
-		android:background="@drawable/bg_button_m3_tonal"/>
+		android:background="@drawable/bg_button_m3_tonal_selector"/>
 </FrameLayout>