diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogSignupFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogSignupFragment.java
index 798b18ac5..7e0437087 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogSignupFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogSignupFragment.java
@@ -381,63 +381,6 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment imple
 		onNextClick(v);
 	}
 
-//	private String getEmojiForCategory(String category){
-//		return switch(category){
-//			case "all" -> "💬";
-//			case "academia" -> "📚";
-//			case "activism" -> "✊";
-//			case "food" -> "🍕";
-//			case "furry" -> "🦁";
-//			case "games" -> "🕹";
-//			case "general" -> "🐘";
-//			case "journalism" -> "📰";
-//			case "lgbt" -> "🏳️‍🌈";
-//			case "regional" -> "📍";
-//			case "art" -> "🎨";
-//			case "music" -> "🎼";
-//			case "tech" -> "📱";
-//			default -> "❓";
-//		};
-//	}
-
-	private int getEmojiForCategory(String category){
-		return switch(category){
-			case "all" -> R.drawable.ic_category_all;
-			case "academia" -> R.drawable.ic_category_academia;
-			case "activism" -> R.drawable.ic_category_activism;
-			case "food" -> R.drawable.ic_category_food;
-			case "furry" -> R.drawable.ic_category_furry;
-			case "games" -> R.drawable.ic_category_games;
-			case "general" -> R.drawable.ic_category_general;
-			case "journalism" -> R.drawable.ic_category_journalism;
-			case "lgbt" -> R.drawable.ic_category_lgbt;
-			case "regional" -> R.drawable.ic_category_regional;
-			case "art" -> R.drawable.ic_category_art;
-			case "music" -> R.drawable.ic_category_music;
-			case "tech" -> R.drawable.ic_category_tech;
-			default -> R.drawable.ic_category_unknown;
-		};
-	}
-
-	private int getTitleForCategory(String category){
-		return switch(category){
-			case "all" -> R.string.category_all;
-			case "academia" -> R.string.category_academia;
-			case "activism" -> R.string.category_activism;
-			case "food" -> R.string.category_food;
-			case "furry" -> R.string.category_furry;
-			case "games" -> R.string.category_games;
-			case "general" -> R.string.category_general;
-			case "journalism" -> R.string.category_journalism;
-			case "lgbt" -> R.string.category_lgbt;
-			case "regional" -> R.string.category_regional;
-			case "art" -> R.string.category_art;
-			case "music" -> R.string.category_music;
-			case "tech" -> R.string.category_tech;
-			default -> 0;
-		};
-	}
-
 	@Override
 	protected void updateFilteredList(){
 		ArrayList<CatalogInstance> prevData=new ArrayList<>(filteredData);
diff --git a/mastodon/src/main/res/drawable/ic_category_academia.xml b/mastodon/src/main/res/drawable/ic_category_academia.xml
deleted file mode 100644
index 4e0ac054a..000000000
--- a/mastodon/src/main/res/drawable/ic_category_academia.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="36dp"
-    android:height="36dp"
-    android:viewportWidth="36"
-    android:viewportHeight="36">
-  <path
-      android:pathData="M15,31c0,2.209 -0.791,4 -3,4H5c-4,0 -4,-14 0,-14h7c2.209,0 3,1.791 3,4v6z"
-      android:fillColor="#553788"/>
-  <path
-      android:pathData="M34,33h-1V23h1c0.553,0 1,-0.447 1,-1s-0.447,-1 -1,-1H10c-4,0 -4,14 0,14h24c0.553,0 1,-0.447 1,-1s-0.447,-1 -1,-1z"
-      android:fillColor="#9266CC"/>
-  <path
-      android:pathData="M34.172,33H11c-2,0 -2,-10 0,-10h23.172c1.104,0 1.104,10 0,10z"
-      android:fillColor="#CCD6DD"/>
-  <path
-      android:pathData="M11.5,25h23.35c-0.135,-1.175 -0.36,-2 -0.678,-2H11c-1.651,0 -1.938,6.808 -0.863,9.188C9.745,29.229 10.199,25 11.5,25z"
-      android:fillColor="#99AAB5"/>
-  <path
-      android:pathData="M12,8c0,2.209 -1.791,4 -4,4H4C0,12 0,1 4,1h4c2.209,0 4,1.791 4,4v3z"
-      android:fillColor="#269"/>
-  <path
-      android:pathData="M31,10h-1V3h1c0.553,0 1,-0.447 1,-1s-0.447,-1 -1,-1H7C3,1 3,12 7,12h24c0.553,0 1,-0.447 1,-1s-0.447,-1 -1,-1z"
-      android:fillColor="#55ACEE"/>
-  <path
-      android:pathData="M31.172,10H8c-2,0 -2,-7 0,-7h23.172c1.104,0 1.104,7 0,7z"
-      android:fillColor="#CCD6DD"/>
-  <path
-      android:pathData="M8,5h23.925c-0.114,-1.125 -0.364,-2 -0.753,-2H8C6.807,3 6.331,5.489 6.562,7.5 6.718,6.142 7.193,5 8,5z"
-      android:fillColor="#99AAB5"/>
-  <path
-      android:pathData="M20,17c0,2.209 -1.791,4 -4,4H6c-4,0 -4,-9 0,-9h10c2.209,0 4,1.791 4,4v1z"
-      android:fillColor="#F4900C"/>
-  <path
-      android:pathData="M35,19h-1v-5h1c0.553,0 1,-0.447 1,-1s-0.447,-1 -1,-1H15c-4,0 -4,9 0,9h20c0.553,0 1,-0.447 1,-1s-0.447,-1 -1,-1z"
-      android:fillColor="#FFAC33"/>
-  <path
-      android:pathData="M35.172,19H16c-2,0 -2,-5 0,-5h19.172c1.104,0 1.104,5 0,5z"
-      android:fillColor="#CCD6DD"/>
-  <path
-      android:pathData="M16,16h19.984c-0.065,-1.062 -0.334,-2 -0.812,-2H16c-1.274,0 -1.733,2.027 -1.383,3.5 0.198,-0.839 0.657,-1.5 1.383,-1.5z"
-      android:fillColor="#99AAB5"/>
-</vector>
diff --git a/mastodon/src/main/res/drawable/ic_category_activism.xml b/mastodon/src/main/res/drawable/ic_category_activism.xml
deleted file mode 100644
index 5001d06f8..000000000
--- a/mastodon/src/main/res/drawable/ic_category_activism.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="36dp"
-    android:height="36dp"
-    android:viewportWidth="36"
-    android:viewportHeight="36">
-  <path
-      android:pathData="M32.218,10.913c-0.81,-1.187 -2.172,-1.967 -3.718,-1.967H28s-5.353,-5.672 -5.15,-6.091C21.754,3.446 21,4.591 21,5.924c0,0 -5.509,-3.431 -5.247,-3.947C14.71,2.669 14,3.946 14,5.424v0.522S8.553,4.321 8.857,3.851C7.757,4.441 7,5.588 7,6.924V8.81l-6,6.272v2.645l17.16,14.439c0,0.001 13.128,-22.164 14.058,-21.253z"
-      android:fillColor="#EF9645"/>
-  <path
-      android:pathData="M4.124,18.946c1.474,0 2.738,-0.831 3.392,-2.043 0.678,1.212 1.958,2.043 3.446,2.043h0.076c1.153,0 2.169,-0.51 2.889,-1.298 0.023,-0.024 0.073,-0.082 0.073,-0.082 0.185,-0.212 0.343,-0.448 0.481,-0.695 0.04,-0.072 0.281,-0.621 0.342,-0.833 0.052,-0.173 0.106,-0.344 0.134,-0.526 0.141,0.167 0.296,0.319 0.46,0.46 0.069,0.059 0.45,0.339 0.576,0.413 0.589,0.351 1.271,0.56 2.008,0.56h3.166c-0.535,0.27 -0.999,0.614 -1.424,1 -1.729,1.568 -2.579,4.085 -2.579,7.663 0,0.276 0.224,0.5 0.5,0.5s0.5,-0.224 0.5,-0.5c0,-3.962 1.01,-6.427 3.24,-7.663 1.175,-0.651 2.682,-0.967 4.571,-0.967 0.059,0 0.526,-0.033 0.526,-0.033 0.276,0 0.5,-0.224 0.5,-0.5s-0.224,-0.5 -0.5,-0.5H18c-1.657,0 -3,-1.343 -3,-3s1.343,-3 3,-3h11c0.973,0 2.288,0.056 3.218,0.967 0.325,0.318 0.604,0.736 0.803,1.297l1.659,5.472c0.156,0.512 0.73,2.857 0.626,3.346 0,7.34 -8.7,14.972 -19.004,14.972C6.326,36 1,27.883 1,17.957v-0.229c0.01,0.01 0.021,0.016 0.031,0.026 0.881,0.882 1.799,1.192 2.845,1.192h0.248z"
-      android:fillColor="#FFDC5D"/>
-  <path
-      android:pathData="M3.864,5.946h0.271C5.718,5.946 7,7.229 7,8.81v6.272c0,1.582 -1.282,2.864 -2.864,2.864h-0.272C2.282,17.946 1,16.664 1,15.082L1,8.81c0,-1.581 1.282,-2.864 2.864,-2.864zM14,14.946c0,0.891 -0.396,1.683 -1.014,2.233 -0.53,0.472 -1.221,0.767 -1.986,0.767 -1.657,0 -3,-1.343 -3,-3v-9c0,-0.816 0.328,-1.554 0.857,-2.095 0.544,-0.557 1.302,-0.905 2.143,-0.905 1.657,0 3,1.343 3,3v9zM18,8.946c-1.201,0 -2.267,0.541 -3,1.38v-6.38c0,-0.758 0.29,-1.442 0.753,-1.97 0.55,-0.627 1.347,-1.03 2.247,-1.03 1.657,0 3,1.343 3,3v5h-3zM22,4.939c0,-0.812 0.326,-1.545 0.85,-2.085 0.544,-0.559 1.301,-0.909 2.143,-0.909h0.014C26.66,1.946 28,3.286 28,4.939v4.007h-6L22,4.939z"
-      android:fillColor="#FFDC5D"/>
-</vector>
diff --git a/mastodon/src/main/res/drawable/ic_category_all.xml b/mastodon/src/main/res/drawable/ic_category_all.xml
deleted file mode 100644
index f94bf550c..000000000
--- a/mastodon/src/main/res/drawable/ic_category_all.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="36dp"
-    android:height="36dp"
-    android:viewportWidth="36"
-    android:viewportHeight="36">
-  <path
-      android:pathData="M18,1C8.059,1 0,7.268 0,15c0,4.368 2.574,8.268 6.604,10.835C6.08,28.144 4.859,31.569 2,35c5.758,-0.96 9.439,-3.761 11.716,-6.416 1.376,0.262 2.805,0.416 4.284,0.416 9.941,0 18,-6.268 18,-14S27.941,1 18,1z"
-      android:fillColor="#BDDDF4"/>
-  <path
-      android:pathData="M18,15m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
-      android:fillColor="#2A6797"/>
-  <path
-      android:pathData="M26,15m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
-      android:fillColor="#2A6797"/>
-  <path
-      android:pathData="M10,15m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
-      android:fillColor="#2A6797"/>
-</vector>
diff --git a/mastodon/src/main/res/drawable/ic_category_art.xml b/mastodon/src/main/res/drawable/ic_category_art.xml
deleted file mode 100644
index f0b8d0bc3..000000000
--- a/mastodon/src/main/res/drawable/ic_category_art.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="36dp"
-    android:height="36dp"
-    android:viewportWidth="36"
-    android:viewportHeight="36">
-  <path
-      android:pathData="M18,3.143c-9.941,0 -18,6.908 -18,15.428 0,1.066 0.126,2.107 0.367,3.112C2.146,24.744 3.377,22.812 9,20c5.727,-2.864 0,4 -2,8 -0.615,1.23 -0.282,2.271 0.56,3.124C10.506,32.928 14.104,34 18,34c9.941,0 18,-6.907 18,-15.429 0,-8.52 -8.059,-15.428 -18,-15.428zM20.849,27.59c-0.395,1.346 -2.46,1.924 -4.613,1.291 -2.153,-0.632 -3.578,-2.234 -3.183,-3.581 0.395,-1.346 2.46,-1.924 4.613,-1.29 2.153,0.631 3.578,2.233 3.183,3.58z"
-      android:fillColor="#D99E82"/>
-  <path
-      android:pathData="M10,11m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
-      android:fillColor="#5C913B"/>
-  <path
-      android:pathData="M20,9m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
-      android:fillColor="#269"/>
-  <path
-      android:pathData="M29,15m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
-      android:fillColor="#DD2E44"/>
-  <path
-      android:pathData="M28,24m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
-      android:fillColor="#FFCC4D"/>
-</vector>
diff --git a/mastodon/src/main/res/drawable/ic_category_food.xml b/mastodon/src/main/res/drawable/ic_category_food.xml
deleted file mode 100644
index a514aeb3d..000000000
--- a/mastodon/src/main/res/drawable/ic_category_food.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="36dp"
-    android:height="36dp"
-    android:viewportWidth="36"
-    android:viewportHeight="36">
-  <path
-      android:pathData="M18,4c7.257,0 13,4 14.699,2 0.197,-0.323 0.301,-0.657 0.301,-1 0,-2 -6.716,-5 -15,-5C9.716,0 3,3 3,5c0,0.343 0.104,0.677 0.301,1C5,8 10.743,4 18,4z"
-      android:fillColor="#F4900C"/>
-  <path
-      android:pathData="M18,3C11.787,3 7.384,4.81 5.727,5.618c-0.477,0.233 -0.539,0.84 -0.415,1.278S16,34 16,34s0.896,2 2,2 2,-2 2,-2L30.704,6.779s0.213,-0.842 -0.569,-1.229C28.392,4.689 24.047,3 18,3z"
-      android:fillColor="#FFCC4D"/>
-  <path
-      android:pathData="M18,31c0,-2.208 -1.791,-4 -4,-4 -0.254,0 -0.5,0.029 -0.741,0.075L16,34s0.071,0.14 0.19,0.342C17.279,33.627 18,32.399 18,31zM17,20c0,-2.209 -1.792,-4 -4,-4 -1.426,0 -2.67,0.752 -3.378,1.876l2.362,5.978c0.327,0.086 0.663,0.146 1.016,0.146 2.208,0 4,-1.792 4,-4z"
-      android:fillColor="#BE1931"/>
-  <path
-      android:pathData="M16,8m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0"
-      android:fillColor="#BE1931"/>
-  <path
-      android:pathData="M25,9c-2.208,0 -4,1.791 -4,4s1.792,4 4,4c0.682,0 1.315,-0.187 1.877,-0.488l1.89,-4.806C28.227,10.135 26.752,9 25,9zM19,25c0,1.868 1.288,3.425 3.019,3.864l2.893,-7.357C24.342,21.194 23.697,21 23,21c-2.208,0 -4,1.792 -4,4zM10,12c0,-2.209 -1.791,-4 -4,-4 -0.087,0 -0.169,0.02 -0.255,0.026 0.55,1.412 1.575,4.016 2.775,7.057C9.416,14.349 10,13.248 10,12z"
-      android:fillColor="#BE1931"/>
-</vector>
diff --git a/mastodon/src/main/res/drawable/ic_category_furry.xml b/mastodon/src/main/res/drawable/ic_category_furry.xml
deleted file mode 100644
index b97a508fc..000000000
--- a/mastodon/src/main/res/drawable/ic_category_furry.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="36dp"
-    android:height="36dp"
-    android:viewportWidth="36"
-    android:viewportHeight="36">
-  <path
-      android:pathData="M32.325,10.958s2.315,0.024 3.511,1.177c-0.336,-4.971 -2.104,-8.249 -5.944,-10.13 -3.141,-1.119 -6.066,1.453 -6.066,1.453s0.862,-1.99 2.19,-2.746C23.789,0.236 21.146,0 18,0c-3.136,0 -5.785,0.227 -8.006,0.701 1.341,0.745 2.215,2.758 2.215,2.758S9.194,0.803 6,2.053C2.221,3.949 0.481,7.223 0.158,12.174c1.183,-1.19 3.55,-1.215 3.55,-1.215S-0.105,13.267 0.282,16.614c0.387,2.947 1.394,5.967 2.879,8.722C3.039,22.15 5.917,20 5.917,20s-2.492,5.96 -0.581,8.738c1.935,2.542 4.313,4.641 6.976,5.916 -0.955,-1.645 -0.136,-3.044 -0.103,-2.945 0.042,0.125 0.459,3.112 2.137,3.743 1.178,0.356 2.4,0.548 3.654,0.548 1.292,0 2.55,-0.207 3.761,-0.583 1.614,-0.691 2.024,-3.585 2.064,-3.708 0.032,-0.098 0.843,1.287 -0.09,2.921 2.706,-1.309 5.118,-3.463 7.064,-6.073 1.699,-2.846 -0.683,-8.557 -0.683,-8.557s2.85,2.13 2.757,5.288c1.556,-2.906 2.585,-6.104 2.911,-9.2 -0.035,-3.061 -3.459,-5.13 -3.459,-5.13z"
-      android:fillColor="#662113"/>
-  <path
-      android:pathData="M13.859,9.495c0.596,2.392 0.16,4.422 -2.231,5.017 -2.392,0.596 -6.363,0.087 -6.958,-2.304 -0.596,-2.392 0.469,-5.39 1.81,-5.724 1.341,-0.334 6.784,0.62 7.379,3.011zM22.963,27.927c0,2.74 -2.222,4.963 -4.963,4.963s-4.963,-2.223 -4.963,-4.963c0,-2.741 2.223,-4.964 4.963,-4.964 2.741,0 4.963,2.222 4.963,4.964z"
-      android:fillColor="#FFCC4D"/>
-  <path
-      android:pathData="M21.309,27.927c0,1.827 -1.481,3.309 -3.309,3.309s-3.309,-1.481 -3.309,-3.309c0,-1.827 1.481,-3.31 3.309,-3.31s3.309,1.483 3.309,3.31z"
-      android:fillColor="#DD2E44"/>
-  <path
-      android:pathData="M11.052,8.997c0.871,1.393 0.447,3.229 -0.946,4.1 -1.394,0.871 -2.608,0.797 -3.479,-0.596 -0.871,-1.394 -0.186,-4.131 0.324,-4.45 0.51,-0.319 3.23,-0.448 4.101,0.946z"
-      android:fillColor="#E6AAAA"/>
-  <path
-      android:pathData="M22.141,9.495c-0.596,2.392 -0.159,4.422 2.232,5.017 2.392,0.596 6.363,0.087 6.959,-2.304 0.596,-2.392 -0.47,-5.39 -1.811,-5.724 -1.342,-0.334 -6.786,0.62 -7.38,3.011z"
-      android:fillColor="#FFCC4D"/>
-  <path
-      android:pathData="M24.948,8.997c-0.871,1.393 -0.447,3.229 0.945,4.1 1.394,0.871 2.608,0.797 3.479,-0.596 0.871,-1.394 0.185,-4.131 -0.324,-4.45 -0.51,-0.319 -3.229,-0.448 -4.1,0.946z"
-      android:fillColor="#E6AAAA"/>
-  <path
-      android:pathData="M18,7.125h-0.002C5.167,7.126 7.125,12.083 8.5,18.667 9.875,25.25 10.384,27 10.384,27h15.228s0.51,-1.75 1.885,-8.333C28.872,12.083 30.829,7.126 18,7.125z"
-      android:fillColor="#FFCC4D"/>
-  <path
-      android:pathData="M12,16s0,-1.5 1.5,-1.5S15,16 15,16v1.5s0,1.5 -1.5,1.5 -1.5,-1.5 -1.5,-1.5L12,16zM21,16s0,-1.5 1.5,-1.5S24,16 24,16v1.5s0,1.5 -1.5,1.5 -1.5,-1.5 -1.5,-1.5L21,16z"
-      android:fillColor="#272B2B"/>
-  <path
-      android:pathData="M20.168,21.521c-1.598,0 -1.385,0.848 -2.168,2.113 -0.783,-1.266 -0.571,-2.113 -2.168,-2.113 -6.865,0 -6.837,0.375 -6.865,2.828 -0.058,4.986 2.802,6.132 5.257,6.06 1.597,-0.048 2.994,-0.88 3.777,-2.131 0.783,1.251 2.179,2.083 3.776,2.131 2.455,0.072 5.315,-1.073 5.257,-6.06 -0.029,-2.453 -0.001,-2.828 -6.866,-2.828z"
-      android:fillColor="#FFE8B6"/>
-  <path
-      android:pathData="M14.582,21.411c-1.14,0.233 2.279,4.431 3.418,4.431s4.559,-4.198 3.419,-4.431c-1.14,-0.232 -5.698,-0.232 -6.837,0z"
-      android:fillColor="#272B2B"/>
-  <path
-      android:pathData="M11.5,24.5m-0.5,0a0.5,0.5 0,1 1,1 0a0.5,0.5 0,1 1,-1 0"
-      android:fillColor="#D99E82"/>
-  <path
-      android:pathData="M10.5,26.5m-0.5,0a0.5,0.5 0,1 1,1 0a0.5,0.5 0,1 1,-1 0"
-      android:fillColor="#D99E82"/>
-  <path
-      android:pathData="M12.5,27.5m-0.5,0a0.5,0.5 0,1 1,1 0a0.5,0.5 0,1 1,-1 0"
-      android:fillColor="#D99E82"/>
-  <path
-      android:pathData="M24.5,24.5m-0.5,0a0.5,0.5 0,1 1,1 0a0.5,0.5 0,1 1,-1 0"
-      android:fillColor="#D99E82"/>
-  <path
-      android:pathData="M25.5,26.5m-0.5,0a0.5,0.5 0,1 1,1 0a0.5,0.5 0,1 1,-1 0"
-      android:fillColor="#D99E82"/>
-  <path
-      android:pathData="M23.5,27.5m-0.5,0a0.5,0.5 0,1 1,1 0a0.5,0.5 0,1 1,-1 0"
-      android:fillColor="#D99E82"/>
-</vector>
diff --git a/mastodon/src/main/res/drawable/ic_category_games.xml b/mastodon/src/main/res/drawable/ic_category_games.xml
deleted file mode 100644
index e09596a00..000000000
--- a/mastodon/src/main/res/drawable/ic_category_games.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="36dp"
-    android:height="36dp"
-    android:viewportWidth="36"
-    android:viewportHeight="36">
-  <path
-      android:pathData="M16,9h4v17h-4z"
-      android:fillColor="#99AAB5"/>
-  <path
-      android:pathData="M10,24.5c0,0.828 -0.672,1.5 -1.5,1.5h-3c-0.828,0 -1.5,-0.672 -1.5,-1.5S4.672,23 5.5,23h3c0.828,0 1.5,0.672 1.5,1.5z"
-      android:fillColor="#DA2F47"/>
-  <path
-      android:pathData="M34,33c0,1.104 -0.896,2 -2,2H4c-1.104,0 -2,-0.896 -2,-2v-6c0,-1.104 0.896,-2 2,-2h28c1.104,0 2,0.896 2,2v6z"
-      android:fillColor="#31373D"/>
-  <path
-      android:pathData="M10,34.5c0,0.828 -0.671,1.5 -1.5,1.5h-3c-0.829,0 -1.5,-0.672 -1.5,-1.5S4.671,33 5.5,33h3c0.829,0 1.5,0.672 1.5,1.5zM32,34.5c0,0.828 -0.672,1.5 -1.5,1.5h-3c-0.828,0 -1.5,-0.672 -1.5,-1.5s0.672,-1.5 1.5,-1.5h3c0.828,0 1.5,0.672 1.5,1.5z"
-      android:fillColor="#31373D"/>
-  <path
-      android:pathData="M18,7m-5,0a5,5 0,1 1,10 0a5,5 0,1 1,-10 0"
-      android:fillColor="#DA2F47"/>
-  <path
-      android:pathData="M25,26c0,1.104 -0.896,2 -2,2H13c-1.104,0 -2,-0.896 -2,-2v-1c0,-1.104 3.896,-6 5,-6h4c1.104,0 5,4.896 5,6v1z"
-      android:fillColor="#31373D"/>
-  <path
-      android:pathData="M33,28c0,0.553 -0.447,1 -1,1H4c-0.552,0 -1,-0.447 -1,-1 0,-0.553 0.448,-1 1,-1h28c0.553,0 1,0.447 1,1z"
-      android:fillColor="#66757F"/>
-</vector>
diff --git a/mastodon/src/main/res/drawable/ic_category_general.xml b/mastodon/src/main/res/drawable/ic_category_general.xml
deleted file mode 100644
index d0a2de42c..000000000
--- a/mastodon/src/main/res/drawable/ic_category_general.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="36dp"
-    android:height="36dp"
-    android:viewportWidth="36"
-    android:viewportHeight="36">
-  <path
-      android:pathData="M34.453,15.573c-0.864,-7.3 -5.729,-10.447 -13.93,-10.447 -0.391,0 -0.763,0.017 -1.139,0.031 -0.013,-0.01 -0.022,-0.021 -0.035,-0.031C14.655,1.605 4.091,2.779 1.745,6.3c-3.255,4.883 -1.174,22.3 0,24.646 1.173,2.35 4.694,3.521 5.868,2.35 1.174,-1.176 0,-1.176 -1.173,-3.521 -0.85,-1.701 -0.466,-5.859 0.255,-8.471 0.028,0.168 0.068,0.322 0.1,0.486 0.39,2.871 1.993,7.412 1.993,9.744 0,3.564 2.102,4.107 4.694,4.107 2.593,0 4.695,-0.543 4.695,-4.107 0,-0.24 -0.008,-0.463 -0.012,-0.695 0.757,0.064 1.535,0.107 2.359,0.107 0.497,0 0.977,-0.016 1.448,-0.039 -0.004,0.209 -0.013,0.41 -0.013,0.627 0,3.564 2.103,4.107 4.694,4.107 2.593,0 4.695,-0.543 4.695,-4.107 0,-1.801 1.192,-4.625 2.039,-6.982 0.159,-0.354 0.291,-0.732 0.42,-1.117 0.118,1.307 0.193,2.706 0.193,4.206 0,0.553 0.447,1 1,1s1,-0.447 1,-1c0,-5.153 -0.771,-9.248 -1.547,-12.068z"
-      android:fillColor="#99AAB5"/>
-  <path
-      android:pathData="M19.35,5.126S23,10.641 20,15.641c-3,5 -7.838,5 -11,5 -2,0 -1,2 0,2 1.414,0 8.395,1.211 12,-6 3,-6 -1.65,-11.515 -1.65,-11.515z"
-      android:fillColor="#66757F"/>
-  <path
-      android:pathData="M6.5,14.141m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"
-      android:fillColor="#292F33"/>
-</vector>
diff --git a/mastodon/src/main/res/drawable/ic_category_journalism.xml b/mastodon/src/main/res/drawable/ic_category_journalism.xml
deleted file mode 100644
index 7decfc895..000000000
--- a/mastodon/src/main/res/drawable/ic_category_journalism.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="36dp"
-    android:height="36dp"
-    android:viewportWidth="36"
-    android:viewportHeight="36">
-  <path
-      android:pathData="M33,36H4c4,0 3,-9 3,-9 0,-2.209 1.791,-15 4,-15h21s4,0 4,4v17s0,3 -3,3z"
-      android:fillColor="#99AAB5"/>
-  <path
-      android:pathData="M30,33c0,3 3,3 3,3H3s-3,0 -3,-4V4c0,-2.209 1.791,-4 4,-4h22c2.209,0 4,1.791 4,4v29z"
-      android:fillColor="#CCD6DD"/>
-  <path
-      android:pathData="M27,20c0,0.553 -0.447,1 -1,1h-8c-0.552,0 -1,-0.447 -1,-1 0,-0.553 0.448,-1 1,-1h8c0.553,0 1,0.447 1,1zM27,16c0,0.553 -0.447,1 -1,1h-8c-0.552,0 -1,-0.447 -1,-1 0,-0.553 0.448,-1 1,-1h8c0.553,0 1,0.447 1,1zM27,12c0,0.553 -0.447,1 -1,1h-8c-0.552,0 -1,-0.447 -1,-1 0,-0.553 0.448,-1 1,-1h8c0.553,0 1,0.447 1,1zM27,24c0,0.553 -0.447,1 -1,1L4,25c-0.552,0 -1,-0.447 -1,-1 0,-0.553 0.448,-1 1,-1h22c0.553,0 1,0.447 1,1zM27,28c0,0.553 -0.447,1 -1,1L4,29c-0.552,0 -1,-0.447 -1,-1 0,-0.553 0.448,-1 1,-1h22c0.553,0 1,0.447 1,1zM27,32c0,0.553 -0.447,1 -1,1L4,33c-0.552,0 -1,-0.447 -1,-1 0,-0.553 0.448,-1 1,-1h22c0.553,0 1,0.447 1,1zM25,9s2,0 2,-2L27,5s0,-2 -2,-2L5,3S3,3 3,5v2s0,2 2,2h20z"
-      android:fillColor="#99AAB5"/>
-  <path
-      android:pathData="M13,21s2,0 2,-2v-6s0,-2 -2,-2H5s-2,0 -2,2v6s0,2 2,2h8z"
-      android:fillColor="#55ACEE"/>
-</vector>
diff --git a/mastodon/src/main/res/drawable/ic_category_lgbt.xml b/mastodon/src/main/res/drawable/ic_category_lgbt.xml
deleted file mode 100644
index 80b9af044..000000000
--- a/mastodon/src/main/res/drawable/ic_category_lgbt.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="36dp"
-    android:height="36dp"
-    android:viewportWidth="36"
-    android:viewportHeight="36">
-  <path
-      android:pathData="M0,27c0,2.209 1.791,4 4,4h28c2.209,0 4,-1.791 4,-4v-0.5H0v0.5z"
-      android:fillColor="#880082"/>
-  <path
-      android:pathData="M0,22.07h36v4.6H0z"
-      android:fillColor="#3558A0"/>
-  <path
-      android:pathData="M0,17.83h36v4.5H0z"
-      android:fillColor="#138F3E"/>
-  <path
-      android:pathData="M0,13.5h36V18H0z"
-      android:fillColor="#FAD220"/>
-  <path
-      android:pathData="M0,9.17h36v4.5H0z"
-      android:fillColor="#FF5000"/>
-  <path
-      android:pathData="M32,5H4C1.791,5 0,6.791 0,9v0.33h36V9c0,-2.209 -1.791,-4 -4,-4z"
-      android:fillColor="#FF000E"/>
-</vector>
diff --git a/mastodon/src/main/res/drawable/ic_category_music.xml b/mastodon/src/main/res/drawable/ic_category_music.xml
deleted file mode 100644
index a2018b4e9..000000000
--- a/mastodon/src/main/res/drawable/ic_category_music.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="36dp"
-    android:height="36dp"
-    android:viewportWidth="36"
-    android:viewportHeight="36">
-  <path
-      android:pathData="M36,5V3H0v30h36v-2H6v-5h30v-2H6v-5h30v-2H6v-5h30v-2H6V5z"
-      android:fillColor="#8899A6"/>
-  <path
-      android:pathData="M27.827,20.562c-0.223,-0.646 -0.543,-1.227 -0.947,-1.723 -0.411,-0.513 -0.926,-0.928 -1.529,-1.232 -0.61,-0.31 -1.259,-0.46 -1.981,-0.46 -0.086,0 -0.208,0.009 -0.366,0.026l-0.533,-2.593c0.613,-0.603 1.156,-1.299 1.616,-2.077 0.499,-0.847 0.885,-1.77 1.145,-2.741 0.269,-0.978 0.399,-1.942 0.399,-2.945 0,-2.106 -0.542,-3.94 -1.627,-5.475 -0.158,-0.196 -0.288,-0.343 -0.387,-0.431 -0.394,-0.355 -0.788,-0.412 -1.704,0.266 -0.47,0.352 -0.883,0.86 -1.224,1.506 -0.352,0.644 -0.608,1.366 -0.786,2.2 -0.185,0.826 -0.283,1.723 -0.292,2.684 0.041,1.352 0.234,2.701 0.576,4.013 -0.77,0.779 -1.392,1.43 -1.881,1.951 -0.521,0.569 -1.038,1.222 -1.539,1.943 -0.495,0.711 -0.91,1.493 -1.233,2.324 -0.317,0.807 -0.497,1.693 -0.533,2.655 0.008,0.982 0.195,1.944 0.561,2.864 0.365,0.902 0.884,1.726 1.546,2.45 0.665,0.718 1.448,1.287 2.325,1.694 1.23,0.569 2.644,0.749 4.02,0.51 0.063,0.288 0.146,0.629 0.244,1.022 0.157,0.647 0.274,1.172 0.35,1.56 0.073,0.391 0.109,0.766 0.109,1.122 0,0.541 -0.059,0.955 -0.197,1.301 -0.05,0.202 -0.185,0.412 -0.401,0.62 -0.233,0.227 -0.508,0.401 -0.839,0.533 -0.468,0.184 -0.922,0.231 -1.289,0.181 0.195,-0.105 0.375,-0.241 0.537,-0.405 0.433,-0.443 0.652,-0.988 0.652,-1.622 0,-0.447 -0.109,-0.875 -0.328,-1.282 -0.215,-0.375 -0.508,-0.684 -0.886,-0.929 -0.378,-0.225 -0.778,-0.341 -1.226,-0.341h-0.006c-0.512,0.034 -0.954,0.195 -1.301,0.471 -0.36,0.266 -0.646,0.619 -0.852,1.051 -0.193,0.406 -0.307,0.847 -0.338,1.362 0.04,1.04 0.477,1.885 1.306,2.508 0.784,0.581 1.707,0.877 2.739,0.877 0.743,0 1.434,-0.164 2.053,-0.487 0.634,-0.326 1.148,-0.796 1.529,-1.402 0.37,-0.602 0.559,-1.291 0.559,-2.046 0,-0.495 -0.043,-0.96 -0.129,-1.419 -0.085,-0.458 -0.211,-1.08 -0.384,-1.869 -0.124,-0.535 -0.219,-0.987 -0.288,-1.35 0.965,-0.428 1.712,-1.049 2.226,-1.85 0.576,-0.898 0.867,-1.908 0.867,-3 -0.001,-0.665 -0.112,-1.342 -0.333,-2.015zM24.705,25.74l-1.047,-5.149c0.261,0.056 0.502,0.147 0.727,0.276 0.396,0.224 0.703,0.529 0.945,0.938 0.241,0.39 0.392,0.838 0.456,1.303 0,1.246 -0.354,2.115 -1.081,2.632zM23.547,7.101c-0.181,0.526 -0.43,1.057 -0.743,1.577 -0.307,0.517 -0.629,0.973 -0.959,1.359 -0.105,0.125 -0.202,0.231 -0.288,0.322 -0.078,-0.354 -0.128,-0.746 -0.149,-1.165 0.016,-0.685 0.116,-1.364 0.305,-2.081 0.17,-0.661 0.408,-1.259 0.695,-1.756 0.305,-0.468 0.621,-0.705 0.944,-0.705 0.115,0 0.196,0.028 0.259,0.087 0.07,0.071 0.119,0.208 0.15,0.454 0.03,0.133 0.047,0.303 0.047,0.494 0,0.443 -0.088,0.918 -0.261,1.414zM18.602,18.58c0.653,-0.943 1.452,-1.837 2.431,-2.718l0.339,1.739c-0.717,0.362 -1.321,0.9 -1.801,1.61 -0.552,0.82 -0.846,1.727 -0.872,2.717 0.017,0.913 0.309,1.736 0.871,2.451 0.566,0.708 1.294,1.181 2.169,1.4l0.12,0.03 0.122,-0.029c0.537,-0.127 0.594,-0.471 0.594,-0.613 0,-0.345 -0.224,-0.621 -0.579,-0.72 -0.367,-0.17 -0.637,-0.417 -0.82,-0.758 -0.202,-0.368 -0.309,-0.713 -0.309,-0.994 0,-0.476 0.17,-0.903 0.516,-1.303 0.214,-0.242 0.432,-0.432 0.654,-0.572l1.093,5.508c-0.382,0.081 -0.733,0.132 -1.046,0.152 -1.384,-0.045 -2.518,-0.5 -3.369,-1.35 -0.434,-0.442 -0.747,-0.907 -0.958,-1.423 -0.213,-0.516 -0.327,-1.059 -0.342,-1.584 0.029,-1.27 0.429,-2.463 1.187,-3.543z"
-      android:fillColor="#31373D"/>
-</vector>
diff --git a/mastodon/src/main/res/drawable/ic_category_regional.xml b/mastodon/src/main/res/drawable/ic_category_regional.xml
deleted file mode 100644
index bd128fba5..000000000
--- a/mastodon/src/main/res/drawable/ic_category_regional.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="36dp"
-    android:height="36dp"
-    android:viewportWidth="36"
-    android:viewportHeight="36">
-  <path
-      android:pathData="M14,34.5a4,1.5 0,1 0,8 0a4,1.5 0,1 0,-8 0z"
-      android:fillColor="#292F33"/>
-  <path
-      android:pathData="M14.339,10.725S16.894,34.998 18.001,35c1.106,0.001 3.66,-24.275 3.66,-24.275h-7.322z"
-      android:fillColor="#99AAB5"/>
-  <path
-      android:pathData="M18,8m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"
-      android:fillColor="#DD2E44"/>
-</vector>
diff --git a/mastodon/src/main/res/drawable/ic_category_tech.xml b/mastodon/src/main/res/drawable/ic_category_tech.xml
deleted file mode 100644
index e9e82f891..000000000
--- a/mastodon/src/main/res/drawable/ic_category_tech.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="36dp"
-    android:height="36dp"
-    android:viewportWidth="36"
-    android:viewportHeight="36">
-  <path
-      android:pathData="M11,36s-4,0 -4,-4V4s0,-4 4,-4h14s4,0 4,4v28s0,4 -4,4H11z"
-      android:fillColor="#31373D"/>
-  <path
-      android:pathData="M9,5h18v26H9z"
-      android:fillColor="#55ACEE"/>
-</vector>
diff --git a/mastodon/src/main/res/drawable/ic_category_unknown.xml b/mastodon/src/main/res/drawable/ic_category_unknown.xml
deleted file mode 100644
index 8f76682f5..000000000
--- a/mastodon/src/main/res/drawable/ic_category_unknown.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="36dp"
-    android:height="36dp"
-    android:viewportWidth="36"
-    android:viewportHeight="36">
-  <path
-      android:pathData="M17,27c-1.657,0 -3,-1.343 -3,-3v-4c0,-1.657 1.343,-3 3,-3 0.603,-0.006 6,-1 6,-5 0,-2 -2,-4 -5,-4 -2.441,0 -4,2 -4,3 0,1.657 -1.343,3 -3,3s-3,-1.343 -3,-3c0,-4.878 4.58,-9 10,-9 8,0 11,5.982 11,11 0,4.145 -2.277,7.313 -6.413,8.92 -0.9,0.351 -1.79,0.587 -2.587,0.747V24c0,1.657 -1.343,3 -3,3z"
-      android:fillColor="#BE1931"/>
-  <path
-      android:pathData="M17,32m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
-      android:fillColor="#BE1931"/>
-</vector>
diff --git a/mastodon/src/main/res/drawable/logo.xml b/mastodon/src/main/res/drawable/logo.xml
deleted file mode 100644
index 42ef5a365..000000000
--- a/mastodon/src/main/res/drawable/logo.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="110dp"
-    android:height="18dp"
-    android:viewportWidth="110"
-    android:viewportHeight="18">
-  <path
-      android:pathData="M18.406,9.999V17.878H15.287V10.231C15.287,8.618 14.609,7.8 13.254,7.8C11.755,7.8 11.004,8.771 11.004,10.69V14.876H7.903V10.69C7.903,8.771 7.151,7.8 5.653,7.8C4.297,7.8 3.619,8.618 3.619,10.231V17.878H0.5V9.999C0.5,8.389 0.91,7.109 1.733,6.162C2.581,5.215 3.693,4.73 5.072,4.73C6.668,4.73 7.877,5.344 8.676,6.572L9.453,7.876L10.23,6.572C11.029,5.344 12.238,4.73 13.834,4.73C15.214,4.73 16.325,5.215 17.174,6.162C17.997,7.109 18.406,8.389 18.406,9.999ZM29.152,13.916C29.795,13.235 30.105,12.378 30.105,11.345C30.105,10.311 29.795,9.454 29.152,8.798C28.532,8.118 27.745,7.79 26.791,7.79C25.838,7.79 25.051,8.118 24.431,8.798C23.811,9.454 23.501,10.311 23.501,11.345C23.501,12.378 23.811,13.235 24.431,13.916C25.051,14.571 25.838,14.899 26.791,14.899C27.745,14.899 28.532,14.571 29.152,13.916ZM30.105,5.042H33.181V17.647H30.105V16.16C29.176,17.395 27.888,18 26.219,18C24.622,18 23.263,17.37 22.118,16.084C20.998,14.798 20.426,13.21 20.426,11.345C20.426,9.504 20.998,7.916 22.118,6.63C23.263,5.345 24.622,4.689 26.219,4.689C27.888,4.689 29.176,5.294 30.105,6.529V5.042ZM43.528,11.118C44.434,11.798 44.888,12.756 44.864,13.966C44.864,15.252 44.41,16.26 43.481,16.966C42.551,17.647 41.431,18 40.072,18C37.616,18 35.947,16.992 35.065,15L37.735,13.412C38.093,14.496 38.879,15.05 40.072,15.05C41.168,15.05 41.717,14.697 41.717,13.966C41.717,13.437 41.001,12.958 39.547,12.58C38.999,12.429 38.546,12.277 38.188,12.151C37.688,11.95 37.258,11.723 36.901,11.445C36.019,10.765 35.566,9.857 35.566,8.698C35.566,7.462 35.995,6.479 36.853,5.773C37.735,5.042 38.808,4.689 40.095,4.689C42.146,4.689 43.648,5.571 44.625,7.361L42.003,8.874C41.621,8.017 40.978,7.588 40.095,7.588C39.166,7.588 38.713,7.941 38.713,8.622C38.713,9.151 39.428,9.63 40.882,10.008C42.003,10.26 42.885,10.639 43.528,11.118ZM53.304,8.168H50.61V13.412C50.61,14.042 50.848,14.42 51.301,14.597C51.635,14.723 52.303,14.748 53.304,14.697V17.647C51.23,17.899 49.728,17.698 48.846,17.017C47.964,16.361 47.534,15.151 47.534,13.412V8.168H45.46V5.042H47.534V2.496L50.61,1.513V5.042H53.304V8.168ZM63.103,13.84C63.723,13.185 64.033,12.353 64.033,11.344C64.033,10.336 63.723,9.504 63.103,8.849C62.483,8.193 61.721,7.866 60.791,7.866C59.861,7.866 59.098,8.193 58.478,8.849C57.882,9.529 57.572,10.361 57.572,11.344C57.572,12.328 57.882,13.16 58.478,13.84C59.098,14.496 59.861,14.823 60.791,14.823C61.721,14.823 62.483,14.496 63.103,13.84ZM56.308,16.084C55.093,14.798 54.497,13.235 54.497,11.344C54.497,9.479 55.093,7.916 56.308,6.63C57.524,5.345 59.026,4.689 60.791,4.689C62.555,4.689 64.057,5.345 65.273,6.63C66.489,7.916 67.109,9.504 67.109,11.344C67.109,13.21 66.489,14.798 65.273,16.084C64.057,17.37 62.579,18 60.791,18C59.002,18 57.524,17.37 56.308,16.084ZM77.385,13.916C78.005,13.235 78.314,12.378 78.314,11.345C78.314,10.311 78.005,9.454 77.385,8.798C76.765,8.118 75.978,7.79 75.024,7.79C74.071,7.79 73.284,8.118 72.64,8.798C72.021,9.454 71.71,10.311 71.71,11.345C71.71,12.378 72.021,13.235 72.64,13.916C73.284,14.571 74.094,14.899 75.024,14.899C75.978,14.899 76.765,14.571 77.385,13.916ZM78.314,0H81.39V17.647H78.314V16.16C77.409,17.395 76.121,18 74.452,18C72.855,18 71.472,17.37 70.328,16.084C69.207,14.798 68.635,13.21 68.635,11.345C68.635,9.504 69.207,7.916 70.328,6.63C71.472,5.345 72.855,4.689 74.452,4.689C76.121,4.689 77.409,5.294 78.314,6.529V0ZM92.191,13.84C92.811,13.185 93.12,12.353 93.12,11.344C93.12,10.336 92.811,9.504 92.191,8.849C91.571,8.193 90.808,7.866 89.878,7.866C88.948,7.866 88.185,8.193 87.565,8.849C86.969,9.529 86.659,10.361 86.659,11.344C86.659,12.328 86.969,13.16 87.565,13.84C88.185,14.496 88.948,14.823 89.878,14.823C90.808,14.823 91.571,14.496 92.191,13.84ZM85.396,16.084C84.18,14.798 83.584,13.235 83.584,11.344C83.584,9.479 84.18,7.916 85.396,6.63C86.612,5.345 88.114,4.689 89.878,4.689C91.642,4.689 93.144,5.345 94.36,6.63C95.576,7.916 96.196,9.504 96.196,11.344C96.196,13.21 95.576,14.798 94.36,16.084C93.144,17.37 91.666,18 89.878,18C88.09,18 86.612,17.37 85.396,16.084ZM109.5,9.908V17.647H106.424V10.311C106.424,9.479 106.21,8.849 105.781,8.37C105.375,7.941 104.803,7.714 104.064,7.714C102.324,7.714 101.442,8.748 101.442,10.84V17.647H98.366V5.042H101.442V6.454C102.181,5.269 103.349,4.689 104.994,4.689C106.305,4.689 107.378,5.143 108.213,6.076C109.071,7.009 109.5,8.269 109.5,9.908Z"
-      android:fillColor="#282C37"/>
-</vector>
diff --git a/mastodon/src/main/res/menu/edit_list_action_mode.xml b/mastodon/src/main/res/menu/edit_list_action_mode.xml
deleted file mode 100644
index 87e8ad393..000000000
--- a/mastodon/src/main/res/menu/edit_list_action_mode.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:id="@+id/delete" android:showAsAction="always" android:icon="@drawable/ic_delete_24px" android:title="@string/delete"/>
-</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 3ca01960c..ee78a81b8 100644
--- a/mastodon/src/main/res/values/strings.xml
+++ b/mastodon/src/main/res/values/strings.xml
@@ -291,7 +291,6 @@
 		<item quantity="one">%,d boost</item>
 		<item quantity="other">%,d boosts</item>
 	</plurals>
-	<string name="timestamp_via_app">%1$s via %2$s</string>
 	<string name="time_now">now</string>
 	<string name="edit_history">Edit history</string>
 	<string name="last_edit_at_x">Last edit %s</string>
@@ -613,8 +612,6 @@
 	<string name="timeline_following">Home</string>
 	<string name="lists">Lists</string>
 	<string name="followed_hashtags">Followed hashtags</string>
-	<string name="no_lists">You don\'t have any lists yet.</string>
-	<string name="no_followed_hashtags">You don\'t follow any hashtags.</string>
 	<string name="manage_lists">Manage lists</string>
 	<string name="manage_hashtags">Manage hashtags</string>
 	<!-- Screen reader description for the menu on the home timeline screen -->