diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
index ab981e646..85c89f1a1 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
@@ -894,6 +894,7 @@ public class HomeTimelineFragment extends StatusListFragment implements ToolbarD
 				}
 			}else{
 				smoothScrollRecyclerViewToTop(list);
+				return;
 			}
 		}else if(list.getChildViewHolder(topChild) instanceof StatusDisplayItem.Holder<?> itemHolder){
 			int postIndex;
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListMembersFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListMembersFragment.java
index 0e14a726d..fcc6ce181 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListMembersFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListMembersFragment.java
@@ -281,7 +281,7 @@ public class ListMembersFragment extends PaginatedAccountListFragment implements
 			@Override
 			public boolean onActionItemClicked(ActionMode mode, MenuItem item){
 				new M3AlertDialogBuilder(getActivity())
-						.setTitle(R.string.confirm_remove_list_members)
+						.setTitle(selectedAccounts.size()>1 ? R.string.confirm_remove_list_members : R.string.confirm_remove_list_member)
 						.setPositiveButton(R.string.remove, (dlg, which)->removeAccounts(new HashSet<>(selectedAccounts), null))
 						.setNegativeButton(R.string.cancel, null)
 						.show();
diff --git a/mastodon/src/main/res/color/m3_outline_overlay.xml b/mastodon/src/main/res/color/m3_outline_overlay.xml
new file mode 100644
index 000000000..61c37fa94
--- /dev/null
+++ b/mastodon/src/main/res/color/m3_outline_overlay.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	 <item android:color="?colorM3Outline" android:alpha="@dimen/overlay_ripple_alpha"/>
+</selector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/bg_photo_viewer_action.xml b/mastodon/src/main/res/drawable/bg_photo_viewer_action.xml
new file mode 100644
index 000000000..2e680c930
--- /dev/null
+++ b/mastodon/src/main/res/drawable/bg_photo_viewer_action.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:width="24dp" android:height="24dp" android:gravity="start|center_vertical" android:start="6dp">
+		<ripple android:color="@color/m3_white_overlay"/>
+	</item>
+</layer-list>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/bg_photo_viewer_action_centered.xml b/mastodon/src/main/res/drawable/bg_photo_viewer_action_centered.xml
new file mode 100644
index 000000000..3428bd8cb
--- /dev/null
+++ b/mastodon/src/main/res/drawable/bg_photo_viewer_action_centered.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:width="24dp" android:height="24dp" android:gravity="center">
+		<ripple android:color="@color/m3_white_overlay"/>
+	</item>
+</layer-list>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/bg_status_action.xml b/mastodon/src/main/res/drawable/bg_status_action.xml
new file mode 100644
index 000000000..c2261d1e3
--- /dev/null
+++ b/mastodon/src/main/res/drawable/bg_status_action.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:width="24dp" android:height="24dp" android:gravity="start|center_vertical" android:start="6dp">
+		<ripple android:color="@color/m3_outline_overlay"/>
+	</item>
+</layer-list>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/bg_status_action_centered.xml b/mastodon/src/main/res/drawable/bg_status_action_centered.xml
new file mode 100644
index 000000000..552a561f9
--- /dev/null
+++ b/mastodon/src/main/res/drawable/bg_status_action_centered.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:width="24dp" android:height="24dp" android:gravity="center">
+		<ripple android:color="@color/m3_outline_overlay"/>
+	</item>
+</layer-list>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/display_item_footer.xml b/mastodon/src/main/res/layout/display_item_footer.xml
index 37d9d02e4..2358fd285 100644
--- a/mastodon/src/main/res/layout/display_item_footer.xml
+++ b/mastodon/src/main/res/layout/display_item_footer.xml
@@ -14,7 +14,7 @@
 		android:layout_height="match_parent"
 		android:layout_marginEnd="4dp"
 		android:paddingHorizontal="8dp"
-		android:background="?android:actionBarItemBackground"
+		android:background="@drawable/bg_status_action"
 		android:minWidth="64dp">
 		<TextView
 			android:id="@+id/reply"
@@ -43,7 +43,7 @@
 		android:layout_height="match_parent"
 		android:layout_marginHorizontal="4dp"
 		android:paddingHorizontal="8dp"
-		android:background="?android:actionBarItemBackground"
+		android:background="@drawable/bg_status_action"
 		android:minWidth="64dp">
 		<TextView
 			android:id="@+id/boost"
@@ -72,7 +72,7 @@
 		android:layout_height="match_parent"
 		android:layout_marginHorizontal="4dp"
 		android:paddingHorizontal="8dp"
-		android:background="?android:actionBarItemBackground"
+		android:background="@drawable/bg_status_action"
 		android:minWidth="64dp">
 		<TextView
 			android:id="@+id/favorite"
@@ -100,7 +100,7 @@
 		android:layout_height="match_parent"
 		android:layout_marginStart="4dp"
 		android:paddingHorizontal="8dp"
-		android:background="?android:actionBarItemBackground"
+		android:background="@drawable/bg_status_action_centered"
 		android:minWidth="34dp">
 		<ImageView
 			android:id="@+id/share"
diff --git a/mastodon/src/main/res/layout/photo_viewer_ui.xml b/mastodon/src/main/res/layout/photo_viewer_ui.xml
index 245790cce..0778cdd4a 100644
--- a/mastodon/src/main/res/layout/photo_viewer_ui.xml
+++ b/mastodon/src/main/res/layout/photo_viewer_ui.xml
@@ -122,7 +122,7 @@
 					android:layout_height="match_parent"
 					android:layout_marginEnd="8dp"
 					android:paddingHorizontal="8dp"
-					android:background="?android:actionBarItemBackground"
+					android:background="@drawable/bg_photo_viewer_action"
 					android:minWidth="64dp">
 					<TextView
 						android:id="@+id/reply"
@@ -145,7 +145,7 @@
 					android:layout_height="match_parent"
 					android:layout_marginEnd="8dp"
 					android:paddingHorizontal="8dp"
-					android:background="?android:actionBarItemBackground"
+					android:background="@drawable/bg_photo_viewer_action"
 					android:minWidth="64dp">
 					<TextView
 						android:id="@+id/boost"
@@ -167,7 +167,7 @@
 					android:layout_width="wrap_content"
 					android:layout_height="match_parent"
 					android:paddingHorizontal="8dp"
-					android:background="?android:actionBarItemBackground"
+					android:background="@drawable/bg_photo_viewer_action"
 					android:minWidth="64dp">
 					<TextView
 						android:id="@+id/favorite"
@@ -194,7 +194,7 @@
 					android:layout_width="wrap_content"
 					android:layout_height="match_parent"
 					android:paddingHorizontal="8dp"
-					android:background="?android:actionBarItemBackground"
+					android:background="@drawable/bg_photo_viewer_action_centered"
 					android:minWidth="34dp">
 					<ImageView
 						android:id="@+id/bookmark"
@@ -213,7 +213,7 @@
 					android:layout_width="wrap_content"
 					android:layout_height="match_parent"
 					android:paddingHorizontal="8dp"
-					android:background="?android:actionBarItemBackground"
+					android:background="@drawable/bg_photo_viewer_action_centered"
 					android:minWidth="34dp">
 					<ImageView
 						android:id="@+id/share"