diff --git a/mastodon/src/main/res/color/window_bg_alpha95.xml b/mastodon/src/main/res/color/window_bg_alpha95.xml
deleted file mode 100644
index 8ec3e9961..000000000
--- a/mastodon/src/main/res/color/window_bg_alpha95.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	 <item android:color="?colorM3Surface" android:alpha="0.95"/>
-</selector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/bg_button_m3_filled_icon.xml b/mastodon/src/main/res/drawable/bg_button_m3_filled_icon.xml
deleted file mode 100644
index 2c4ea8a12..000000000
--- a/mastodon/src/main/res/drawable/bg_button_m3_filled_icon.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<inset xmlns:android="http://schemas.android.com/apk/res/android" android:drawable="@drawable/bg_button_m3_filled" android:inset="4dp">
-</inset>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/bg_button_m3_icon_label.xml b/mastodon/src/main/res/drawable/bg_button_m3_icon_label.xml
deleted file mode 100644
index 73eec74d5..000000000
--- a/mastodon/src/main/res/drawable/bg_button_m3_icon_label.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple android:color="@color/m3_primary_overlay" xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:id="@android:id/mask">
-		 <shape>
-			   <solid android:color="#000"/>
-			   <corners android:radius="8dp"/>
-		 </shape>
-	</item>
-</ripple>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/bg_button_m3_tonal_icon.xml b/mastodon/src/main/res/drawable/bg_button_m3_tonal_icon.xml
deleted file mode 100644
index 81a9482a9..000000000
--- a/mastodon/src/main/res/drawable/bg_button_m3_tonal_icon.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<inset xmlns:android="http://schemas.android.com/apk/res/android" android:drawable="@drawable/bg_button_m3_tonal" android:inset="4dp">
-</inset>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/bg_rect_12dp_ripple.xml b/mastodon/src/main/res/drawable/bg_rect_12dp_ripple.xml
deleted file mode 100644
index f62baf8d3..000000000
--- a/mastodon/src/main/res/drawable/bg_rect_12dp_ripple.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/m3_on_surface_overlay">
-	<item android:id="@android:id/mask">
-		<shape>
-			<solid android:color="#000"/>
-			<corners android:radius="12dp"/>
-		</shape>
-	</item>
-</ripple>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/bg_rect_ripple.xml b/mastodon/src/main/res/drawable/bg_rect_ripple.xml
deleted file mode 100644
index a6322aabf..000000000
--- a/mastodon/src/main/res/drawable/bg_rect_ripple.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/m3_on_surface_overlay">
-	<item android:id="@android:id/mask">
-		<shape>
-			<solid android:color="#000"/>
-		</shape>
-	</item>
-</ripple>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/divider_inset_16dp_start.xml b/mastodon/src/main/res/drawable/divider_inset_16dp_start.xml
deleted file mode 100644
index 4b9a0fae1..000000000
--- a/mastodon/src/main/res/drawable/divider_inset_16dp_start.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:start="16dp">
-		<shape>
-			<solid android:color="?colorM3OutlineVariant"/>
-			<size android:height="0.5dp"/>
-		</shape>
-	</item>
-</layer-list>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/ic_arrow_upward_24px.xml b/mastodon/src/main/res/drawable/ic_arrow_upward_24px.xml
deleted file mode 100644
index 15d81d9d6..000000000
--- a/mastodon/src/main/res/drawable/ic_arrow_upward_24px.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M11,20V7.825L5.4,13.425L4,12L12,4L20,12L18.6,13.425L13,7.825V20Z"/>
-</vector>
diff --git a/mastodon/src/main/res/drawable/ic_bookmark_24px_selector.xml b/mastodon/src/main/res/drawable/ic_bookmark_24px_selector.xml
deleted file mode 100644
index 66792647d..000000000
--- a/mastodon/src/main/res/drawable/ic_bookmark_24px_selector.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:drawable="@drawable/ic_bookmark_fill1_24px" android:state_selected="true"/>
-	<item android:drawable="@drawable/ic_bookmark_24px"/>
-</selector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/ic_bookmark_fill1_24px.xml b/mastodon/src/main/res/drawable/ic_bookmark_fill1_24px.xml
deleted file mode 100644
index 2b286bbc1..000000000
--- a/mastodon/src/main/res/drawable/ic_bookmark_fill1_24px.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M5,21V5Q5,4.175 5.588,3.587Q6.175,3 7,3H17Q17.825,3 18.413,3.587Q19,4.175 19,5V21L12,18Z"/>
-</vector>
diff --git a/mastodon/src/main/res/drawable/ic_download_24px.xml b/mastodon/src/main/res/drawable/ic_download_24px.xml
deleted file mode 100644
index 29ecb8fc6..000000000
--- a/mastodon/src/main/res/drawable/ic_download_24px.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M6,20Q5.175,20 4.588,19.413Q4,18.825 4,18V15H6V18Q6,18 6,18Q6,18 6,18H18Q18,18 18,18Q18,18 18,18V15H20V18Q20,18.825 19.413,19.413Q18.825,20 18,20ZM12,16 L7,11 8.4,9.55 11,12.15V4H13V12.15L15.6,9.55L17,11Z"/>
-</vector>
diff --git a/mastodon/src/main/res/drawable/ic_info_fill1_24px.xml b/mastodon/src/main/res/drawable/ic_info_fill1_24px.xml
deleted file mode 100644
index 077f39342..000000000
--- a/mastodon/src/main/res/drawable/ic_info_fill1_24px.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M11,17H13V11H11ZM12,9Q12.425,9 12.713,8.712Q13,8.425 13,8Q13,7.575 12.713,7.287Q12.425,7 12,7Q11.575,7 11.288,7.287Q11,7.575 11,8Q11,8.425 11.288,8.712Q11.575,9 12,9ZM12,22Q9.925,22 8.1,21.212Q6.275,20.425 4.925,19.075Q3.575,17.725 2.788,15.9Q2,14.075 2,12Q2,9.925 2.788,8.1Q3.575,6.275 4.925,4.925Q6.275,3.575 8.1,2.787Q9.925,2 12,2Q14.075,2 15.9,2.787Q17.725,3.575 19.075,4.925Q20.425,6.275 21.212,8.1Q22,9.925 22,12Q22,14.075 21.212,15.9Q20.425,17.725 19.075,19.075Q17.725,20.425 15.9,21.212Q14.075,22 12,22Z"/>
-</vector>
diff --git a/mastodon/src/main/res/drawable/ic_poll_check.xml b/mastodon/src/main/res/drawable/ic_poll_check.xml
deleted file mode 100644
index d74e61ba8..000000000
--- a/mastodon/src/main/res/drawable/ic_poll_check.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_selected="true" android:drawable="@drawable/ic_check_20px"/>
-</selector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/ic_star_24px_selector.xml b/mastodon/src/main/res/drawable/ic_star_24px_selector.xml
deleted file mode 100644
index 1b4090e75..000000000
--- a/mastodon/src/main/res/drawable/ic_star_24px_selector.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:drawable="@drawable/ic_star_fill1_24px" android:state_selected="true"/>
-	<item android:drawable="@drawable/ic_star_24px"/>
-</selector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/seekbar_video_player_thumb.xml b/mastodon/src/main/res/drawable/seekbar_video_player_thumb.xml
deleted file mode 100644
index 26fe1b5e5..000000000
--- a/mastodon/src/main/res/drawable/seekbar_video_player_thumb.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-	<solid android:color="#ffffff"/>
-	<size android:width="18dp" android:height="18dp"/>
-</shape>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/window_bg_alpha95.xml b/mastodon/src/main/res/drawable/window_bg_alpha95.xml
deleted file mode 100644
index 9cbb77eae..000000000
--- a/mastodon/src/main/res/drawable/window_bg_alpha95.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-	<solid android:color="@color/window_bg_alpha95"/>
-</shape>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/sheet_photo_viewer_info.xml b/mastodon/src/main/res/layout/sheet_photo_viewer_info.xml
deleted file mode 100644
index 560f85d63..000000000
--- a/mastodon/src/main/res/layout/sheet_photo_viewer_info.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<org.joinmastodon.android.ui.views.CustomScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:background="@drawable/bg_bottom_sheet"
-	android:outlineProvider="background"
-	android:elevation="1dp">
-
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:orientation="vertical"
-		android:paddingBottom="16dp">
-
-		<View
-			android:id="@+id/handle"
-			android:layout_width="match_parent"
-			android:layout_height="36dp"
-			android:background="@drawable/bg_bottom_sheet_handle"/>
-
-		<HorizontalScrollView
-			android:id="@+id/buttons_container"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:fillViewport="true">
-
-			<LinearLayout
-				android:layout_width="wrap_content"
-				android:layout_height="64dp"
-				android:orientation="horizontal"
-				android:paddingHorizontal="16dp"
-				android:baselineAligned="false">
-
-				<Button
-					android:id="@+id/btn_boost"
-					android:layout_width="64dp"
-					android:layout_height="64dp"
-					android:text="@string/button_reblog"
-					android:drawableTop="@drawable/ic_boost"
-					style="@style/Widget.Mastodon.M3.Button.IconWithLabel"/>
-
-				<Space
-					android:layout_width="0dp"
-					android:layout_height="1dp"
-					android:layout_weight="1"/>
-
-				<Button
-					android:id="@+id/btn_favorite"
-					android:layout_width="64dp"
-					android:layout_height="64dp"
-					android:text="@string/button_favorite"
-					android:drawableTop="@drawable/ic_star_24px_selector"
-					style="@style/Widget.Mastodon.M3.Button.IconWithLabel"/>
-
-				<Space
-					android:layout_width="0dp"
-					android:layout_height="1dp"
-					android:layout_weight="1"/>
-
-				<Button
-					android:id="@+id/btn_share"
-					android:layout_width="64dp"
-					android:layout_height="64dp"
-					android:text="@string/button_share"
-					android:drawableTop="@drawable/ic_share_24px"
-					style="@style/Widget.Mastodon.M3.Button.IconWithLabel"/>
-
-				<Space
-					android:layout_width="0dp"
-					android:layout_height="1dp"
-					android:layout_weight="1"/>
-
-				<Button
-					android:id="@+id/btn_bookmark"
-					android:layout_width="64dp"
-					android:layout_height="64dp"
-					android:text="@string/add_bookmark"
-					android:drawableTop="@drawable/ic_bookmark_24px_selector"
-					style="@style/Widget.Mastodon.M3.Button.IconWithLabel"/>
-
-				<Space
-					android:layout_width="0dp"
-					android:layout_height="1dp"
-					android:layout_weight="1"/>
-
-				<Button
-					android:id="@+id/btn_download"
-					android:layout_width="64dp"
-					android:layout_height="64dp"
-					android:text="@string/download"
-					android:drawableTop="@drawable/ic_download_24px"
-					style="@style/Widget.Mastodon.M3.Button.IconWithLabel"/>
-
-			</LinearLayout>
-
-		</HorizontalScrollView>
-		
-		<View
-			android:id="@+id/divider"
-			android:layout_width="match_parent"
-			android:layout_height="1dp"
-			android:layout_marginVertical="4dp"
-			android:layout_marginHorizontal="16dp"
-			android:background="?colorM3OutlineVariant"/>
-
-		<LinearLayout
-			android:id="@+id/alt_text_title"
-			android:layout_width="match_parent"
-			android:layout_height="48dp"
-			android:orientation="horizontal"
-			android:layout_marginHorizontal="16dp">
-
-			<TextView
-				android:layout_width="0dp"
-				android:layout_height="match_parent"
-				android:layout_weight="1"
-				android:layout_marginEnd="8dp"
-				android:singleLine="true"
-				android:ellipsize="end"
-				android:textSize="22dp"
-				android:textColor="?colorM3OnSurfaceVariant"
-				android:gravity="center_vertical|start"
-				android:text="@string/alt_text"/>
-
-			<ImageButton
-				android:id="@+id/alt_text_help"
-				android:layout_width="48dp"
-				android:layout_height="48dp"
-				android:background="?android:actionBarItemBackground"
-				android:tint="?colorM3OnSurfaceVariant"
-				android:contentDescription="@string/help"
-				android:src="@drawable/ic_help_24px"/>
-
-		</LinearLayout>
-
-		<TextView
-			android:id="@+id/alt_text"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginHorizontal="16dp"
-			android:textAppearance="@style/m3_body_large"
-			android:textColor="?colorM3OnSurface"
-			android:textIsSelectable="true"
-			tools:text="A cute black cat"/>
-
-	</LinearLayout>
-
-</org.joinmastodon.android.ui.views.CustomScrollView>
\ No newline at end of file
diff --git a/mastodon/src/main/res/menu/compose_visibility.xml b/mastodon/src/main/res/menu/compose_visibility.xml
deleted file mode 100644
index a8cd7d24c..000000000
--- a/mastodon/src/main/res/menu/compose_visibility.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:id="@+id/vis_public"
-		android:title="@string/visibility_public"/>
-	<item android:id="@+id/vis_unlisted"
-		android:title="@string/visibility_unlisted"/>
-	<item android:id="@+id/vis_followers"
-		android:title="@string/visibility_followers_only"/>
-	<item android:id="@+id/vis_private"
-		android:title="@string/visibility_private"/>
-</menu>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values/strings.xml b/mastodon/src/main/res/values/strings.xml
index 8c229eb47..1ace86f88 100644
--- a/mastodon/src/main/res/values/strings.xml
+++ b/mastodon/src/main/res/values/strings.xml
@@ -95,9 +95,7 @@
 	</plurals>
 	<string name="poll_closed">Closed</string>
 	<string name="do_mute">Mute</string>
