diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java b/mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
index 4b48934ca..e16c6fb98 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
@@ -165,6 +165,57 @@ public class TimelineDefinition {
     public enum Icon {
         HEART(R.drawable.ic_fluent_heart_24_regular, R.string.sk_icon_heart),
         STAR(R.drawable.ic_fluent_star_24_regular, R.string.sk_icon_star),
+        PEOPLE(R.drawable.ic_fluent_people_24_regular, R.string.sk_icon_people),
+        CITY(R.drawable.ic_fluent_city_24_regular, R.string.sk_icon_city),
+        IMAGE(R.drawable.ic_fluent_image_24_regular, R.string.sk_icon_image),
+        NEWS(R.drawable.ic_fluent_news_24_regular, R.string.sk_icon_news),
+        COLOR_PALETTE(R.drawable.ic_fluent_color_24_regular, R.string.sk_icon_color_palette),
+        CAT(R.drawable.ic_fluent_animal_cat_24_regular, R.string.sk_icon_cat),
+        DOG(R.drawable.ic_fluent_animal_dog_24_regular, R.string.sk_icon_dog),
+        RABBIT(R.drawable.ic_fluent_animal_rabbit_24_regular, R.string.sk_icon_rabbit),
+        TURTLE(R.drawable.ic_fluent_animal_turtle_24_regular, R.string.sk_icon_turtle),
+        ACADEMIC_CAP(R.drawable.ic_fluent_hat_graduation_24_regular, R.string.sk_icon_academic_cap),
+        BOT(R.drawable.ic_fluent_bot_24_regular, R.string.sk_icon_bot),
+        IMPORTANT(R.drawable.ic_fluent_important_24_regular, R.string.sk_icon_important),
+        SHIELD(R.drawable.ic_fluent_shield_24_regular, R.string.sk_icon_shield),
+        CHAT(R.drawable.ic_fluent_chat_multiple_24_regular, R.string.sk_icon_chat),
+        TAG(R.drawable.ic_fluent_tag_24_regular, R.string.sk_icon_tag),
+        TRAIN(R.drawable.ic_fluent_vehicle_subway_24_regular, R.string.sk_icon_train),
+        BICYCLE(R.drawable.ic_fluent_vehicle_bicycle_24_regular, R.string.sk_icon_bicycle),
+        MAP(R.drawable.ic_fluent_map_24_regular, R.string.sk_icon_map),
+        BACKPACK(R.drawable.ic_fluent_backpack_24_regular, R.string.sk_icon_backpack),
+        BRIEFCASE(R.drawable.ic_fluent_briefcase_24_regular, R.string.sk_icon_briefcase),
+        BOOK(R.drawable.ic_fluent_book_open_24_regular, R.string.sk_icon_book),
+        LANGUAGE(R.drawable.ic_fluent_local_language_24_regular, R.string.sk_icon_language),
+        WEATHER(R.drawable.ic_fluent_weather_rain_showers_day_24_regular, R.string.sk_icon_weather),
+        APERTURE(R.drawable.ic_fluent_scan_24_regular, R.string.sk_icon_aperture),
+        MUSIC(R.drawable.ic_fluent_music_note_2_24_regular, R.string.sk_icon_music),
+        LOCATION(R.drawable.ic_fluent_location_24_regular, R.string.sk_icon_location),
+        GLOBE(R.drawable.ic_fluent_globe_24_regular, R.string.sk_icon_globe),
+        MEGAPHONE(R.drawable.ic_fluent_megaphone_loud_24_regular, R.string.sk_icon_megaphone),
+        MICROPHONE(R.drawable.ic_fluent_mic_24_regular, R.string.sk_icon_microphone),
+        MICROSCOPE(R.drawable.ic_fluent_microscope_24_regular, R.string.sk_icon_microscope),
+        STETHOSCOPE(R.drawable.ic_fluent_stethoscope_24_regular, R.string.sk_icon_stethoscope),
+        KEYBOARD(R.drawable.ic_fluent_midi_24_regular, R.string.sk_icon_keyboard),
+        COFFEE(R.drawable.ic_fluent_drink_coffee_24_regular, R.string.sk_icon_coffee),
+        CLAPPER_BOARD(R.drawable.ic_fluent_movies_and_tv_24_regular, R.string.sk_icon_clapper_board),
+        LAUGH(R.drawable.ic_fluent_emoji_laugh_24_regular, R.string.sk_icon_laugh),
+        BALLOON(R.drawable.ic_fluent_balloon_24_regular, R.string.sk_icon_balloon),
+        PI(R.drawable.ic_fluent_pi_24_regular, R.string.sk_icon_pi),
+        MATH_FORMULA(R.drawable.ic_fluent_math_formula_24_regular, R.string.sk_icon_math_formula),
+        GAMES(R.drawable.ic_fluent_games_24_regular, R.string.sk_icon_games),
+        CODE(R.drawable.ic_fluent_code_24_regular, R.string.sk_icon_code),
+        BUG(R.drawable.ic_fluent_bug_24_regular, R.string.sk_icon_bug),
+        LIGHT_BULB(R.drawable.ic_fluent_lightbulb_24_regular, R.string.sk_icon_light_bulb),
+        FIRE(R.drawable.ic_fluent_fire_24_regular, R.string.sk_icon_fire),
+        LEAVES(R.drawable.ic_fluent_leaf_three_24_regular, R.string.sk_icon_leaves),
+        SPORT(R.drawable.ic_fluent_sport_24_regular, R.string.sk_icon_sport),
+        HEALTH(R.drawable.ic_fluent_heart_pulse_24_regular, R.string.sk_icon_health),
+        PIZZA(R.drawable.ic_fluent_food_pizza_24_regular, R.string.sk_icon_pizza),
+        GAVEL(R.drawable.ic_fluent_gavel_24_regular, R.string.sk_icon_gavel),
+        GAUGE(R.drawable.ic_fluent_gauge_24_regular, R.string.sk_icon_gauge),
+        HEADPHONES(R.drawable.ic_fluent_headphones_sound_wave_24_regular, R.string.sk_icon_headphones),
+        HUMAN(R.drawable.ic_fluent_accessibility_24_regular, R.string.sk_icon_human),
 
         HOME(R.drawable.ic_fluent_home_24_regular, R.string.sk_timeline_home, true),
         LOCAL(R.drawable.ic_fluent_people_community_24_regular, R.string.sk_timeline_local, true),
diff --git a/mastodon/src/main/res/drawable/ic_fluent_accessibility_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_accessibility_24_regular.xml
new file mode 100644
index 000000000..1e0603d2b
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_accessibility_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M10.5 5c0 0.641 0.402 1.188 0.968 1.403 0.35 0.085 0.714 0.085 1.063 0C13.098 6.19 13.5 5.641 13.5 5c0-0.828-0.672-1.5-1.5-1.5-0.829 0-1.5 0.672-1.5 1.5zM9.026 5.399C9.01 5.269 9 5.135 9 5c0-1.657 1.343-3 3-3s3 1.343 3 3c0 0.135-0.009 0.268-0.026 0.399l2.876-1.221c1.143-0.485 2.468 0.044 2.962 1.184 0.495 1.143-0.034 2.467-1.181 2.954l-3.628 1.54v3.717l1.874 5.444c0.404 1.175-0.22 2.455-1.395 2.86-1.175 0.404-2.455-0.22-2.86-1.395L12 15.772l-1.622 4.71c-0.404 1.175-1.685 1.799-2.86 1.394-1.175-0.404-1.8-1.685-1.394-2.86l1.878-5.456V9.857L4.37 8.316c-1.147-0.487-1.676-1.81-1.18-2.954 0.493-1.14 1.818-1.67 2.96-1.184l2.877 1.22zm1.996 2.438c-0.165-0.045-0.328-0.1-0.487-0.168l-4.971-2.11c-0.385-0.164-0.833 0.016-1 0.399-0.163 0.38 0.011 0.816 0.392 0.977L8.74 8.542c0.462 0.196 0.761 0.649 0.761 1.15v3.91c0 0.138-0.023 0.275-0.068 0.406l-1.892 5.497c-0.135 0.392 0.073 0.818 0.465 0.953 0.391 0.135 0.818-0.073 0.953-0.465l2.108-6.123c0.306-0.888 1.56-0.884 1.864 0l2.108 6.123c0.135 0.392 0.562 0.6 0.954 0.465 0.391-0.134 0.6-0.561 0.465-0.953l-1.888-5.483c-0.046-0.131-0.069-0.268-0.069-0.407V9.69c0-0.501 0.3-0.954 0.762-1.15l3.78-1.605c0.381-0.161 0.555-0.598 0.391-0.977-0.166-0.383-0.614-0.563-0.999-0.4l-4.97 2.11c-0.16 0.068-0.323 0.125-0.489 0.17C12.671 7.942 12.342 8 12 8c-0.342 0-0.671-0.057-0.978-0.163z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_animal_cat_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_animal_cat_24_regular.xml
new file mode 100644
index 000000000..6203e61ed
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_animal_cat_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M15.492 3.507c-0.84 0.075-1.499 0.782-1.499 1.643V10c0 0.414-0.335 0.75-0.75 0.75-1.443 0-2.457 0.588-3.207 1.488-0.772 0.928-1.275 2.206-1.59 3.557-0.313 1.343-0.427 2.696-0.462 3.722C7.973 19.9 7.97 20.232 7.974 20.5h7.019v-0.75c0-1.243-1.007-2.25-2.249-2.25h-1.25c-0.413 0-0.749-0.336-0.749-0.75S11.081 16 11.495 16h1.249c2.07 0 3.748 1.679 3.748 3.75v0.75h0.75c0.413 0 0.75-0.336 0.75-0.75v-10c0-0.414 0.335-0.75 0.749-0.75h0.506c0.98 0 1.578-1.076 1.062-1.909l-0.62-1C19.462 5.724 19.06 5.5 18.628 5.5h-2.386c-0.414 0-0.75-0.336-0.75-0.75V3.507zM6.474 20.5c-0.003-0.284-0.001-0.634 0.012-1.033 0.036-1.083 0.157-2.542 0.5-4.012 0.34-1.462 0.915-2.996 1.899-4.177 0.872-1.047 2.055-1.801 3.61-1.985V5.15c0-1.74 1.409-3.15 3.147-3.15 0.746 0 1.35 0.604 1.35 1.35V4h1.636c0.95 0 1.834 0.492 2.335 1.3l0.62 1c1.092 1.763-0.084 4.02-2.093 4.19v9.26c0 1.243-1.006 2.25-2.248 2.25H5.795C3.7 22 2 20.3 2 18.202c0-0.963 0.365-1.889 1.021-2.592l1.135-1.217c0.764-0.819 1.02-1.99 0.665-3.053-0.15-0.45-0.403-0.86-0.738-1.195L2.969 9.03c-0.293-0.292-0.293-0.767 0-1.06 0.293-0.293 0.767-0.293 1.06 0l1.114 1.114c0.5 0.5 0.877 1.11 1.1 1.782 0.528 1.584 0.148 3.33-0.99 4.55l-1.136 1.217C3.72 17.06 3.499 17.62 3.499 18.202c0 1.269 1.029 2.298 2.297 2.298h0.678z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_animal_dog_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_animal_dog_24_regular.xml
new file mode 100644
index 000000000..53640efe7
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_animal_dog_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M13.25 2h3.185c0.509 0 1.007 0.141 1.44 0.408l2.768 1.703C20.865 4.248 21 4.49 21 4.75v1.5c0 1.243-1.007 2.25-2.25 2.25H18.5v9.047c0.997 0.134 1.695 0.555 2.095 1.275 0.223 0.403 0.318 0.84 0.362 1.243C21 20.456 21 20.865 21 21.225v0.025c0 0.414-0.336 0.75-0.75 0.75H5.833C3.716 22 2 20.284 2 18.167c0-1.398 0.749-2.62 1.864-3.29 0.355-0.213 0.816-0.097 1.029 0.258 0.213 0.355 0.098 0.816-0.258 1.029C3.954 16.573 3.5 17.317 3.5 18.167c0 1.288 1.045 2.333 2.333 2.333 0.319 0 0.517-0.083 0.649-0.176 0.139-0.098 0.248-0.238 0.332-0.407 0.084-0.17 0.133-0.35 0.16-0.493 0.013-0.07 0.02-0.126 0.023-0.162L7 19.227v-0.035l0.004-0.143c0.005-0.122 0.013-0.296 0.03-0.51 0.032-0.426 0.098-1.017 0.23-1.676 0.26-1.292 0.796-2.968 1.952-4.14 0.848-0.86 1.309-2.119 1.547-3.364C11 8.13 11 7.008 11 6.5V4.25C11 3.008 12.006 2 13.25 2zm-5.5 17.25l0.75 0.026v0.006l-0.001 0.01-0.002 0.028-0.007 0.09c-0.007 0.073-0.02 0.173-0.042 0.29-0.04 0.213-0.113 0.5-0.251 0.8h7.25c-0.09-0.494-0.34-1.006-1.013-1.32L14.4 19.164c-0.052-0.028-0.202-0.077-0.45-0.116-0.23-0.036-0.484-0.055-0.701-0.055l-0.283 0.004-0.141 0.002h-0.06c-0.415 0.009-0.757-0.321-0.764-0.735-0.008-0.414 0.322-0.756 0.736-0.764H12.8l0.143-0.002 0.307-0.004c0.235 0 0.495 0.016 0.75 0.047v-2.287c0-0.414 0.336-0.75 0.75-0.75s0.75 0.336 0.75 0.75v2.804c1.065 0.682 1.374 1.703 1.463 2.443h2.524c-0.004-0.093-0.011-0.183-0.021-0.27-0.033-0.301-0.094-0.52-0.183-0.68C19.153 19.316 18.85 19 17.75 19 17.336 19 17 18.664 17 18.25V7.75C17 7.336 17.336 7 17.75 7h1c0.414 0 0.75-0.336 0.75-0.75V5.17l-2.411-1.485C16.892 3.564 16.666 3.5 16.435 3.5h-3.186c-0.414 0-0.749 0.335-0.749 0.75v2.232c0.013 0.228 0.092 0.425 0.205 0.554 0.101 0.115 0.26 0.214 0.545 0.214 0.287 0 0.453-0.101 0.556-0.219C13.92 6.9 14 6.696 14 6.45c0-0.414 0.336-0.75 0.75-0.75s0.75 0.336 0.75 0.75c0 0.554-0.177 1.125-0.566 1.569-0.4 0.457-0.984 0.731-1.684 0.731-0.312 0-0.599-0.054-0.855-0.154-0.038 0.332-0.09 0.684-0.158 1.045-0.262 1.366-0.801 2.968-1.953 4.136-0.845 0.856-1.308 2.18-1.549 3.38-0.117 0.588-0.176 1.117-0.206 1.498-0.015 0.19-0.022 0.343-0.025 0.446L8.5 19.217v0.059L7.75 19.25zm8.5 2.75v-0.75z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_animal_rabbit_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_animal_rabbit_24_regular.xml
new file mode 100644
index 000000000..3925a7c2e
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_animal_rabbit_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M7.75 19c-1.463 0-2.658-1.141-2.745-2.582L5 16.25V15c-1.657 0-3-1.344-3-3 0-1.657 1.343-3 3-3 1.074 0 2.031 0.57 2.562 1.44 0.512-0.247 1.08-0.398 1.68-0.432L9.5 10h4l0.248 0.007 0.245 0.02 0.127 0.017 0.11-0.167 0.131-0.178-1.777-1.777c-0.7-0.7-0.773-1.788-0.22-2.57l0.103-0.134 0.117-0.128c0.74-0.74 1.918-0.78 2.705-0.117l0.127 0.117 5.412 5.413c1.563 1.562 1.563 4.095 0 5.657-0.72 0.72-1.665 1.122-2.642 1.167l-0.225 0.004-0.182-0.007-0.026 0.064c-0.386 0.85-1.189 1.462-2.138 1.588l-0.192 0.019L15.249 19H7.75zm6.605-12.849c-0.196-0.196-0.514-0.196-0.71 0-0.175 0.175-0.194 0.445-0.058 0.641l0.058 0.07 2.808 2.808-0.638 0.642c-0.21 0.21-0.385 0.444-0.523 0.696L15.195 11.2l-0.266 0.584-0.618-0.173c-0.196-0.055-0.398-0.09-0.604-0.104L13.499 11.5H9.5c-0.7 0-1.343 0.24-1.853 0.64l-0.143 0.12-0.165 0.16-0.093 0.1-0.111 0.134-0.121 0.167-0.042 0.064c-0.041 0.063-0.08 0.129-0.115 0.196l-0.058 0.112-0.062 0.137-0.034 0.084-0.051 0.142-0.055 0.184c-0.025 0.097-0.046 0.197-0.062 0.297L6.524 14.12l-0.018 0.19L6.5 14.5v1.75c0 0.648 0.492 1.18 1.122 1.244L7.75 17.5h4.251v-0.246c0-0.648-0.491-1.18-1.121-1.244l-0.128-0.006h-1c-0.414 0-0.75-0.336-0.75-0.75 0-0.38 0.282-0.694 0.648-0.743l0.102-0.007h1c1.462 0 2.658 1.141 2.745 2.582l0.005 0.168L13.5 17.5h1.748c0.592 0 1.095-0.414 1.219-0.975l0.02-0.122 0.1-0.84 0.822 0.198c0.842 0.204 1.734-0.038 2.358-0.662 0.934-0.934 0.974-2.423 0.122-3.405l-0.122-0.13-5.413-5.413zM5 10.501C4.17 10.5 3.5 11.17 3.5 12c0 0.78 0.595 1.42 1.355 1.492L5 13.5l0.115-0.005 0.005-0.025c0.035-0.15 0.077-0.295 0.126-0.438l0.097-0.255 0.106-0.236 0.057-0.113 0.13-0.234 0.088-0.14 0.145-0.21 0.074-0.098 0.108-0.134 0.129-0.147 0.15-0.157c-0.21-0.4-0.59-0.69-1.037-0.778l-0.151-0.022L5 10.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_animal_turtle_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_animal_turtle_24_regular.xml
new file mode 100644
index 000000000..df5c66995
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_animal_turtle_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M10.997 5.998c2.623 0 4.946 1.665 5.8 4.126l0.075 0.233 0.044 0.144h2.33c1.462 0 2.658 1.142 2.744 2.582l0.005 0.167v1c0 0.917-0.707 1.67-1.606 1.743l-0.143 0.005H18.62l0.241 0.584c0.35 0.846-0.015 1.808-0.813 2.22l-0.137 0.064c-0.159 0.065-0.326 0.107-0.496 0.124l-0.171 0.008h-1.787c-0.625 0-1.199-0.333-1.51-0.867l-0.072-0.137-0.539-1.143 0.054-0.007c-1.4 0.186-2.817 0.208-4.221 0.066l-0.497-0.057-0.535 1.136c-0.289 0.614-0.905 1.005-1.583 1.005H4.75c-0.229 0-0.455-0.045-0.667-0.132-0.893-0.367-1.319-1.39-0.951-2.283l0.433-1.05c-0.94-0.569-1.57-1.6-1.57-2.78 0-0.38 0.282-0.693 0.648-0.742L2.745 12h1.88l0.497-1.643c0.784-2.588 3.17-4.359 5.875-4.359zm6.777 9.694c-0.771 0.31-1.559 0.564-2.356 0.764l-0.549 0.129 0.362 0.77c0.025 0.053 0.067 0.094 0.117 0.119l0.053 0.018 0.056 0.007h1.787c0.033 0 0.065-0.007 0.095-0.02 0.107-0.043 0.166-0.152 0.153-0.26l-0.017-0.065-0.478-1.156h-0.043l0.411-0.148 0.409-0.159zm-13.552 0l0.39 0.151L5 15.984 4.518 17.15c-0.052 0.127 0.009 0.273 0.136 0.326 0.03 0.012 0.063 0.019 0.096 0.019h1.804l0.057-0.007c0.073-0.017 0.136-0.067 0.17-0.137l0.359-0.763 0.044 0.01c-1.005-0.216-1.996-0.518-2.962-0.906zm6.775-8.195c-1.971 0-3.718 1.245-4.371 3.087l-0.069 0.207-1.135 3.75 0.163 0.059c3.372 1.158 7.025 1.202 10.42 0.133L16.41 14.6l0.162-0.059-1.136-3.75c-0.55-1.816-2.145-3.1-4.006-3.274l-0.216-0.015-0.218-0.005zm-6.977 6.5l0.151-0.5L3.664 13.5l0.026 0.05c0.086 0.166 0.198 0.316 0.33 0.446zM17.37 12l0.756 2.498 2.12 0.001c0.118 0 0.217-0.082 0.243-0.192l0.007-0.058V13.25c0-0.647-0.492-1.179-1.122-1.243l-0.128-0.006H17.37z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_backpack_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_backpack_24_regular.xml
new file mode 100644
index 000000000..8067b544d
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_backpack_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M10.417 8C9.082 8 8 9.082 8 10.417 8 11.29 8.709 12 9.583 12h4.834C15.29 12 16 11.291 16 10.417 16 9.082 14.918 8 13.583 8h-3.166zM9.5 10.417C9.5 9.91 9.91 9.5 10.417 9.5h3.166c0.507 0 0.917 0.41 0.917 0.917 0 0.046-0.037 0.083-0.083 0.083H9.583c-0.046 0-0.083-0.037-0.083-0.083zM12 2c-1.961 0-3.57 1.506-3.736 3.424C5.728 6.766 4 9.431 4 12.5v6.25C4 20.545 5.455 22 7.25 22h9.5c1.795 0 3.25-1.455 3.25-3.25V12.5c0-3.069-1.728-5.734-4.264-7.076C15.571 3.506 13.961 2 12 2zm6.5 12h-13v-1.5C5.5 8.91 8.41 6 12 6s6.5 2.91 6.5 6.5V14zM8 17.25C8 17.664 8.336 18 8.75 18s0.75-0.336 0.75-0.75v-1.536h9v3.036c0 0.966-0.784 1.75-1.75 1.75h-9.5c-0.966 0-1.75-0.784-1.75-1.75v-3.036H8v1.536zM12 4.5c-0.698 0-1.374 0.09-2.02 0.257C10.347 4.012 11.114 3.5 12 3.5c0.886 0 1.653 0.512 2.02 1.257C13.374 4.59 12.698 4.5 12 4.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_balloon_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_balloon_24_regular.xml
new file mode 100644
index 000000000..23c61eb37
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_balloon_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M12.018 5.665c0.095-0.404 0.498-0.654 0.902-0.559 1.468 0.346 2.623 1.499 2.972 2.966 0.095 0.403-0.154 0.807-0.557 0.903-0.403 0.096-0.807-0.153-0.903-0.556-0.217-0.915-0.94-1.637-1.856-1.853-0.403-0.095-0.653-0.498-0.558-0.901zM5 9c0-3.866 3.134-7 7-7s7 3.134 7 7c0 2.025-0.67 4.236-1.85 5.956-1.042 1.52-2.543 2.731-4.4 2.992v0.302c0 0.414 0.336 0.75 0.75 0.75h3.25c1.243 0 2.25 1.007 2.25 2.25v1c0 0.414-0.336 0.75-0.75 0.75s-0.75-0.336-0.75-0.75v-1c0-0.414-0.336-0.75-0.75-0.75H13.5c-1.243 0-2.25-1.007-2.25-2.25v-0.302c-1.857-0.261-3.357-1.473-4.4-2.992C5.67 13.236 5 11.025 5 9zm7-5.5C8.962 3.5 6.5 5.962 6.5 9c0 1.725 0.58 3.64 1.586 5.107C9.094 15.575 10.453 16.5 12 16.5c1.547 0 2.906-0.925 3.914-2.393C16.92 12.639 17.5 10.725 17.5 9c0-3.038-2.462-5.5-5.5-5.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_book_open_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_book_open_24_regular.xml
new file mode 100644
index 000000000..c6c56d0dc
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_book_open_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M12 19.137C11.499 19.67 10.788 20 10 20H3.75C2.784 20 2 19.216 2 18.25V5.75C2 4.784 2.784 4 3.75 4H10c0.788 0 1.499 0.331 2 0.862C12.501 4.332 13.212 4 14 4h6.25C21.216 4 22 4.784 22 5.75v12.5c0 0.966-0.784 1.75-1.75 1.75H14c-0.788 0-1.499-0.331-2-0.863zM3.5 5.75v12.5c0 0.138 0.112 0.25 0.25 0.25H10c0.69 0 1.25-0.56 1.25-1.25V6.75c0-0.69-0.56-1.25-1.25-1.25H3.75C3.612 5.5 3.5 5.612 3.5 5.75zm9.25 11.5c0 0.69 0.56 1.25 1.25 1.25h6.25c0.138 0 0.25-0.112 0.25-0.25V5.75c0-0.138-0.112-0.25-0.25-0.25H14c-0.69 0-1.25 0.56-1.25 1.25v10.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_bot_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_bot_24_regular.xml
new file mode 100644
index 000000000..7f0d356af
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_bot_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M17.753 14c1.243 0 2.25 1.007 2.25 2.25v0.904c0 1.094-0.477 2.133-1.307 2.846-1.565 1.344-3.806 2-6.696 2-2.89 0-5.128-0.656-6.69-2-0.83-0.712-1.306-1.75-1.306-2.843v-0.908c0-1.242 1.007-2.25 2.25-2.25h11.5zm0 1.5h-11.5c-0.413 0-0.75 0.335-0.75 0.75v0.907c0 0.655 0.287 1.278 0.784 1.706C7.545 19.945 9.441 20.5 12 20.5c2.56 0 4.458-0.557 5.72-1.64 0.497-0.427 0.783-1.05 0.783-1.707V16.25c0-0.414-0.335-0.75-0.75-0.75zM11.9 2.006L12 2c0.38 0 0.693 0.282 0.743 0.648L12.75 2.75v0.749h3.5c1.243 0 2.25 1.008 2.25 2.25v4.505c0 1.243-1.007 2.25-2.25 2.25h-8.5c-1.242 0-2.25-1.007-2.25-2.25V5.75c0-1.243 1.008-2.25 2.25-2.25l3.5-0.001V2.75c0-0.38 0.283-0.693 0.649-0.743L12 2l-0.102 0.007zM16.25 5h-8.5C7.336 5 7 5.335 7 5.75v4.504c0 0.414 0.336 0.75 0.75 0.75h8.5c0.415 0 0.75-0.336 0.75-0.75V5.75C17 5.335 16.665 5 16.25 5zm-6.5 1.5c0.69 0 1.249 0.559 1.249 1.249 0 0.69-0.56 1.25-1.25 1.25S8.5 8.438 8.5 7.748s0.56-1.25 1.25-1.25zm4.492 0c0.69 0 1.25 0.559 1.25 1.249 0 0.69-0.56 1.25-1.25 1.25s-1.249-0.56-1.249-1.25 0.56-1.25 1.25-1.25z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_briefcase_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_briefcase_24_regular.xml
new file mode 100644
index 000000000..5edf325a2
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_briefcase_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M8.75 3h6.5c0.38 0 0.694 0.282 0.743 0.648L16 3.75V7h1.75C19.545 7 21 8.455 21 10.25v6.5c0 1.795-1.455 3.25-3.25 3.25H6.25C4.455 20 3 18.545 3 16.75v-6.5C3 8.455 4.455 7 6.25 7H8V3.75c0-0.38 0.282-0.693 0.648-0.743L8.75 3h6.5-6.5zm9 5.5H6.25c-0.966 0-1.75 0.784-1.75 1.75v6.5c0 0.966 0.784 1.75 1.75 1.75h11.5c0.966 0 1.75-0.784 1.75-1.75v-6.5c0-0.966-0.784-1.75-1.75-1.75zm-3.25-4h-5V7h5V4.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_bug_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_bug_24_regular.xml
new file mode 100644
index 000000000..4511feb89
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_bug_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M10.5 2.752c0-0.414-0.336-0.75-0.75-0.75S9 2.338 9 2.752v0.752c0 0.632 0.196 1.22 0.53 1.703-1.393 0.48-2.415 1.755-2.52 3.284H6.752c-1.242-0.005-2.246-1.017-2.24-2.26l0.006-1.485C4.52 4.332 4.186 3.995 3.772 3.993 3.358 3.99 3.02 4.326 3.019 4.74L3.013 6.225c-0.01 2.072 1.663 3.757 3.734 3.766H7v1.51H2.75C2.336 11.5 2 11.836 2 12.25 2 12.665 2.336 13 2.75 13H7v1.992H6.747C4.676 15 3.004 16.687 3.013 18.758l0.006 1.486c0.001 0.414 0.338 0.749 0.753 0.747 0.414-0.002 0.748-0.339 0.747-0.753l-0.006-1.486c-0.006-1.242 0.998-2.254 2.24-2.26h0.473c0.635 2.034 2.532 3.51 4.774 3.51s4.14-1.476 4.774-3.51h0.473c1.242 0.006 2.246 1.018 2.24 2.26l-0.006 1.486c-0.001 0.414 0.333 0.751 0.747 0.753 0.414 0.002 0.752-0.333 0.753-0.747l0.006-1.486c0.01-2.07-1.663-3.756-3.734-3.765H17V13h4.251c0.415 0 0.75-0.336 0.75-0.75 0-0.415-0.335-0.75-0.75-0.75H17V9.99h0.253c2.071-0.009 3.743-1.694 3.735-3.766L20.98 4.74c-0.001-0.414-0.339-0.749-0.753-0.747-0.414 0.002-0.748 0.339-0.747 0.753l0.006 1.486c0.006 1.242-0.997 2.254-2.24 2.259H16.99c-0.106-1.529-1.128-2.805-2.52-3.284C14.803 4.723 15 4.137 15 3.504V2.752c0-0.414-0.336-0.75-0.75-0.75s-0.75 0.336-0.75 0.75v0.752c0 0.828-0.672 1.5-1.5 1.5s-1.5-0.671-1.5-1.5V2.752zm-2 6.002c0-1.243 1.007-2.25 2.25-2.25h2.5c1.243 0 2.25 1.007 2.25 2.25v6.247c0 1.933-1.567 3.5-3.5 3.5s-3.5-1.567-3.5-3.5V8.754z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_city_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_city_24_regular.xml
new file mode 100644
index 000000000..d64de55fd
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_city_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M12 1.996c0.414 0 0.75 0.336 0.75 0.75V4h2c0.966 0 1.75 0.784 1.75 1.75V11h2.25c0.966 0 1.75 0.784 1.75 1.75v7.5c0 0.967-0.784 1.75-1.75 1.75H5.25c-0.966 0-1.75-0.783-1.75-1.75v-8.43c0-0.619 0.327-1.192 0.86-1.507L7.5 8.458V5.749C7.5 4.783 8.284 4 9.25 4h2V2.746c0-0.414 0.336-0.75 0.75-0.75zM9 8.018c0.81 0.12 1.5 0.806 1.5 1.734v10.747h3v-7.75c0-0.881 0.652-1.61 1.5-1.732V5.75c0-0.138-0.112-0.25-0.25-0.25h-5.5C9.112 5.5 9 5.611 9 5.75v2.269zm6.25 4.481c-0.138 0-0.25 0.112-0.25 0.25v7.75h3.75c0.138 0 0.25-0.111 0.25-0.25v-7.5c0-0.138-0.112-0.25-0.25-0.25h-3.5zM8.623 9.537l-3.5 2.068C5.047 11.65 5 11.732 5 11.82v8.43c0 0.137 0.112 0.25 0.25 0.25H9V9.751c0-0.194-0.21-0.314-0.377-0.215z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_code_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_code_24_regular.xml
new file mode 100644
index 000000000..1ffd4232a
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_code_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M8.066 18.943l6.5-14.5c0.17-0.378 0.613-0.547 0.99-0.377 0.347 0.155 0.518 0.54 0.414 0.895l-0.036 0.096-6.5 14.5c-0.17 0.378-0.613 0.547-0.99 0.378-0.347-0.156-0.518-0.542-0.414-0.896l0.036-0.096 6.5-14.5-6.5 14.5zM2.22 11.47l4.25-4.25c0.293-0.293 0.767-0.293 1.06 0 0.267 0.266 0.29 0.683 0.073 0.976L7.53 8.281 3.81 12l3.72 3.719c0.293 0.293 0.293 0.768 0 1.06-0.266 0.267-0.683 0.291-0.976 0.073L6.47 16.78l-4.25-4.25c-0.267-0.266-0.29-0.682-0.073-0.976L2.22 11.47l4.25-4.25-4.25 4.25zm14.25-4.25c0.266-0.266 0.683-0.29 0.976-0.073L17.53 7.22l4.25 4.25c0.267 0.266 0.29 0.683 0.073 0.976l-0.073 0.085-4.25 4.25c-0.293 0.292-0.767 0.292-1.06 0-0.267-0.267-0.29-0.683-0.073-0.977l0.073-0.084L20.19 12l-3.72-3.72c-0.293-0.292-0.293-0.767 0-1.06z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_drink_coffee_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_drink_coffee_24_regular.xml
new file mode 100644
index 000000000..d164b5185
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_drink_coffee_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M5.5 2.75C5.5 2.336 5.164 2 4.75 2S4 2.336 4 2.75c0 1.27 0.928 1.917 1.506 2.32L5.57 5.114C6.25 5.59 6.5 5.82 6.5 6.25 6.5 6.664 6.836 7 7.25 7S8 6.664 8 6.25c0-1.27-0.928-1.917-1.506-2.32L6.43 3.886C5.75 3.41 5.5 3.18 5.5 2.75zM3 9.821C3 8.816 3.816 8 4.821 8H17.18C18.185 8 19 8.816 19 9.821V10.5h0.75c1.795 0 3.25 1.455 3.25 3.25S21.545 17 19.75 17h-1.331c-1.187 2.932-4.062 5-7.419 5-4.418 0-8-3.582-8-8V9.821zm14.5 0c0-0.177-0.144-0.321-0.321-0.321H4.82C4.644 9.5 4.5 9.644 4.5 9.821V14c0 3.59 2.91 6.5 6.5 6.5s6.5-2.91 6.5-6.5V9.821zM19.75 12H19v2c0 0.513-0.048 1.014-0.14 1.5h0.89c0.966 0 1.75-0.784 1.75-1.75S20.716 12 19.75 12zm-11-10C9.164 2 9.5 2.336 9.5 2.75c0 0.431 0.25 0.66 0.93 1.136l0.064 0.044C11.072 4.333 12 4.98 12 6.25 12 6.664 11.664 7 11.25 7S10.5 6.664 10.5 6.25c0-0.431-0.25-0.66-0.93-1.136L9.506 5.07C8.928 4.667 8 4.02 8 2.75 8 2.336 8.336 2 8.75 2zm4.75 0.75C13.5 2.336 13.164 2 12.75 2S12 2.336 12 2.75c0 1.27 0.928 1.917 1.506 2.32l0.064 0.044C14.25 5.59 14.5 5.82 14.5 6.25 14.5 6.664 14.836 7 15.25 7S16 6.664 16 6.25c0-1.27-0.928-1.917-1.506-2.32L14.43 3.886C13.75 3.41 13.5 3.18 13.5 2.75z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_emoji_laugh_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_emoji_laugh_24_regular.xml
new file mode 100644
index 000000000..58c6c4554
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_emoji_laugh_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M6.75 12c-0.212 0-0.412 0.089-0.555 0.244-0.142 0.156-0.212 0.364-0.193 0.574C6.282 15.892 8.552 18.5 12 18.5c3.448 0 5.717-2.608 5.998-5.682 0.019-0.21-0.051-0.418-0.193-0.574C17.663 12.09 17.462 12 17.25 12H6.749zM12 17c-2.257 0-3.871-1.48-4.368-3.5h8.736C15.872 15.52 14.258 17 12 17zm3.25-8.25c-0.408 0-0.71 0.287-0.758 0.61-0.06 0.41-0.442 0.693-0.852 0.632-0.41-0.06-0.693-0.442-0.632-0.852 0.162-1.09 1.123-1.89 2.242-1.89s2.08 0.8 2.242 1.89c0.06 0.41-0.222 0.791-0.632 0.852-0.41 0.06-0.791-0.222-0.852-0.632-0.048-0.323-0.35-0.61-0.758-0.61zM7.992 9.36C8.04 9.037 8.342 8.75 8.75 8.75c0.409 0 0.71 0.287 0.758 0.61 0.06 0.41 0.442 0.693 0.852 0.632 0.41-0.06 0.693-0.442 0.632-0.852-0.161-1.09-1.123-1.89-2.242-1.89s-2.08 0.8-2.242 1.89C6.448 9.55 6.731 9.931 7.14 9.992c0.41 0.06 0.791-0.222 0.852-0.632zM12 2C6.477 2 2 6.477 2 12s4.477 10 10 10 10-4.477 10-10S17.523 2 12 2zM3.5 12c0-4.694 3.806-8.5 8.5-8.5s8.5 3.806 8.5 8.5-3.806 8.5-8.5 8.5-8.5-3.806-8.5-8.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_fire_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_fire_24_regular.xml
new file mode 100644
index 000000000..4d2868f9f
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_fire_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M12.538 4.295c0.323-0.244 0.644-0.431 0.93-0.563 0.088 2.127 1.127 3.726 2.129 5.14l0.272 0.382c1.083 1.518 2.011 2.819 2.112 4.54 0.117 1.982-0.377 3.657-1.336 4.824C15.7 19.77 14.24 20.5 12.25 20.5c-2.061 0-3.61-0.529-4.691-1.416-1.077-0.883-1.764-2.181-1.994-3.872-0.226-1.663 0.176-2.845 0.611-3.603 0.086-0.149 0.173-0.282 0.258-0.4l0.315 0.598c0.551 1.046 1.83 1.472 2.898 0.965 1.306-0.62 1.584-2.213 1.17-3.33-0.29-0.783-0.445-1.737-0.11-2.694 0.377-1.072 1.091-1.896 1.831-2.454zM6.156 9.322L6.154 9.325 6.15 9.328 6.14 9.336 6.11 9.36C6.084 9.38 6.052 9.406 6.013 9.44c-0.076 0.067-0.18 0.164-0.301 0.29-0.24 0.253-0.548 0.629-0.837 1.132-0.582 1.015-1.071 2.528-0.796 4.551 0.271 1.997 1.11 3.666 2.528 4.83C8.021 21.404 9.935 22 12.25 22c2.387 0 4.293-0.895 5.554-2.43 1.25-1.521 1.808-3.596 1.675-5.864-0.128-2.176-1.313-3.827-2.36-5.285L16.82 8.004c-1.142-1.612-2.043-3.097-1.824-5.175 0.022-0.212-0.046-0.423-0.189-0.58C14.665 2.09 14.463 2 14.25 2c-0.382 0-0.82 0.118-1.242 0.296-0.436 0.183-0.91 0.452-1.373 0.8-0.925 0.698-1.85 1.75-2.343 3.156C8.8 7.654 9.05 8.99 9.41 9.963c0.237 0.639-0.02 1.27-0.406 1.454-0.342 0.162-0.752 0.026-0.928-0.31L7.27 9.576C7.167 9.38 6.985 9.24 6.77 9.193c-0.214-0.049-0.439 0-0.615 0.13z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_food_pizza_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_food_pizza_24_regular.xml
new file mode 100644
index 000000000..5f36cf5c2
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_food_pizza_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M9 10.99c0.552 0 1-0.447 1-1 0-0.552-0.448-1-1-1s-1 0.448-1 1c0 0.553 0.448 1 1 1zm5 1.998c0 0.553-0.448 1-1 1s-1-0.447-1-1c0-0.552 0.448-1 1-1s1 0.448 1 1zm-5 3.998c0.552 0 1-0.448 1-1 0-0.553-0.448-1-1-1s-1 0.447-1 1c0 0.552 0.448 1 1 1zM5 4.66c0-1.497 1.23-2.805 2.82-2.648C13.146 2.539 17.882 5.07 21.262 8.84c1.07 1.193 0.737 2.964-0.479 3.845-1.582 1.148-3.94 2.857-5.283 3.833-0.002 0.437-0.002 0.721-0.001 1.092v0.628c0 0.946-0.763 1.75-1.75 1.75-0.105 0-0.207-0.009-0.306-0.026-0.204 0.826-0.932 1.527-1.944 1.527-0.7 0-1.262-0.335-1.609-0.815l-1.325 0.957c-1.488 1.074-3.57 0.011-3.569-1.826L5 4.661zm2.673-1.155C7.064 3.446 6.499 3.949 6.499 4.66v0.52c5.254 0.22 9.911 2.749 12.985 6.594l0.419-0.304c0.578-0.42 0.652-1.173 0.242-1.63-3.138-3.5-7.533-5.848-12.472-6.335zm-1.177 16.3c0 0.612 0.694 0.967 1.19 0.608l2.128-1.534c0.229-0.164 0.53-0.186 0.78-0.058s0.408 0.386 0.408 0.667c0 0.27 0.209 0.5 0.497 0.5 0.292 0 0.502-0.233 0.502-0.5v-1.251c0-0.415 0.335-0.75 0.75-0.75 0.414 0 0.75 0.335 0.75 0.75 0 0.14 0.111 0.25 0.248 0.25 0.138 0 0.25-0.111 0.25-0.25v-0.622c-0.001-0.47-0.002-0.808 0.005-1.489 0.002-0.237 0.116-0.46 0.308-0.6 0.902-0.656 2.496-1.812 3.956-2.87-2.801-3.474-7.016-5.756-11.77-5.974L6.497 19.806z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_games_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_games_24_regular.xml
new file mode 100644
index 000000000..b7f9497dd
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_games_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M14.998 5c3.866 0 7 3.134 7 7 0 3.786-3.005 6.87-6.76 6.996L14.998 19H9.002c-3.866 0-7-3.134-7-7 0-3.785 3.005-6.87 6.76-6.996L9.002 5h5.996zm0 1.5H9.002c-3.038 0-5.5 2.462-5.5 5.5 0 2.963 2.344 5.38 5.279 5.496L9.002 17.5h5.996c3.037 0 5.5-2.462 5.5-5.5 0-2.963-2.344-5.38-5.279-5.496L14.998 6.5zM8 9c0.414 0 0.75 0.336 0.75 0.75v1.498h1.5c0.414 0 0.75 0.337 0.75 0.75 0 0.415-0.336 0.75-0.75 0.75h-1.5v1.502C8.75 14.664 8.414 15 8 15s-0.75-0.336-0.75-0.75v-1.502h-1.5c-0.414 0-0.75-0.335-0.75-0.75 0-0.413 0.336-0.75 0.75-0.75h1.5V9.75C7.25 9.336 7.586 9 8 9zm6.75 3.5c0.69 0 1.25 0.56 1.25 1.25S15.44 15 14.75 15s-1.25-0.56-1.25-1.25 0.56-1.25 1.25-1.25zm2-3.5C17.44 9 18 9.56 18 10.25s-0.56 1.25-1.25 1.25-1.25-0.56-1.25-1.25S16.06 9 16.75 9z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_gauge_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_gauge_24_regular.xml
new file mode 100644
index 000000000..8cabd534a
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_gauge_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M7.934 16.066c0.293 0.293 0.293 0.768 0 1.06-0.293 0.293-0.768 0.293-1.06 0-2.832-2.83-2.832-7.421 0-10.253 1.844-1.844 4.436-2.486 6.798-1.928 0.403 0.095 0.653 0.499 0.558 0.902-0.095 0.403-0.5 0.653-0.902 0.557-1.878-0.443-3.932 0.068-5.394 1.53-2.245 2.246-2.245 5.886 0 8.132zm9.954-6.924c0.39-0.137 0.819 0.069 0.955 0.46 0.89 2.544 0.32 5.489-1.716 7.524-0.293 0.293-0.768 0.293-1.061 0-0.293-0.292-0.293-0.767 0-1.06 1.613-1.613 2.068-3.948 1.362-5.969-0.137-0.391 0.069-0.819 0.46-0.955zm-2.009-2.475c0.227-0.194 0.56-0.2 0.794-0.015 0.235 0.185 0.305 0.51 0.168 0.776l-0.13 0.25c-0.081 0.16-0.2 0.388-0.343 0.664-0.286 0.55-0.673 1.291-1.072 2.05-0.4 0.757-0.814 1.533-1.156 2.156-0.171 0.31-0.326 0.586-0.452 0.803-0.118 0.201-0.233 0.391-0.32 0.5-0.642 0.812-1.82 0.95-2.633 0.307-0.812-0.643-0.95-1.822-0.307-2.634 0.086-0.109 0.244-0.265 0.413-0.425 0.182-0.173 0.414-0.387 0.678-0.625 0.527-0.476 1.187-1.058 1.832-1.62 0.646-0.564 1.278-1.11 1.748-1.516l0.566-0.487 0.214-0.184zM22 12c0 5.523-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2s10 4.477 10 10zM3.5 12c0 4.694 3.806 8.5 8.5 8.5s8.5-3.806 8.5-8.5-3.806-8.5-8.5-8.5S3.5 7.306 3.5 12z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_gavel_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_gavel_24_regular.xml
new file mode 100644
index 000000000..65496b10b
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_gavel_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M14.14 2.98c-0.814-1.119-2.434-1.246-3.412-0.268L7.264 6.177C6.26 7.18 6.425 8.852 7.606 9.64l2.01 1.339-6.873 6.743c-0.996 0.977-1.004 2.579-0.017 3.565 0.98 0.98 2.569 0.98 3.549 0l6.872-6.872 1.216 1.91c0.773 1.215 2.472 1.402 3.49 0.384l3.436-3.436c0.978-0.978 0.85-2.598-0.268-3.411l-3.888-2.828c-0.064-0.046-0.12-0.102-0.166-0.166L14.14 2.98zm-2.35 0.792c0.325-0.325 0.865-0.283 1.136 0.09l0.46 0.632L9.068 8.81l-0.63-0.42C8.045 8.13 7.99 7.573 8.324 7.238l3.465-3.465zM10.34 9.66l3.939-3.938 1.475 2.028c0.139 0.19 0.306 0.358 0.496 0.497l1.96 1.423-3.852 3.851-1.054-1.657c-0.168-0.264-0.39-0.49-0.65-0.664L10.34 9.66zm4.842 5.159l4.255-4.255 0.702 0.51c0.373 0.272 0.415 0.812 0.09 1.138l-3.437 3.436c-0.34 0.34-0.906 0.277-1.163-0.127l-0.447-0.702zm-2.86-1.7l-7.108 7.108c-0.394 0.394-1.033 0.394-1.427 0-0.397-0.397-0.394-1.042 0.006-1.435l7.097-6.963 0.93 0.62c0.088 0.058 0.161 0.134 0.217 0.222l0.285 0.447zM14.75 19C14.336 19 14 19.337 14 19.75s0.336 0.75 0.75 0.75h-2c-0.414 0-0.75 0.336-0.75 0.75S12.336 22 12.75 22h8.5c0.414 0 0.75-0.336 0.75-0.75s-0.336-0.75-0.75-0.75h-2c0.414 0 0.75-0.336 0.75-0.75S19.664 19 19.25 19h-4.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_hat_graduation_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_hat_graduation_24_regular.xml
new file mode 100644
index 000000000..c21171199
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_hat_graduation_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M9.909 3.7c1.274-0.816 2.908-0.816 4.182 0l8.064 5.17c0.214 0.137 0.344 0.373 0.345 0.628 0.001 0.254-0.127 0.492-0.34 0.63L19 12.195v5.557c0 0.162-0.053 0.32-0.15 0.45l-0.001 0.001-0.001 0.002-0.003 0.004-0.009 0.01-0.015 0.02-0.01 0.012c-0.02 0.026-0.05 0.06-0.086 0.102-0.073 0.084-0.178 0.197-0.317 0.33-0.277 0.267-0.69 0.614-1.25 0.958C16.037 20.33 14.339 21 12 21c-2.339 0-4.036-0.67-5.159-1.36-0.559-0.344-0.971-0.69-1.25-0.957-0.138-0.134-0.243-0.247-0.316-0.33-0.043-0.05-0.085-0.099-0.124-0.15L5.15 18.2C5.053 18.07 5 17.913 5 17.75v-5.558l-2-1.306v5.364C3 16.665 2.664 17 2.25 17S1.5 16.665 1.5 16.25V9.5c0-0.27 0.143-0.508 0.358-0.64l8.05-5.16zm4.21 11.682c-1.287 0.842-2.95 0.841-4.238 0L6.5 13.174v4.296c0.037 0.038 0.08 0.082 0.13 0.13 0.211 0.203 0.54 0.481 0.997 0.762 0.909 0.56 2.337 1.139 4.373 1.139s3.464-0.58 4.373-1.139c0.456-0.28 0.786-0.56 0.996-0.761L17.5 17.47v-4.296l-3.38 2.208zM13.282 4.963c-0.781-0.5-1.783-0.5-2.564 0L3.63 9.507l7.071 4.62c0.79 0.515 1.809 0.515 2.598 0l7.07-4.62-7.087-4.544z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_headphones_sound_wave_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_headphones_sound_wave_24_regular.xml
new file mode 100644
index 000000000..b336b7b38
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_headphones_sound_wave_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M3.5 12c0-4.694 3.806-8.5 8.5-8.5s8.5 3.806 8.5 8.5v2h-2.25c-0.414 0-0.75 0.336-0.75 0.75v6.5c0 0.414 0.336 0.75 0.75 0.75H19c1.657 0 3-1.343 3-3v-7c0-5.523-4.477-10-10-10S2 6.477 2 12v7c0 1.657 1.343 3 3 3h0.75c0.414 0 0.75-0.336 0.75-0.75v-6.5C6.5 14.336 6.164 14 5.75 14H3.5v-2zm17 3.5V19c0 0.828-0.672 1.5-1.5 1.5v-5h1.5zM3.5 19v-3.5H5v5c-0.828 0-1.5-0.672-1.5-1.5zm9.25-7.25c0-0.414-0.336-0.75-0.75-0.75s-0.75 0.336-0.75 0.75v10.5c0 0.414 0.336 0.75 0.75 0.75s0.75-0.336 0.75-0.75v-10.5zm-4 2.25c0.414 0 0.75 0.335 0.75 0.75v4.5C9.5 19.664 9.164 20 8.75 20S8 19.664 8 19.25v-4.5C8 14.335 8.336 14 8.75 14zM16 14.75c0-0.414-0.336-0.75-0.75-0.75s-0.75 0.336-0.75 0.75v4.5c0 0.414 0.336 0.75 0.75 0.75S16 19.664 16 19.25v-4.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_heart_pulse_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_heart_pulse_24_regular.xml
new file mode 100644
index 000000000..902bcb8a2
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_heart_pulse_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M12.82 5.58L12 6.401l-0.824-0.824c-2.1-2.099-5.502-2.099-7.601 0C2.108 7.045 1.665 9.15 2.249 11h1.605C3.196 9.57 3.456 7.82 4.635 6.64c1.514-1.513 3.967-1.513 5.48 0l1.358 1.357c0.298 0.298 0.782 0.293 1.073-0.012L13.88 6.64c1.517-1.517 3.972-1.517 5.489 0 1.18 1.18 1.438 2.926 0.779 4.36h1.605c0.584-1.852 0.145-3.953-1.323-5.42-2.103-2.104-5.508-2.104-7.611 0zm-1.35 15.495L4.894 14.5h1.963c0.051 0 0.102-0.003 0.152-0.007L12 19.484l4.988-4.985h2.122l-6.58 6.576c-0.292 0.293-0.767 0.293-1.06 0zM9.42 8.415C9.294 8.156 9.03 7.995 8.743 8c-0.287 0.003-0.547 0.17-0.67 0.429l-1.69 3.57H2.75C2.336 12 2 12.335 2 12.75s0.336 0.75 0.75 0.75h4.107c0.29 0 0.554-0.167 0.678-0.429l1.234-2.606 2.56 5.12c0.117 0.236 0.349 0.392 0.61 0.413 0.262 0.021 0.515-0.096 0.669-0.308l2.698-3.736 1.13 1.29C16.578 13.406 16.784 13.5 17 13.5h4.25c0.414 0 0.75-0.335 0.75-0.75 0-0.414-0.336-0.75-0.75-0.75h-3.91l-1.526-1.743c-0.15-0.172-0.37-0.266-0.599-0.256-0.228 0.011-0.44 0.125-0.573 0.31l-2.525 3.496-2.696-5.392z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_important_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_important_24_regular.xml
new file mode 100644
index 000000000..5a24a2b07
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_important_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M12 2.002c-2.14 0-3.875 1.735-3.875 3.875 0 2.92 1.207 6.552 1.813 8.199 0.323 0.878 1.159 1.423 2.064 1.423 0.904 0 1.739-0.542 2.063-1.418 0.606-1.64 1.81-5.254 1.81-8.204 0-2.14-1.734-3.875-3.875-3.875zM9.625 5.877c0-1.312 1.063-2.375 2.375-2.375s2.376 1.063 2.376 2.375c0 2.654-1.112 6.043-1.718 7.684-0.096 0.258-0.35 0.438-0.655 0.438-0.308 0-0.562-0.18-0.657-0.44-0.607-1.652-1.721-5.058-1.721-7.682zm2.376 11.124c-1.381 0-2.501 1.12-2.501 2.501 0 1.381 1.12 2.501 2.501 2.501 1.382 0 2.501-1.12 2.501-2.5 0-1.382-1.12-2.502-2.5-2.502zM11 19.502c0-0.553 0.448-1.001 1.001-1.001 0.553 0 1.001 0.448 1.001 1.001 0 0.553-0.448 1.001-1 1.001-0.554 0-1.002-0.448-1.002-1z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_leaf_three_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_leaf_three_24_regular.xml
new file mode 100644
index 000000000..72abc07ce
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_leaf_three_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M19 7.5c0 0.52-0.072 1.023-0.207 1.5h1.62C21.29 9 22 9.71 22 10.586V15.5c0 3.59-2.91 6.5-6.5 6.5-1.525 0-2.927-0.525-4.035-1.404L10.28 21.78c-0.292 0.293-0.767 0.293-1.06 0-0.293-0.293-0.293-0.767 0-1.06l1.184-1.185c-0.395-0.497-0.718-1.054-0.954-1.655C9.062 17.96 8.66 18 8.25 18c-3.314 0-6-2.686-6-6V7.514C2.25 6.678 2.928 6 3.764 6h4.443C8.86 3.692 10.982 2 13.5 2h4.06C18.354 2 19 2.645 19 3.44V7.5zM9.722 6.182c1.695 0.427 3.103 1.576 3.879 3.1C14.2 9.099 14.838 9 15.5 9h1.71c0.187-0.463 0.29-0.97 0.29-1.5v-4h-4c-1.747 0-3.233 1.12-3.778 2.682zm2.813 13.344c0.83 0.612 1.855 0.974 2.965 0.974 2.761 0 5-2.239 5-5v-4.914c0-0.047-0.039-0.086-0.086-0.086H15.5c-2.761 0-5 2.239-5 5 0 1.11 0.362 2.136 0.974 2.965l4.246-4.245c0.293-0.293 0.768-0.293 1.06 0 0.293 0.293 0.293 0.767 0 1.06l-4.245 4.246zM9 15.5c0-0.592 0.08-1.166 0.228-1.711L6.47 11.03c-0.293-0.293-0.293-0.767 0-1.06 0.293-0.293 0.767-0.293 1.06 0l2.318 2.317c0.566-0.994 1.388-1.824 2.375-2.402C11.466 8.466 9.971 7.5 8.25 7.5H3.759L3.754 7.505 3.751 7.509 3.75 7.514V12c0 2.485 2.015 4.5 4.5 4.5 0.278 0 0.551-0.025 0.816-0.074C9.021 16.124 9 15.815 9 15.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_lightbulb_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_lightbulb_24_regular.xml
new file mode 100644
index 000000000..8f6699965
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_lightbulb_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M12 2.001c4.004 0 7.25 3.246 7.25 7.25 0 2.096-0.9 4.02-2.663 5.742-0.077 0.075-0.137 0.166-0.175 0.265l-0.032 0.103-1.13 4.895c-0.223 0.964-1.046 1.662-2.02 1.737L13.057 22h-2.114c-0.99 0-1.855-0.645-2.147-1.577l-0.045-0.167-1.13-4.895c-0.032-0.14-0.104-0.268-0.206-0.368-1.68-1.64-2.577-3.463-2.659-5.444L4.75 9.251l0.004-0.24C4.88 5.119 8.076 2.002 12 2.002zm2.115 16.498H9.884l0.329 1.42c0.07 0.305 0.323 0.531 0.627 0.573l0.103 0.008h2.114c0.314 0 0.591-0.196 0.7-0.483l0.03-0.099 0.328-1.419zM12 3.501c-3.102 0-5.63 2.456-5.746 5.53L6.25 9.25l0.007 0.277c0.076 1.563 0.8 3.02 2.206 4.392 0.264 0.258 0.46 0.576 0.571 0.926l0.049 0.178 0.455 1.975h4.923l0.458-1.976c0.083-0.36 0.253-0.692 0.493-0.97l0.127-0.133c1.404-1.373 2.128-2.828 2.204-4.392L17.75 9.25l-0.004-0.22C17.63 5.956 15.102 3.5 12 3.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_local_language_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_local_language_24_regular.xml
new file mode 100644
index 000000000..6928902ad
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_local_language_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M9.34 6.372l0.05 0.105 5.56 14.5c0.147 0.385-0.04 0.82-0.418 0.971-0.347 0.139-0.734-0.01-0.91-0.333l-0.043-0.092-1.433-3.737H5.06L4.965 17.78 3.42 21.54c-0.16 0.382-0.59 0.562-0.965 0.4-0.344-0.146-0.52-0.528-0.427-0.885l0.033-0.096 5.964-14.5c0.24-0.585 1.023-0.61 1.315-0.088zm9.406-4.37c0.38 0 0.693 0.283 0.743 0.65l0.007 0.1V7.5h1.75c0.38 0 0.693 0.283 0.743 0.649l0.007 0.102c0 0.38-0.282 0.693-0.648 0.743L21.245 9l-1.75-0.001v7.25c0 0.38-0.282 0.694-0.648 0.744L18.745 17c-0.38 0-0.694-0.282-0.743-0.648l-0.007-0.102V2.753c0-0.414 0.335-0.75 0.75-0.75zM8.81 8.748l-3.16 7.538h6.11L8.81 8.747zm1.937-6.744h5.498c0.38 0 0.693 0.282 0.743 0.648l0.006 0.102v3.004c0 2.344-1.9 4.245-4.245 4.245-0.414 0-0.75-0.336-0.75-0.75s0.336-0.75 0.75-0.75c1.46 0 2.654-1.14 2.74-2.578l0.005-0.167V3.503h-4.747c-0.414 0-0.75-0.336-0.75-0.75 0-0.38 0.282-0.694 0.648-0.743l0.102-0.007h5.498-5.498z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_location_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_location_24_regular.xml
new file mode 100644
index 000000000..10af130d0
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_location_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M5.843 4.568c3.4-3.4 8.913-3.4 12.314 0 3.4 3.4 3.4 8.914 0 12.314l-1.187 1.174c-0.875 0.858-2.01 1.962-3.406 3.312-0.872 0.843-2.256 0.843-3.128 0l-3.491-3.396c-0.44-0.431-0.806-0.794-1.102-1.09-3.4-3.4-3.4-8.914 0-12.314zm11.253 1.06c-2.815-2.814-7.378-2.814-10.192 0-2.815 2.815-2.815 7.379 0 10.193L8.39 17.29c0.82 0.801 1.849 1.801 3.089 3 0.29 0.282 0.752 0.282 1.042 0l3.395-3.3c0.47-0.461 0.863-0.85 1.18-1.168 2.815-2.814 2.815-7.378 0-10.192zM12 7.999c1.658-0.001 3 1.343 3 3.001s-1.343 3.002-3.001 3.002S8.998 12.658 8.998 11c0-1.658 1.344-3.002 3.002-3.002zm0 1.5c-0.83 0-1.502 0.673-1.502 1.502 0 0.83 0.673 1.502 1.502 1.502 0.83 0 1.501-0.673 1.501-1.502 0-0.83-0.672-1.502-1.501-1.502z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_map_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_map_24_regular.xml
new file mode 100644
index 000000000..183efac0a
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_map_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M9.203 4L9.25 3.997l0.046 0.001 0.068 0.008L9.38 4.01c0.085 0.014 0.17 0.044 0.25 0.092l0.053 0.034 5.07 3.565 5.067-3.562c0.468-0.329 1.102-0.033 1.174 0.51l0.007 0.104v10.632c0 0.21-0.087 0.408-0.238 0.548L20.683 16l-5.5 3.866c-0.267 0.188-0.588 0.172-0.828 0.023L9.25 16.297l-5.07 3.565c-0.467 0.329-1.101 0.033-1.174-0.51l-0.007-0.104V8.616c0-0.21 0.087-0.408 0.238-0.548l0.08-0.066 5.5-3.866c0.065-0.045 0.132-0.079 0.2-0.101L9.14 4.007l0.063-0.008zm10.298 2.197l-4 2.812v8.799l4-2.812v-8.8zM8.5 6.193l-4 2.812v8.8l4-2.813V6.193zm1.502 0v8.8l4 2.811V9.005l-4-2.812z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_math_formula_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_math_formula_24_regular.xml
new file mode 100644
index 000000000..45aaedb41
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_math_formula_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M12.482 3.827c-1.113-0.824-2.696-0.091-2.788 1.29L9.535 7.5h2.715C12.664 7.5 13 7.835 13 8.25 13 8.664 12.664 9 12.25 9H9.435l-0.6 9.006c-0.18 2.685-3.358 4.002-5.383 2.23l-0.196-0.172c-0.312-0.273-0.343-0.746-0.07-1.058 0.272-0.312 0.746-0.343 1.058-0.07l0.195 0.17c1.091 0.955 2.803 0.246 2.899-1.2L7.932 9H5.75C5.336 9 5 8.664 5 8.25 5 7.835 5.336 7.5 5.75 7.5h2.282l0.165-2.483c0.171-2.565 3.112-3.926 5.178-2.395l0.371 0.275c0.333 0.247 0.403 0.716 0.157 1.05-0.247 0.332-0.717 0.402-1.05 0.155l-0.371-0.275zm1.23 8.936c-0.224-0.426-0.786-0.533-1.152-0.22l-0.322 0.276c-0.314 0.27-0.788 0.233-1.057-0.081-0.27-0.315-0.234-0.788 0.08-1.058l0.323-0.276c1.097-0.94 2.783-0.618 3.456 0.66l0.977 1.858 2.703-2.703c0.293-0.292 0.767-0.292 1.06 0 0.293 0.293 0.293 0.768 0 1.061l-3.031 3.032 1.539 2.924c0.224 0.427 0.786 0.534 1.152 0.22l0.322-0.276c0.314-0.27 0.788-0.233 1.058 0.082 0.269 0.314 0.233 0.788-0.082 1.057l-0.322 0.276c-1.097 0.94-2.783 0.618-3.456-0.66l-1.322-2.513-3.358 3.358c-0.292 0.293-0.767 0.293-1.06 0-0.293-0.293-0.293-0.768 0-1.06l3.687-3.687-1.195-2.27z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_megaphone_loud_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_megaphone_loud_24_regular.xml
new file mode 100644
index 000000000..83a99f4da
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_megaphone_loud_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M17.212 2.237c0.13-0.393-0.082-0.817-0.474-0.948-0.393-0.131-0.818 0.081-0.95 0.474l-0.75 2.249c-0.13 0.393 0.082 0.818 0.475 0.949 0.393 0.13 0.818-0.082 0.949-0.474l0.75-2.25zM21.78 2.22c0.293 0.293 0.293 0.768 0 1.06l-2.5 2.5c-0.293 0.293-0.767 0.293-1.06 0-0.293-0.292-0.293-0.767 0-1.06l2.5-2.5c0.293-0.293 0.767-0.293 1.06 0zM9.076 4.318c0.71-1.473 2.679-1.772 3.795-0.577l7.006 7.506c1.09 1.169 0.704 3.065-0.758 3.712l-3.42 1.516C15.893 16.945 16 17.46 16 18c0 2.21-1.79 4-4 4-1.595 0-2.973-0.934-3.614-2.285l-1.418 0.628c-0.663 0.294-1.437 0.161-1.964-0.336L3.565 18.65c-0.57-0.538-0.727-1.384-0.386-2.091l5.897-12.24zm0.682 14.789C10.166 19.932 11.017 20.5 12 20.5c1.381 0 2.5-1.12 2.5-2.5 0-0.324-0.061-0.633-0.173-0.917l-4.57 2.024zm2.016-14.342C11.378 4.34 10.68 4.447 10.428 4.97L4.53 17.21c-0.057 0.118-0.03 0.26 0.064 0.35l1.439 1.356c0.088 0.083 0.217 0.105 0.327 0.056l12.151-5.383c0.52-0.23 0.657-0.903 0.27-1.317l-7.007-7.506zM19 8.249c0-0.414 0.336-0.75 0.75-0.75h2c0.414 0 0.75 0.336 0.75 0.75C22.5 8.664 22.164 9 21.75 9h-2C19.336 9 19 8.664 19 8.25z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_mic_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_mic_24_regular.xml
new file mode 100644
index 000000000..720623a9b
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_mic_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M18.25 11c0.38 0 0.694 0.282 0.743 0.648L19 11.75v0.5c0 3.56-2.755 6.475-6.249 6.732L12.75 21.25c0 0.414-0.336 0.75-0.75 0.75-0.38 0-0.694-0.282-0.743-0.648L11.25 21.25v-2.268c-3.417-0.25-6.127-3.044-6.246-6.496L5 12.25v-0.5C5 11.336 5.336 11 5.75 11c0.38 0 0.694 0.282 0.743 0.648L6.5 11.75v0.5c0 2.827 2.235 5.132 5.034 5.246L11.75 17.5h0.5c2.827 0 5.132-2.234 5.246-5.034L17.5 12.25v-0.5c0-0.414 0.336-0.75 0.75-0.75zM12 2c2.21 0 4 1.79 4 4v6c0 2.21-1.79 4-4 4s-4-1.79-4-4V6c0-2.21 1.79-4 4-4zm0 1.5c-1.38 0-2.5 1.12-2.5 2.5v6c0 1.38 1.12 2.5 2.5 2.5s2.5-1.12 2.5-2.5V6c0-1.38-1.12-2.5-2.5-2.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_microscope_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_microscope_24_regular.xml
new file mode 100644
index 000000000..ffdb9b096
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_microscope_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M8 2.75C8 2.336 8.336 2 8.75 2h1.5C10.664 2 11 2.336 11 2.75V3h1.25C12.664 3 13 3.336 13 3.75v1.785c0.008 0 0.017 0 0.025 0.002 2.112 0.199 4.065 1.204 5.456 2.805 1.39 1.602 2.11 3.678 2.01 5.796-0.1 2.119-1.012 4.117-2.546 5.581-0.3 0.285-0.617 0.546-0.951 0.781h3.256c0.414 0 0.75 0.336 0.75 0.75S20.664 22 20.25 22H3.75C3.336 22 3 21.664 3 21.25s0.336-0.75 0.75-0.75h8.527c1.725-0.007 3.383-0.674 4.632-1.866 1.256-1.198 2.002-2.833 2.084-4.566 0.081-1.734-0.508-3.432-1.645-4.742C16.236 8.044 14.683 7.23 13 7.042v5.208c0 0.414-0.336 0.75-0.75 0.75H11.5v1c0 1.105-0.895 2-2 2s-2-0.895-2-2v-1H6.75C6.336 13 6 12.664 6 12.25v-8.5C6 3.336 6.336 3 6.75 3H8V2.75zM9 13v1c0 0.276 0.224 0.5 0.5 0.5S10 14.276 10 14v-1H9zm-1.5-1.5h4v-7h-4v7zm-1.75 6C5.336 17.5 5 17.836 5 18.25S5.336 19 5.75 19h7.5c0.414 0 0.75-0.336 0.75-0.75s-0.336-0.75-0.75-0.75h-7.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_midi_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_midi_24_regular.xml
new file mode 100644
index 000000000..e2593a7d9
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_midi_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M21.25 4.002c0.38 0 0.694 0.282 0.743 0.648L22 4.752v14.5c0 0.38-0.282 0.693-0.648 0.743l-0.102 0.007H2.75c-0.38 0-0.693-0.282-0.743-0.648L2 19.252v-14.5c0-0.38 0.282-0.693 0.648-0.743L2.75 4.002h18.5zM6 12.5H3.5v6h17v-6H18v3.749c0 0.414-0.336 0.75-0.75 0.75-0.38 0-0.694-0.282-0.743-0.648L16.5 16.25V12.5h-2v3.749c0 0.414-0.336 0.75-0.75 0.75-0.38 0-0.694-0.282-0.743-0.648L13 16.25V12.5h-2v3.749c0 0.414-0.336 0.75-0.75 0.75-0.38 0-0.694-0.282-0.743-0.648L9.5 16.25V12.5h-2v3.749C7.5 16.664 7.164 17 6.75 17c-0.38 0-0.694-0.282-0.743-0.648L6 16.25V12.5zm14.5-7h-17V11h17V5.5zm-11.25 2C9.664 7.5 10 7.837 10 8.25 10 8.665 9.664 9 9.25 9S8.5 8.667 8.5 8.252c0-0.413 0.336-0.75 0.75-0.75zm8 0C17.664 7.5 18 7.837 18 8.25c0 0.38-0.282 0.693-0.648 0.743L17.25 9.001h-2.5C14.336 9 14 8.665 14 8.25c0-0.38 0.282-0.694 0.648-0.743L14.75 7.5h2.5zm-11 0C6.664 7.5 7 7.836 7 8.25S6.664 9 6.25 9 5.5 8.664 5.5 8.25 5.836 7.5 6.25 7.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_movies_and_tv_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_movies_and_tv_24_regular.xml
new file mode 100644
index 000000000..0cd018717
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_movies_and_tv_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M19.729 3.917l0.05 0.16 0.552 1.922c0.105 0.365-0.08 0.745-0.418 0.893l-0.096 0.035L9.09 10.002h11.16c0.379 0 0.693 0.283 0.742 0.65l0.007 0.1v8.499c0 1.462-1.141 2.658-2.582 2.745L18.249 22H5.75c-1.462 0-2.658-1.142-2.745-2.582L3 19.25v-8.392l-0.522-1.82c-0.403-1.406 0.365-2.87 1.726-3.35l0.16-0.052 12.014-3.445c1.406-0.403 2.87 0.365 3.35 1.726zm-0.23 7.585H4.5v7.749c0 0.604 0.429 1.108 0.998 1.224l0.124 0.02L5.75 20.5h12.5c0.646 0 1.179-0.492 1.243-1.122l0.006-0.128v-7.749zM6.272 6.649L4.777 7.08C4.155 7.256 3.78 7.875 3.891 8.498l0.03 0.125 0.344 1.201L4.56 9.74l1.713-3.09zm4.756-1.364l-2.717 0.78-1.714 3.09 2.718-0.778 1.713-3.092zm4.758-1.364l-2.718 0.78-1.713 3.09 2.716-0.778 1.715-3.092zm1.847-0.233l-1.521 2.74 2.569-0.737-0.344-1.2c-0.107-0.375-0.373-0.66-0.704-0.803z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_music_note_2_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_music_note_2_24_regular.xml
new file mode 100644
index 000000000..4ced5601b
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_music_note_2_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M19.698 2.148C19.888 2.29 20 2.513 20 2.75v13.5c0 0.027-0.001 0.053-0.004 0.079C19.999 16.386 20 16.443 20 16.5c0 1.933-1.567 3.5-3.5 3.5S13 18.433 13 16.5s1.567-3.5 3.5-3.5c0.744 0 1.433 0.232 2 0.627V7.758l-8.5 2.55v7.942c0 0.027-0.001 0.053-0.004 0.079C9.999 18.386 10 18.443 10 18.5c0 1.933-1.567 3.5-3.5 3.5S3 20.433 3 18.5 4.567 15 6.5 15c0.744 0 1.433 0.232 2 0.627V5.75c0-0.331 0.217-0.623 0.534-0.718l10-3c0.228-0.069 0.474-0.025 0.664 0.116zM10 8.742l8.5-2.55V3.758L10 6.308v2.434zM6.5 16.5c-1.105 0-2 0.895-2 2s0.895 2 2 2 2-0.895 2-2-0.895-2-2-2zm8 0c0 1.105 0.895 2 2 2s2-0.895 2-2-0.895-2-2-2-2 0.895-2 2z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_news_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_news_24_regular.xml
new file mode 100644
index 000000000..bcb6f260b
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_news_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M18.75 20H5.25c-1.733 0-3.15-1.357-3.245-3.066L2 16.75V6.25c0-1.19 0.925-2.166 2.096-2.245L4.25 4h12.5c1.19 0 2.166 0.925 2.245 2.096L19 6.25V7h0.75c1.19 0 2.166 0.925 2.245 2.096L22 9.25v7.5c0 1.733-1.357 3.15-3.066 3.245L18.75 20H5.25h13.5zm-13.5-1.5h13.5c0.918 0 1.671-0.707 1.744-1.607L20.5 16.75v-7.5c0-0.38-0.282-0.694-0.648-0.743L19.75 8.5H19v7.75c0 0.38-0.282 0.694-0.648 0.743L18.25 17c-0.38 0-0.694-0.282-0.743-0.648L17.5 16.25v-10c0-0.38-0.282-0.694-0.648-0.743L16.75 5.5H4.25c-0.38 0-0.693 0.282-0.743 0.648L3.5 6.25v10.5c0 0.918 0.707 1.671 1.606 1.744L5.25 18.5h13.5-13.5zm6.996-4h3.006c0.414 0 0.75 0.336 0.75 0.75 0 0.38-0.282 0.694-0.648 0.743L15.252 16h-3.006c-0.414 0-0.75-0.336-0.75-0.75 0-0.38 0.282-0.694 0.648-0.743l0.102-0.007h3.006-3.006zm-3.003-3.495c0.415 0 0.75 0.335 0.75 0.75v3.495c0 0.414-0.335 0.75-0.75 0.75H5.748c-0.415 0-0.75-0.336-0.75-0.75v-3.495c0-0.415 0.335-0.75 0.75-0.75h3.495zm-0.75 1.5H6.498V14.5h1.995v-1.995zm3.753-1.5h3.006c0.414 0 0.75 0.335 0.75 0.75 0 0.38-0.282 0.693-0.648 0.743l-0.102 0.007h-3.006c-0.414 0-0.75-0.336-0.75-0.75 0-0.38 0.282-0.694 0.648-0.744l0.102-0.006h3.006-3.006zM5.748 7.502h9.504c0.414 0 0.75 0.336 0.75 0.75 0 0.38-0.282 0.694-0.648 0.744l-0.102 0.006H5.748c-0.415 0-0.75-0.335-0.75-0.75 0-0.38 0.282-0.693 0.648-0.743l0.102-0.006h9.504-9.504z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_pi_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_pi_24_regular.xml
new file mode 100644
index 000000000..b464e656b
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_pi_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M2.5 6.75C2.5 5.231 3.731 4 5.25 4h15C20.664 4 21 4.336 21 4.75S20.664 5.5 20.25 5.5H17v11.453c0 1.21 1.199 2.055 2.339 1.648l0.159-0.057c0.39-0.14 0.819 0.064 0.958 0.454 0.14 0.39-0.064 0.819-0.454 0.958l-0.159 0.057C17.727 20.77 15.5 19.2 15.5 16.953V5.5H9.494C9.49 5.74 9.482 6.06 9.468 6.444c-0.031 0.897-0.095 2.153-0.22 3.59-0.252 2.862-0.759 6.498-1.79 9.462-0.136 0.392-0.563 0.598-0.954 0.462-0.392-0.136-0.598-0.563-0.462-0.954 0.969-2.787 1.462-6.275 1.71-9.1 0.125-1.407 0.186-2.636 0.217-3.512C7.982 6.03 7.99 5.729 7.994 5.5H5.25C4.56 5.5 4 6.06 4 6.75v0.5C4 7.664 3.664 8 3.25 8S2.5 7.664 2.5 7.25v-0.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_scan_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_scan_24_regular.xml
new file mode 100644
index 000000000..3f94335f9
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_scan_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2zm3.25 12.332l-0.039 0.072-0.063 0.091-4.757 5.853C10.912 20.448 11.45 20.5 12 20.5c2.171 0 4.152-0.814 5.654-2.153l-2.084-4.54c-0.093 0.183-0.2 0.359-0.32 0.525zM4.49 15.985c0.937 1.762 2.475 3.154 4.34 3.904L11.992 16l-0.19-0.005-0.132-0.008-7.179-0.002zm15.64-6.473h-4.998c0.082 0.102 0.159 0.21 0.23 0.32 0.024 0.027 0.047 0.057 0.067 0.089l0.049 0.09 0.039 0.082c0.086 0.158 0.162 0.323 0.226 0.493l3.016 6.57C19.85 15.725 20.5 13.937 20.5 12c0-0.866-0.13-1.701-0.37-2.488zM3.5 12c0 0.865 0.13 1.7 0.37 2.486h4.996c-0.082-0.103-0.158-0.21-0.23-0.32l-0.135-0.223-3.614-6.597C4.01 8.681 3.5 10.282 3.5 12zm6.52-1.526l-0.044 0.071c-0.022 0.035-0.047 0.066-0.073 0.096C9.648 11.03 9.5 11.499 9.5 12c0 1.294 0.983 2.359 2.244 2.487h0.512C13.516 14.359 14.5 13.294 14.5 12c0-1.302-0.995-2.37-2.265-2.49l-0.373 0.003-0.058-0.005c-0.726 0.056-1.364 0.422-1.784 0.966zM12 3.5c-2.391 0-4.552 0.987-6.097 2.577l2.402 4.387c0.127-0.304 0.29-0.59 0.485-0.851l3.904-6.085C12.465 3.509 12.234 3.5 12 3.5zm-0.406 4.52C11.728 8.007 11.863 8 12 8c0.103 0 0.204 0.004 0.305 0.011l7.204 0.002c-1.033-1.941-2.797-3.434-4.924-4.113l-0.292-0.087-2.699 4.207z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_shield_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_shield_24_regular.xml
new file mode 100644
index 000000000..98ecd4947
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_shield_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M3 5.75C3 5.336 3.336 5 3.75 5c2.663 0 5.258-0.944 7.8-2.85 0.267-0.2 0.633-0.2 0.9 0C14.992 4.056 17.587 5 20.25 5 20.664 5 21 5.336 21 5.75V11c0 5.001-2.958 8.676-8.725 10.948-0.177 0.07-0.373 0.07-0.55 0C5.958 19.676 3 16 3 11V5.75zm1.5 0.728V11c0 4.256 2.453 7.379 7.5 9.442 5.047-2.063 7.5-5.186 7.5-9.442V6.478c-2.577-0.152-5.08-1.09-7.5-2.8-2.42 1.71-4.923 2.648-7.5 2.8z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_sport_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_sport_24_regular.xml
new file mode 100644
index 000000000..72d513fa2
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_sport_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M6.088 7.188C6.022 7.35 5.963 7.516 5.908 7.682 6.373 7.752 6.872 7.85 7.393 7.98 7.638 7.29 8 6.631 8.477 6.035l4.214 4.214-0.252 0.252c0.187 0.161 0.37 0.332 0.55 0.51 0.18 0.18 0.35 0.363 0.51 0.55l0.253-0.251 4.213 4.213c-0.597 0.477-1.255 0.84-1.945 1.086 0.13 0.52 0.228 1.02 0.299 1.482 0.325-0.106 0.645-0.233 0.957-0.38 0.835-0.395 1.618-0.937 2.308-1.628 0.131-0.13 0.256-0.264 0.376-0.401 0.563-0.643 1.027-1.373 1.37-2.167 0.414-0.963 0.637-1.99 0.667-3.02 0.002-0.081 0.004-0.163 0.004-0.245 0-0.104-0.002-0.208-0.006-0.311-0.022-0.583-0.105-1.164-0.25-1.732-0.743-2.914-3.036-5.21-5.95-5.952-0.396-0.1-0.799-0.171-1.203-0.213C14.315 2.014 14.035 2 13.751 2c-0.278 0-0.552 0.014-0.823 0.04C12.274 2.107 11.626 2.25 11 2.47 8.761 3.262 6.966 4.992 6.088 7.188zm13.96 0.627c-0.88 0.694-2.087 0.775-3.042 0.24l2.019-2.019c0.439 0.548 0.78 1.15 1.023 1.779zm-4.13 1.328c1.346 0.939 3.114 1.009 4.523 0.21 0.237 1.78-0.235 3.635-1.416 5.11L14.81 10.25l1.108-1.107zm-1.06-1.061L13.75 9.189 9.537 4.976c1.475-1.182 3.331-1.654 5.11-1.417-0.798 1.41-0.728 3.177 0.21 4.523zm1.087-1.087c-0.534-0.956-0.454-2.162 0.241-3.042 0.63 0.243 1.23 0.584 1.778 1.023l-2.019 2.019zM6.97 13.47c0.293-0.293 0.768-0.293 1.06 0l2.5 2.5c0.294 0.293 0.294 0.767 0 1.06-0.292 0.293-0.767 0.293-1.06 0l-2.5-2.5c-0.293-0.293-0.293-0.767 0-1.06zm-4.94-2.451c-0.11-1.442 1.048-2.6 2.49-2.49 1.978 0.15 5.34 0.768 7.762 3.19 2.422 2.423 3.041 5.784 3.191 7.763 0.11 1.441-1.048 2.6-2.49 2.49-1.978-0.15-5.34-0.77-7.762-3.192-2.422-2.422-3.041-5.783-3.191-7.761zm2.377-0.995c-0.526-0.04-0.921 0.355-0.882 0.881 0.142 1.863 0.719 4.777 2.757 6.815 2.038 2.038 4.952 2.615 6.814 2.756 0.526 0.04 0.922-0.355 0.882-0.881-0.142-1.863-0.719-4.776-2.757-6.815-2.038-2.038-4.952-2.615-6.814-2.756z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_stethoscope_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_stethoscope_24_regular.xml
new file mode 100644
index 000000000..af3311024
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_stethoscope_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M2.75 2.5C2.336 2.5 2 2.836 2 3.25V9c0 3.06 2.29 5.585 5.25 5.954v0.796c0 3.314 2.686 6 6 6s6-2.686 6-6v-0.844c1.294-0.333 2.25-1.508 2.25-2.906 0-1.657-1.343-3-3-3s-3 1.343-3 3c0 1.398 0.956 2.573 2.25 2.906v0.844c0 2.485-2.015 4.5-4.5 4.5s-4.5-2.015-4.5-4.5v-0.796C11.71 14.584 14 12.06 14 9V3.25c0-0.414-0.336-0.75-0.75-0.75h-2.5C10.336 2.5 10 2.836 10 3.25S10.336 4 10.75 4h1.75v5c0 2.485-2.015 4.5-4.5 4.5S3.5 11.485 3.5 9V4h1.75C5.664 4 6 3.664 6 3.25S5.664 2.5 5.25 2.5h-2.5zm15.75 8c0.828 0 1.5 0.672 1.5 1.5 0 0.829-0.672 1.5-1.5 1.5S17 12.83 17 12c0-0.828 0.672-1.5 1.5-1.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_tag_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_tag_24_regular.xml
new file mode 100644
index 000000000..e3604263a
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_tag_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M19.75 2C20.992 2 22 3.007 22 4.25v5.462c0 0.862-0.343 1.688-0.952 2.298l-8.5 8.503c-1.27 1.267-3.326 1.268-4.597 0.001L3.489 16.06c-1.27-1.268-1.272-3.326-0.004-4.596l8.5-8.51C12.595 2.343 13.422 2 14.285 2h5.465zm0 1.5h-5.466c-0.464 0-0.91 0.185-1.238 0.513l-8.512 8.523c-0.67 0.685-0.665 1.783 0.015 2.462l4.461 4.454c0.685 0.682 1.793 0.682 2.477 0l8.5-8.503c0.329-0.328 0.513-0.773 0.513-1.237V4.25c0-0.414-0.336-0.75-0.75-0.75zM17 5.502c0.828 0 1.5 0.672 1.5 1.5 0 0.829-0.672 1.5-1.5 1.5-0.829 0-1.5-0.671-1.5-1.5 0-0.828 0.671-1.5 1.5-1.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_vehicle_bicycle_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_vehicle_bicycle_24_regular.xml
new file mode 100644
index 000000000..5327229f9
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_vehicle_bicycle_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M12.75 3C12.336 3 12 3.336 12 3.75s0.336 0.75 0.75 0.75h1.427L15.132 8H8.5V5.75C8.5 5.336 8.164 5 7.75 5h-3C4.336 5 4 5.336 4 5.75S4.336 6.5 4.75 6.5H7v2.188L6.698 10.5C4.375 10.528 2.5 12.42 2.5 14.75 2.5 17.097 4.403 19 6.75 19S11 17.097 11 14.75c0-0.062-0.001-0.124-0.004-0.185l4.656-4.656 0.274 1.002C14.49 11.593 13.5 13.056 13.5 14.75c0 2.347 1.903 4.25 4.25 4.25S22 17.097 22 14.75s-1.903-4.25-4.25-4.25c-0.127 0-0.253 0.006-0.377 0.017l-1.9-6.964C15.386 3.226 15.089 3 14.75 3h-2zm3.58 9.394l0.696 2.553c0.11 0.4 0.522 0.636 0.921 0.527 0.4-0.11 0.636-0.522 0.527-0.921L17.777 12c1.507 0.015 2.723 1.24 2.723 2.75 0 1.519-1.231 2.75-2.75 2.75S15 16.269 15 14.75c0-1 0.533-1.874 1.33-2.356zm-5.765 0.48c-0.486-0.985-1.342-1.756-2.387-2.128L8.385 9.5h5.554l-3.374 3.374zm-2.64-0.611C8.635 12.599 9.179 13.23 9.396 14h-1.76l0.289-1.737zm-1.48-0.246l-0.435 2.61c-0.036 0.217 0.025 0.44 0.168 0.608C6.32 15.403 6.529 15.5 6.75 15.5h2.646c-0.326 1.154-1.387 2-2.646 2C5.231 17.5 4 16.269 4 14.75c0-1.416 1.07-2.582 2.445-2.733z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_vehicle_subway_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_vehicle_subway_24_regular.xml
new file mode 100644
index 000000000..65570be21
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_vehicle_subway_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M16.25 3C18.32 3 20 4.679 20 6.75v9c0 1.775-1.234 3.262-2.89 3.651l2.462 1.172c0.374 0.178 0.533 0.625 0.355 1-0.163 0.342-0.553 0.504-0.905 0.392l-0.095-0.038L13.83 19.5h-3.661l-5.097 2.427c-0.374 0.178-0.821 0.02-1-0.354-0.177-0.375-0.019-0.822 0.356-1L6.89 19.4C5.233 19.012 4 17.525 4 15.75v-9C4 4.679 5.679 3 7.75 3h8.5zm2.25 11h-13v1.75C5.5 16.993 6.507 18 7.75 18h8.5c1.243 0 2.25-1.007 2.25-2.25V14zM8 15c0.552 0 1 0.448 1 1s-0.448 1-1 1-1-0.448-1-1 0.448-1 1-1zm8 0c0.552 0 1 0.448 1 1s-0.448 1-1 1-1-0.448-1-1 0.448-1 1-1zm0.25-10.5h-8.5C6.507 4.5 5.5 5.507 5.5 6.75v5.75h13V6.75c0-1.243-1.007-2.25-2.25-2.25zm-3 1.5C13.664 6 14 6.336 14 6.75S13.664 7.5 13.25 7.5h-2.5C10.336 7.5 10 7.164 10 6.75S10.336 6 10.75 6h2.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_weather_rain_showers_day_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_weather_rain_showers_day_24_regular.xml
new file mode 100644
index 000000000..2884433fa
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_weather_rain_showers_day_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M13.002 6.01c3.169 0 4.966 2.097 5.228 4.63h0.08c2.039 0 3.692 1.649 3.692 3.682 0 2.034-1.653 3.683-3.692 3.683l-0.619-0.002-1.55 2.625c-0.208 0.359-0.667 0.482-1.025 0.274-0.33-0.19-0.46-0.59-0.32-0.932l0.045-0.092 1.118-1.875h-2.136l-1.551 2.625c-0.207 0.359-0.666 0.482-1.024 0.274-0.33-0.19-0.46-0.59-0.32-0.932l0.045-0.092 1.118-1.875H9.955l-1.551 2.625c-0.207 0.359-0.666 0.482-1.025 0.274-0.328-0.19-0.46-0.59-0.32-0.932l0.046-0.092 1.117-1.875-0.527 0.002c-2.04 0-3.692-1.649-3.692-3.682 0-2.034 1.653-3.683 3.692-3.683h0.08c0.263-2.55 2.059-4.63 5.227-4.63zm0 1.498c-2.071 0-3.876 1.633-3.876 3.889 0 0.357-0.32 0.638-0.685 0.638h-0.69c-1.261 0-2.283 1-2.283 2.236 0 1.235 1.022 2.236 2.283 2.236h10.503c1.26 0 2.283-1 2.283-2.236 0-1.235-1.022-2.236-2.283-2.236h-0.69c-0.366 0-0.685-0.28-0.685-0.638 0-2.285-1.805-3.89-3.877-3.89zm-8.634 2.657c0.145 0.351 0.005 0.749-0.315 0.935l-0.091 0.045-0.926 0.384c-0.383 0.158-0.822-0.023-0.98-0.406-0.145-0.35-0.005-0.749 0.314-0.935l0.092-0.045 0.926-0.384c0.383-0.158 0.821 0.024 0.98 0.406zm6.487-4.833L10.683 5.39c-0.534 0.188-1.022 0.444-1.46 0.758-0.533-0.174-1.13-0.166-1.69 0.066-1.245 0.516-1.837 1.944-1.32 3.19 0.06 0.146 0.133 0.284 0.217 0.411-0.492 0.138-0.953 0.356-1.366 0.64-0.09-0.15-0.168-0.31-0.237-0.477-0.833-2.011 0.122-4.317 2.133-5.15 1.342-0.556 2.816-0.315 3.895 0.504zM2.94 5.363l0.106 0.035 0.926 0.384c0.383 0.158 0.564 0.597 0.406 0.98-0.144 0.348-0.52 0.53-0.875 0.44L3.4 7.168 2.473 6.784C2.09 6.625 1.908 6.187 2.067 5.804c0.144-0.348 0.52-0.53 0.874-0.44zm3.815-2.986l0.046 0.091 0.383 0.926c0.159 0.383-0.023 0.822-0.406 0.98C6.43 4.52 6.031 4.38 5.845 4.06L5.8 3.969 5.415 3.042C5.257 2.66 5.439 2.221 5.822 2.062c0.35-0.145 0.748-0.004 0.934 0.315zm4.354-0.319c0.348 0.144 0.53 0.52 0.44 0.875l-0.034 0.105-0.384 0.926c-0.159 0.383-0.597 0.565-0.98 0.406-0.348-0.144-0.53-0.52-0.44-0.874L9.745 3.39l0.384-0.926c0.158-0.382 0.597-0.564 0.98-0.406z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index 796586124..5e85608f3 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -168,6 +168,57 @@
     <string name="sk_timeline_icon">Icon</string>
     <string name="sk_icon_heart">Heart</string>
     <string name="sk_icon_star">Star</string>
+    <string name="sk_icon_city">City</string>
+    <string name="sk_icon_cat">Cat</string>
+    <string name="sk_icon_dog">Dog</string>
+    <string name="sk_icon_rabbit">Rabbit</string>
+    <string name="sk_icon_turtle">Turtle</string>
+    <string name="sk_icon_balloon">Balloon</string>
+    <string name="sk_icon_image">Image</string>
+    <string name="sk_icon_bot">Bot</string>
+    <string name="sk_icon_language">Language</string>
+    <string name="sk_icon_location">Location</string>
+    <string name="sk_icon_megaphone">Megaphone</string>
+    <string name="sk_icon_microphone">Microphone</string>
+    <string name="sk_icon_microscope">Microscope</string>
+    <string name="sk_icon_keyboard">Keyboard</string>
+    <string name="sk_icon_coffee">Coffee</string>
+    <string name="sk_icon_laugh">Laugh</string>
+    <string name="sk_icon_news">News</string>
+    <string name="sk_icon_pi">Pi</string>
+    <string name="sk_icon_color_palette">Color palette</string>
+    <string name="sk_icon_academic_cap">Academic cap</string>
+    <string name="sk_icon_tag">Tag</string>
+    <string name="sk_icon_stethoscope">Stethoscope</string>
+    <string name="sk_icon_weather">Weather</string>
+    <string name="sk_icon_games">Games</string>
+    <string name="sk_icon_code">Code</string>
+    <string name="sk_icon_light_bulb">Light bulb</string>
+    <string name="sk_icon_train">Train</string>
+    <string name="sk_icon_clapper_board">Clapper board</string>
+    <string name="sk_icon_leaves">Leaves</string>
+    <string name="sk_icon_sport">Sport</string>
+    <string name="sk_icon_aperture">Aperture</string>
+    <string name="sk_icon_music">Music</string>
+    <string name="sk_icon_people">People</string>
+    <string name="sk_icon_health">Health</string>
+    <string name="sk_icon_important">Important</string>
+    <string name="sk_icon_chat">Chat</string>
+    <string name="sk_icon_shield">Shield</string>
+    <string name="sk_icon_book">Book</string>
+    <string name="sk_icon_bicycle">Bicycle</string>
+    <string name="sk_icon_map">Map</string>
+    <string name="sk_icon_math_formula">Math formula</string>
+    <string name="sk_icon_backpack">Backpack</string>
+    <string name="sk_icon_briefcase">Briefcase</string>
+    <string name="sk_icon_fire">Fire</string>
+    <string name="sk_icon_bug">Bug</string>
+    <string name="sk_icon_pizza">Pizza</string>
+    <string name="sk_icon_gavel">Gavel</string>
+    <string name="sk_icon_gauge">Gauge</string>
+    <string name="sk_icon_headphones">Headphones</string>
+    <string name="sk_icon_human">Human</string>
+    <string name="sk_icon_globe">Globe</string>
     <string name="sk_edit_timeline">Edit timeline</string>
     <string name="sk_edit_timelines">Edit timelines…</string>
     <string name="sk_alt_button">ALT</string>