-	<string name="do_unmute">Unmute</string>
 	<string name="do_block">Block</string>
-	<string name="do_unblock">Unblock</string>
 	<string name="button_blocked">Blocked</string>
 	<string name="action_vote">Vote</string>
 	<string name="delete">Delete</string>
@@ -172,7 +170,6 @@
 	<string name="visibility_followers_only">Followers</string>
 	<string name="visibility_private">Specific people</string>
 	<string name="recent_searches">Recents</string>
-	<string name="skip">Skip</string>
 	<string name="notification_type_follow">New followers</string>
 	<string name="notification_type_favorite">Favorites</string>
 	<string name="notification_type_reblog">Boosts</string>
@@ -234,7 +231,6 @@
 	<string name="storage_permission_to_download">The app needs access to your storage to save this file.</string>
 	<string name="open_settings">Open settings</string>
 	<string name="error_saving_file">Error saving file</string>
-	<string name="file_saved">File saved</string>
 	<string name="downloading">Downloading…</string>
 	<string name="no_app_to_handle_action">There’s no app to handle this action</string>
 	<string name="local_timeline">Live feed</string>
@@ -650,10 +646,8 @@
 	<string name="onboarding_recommendations_intro">You curate your own home feed.
The more people you follow, the more active and interesting it will be.</string>
 	<string name="onboarding_recommendations_title">Personalize your home feed</string>
 	<string name="article_by_author">By %s</string>
-	<string name="info">Info</string>
 	<string name="button_reblogged">Boosted</string>
 	<string name="button_favorited">Favorited</string>
-	<string name="bookmarked">Bookmarked</string>
 	<string name="join_server_x_with_invite">Join %s with invite</string>
 	<string name="expired_invite_link">Expired invite link</string>
 	<string name="expired_clipboard_invite_link_alert">The invite link for %1$s in your clipboard has expired and cannot be used to sign up.\n\nYou can request a new link from an existing user, sign up through %2$s, or pick another server to sign up through.</string>