diff --git a/mastodon/build.gradle b/mastodon/build.gradle
index d3391cfac..84594b801 100644
--- a/mastodon/build.gradle
+++ b/mastodon/build.gradle
@@ -17,7 +17,7 @@ android {
 		minSdk 23
 		targetSdk 33
 		versionCode 104
-		versionName "2.1.4+fork.104.moshinda"
+		versionName "2.2.4+fork.104.moshinda"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         resourceConfigurations += ['ar-rSA', 'ar-rDZ', 'be-rBY', 'bn-rBD', 'bs-rBA', 'ca-rES', 'cs-rCZ', 'da-rDK', 'de-rDE', 'el-rGR', 'es-rES', 'eu-rES', 'fa-rIR', 'fi-rFI', 'fil-rPH', 'fr-rFR', 'ga-rIE', 'gd-rGB', 'gl-rES', 'hi-rIN', 'hr-rHR', 'hu-rHU', 'hy-rAM', 'ig-rNG', 'in-rID', 'is-rIS', 'it-rIT', 'iw-rIL', 'ja-rJP', 'kab', 'ko-rKR', 'my-rMM', 'nl-rNL', 'no-rNO', 'oc-rFR', 'pl-rPL', 'pt-rBR', 'pt-rPT', 'ro-rRO', 'ru-rRU', 'si-rLK', 'sl-rSI', 'sv-rSE', 'th-rTH', 'tr-rTR', 'uk-rUA', 'ur-rIN', 'vi-rVN', 'zh-rCN', 'zh-rTW']
     }
@@ -142,7 +142,7 @@ dependencies {
 	implementation 'me.grishka.litex:viewpager:1.0.0'
 	implementation 'me.grishka.litex:viewpager2:1.0.0'
 	implementation 'me.grishka.litex:palette:1.0.0'
-	implementation 'me.grishka.appkit:appkit:1.2.14'
+	implementation 'me.grishka.appkit:appkit:1.2.16'
 	implementation 'com.google.code.gson:gson:2.9.0'
 	implementation 'org.jsoup:jsoup:1.14.3'
 	implementation 'com.squareup:otto:1.3.8'
diff --git a/mastodon/src/androidTest/java/org/joinmastodon/android/utils/StatusFilterPredicateTest.java b/mastodon/src/androidTest/java/org/joinmastodon/android/utils/StatusFilterPredicateTest.java
index 8ad1ff689..87235de8f 100644
--- a/mastodon/src/androidTest/java/org/joinmastodon/android/utils/StatusFilterPredicateTest.java
+++ b/mastodon/src/androidTest/java/org/joinmastodon/android/utils/StatusFilterPredicateTest.java
@@ -4,6 +4,9 @@ import static org.joinmastodon.android.model.FilterAction.*;
 import static org.joinmastodon.android.model.FilterContext.*;
 import static org.junit.Assert.*;
 
+import android.graphics.drawable.ColorDrawable;
+
+import org.joinmastodon.android.model.Attachment;
 import org.joinmastodon.android.model.LegacyFilter;
 import org.joinmastodon.android.model.Status;
 import org.junit.Test;
@@ -32,11 +35,11 @@ public class StatusFilterPredicateTest {
         warnMeFilter.filterAction = WARN;
         warnMeFilter.context = EnumSet.of(PUBLIC, HOME);
 
-        noAltText.mediaAttachments = Attachment.createFakeAttachments("fakeurl", new ColorDrawable());
-        withAltText.mediaAttachments = Attachment.createFakeAttachments("fakeurl", new ColorDrawable());
-        for (Attachment mediaAttachment : withAltText.mediaAttachments) {
-            mediaAttachment.description = "Alt Text";
-        }
+//        noAltText.mediaAttachments = Attachment.createFakeAttachments("fakeurl", new ColorDrawable());
+//        withAltText.mediaAttachments = Attachment.createFakeAttachments("fakeurl", new ColorDrawable());
+//        for (Attachment mediaAttachment : withAltText.mediaAttachments) {
+//            mediaAttachment.description = "Alt Text";
+//        }
     }
 
     @Test
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java b/mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java
index 382456256..9c2aef514 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java
@@ -13,7 +13,7 @@ import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.ComposeFragment;
-import org.joinmastodon.android.ui.AccountSwitcherSheet;
+import org.joinmastodon.android.ui.sheets.AccountSwitcherSheet;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.jsoup.internal.StringUtil;
 
diff --git a/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java b/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
index 389e6eb81..6f14482dc 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
@@ -28,6 +28,9 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.model.Account;
+
 public class GlobalUserPreferences{
 	private static final String TAG="GlobalUserPreferences";
 
@@ -84,6 +87,11 @@ public class GlobalUserPreferences{
 		return MastodonApp.context.getSharedPreferences("global", Context.MODE_PRIVATE);
 	}
 
+	private static SharedPreferences getPreReplyPrefs(){
+		return MastodonApp.context.getSharedPreferences("pre_reply_sheets", Context.MODE_PRIVATE);
+	}
+
+
 	public static <T> T fromJson(String json, Type type, T orElse){
 		if(json==null) return orElse;
 		try{
@@ -236,12 +244,41 @@ public class GlobalUserPreferences{
 				.apply();
 	}
 
+	public static boolean isOptedOutOfPreReplySheet(PreReplySheetType type, Account account, String accountID){
+		if(getPreReplyPrefs().getBoolean("opt_out_"+type, false))
+			return true;
+		if(account==null)
+			return false;
+		String accountKey=account.acct;
+		if(!accountKey.contains("@"))
+			accountKey+="@"+AccountSessionManager.get(accountID).domain;
+		return getPreReplyPrefs().getBoolean("opt_out_"+type+"_"+accountKey.toLowerCase(), false);
+	}
+
+	public static void optOutOfPreReplySheet(PreReplySheetType type, Account account, String accountID){
+		String key;
+		if(account==null){
+			key="opt_out_"+type;
+		}else{
+			String accountKey=account.acct;
+			if(!accountKey.contains("@"))
+				accountKey+="@"+AccountSessionManager.get(accountID).domain;
+			key="opt_out_"+type+"_"+accountKey.toLowerCase();
+		}
+		getPreReplyPrefs().edit().putBoolean(key, true).apply();
+	}
+
 	public enum ThemePreference{
 		AUTO,
 		LIGHT,
 		DARK
 	}
 
+	public enum PreReplySheetType{
+		OLD_POST,
+		NON_MUTUAL
+	}
+
 	public enum AutoRevealMode {
 		NEVER,
 		THREADS,
@@ -306,5 +343,4 @@ public class GlobalUserPreferences{
 	}
 
 	//endregion
-
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java b/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
index 0625962ae..979a160fe 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
@@ -12,6 +12,7 @@ import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.net.Uri;
+import android.os.BadParcelableException;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.MediaStore;
@@ -131,11 +132,11 @@ public class MainActivity extends FragmentStackActivity implements ProvidesAssis
 			session=AccountSessionManager.get(accountID);
 		if(session==null || !session.activated)
 			return;
-		openSearchQuery(uri.toString(), session.getID(), R.string.opening_link, false);
+		openSearchQuery(uri.toString(), session.getID(), R.string.opening_link, false, null);
 	}
 
-	public void openSearchQuery(String q, String accountID, int progressText, boolean fromSearch){
-		new GetSearchResults(q, null, true, null, 0, 0)
+	public void openSearchQuery(String q, String accountID, int progressText, boolean fromSearch, GetSearchResults.Type type){
+		new GetSearchResults(q, type, true, null, 0, 0)
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(SearchResults result){
@@ -334,8 +335,14 @@ public class MainActivity extends FragmentStackActivity implements ProvidesAssis
 			Fragment fragment=session.activated ? new HomeFragment() : new AccountActivationFragment();
 			fragment.setArguments(args);
 			if(fromNotification && hasNotification){
-				Notification notification=Parcels.unwrap(intent.getParcelableExtra("notification"));
-				showFragmentForNotification(notification, session.getID());
+				// Parcelables might not be compatible across app versions so this protects against possible crashes
+				// when a notification was received, then the app was updated, and then the user opened the notification
+				try{
+					Notification notification=Parcels.unwrap(intent.getParcelableExtra("notification"));
+					showFragmentForNotification(notification, session.getID());
+				}catch(BadParcelableException x){
+					Log.w(TAG, x);
+				}
 			} else if (intent.getBooleanExtra("compose", false)){
 				showCompose();
 			} else if (Intent.ACTION_VIEW.equals(intent.getAction())){
diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java b/mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java
index 47b55c4c1..a904ac0a0 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java
@@ -9,21 +9,32 @@ import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
 
+import com.google.gson.reflect.TypeToken;
+
 import org.joinmastodon.android.BuildConfig;
 import org.joinmastodon.android.MastodonApp;
+import org.joinmastodon.android.api.requests.lists.GetLists;
 import org.joinmastodon.android.api.requests.notifications.GetNotifications;
 import org.joinmastodon.android.api.requests.timelines.GetHomeTimeline;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.CacheablePaginatedResponse;
 import org.joinmastodon.android.model.FilterContext;
+import org.joinmastodon.android.model.FollowList;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.PaginatedResponse;
 import org.joinmastodon.android.model.SearchResult;
 import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.ui.utils.UiUtils;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Objects;
@@ -44,6 +55,7 @@ public class CacheController{
 	private final Runnable databaseCloseRunnable=this::closeDatabase;
 	private boolean loadingNotifications;
 	private final ArrayList<Callback<PaginatedResponse<List<Notification>>>> pendingNotificationsCallbacks=new ArrayList<>();
+	private List<FollowList> lists;
 
 	private static final int POST_FLAG_GAP_AFTER=1;
 
@@ -348,6 +360,99 @@ public class CacheController{
 		}, 0);
 	}
 
+	public void reloadLists(Callback<List<FollowList>> callback){
+		new GetLists()
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(List<FollowList> result){
+						result.sort(Comparator.comparing(l->l.title));
+						lists=result;
+						if(callback!=null)
+							callback.onSuccess(result);
+						writeListsToFile();
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						if(callback!=null)
+							callback.onError(error);
+					}
+				})
+				.exec(accountID);
+	}
+
+	private List<FollowList> loadListsFromFile(){
+		File file=getListsFile();
+		if(!file.exists())
+			return null;
+		try(InputStreamReader in=new InputStreamReader(new FileInputStream(file))){
+			return MastodonAPIController.gson.fromJson(in, new TypeToken<List<FollowList>>(){}.getType());
+		}catch(Exception x){
+			Log.w(TAG, "failed to read lists from cache file", x);
+			return null;
+		}
+	}
+
+	private void writeListsToFile(){
+		databaseThread.postRunnable(()->{
+			try(OutputStreamWriter out=new OutputStreamWriter(new FileOutputStream(getListsFile()))){
+				MastodonAPIController.gson.toJson(lists, out);
+			}catch(IOException x){
+				Log.w(TAG, "failed to write lists to cache file", x);
+			}
+		}, 0);
+	}
+
+	public void getLists(Callback<List<FollowList>> callback){
+		if(lists!=null){
+			if(callback!=null)
+				callback.onSuccess(lists);
+			return;
+		}
+		databaseThread.postRunnable(()->{
+			List<FollowList> lists=loadListsFromFile();
+			if(lists!=null){
+				this.lists=lists;
+				if(callback!=null)
+					uiHandler.post(()->callback.onSuccess(lists));
+				return;
+			}
+			reloadLists(callback);
+		}, 0);
+	}
+
+	public File getListsFile(){
+		return new File(MastodonApp.context.getFilesDir(), "lists_"+accountID+".json");
+	}
+
+	public void addList(FollowList list){
+		if(lists==null)
+			return;
+		lists.add(list);
+		lists.sort(Comparator.comparing(l->l.title));
+		writeListsToFile();
+	}
+
+	public void deleteList(String id){
+		if(lists==null)
+			return;
+		lists.removeIf(l->l.id.equals(id));
+		writeListsToFile();
+	}
+
+	public void updateList(FollowList list){
+		if(lists==null)
+			return;
+		for(int i=0;i<lists.size();i++){
+			if(lists.get(i).id.equals(list.id)){
+				lists.set(i, list);
+				lists.sort(Comparator.comparing(l->l.title));
+				writeListsToFile();
+				break;
+			}
+		}
+	}
+
 	private class DatabaseHelper extends SQLiteOpenHelper{
 
 		public DatabaseHelper(){
diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIController.java b/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIController.java
index 522f9a62c..23be5d4b9 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIController.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIController.java
@@ -54,7 +54,9 @@ public class MastodonAPIController{
 			.create();
 	private static WorkerThread thread=new WorkerThread("MastodonAPIController");
 	private static OkHttpClient httpClient=new OkHttpClient.Builder()
-			.readTimeout(30, TimeUnit.SECONDS)
+			.connectTimeout(60, TimeUnit.SECONDS)
+			.writeTimeout(60, TimeUnit.SECONDS)
+			.readTimeout(60, TimeUnit.SECONDS)
 			.build();
 
 	private AccountSession session;
@@ -122,15 +124,15 @@ public class MastodonAPIController{
 				}
 
 				if(BuildConfig.DEBUG)
-					Log.d(TAG, "["+(session==null ? "no-auth" : session.getID())+"] Sending request: "+hreq);
+					Log.d(TAG, logTag(session)+"Sending request: "+hreq);
 
 				call.enqueue(new Callback(){
 					@Override
 					public void onFailure(@NonNull Call call, @NonNull IOException e){
-						if(call.isCanceled())
+						if(req.canceled)
 							return;
 						if(BuildConfig.DEBUG)
-							Log.w(TAG, "["+(session==null ? "no-auth" : session.getID())+"] "+hreq+" failed", e);
+							Log.w(TAG, logTag(session)+""+hreq+" failed", e);
 						synchronized(req){
 							req.okhttpCall=null;
 						}
@@ -139,10 +141,10 @@ public class MastodonAPIController{
 
 					@Override
 					public void onResponse(@NonNull Call call, @NonNull Response response) throws IOException{
-						if(call.isCanceled())
+						if(req.canceled)
 							return;
 						if(BuildConfig.DEBUG)
-							Log.d(TAG, "["+(session==null ? "no-auth" : session.getID())+"] "+hreq+" received response: "+response);
+							Log.d(TAG, logTag(session)+hreq+" received response: "+response);
 						synchronized(req){
 							req.okhttpCall=null;
 						}
@@ -153,7 +155,7 @@ public class MastodonAPIController{
 								try{
 									if(BuildConfig.DEBUG){
 										JsonElement respJson=JsonParser.parseReader(reader);
-										Log.d(TAG, "["+(session==null ? "no-auth" : session.getID())+"] response body: "+respJson);
+										Log.d(TAG, logTag(session)+"response body: "+respJson);
 										if(req.respTypeToken!=null)
 											respObj=gson.fromJson(respJson, req.respTypeToken.getType());
 										else if(req.respClass!=null)
@@ -175,7 +177,7 @@ public class MastodonAPIController{
 										return;
 									}
 									if(BuildConfig.DEBUG)
-										Log.w(TAG, "["+(session==null ? "no-auth" : session.getID())+"] "+response+" error parsing or reading body", x);
+										Log.w(TAG, logTag(session)+response+" error parsing or reading body", x);
 									req.onError(x.getLocalizedMessage(), response.code(), x);
 									return;
 								}
@@ -184,19 +186,19 @@ public class MastodonAPIController{
 									req.validateAndPostprocessResponse(respObj, response);
 								}catch(IOException x){
 									if(BuildConfig.DEBUG)
-										Log.w(TAG, "["+(session==null ? "no-auth" : session.getID())+"] "+response+" error post-processing or validating response", x);
+										Log.w(TAG, logTag(session)+response+" error post-processing or validating response", x);
 									req.onError(x.getLocalizedMessage(), response.code(), x);
 									return;
 								}
 
 								if(BuildConfig.DEBUG)
-									Log.d(TAG, "["+(session==null ? "no-auth" : session.getID())+"] "+response+" parsed successfully: "+respObj);
+									Log.d(TAG, logTag(session)+response+" parsed successfully: "+respObj);
 
 								req.onSuccess(respObj);
 							}else{
 								try{
 									JsonObject error=JsonParser.parseReader(reader).getAsJsonObject();
-									Log.w(TAG, "["+(session==null ? "no-auth" : session.getID())+"] "+response+" received error: "+error);
+									Log.w(TAG, logTag(session)+response+" received error: "+error);
 									if(error.has("details")){
 										MastodonDetailedErrorResponse err=new MastodonDetailedErrorResponse(error.get("error").getAsString(), response.code(), null);
 										HashMap<String, List<MastodonDetailedErrorResponse.FieldError>> details=new HashMap<>();
@@ -231,7 +233,7 @@ public class MastodonAPIController{
 				});
 			}catch(Exception x){
 				if(BuildConfig.DEBUG)
-					Log.w(TAG, "["+(session==null ? "no-auth" : session.getID())+"] error creating and sending http request", x);
+					Log.w(TAG, logTag(session)+"error creating and sending http request", x);
 				req.onError(x.getLocalizedMessage(), 0, x);
 			}
 		}, 0);
@@ -244,4 +246,8 @@ public class MastodonAPIController{
 	public static OkHttpClient getHttpClient(){
 		return httpClient;
 	}
+
+	private static String logTag(AccountSession session){
+		return "["+(session==null ? "no-auth" : session.getID())+"] ";
+	}
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIRequest.java b/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIRequest.java
index 09cb7ca60..99b0beb48 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIRequest.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIRequest.java
@@ -180,6 +180,8 @@ public abstract class MastodonAPIRequest<T> extends APIRequest<T>{
 	}
 
 	public RequestBody getRequestBody() throws IOException{
+		if(requestBody instanceof RequestBody rb)
+			return rb;
 		return requestBody==null ? null : new JsonObjectRequestBody(requestBody);
 	}
 
diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/CheckInviteLink.java b/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/CheckInviteLink.java
new file mode 100644
index 000000000..136200548
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/CheckInviteLink.java
@@ -0,0 +1,22 @@
+package org.joinmastodon.android.api.requests.accounts;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.api.RequiredField;
+import org.joinmastodon.android.model.BaseModel;
+
+public class CheckInviteLink extends MastodonAPIRequest<CheckInviteLink.Response>{
+	public CheckInviteLink(String path){
+		super(HttpMethod.GET, path, Response.class);
+		addHeader("Accept", "application/json");
+	}
+
+	@Override
+	protected String getPathPrefix(){
+		return "";
+	}
+
+	public static class Response extends BaseModel{
+		@RequiredField
+		public String inviteCode;
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountLists.java b/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountLists.java
new file mode 100644
index 000000000..55e03fb31
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountLists.java
@@ -0,0 +1,14 @@
+package org.joinmastodon.android.api.requests.accounts;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.FollowList;
+
+import java.util.List;
+
+public class GetAccountLists extends MastodonAPIRequest<List<FollowList>>{
+	public GetAccountLists(String id){
+		super(HttpMethod.GET, "/accounts/"+id+"/lists", new TypeToken<>(){});
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/RegisterAccount.java b/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/RegisterAccount.java
index 622145237..df7915bb5 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/RegisterAccount.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/RegisterAccount.java
@@ -4,22 +4,23 @@ import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Token;
 
 public class RegisterAccount extends MastodonAPIRequest<Token>{
-	public RegisterAccount(String username, String email, String password, String locale, String reason, String timezone){
+	public RegisterAccount(String username, String email, String password, String locale, String reason, String timezone, String inviteCode){
 		super(HttpMethod.POST, "/accounts", Token.class);
-		setRequestBody(new Body(username, email, password, locale, reason, timezone));
+		setRequestBody(new Body(username, email, password, locale, reason, timezone, inviteCode));
 	}
 
 	private static class Body{
-		public String username, email, password, locale, reason, timeZone;
+		public String username, email, password, locale, reason, timeZone, inviteCode;
 		public boolean agreement=true;
 
-		public Body(String username, String email, String password, String locale, String reason, String timeZone){
+		public Body(String username, String email, String password, String locale, String reason, String timeZone, String inviteCode){
 			this.username=username;
 			this.email=email;
 			this.password=password;
 			this.locale=locale;
 			this.reason=reason;
 			this.timeZone=timeZone;
+			this.inviteCode=inviteCode;
 		}
 	}
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SearchAccounts.java b/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SearchAccounts.java
new file mode 100644
index 000000000..6bfb87e4c
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SearchAccounts.java
@@ -0,0 +1,23 @@
+package org.joinmastodon.android.api.requests.accounts;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Account;
+
+import java.util.List;
+
+public class SearchAccounts extends MastodonAPIRequest<List<Account>>{
+	public SearchAccounts(String q, int limit, int offset, boolean resolve, boolean following){
+		super(HttpMethod.GET, "/accounts/search", new TypeToken<>(){});
+		addQueryParameter("q", q);
+		if(limit>0)
+			addQueryParameter("limit", limit+"");
+		if(offset>0)
+			addQueryParameter("offset", offset+"");
+		if(resolve)
+			addQueryParameter("resolve", "true");
+		if(following)
+			addQueryParameter("following", "true");
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/UpdateAccountCredentials.java b/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/UpdateAccountCredentials.java
index 5724a933b..37f52f83b 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/UpdateAccountCredentials.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/UpdateAccountCredentials.java
@@ -22,6 +22,7 @@ public class UpdateAccountCredentials extends MastodonAPIRequest<Account>{
 	private Uri avatar, cover;
 	private File avatarFile, coverFile;
 	private List<AccountField> fields;
+	private Boolean discoverable, indexable;
 
 	public UpdateAccountCredentials(String displayName, String bio, Uri avatar, Uri cover, List<AccountField> fields){
 		super(HttpMethod.PATCH, "/accounts/update_credentials", Account.class);
@@ -41,6 +42,12 @@ public class UpdateAccountCredentials extends MastodonAPIRequest<Account>{
 		this.fields=fields;
 	}
 
+	public UpdateAccountCredentials setDiscoverableIndexable(boolean discoverable, boolean indexable){
+		this.discoverable=discoverable;
+		this.indexable=indexable;
+		return this;
+	}
+
 	@Override
 	public RequestBody getRequestBody() throws IOException{
 		MultipartBody.Builder bldr=new MultipartBody.Builder()
@@ -58,15 +65,21 @@ public class UpdateAccountCredentials extends MastodonAPIRequest<Account>{
 		}else if(coverFile!=null){
 			bldr.addFormDataPart("header", coverFile.getName(), new ResizedImageRequestBody(Uri.fromFile(coverFile), 1500*500, null));
 		}
-		if(fields.isEmpty()){
-			bldr.addFormDataPart("fields_attributes[0][name]", "").addFormDataPart("fields_attributes[0][value]", "");
-		}else{
-			int i=0;
-			for(AccountField field:fields){
-				bldr.addFormDataPart("fields_attributes["+i+"][name]", field.name).addFormDataPart("fields_attributes["+i+"][value]", field.value);
-				i++;
+		if(fields!=null){
+			if(fields.isEmpty()){
+				bldr.addFormDataPart("fields_attributes[0][name]", "").addFormDataPart("fields_attributes[0][value]", "");
+			}else{
+				int i=0;
+				for(AccountField field:fields){
+					bldr.addFormDataPart("fields_attributes["+i+"][name]", field.name).addFormDataPart("fields_attributes["+i+"][value]", field.value);
+					i++;
+				}
 			}
 		}
+		if(discoverable!=null)
+			bldr.addFormDataPart("discoverable", discoverable.toString());
+		if(indexable!=null)
+			bldr.addFormDataPart("indexable", indexable.toString());
 
 		return bldr.build();
 	}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/filters/KeywordAttribute.java b/mastodon/src/main/java/org/joinmastodon/android/api/requests/filters/KeywordAttribute.java
index d35a0f0fa..b2ed7f18b 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/filters/KeywordAttribute.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/filters/KeywordAttribute.java
@@ -2,6 +2,9 @@ package org.joinmastodon.android.api.requests.filters;
 
 import com.google.gson.annotations.SerializedName;
 
+import androidx.annotation.Keep;
+
+@Keep
 class KeywordAttribute{
 	public String id;
 	@SerializedName("_destroy")
diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/AddAccountsToList.java b/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/AddAccountsToList.java
index f3db76322..29c1aacea 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/AddAccountsToList.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/AddAccountsToList.java
@@ -1,17 +1,19 @@
 package org.joinmastodon.android.api.requests.lists;
 
-import org.joinmastodon.android.api.MastodonAPIRequest;
-import java.util.List;
+import org.joinmastodon.android.api.ResultlessMastodonAPIRequest;
 
-public class AddAccountsToList extends MastodonAPIRequest<Object> {
-    public AddAccountsToList(String listId, List<String> accountIds){
-        super(HttpMethod.POST, "/lists/"+listId+"/accounts", Object.class);
-        Request req = new Request();
-        req.accountIds = accountIds;
-        setRequestBody(req);
-    }
+import java.nio.charset.StandardCharsets;
+import java.util.Collection;
 
-    public static class Request{
-        public List<String> accountIds;
-    }
+import okhttp3.FormBody;
+
+public class AddAccountsToList extends ResultlessMastodonAPIRequest{
+	public AddAccountsToList(String listID, Collection<String> accountIDs){
+		super(HttpMethod.POST, "/lists/"+listID+"/accounts");
+		FormBody.Builder builder=new FormBody.Builder(StandardCharsets.UTF_8);
+		for(String id:accountIDs){
+			builder.add("account_ids[]", id);
+		}
+		setRequestBody(builder.build());
+	}
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/CreateList.java b/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/CreateList.java
index 1ec4204e5..2c217a627 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/CreateList.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/CreateList.java
@@ -1,21 +1,23 @@
 package org.joinmastodon.android.api.requests.lists;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.model.ListTimeline;
+import org.joinmastodon.android.model.FollowList;
 
-public class CreateList extends MastodonAPIRequest<ListTimeline> {
-	public CreateList(String title, boolean exclusive, ListTimeline.RepliesPolicy repliesPolicy) {
-		super(HttpMethod.POST, "/lists", ListTimeline.class);
-		Request req = new Request();
-		req.title = title;
-		req.exclusive = exclusive;
-		req.repliesPolicy = repliesPolicy;
-		setRequestBody(req);
+public class CreateList extends MastodonAPIRequest<FollowList>{
+	public CreateList(String title, FollowList.RepliesPolicy repliesPolicy, boolean exclusive){
+		super(HttpMethod.POST, "/lists", FollowList.class);
+		setRequestBody(new Request(title, repliesPolicy, exclusive));
 	}
 
-	public static class Request {
+	private static class Request{
 		public String title;
+		public FollowList.RepliesPolicy repliesPolicy;
 		public boolean exclusive;
-		public ListTimeline.RepliesPolicy repliesPolicy;
+
+		public Request(String title, FollowList.RepliesPolicy repliesPolicy, boolean exclusive){
+			this.title=title;
+			this.repliesPolicy=repliesPolicy;
+			this.exclusive=exclusive;
+		}
 	}
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/DeleteList.java b/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/DeleteList.java
index 64620adac..716d9a5d8 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/DeleteList.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/DeleteList.java
@@ -1,10 +1,9 @@
 package org.joinmastodon.android.api.requests.lists;
 
-import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.model.ListTimeline;
+import org.joinmastodon.android.api.ResultlessMastodonAPIRequest;
 
-public class DeleteList extends MastodonAPIRequest<Object> {
-	public DeleteList(String id) {
-		super(HttpMethod.DELETE, "/lists/" + id, Object.class);
+public class DeleteList extends ResultlessMastodonAPIRequest{
+	public DeleteList(String id){
+		super(HttpMethod.DELETE, "/lists/"+id);
 	}
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/GetList.java b/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/GetList.java
index 19bda79ca..340af5523 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/GetList.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/GetList.java
@@ -1,10 +1,10 @@
 package org.joinmastodon.android.api.requests.lists;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.model.ListTimeline;
+import org.joinmastodon.android.model.FollowList;
 
-public class GetList extends MastodonAPIRequest<ListTimeline> {
+public class GetList extends MastodonAPIRequest<FollowList> {
 	public GetList(String id) {
-		super(HttpMethod.GET, "/lists/" + id, ListTimeline.class);
+		super(HttpMethod.GET, "/lists/" + id, FollowList.class);
 	}
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/GetListAccounts.java b/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/GetListAccounts.java
new file mode 100644
index 000000000..1d54dc2d9
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/GetListAccounts.java
@@ -0,0 +1,17 @@
+package org.joinmastodon.android.api.requests.lists;
+
+import android.text.TextUtils;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.model.Account;
+
+public class GetListAccounts extends HeaderPaginationRequest<Account>{
+	public GetListAccounts(String listID, String maxID, int limit){
+		super(HttpMethod.GET, "/lists/"+listID+"/accounts", new TypeToken<>(){});
+		if(!TextUtils.isEmpty(maxID))
+			addQueryParameter("max_id", maxID);
+		addQueryParameter("limit", String.valueOf(limit));
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/GetLists.java b/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/GetLists.java
index 61abeb03a..ab1cdad48 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/GetLists.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/GetLists.java
@@ -3,11 +3,11 @@ package org.joinmastodon.android.api.requests.lists;
 import com.google.gson.reflect.TypeToken;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.model.ListTimeline;
+import org.joinmastodon.android.model.FollowList;
 
 import java.util.List;
 
-public class GetLists extends MastodonAPIRequest<List<ListTimeline>>{
+public class GetLists extends MastodonAPIRequest<List<FollowList>>{
     public GetLists() {
         super(HttpMethod.GET, "/lists", new TypeToken<>(){});
     }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/RemoveAccountsFromList.java b/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/RemoveAccountsFromList.java
index f285d54f6..20f20463f 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/RemoveAccountsFromList.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/RemoveAccountsFromList.java
@@ -1,17 +1,19 @@
 package org.joinmastodon.android.api.requests.lists;
 
-import org.joinmastodon.android.api.MastodonAPIRequest;
-import java.util.List;
+import org.joinmastodon.android.api.ResultlessMastodonAPIRequest;
 
-public class RemoveAccountsFromList extends MastodonAPIRequest<Object> {
-    public RemoveAccountsFromList(String listId, List<String> accountIds){
-        super(HttpMethod.DELETE, "/lists/"+listId+"/accounts", Object.class);
-        Request req = new Request();
-        req.accountIds = accountIds;
-        setRequestBody(req);
-    }
+import java.nio.charset.StandardCharsets;
+import java.util.Collection;
 
-    public static class Request{
-        public List<String> accountIds;
-    }
+import okhttp3.FormBody;
+
+public class RemoveAccountsFromList extends ResultlessMastodonAPIRequest{
+	public RemoveAccountsFromList(String listID, Collection<String> accountIDs){
+		super(HttpMethod.DELETE, "/lists/"+listID+"/accounts");
+		FormBody.Builder builder=new FormBody.Builder(StandardCharsets.UTF_8);
+		for(String id:accountIDs){
+			builder.add("account_ids[]", id);
+		}
+		setRequestBody(builder.build());
+	}
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/UpdateList.java b/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/UpdateList.java
index 64073fd3d..905ad0d26 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/UpdateList.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/UpdateList.java
@@ -1,15 +1,23 @@
 package org.joinmastodon.android.api.requests.lists;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.model.ListTimeline;
+import org.joinmastodon.android.model.FollowList;
 
-public class UpdateList extends MastodonAPIRequest<ListTimeline> {
-	public UpdateList(String id, String title, boolean exclusive, ListTimeline.RepliesPolicy repliesPolicy) {
-		super(HttpMethod.PUT, "/lists/" + id, ListTimeline.class);
-		CreateList.Request req = new CreateList.Request();
-		req.title = title;
-		req.exclusive = exclusive;
-		req.repliesPolicy = repliesPolicy;
-		setRequestBody(req);
+public class UpdateList extends MastodonAPIRequest<FollowList>{
+	public UpdateList(String listID, String title, FollowList.RepliesPolicy repliesPolicy, boolean exclusive){
+		super(HttpMethod.PUT, "/lists/"+listID, FollowList.class);
+		setRequestBody(new Request(title, repliesPolicy, exclusive));
+	}
+
+	private static class Request{
+		public String title;
+		public FollowList.RepliesPolicy repliesPolicy;
+		public boolean exclusive;
+
+		public Request(String title, FollowList.RepliesPolicy repliesPolicy, boolean exclusive){
+			this.title=title;
+			this.repliesPolicy=repliesPolicy;
+			this.exclusive=exclusive;
+		}
 	}
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetStatusEditHistory.java b/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetStatusEditHistory.java
index 608c8211c..27432bfdc 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetStatusEditHistory.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetStatusEditHistory.java
@@ -26,8 +26,11 @@ public class GetStatusEditHistory extends MastodonAPIRequest<List<Status>>{
 			s.visibility=StatusPrivacy.PUBLIC;
 			s.mentions=Collections.emptyList();
 			s.tags=Collections.emptyList();
-			if (s.poll != null)
+			if(s.poll!=null){
 				s.poll.id="fakeID"+i;
+				s.poll.emojis=Collections.emptyList();
+				s.poll.ownVotes=Collections.emptyList();
+			}
 			i++;
 		}
 		super.validateAndPostprocessResponse(respObj, httpResponse);
diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/tags/GetFollowedTags.java b/mastodon/src/main/java/org/joinmastodon/android/api/requests/tags/GetFollowedTags.java
new file mode 100644
index 000000000..5c88a471a
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/tags/GetFollowedTags.java
@@ -0,0 +1,16 @@
+package org.joinmastodon.android.api.requests.tags;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.model.Hashtag;
+
+public class GetFollowedTags extends HeaderPaginationRequest<Hashtag>{
+	public GetFollowedTags(String maxID, int limit){
+		super(HttpMethod.GET, "/followed_tags", new TypeToken<>(){});
+		if(maxID!=null)
+			addQueryParameter("max_id", maxID);
+		if(limit>0)
+			addQueryParameter("limit", limit+"");
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetPublicTimeline.java b/mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetPublicTimeline.java
index 328bf869a..08c03b1c4 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetPublicTimeline.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetPublicTimeline.java
@@ -10,7 +10,7 @@ import org.joinmastodon.android.model.Status;
 import java.util.List;
 
 public class GetPublicTimeline extends MastodonAPIRequest<List<Status>>{
-	public GetPublicTimeline(boolean local, boolean remote, String maxID, int limit, String replyVisibility){
+	public GetPublicTimeline(boolean local, boolean remote, String maxID, String minID, int limit, String sinceID, String replyVisibility){
 		super(HttpMethod.GET, "/timelines/public", new TypeToken<>(){});
 		if(local)
 			addQueryParameter("local", "true");
@@ -18,6 +18,10 @@ public class GetPublicTimeline extends MastodonAPIRequest<List<Status>>{
 			addQueryParameter("remote", "true");
 		if(!TextUtils.isEmpty(maxID))
 			addQueryParameter("max_id", maxID);
+		if(!TextUtils.isEmpty(minID))
+			addQueryParameter("min_id", minID);
+		if(!TextUtils.isEmpty(sinceID))
+			addQueryParameter("since_id", sinceID);
 		if(limit>0)
 			addQueryParameter("limit", limit+"");
 		if(replyVisibility != null)
diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountLocalPreferences.java b/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountLocalPreferences.java
index 24439acbe..e17136d9e 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountLocalPreferences.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountLocalPreferences.java
@@ -50,6 +50,7 @@ public class AccountLocalPreferences{
 	public ShowEmojiReactions showEmojiReactions;
 	public ColorPreference color;
 	public ArrayList<Emoji> recentCustomEmoji;
+	public boolean preReplySheet;
 
 	private final static Type recentLanguagesType=new TypeToken<ArrayList<String>>() {}.getType();
 	private final static Type timelinesType=new TypeToken<ArrayList<TimelineDefinition>>() {}.getType();
@@ -68,6 +69,7 @@ public class AccountLocalPreferences{
 		revealCWs=prefs.getBoolean("revealCWs", false);
 		hideSensitiveMedia=prefs.getBoolean("hideSensitive", true);
 		serverSideFiltersSupported=prefs.getBoolean("serverSideFilters", false);
+//		preReplySheet=prefs.getBoolean("preReplySheet", false);
 
 		// MEGALODON
 		showReplies=prefs.getBoolean("showReplies", true);
@@ -112,6 +114,9 @@ public class AccountLocalPreferences{
 				.putBoolean("hideSensitive", hideSensitiveMedia)
 				.putBoolean("serverSideFilters", serverSideFiltersSupported)
 
+				//TODO figure this stuff out
+//				.putBoolean("preReplySheet", preReplySheet)
+
 				// MEGALODON
 				.putBoolean("showReplies", showReplies)
 				.putBoolean("showBoosts", showBoosts)
diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java b/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java
index 5d70e0b23..8f5a6fcba 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java
@@ -26,6 +26,7 @@ import org.joinmastodon.android.model.FilterAction;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.FilterResult;
 import org.joinmastodon.android.model.Instance;
+import org.joinmastodon.android.model.FollowList;
 import org.joinmastodon.android.model.LegacyFilter;
 import org.joinmastodon.android.model.Preferences;
 import org.joinmastodon.android.model.PushSubscription;
@@ -34,6 +35,7 @@ import org.joinmastodon.android.model.TimelineMarkers;
 import org.joinmastodon.android.model.Token;
 import org.joinmastodon.android.utils.ObjectIdComparator;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -70,6 +72,7 @@ public class AccountSession{
 	private transient SharedPreferences prefs;
 	private transient boolean preferencesNeedSaving;
 	private transient AccountLocalPreferences localPreferences;
+	private transient List<FollowList> lists;
 
 	AccountSession(Token token, Account self, Application app, String domain, boolean activated, AccountActivationInfo activationInfo){
 		this.token=token;
@@ -343,4 +346,12 @@ public class AccountSession{
 				.map(instance->"https://"+domain+(instance.isAkkoma() ? "/images/avi.png" : "/avatars/original/missing.png"))
 				.orElse("");
 	}
+
+	public boolean isNotificationsMentionsOnly(){
+		return getRawLocalPreferences().getBoolean("notificationsMentionsOnly", false);
+	}
+
+	public void setNotificationsMentionsOnly(boolean mentionsOnly){
+		getRawLocalPreferences().edit().putBoolean("notificationsMentionsOnly", mentionsOnly).apply();
+	}
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java b/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java
index 33bd83ff3..6a80d5572 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java
@@ -216,12 +216,17 @@ public class AccountSessionManager{
 	public void removeAccount(String id){
 		AccountSession session=getAccount(id);
 		session.getCacheController().closeDatabase();
+		session.getCacheController().getListsFile().delete();
 		MastodonApp.context.deleteDatabase(id+".db");
 		MastodonApp.context.getSharedPreferences(id, 0).edit().clear().commit();
 		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N){
 			MastodonApp.context.deleteSharedPreferences(id);
 		}else{
-			new File(MastodonApp.context.getDir("shared_prefs", Context.MODE_PRIVATE), id+".xml").delete();
+			String dataDir=MastodonApp.context.getApplicationInfo().dataDir;
+			if(dataDir!=null){
+				File prefsDir=new File(dataDir, "shared_prefs");
+				new File(prefsDir, id+".xml").delete();
+			}
 		}
 		sessions.remove(id);
 		if(lastActiveAccountID.equals(id)){
diff --git a/mastodon/src/main/java/org/joinmastodon/android/events/AccountAddedToListEvent.java b/mastodon/src/main/java/org/joinmastodon/android/events/AccountAddedToListEvent.java
new file mode 100644
index 000000000..032485381
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/events/AccountAddedToListEvent.java
@@ -0,0 +1,15 @@
+package org.joinmastodon.android.events;
+
+import org.joinmastodon.android.model.Account;
+
+public class AccountAddedToListEvent{
+	public final String accountID;
+	public final String listID;
+	public final Account account;
+
+	public AccountAddedToListEvent(String accountID, String listID, Account account){
+		this.accountID=accountID;
+		this.listID=listID;
+		this.account=account;
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/events/AccountRemovedFromListEvent.java b/mastodon/src/main/java/org/joinmastodon/android/events/AccountRemovedFromListEvent.java
new file mode 100644
index 000000000..f7cce08e7
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/events/AccountRemovedFromListEvent.java
@@ -0,0 +1,13 @@
+package org.joinmastodon.android.events;
+
+public class AccountRemovedFromListEvent{
+	public final String accountID;
+	public final String listID;
+	public final String targetAccountID;
+
+	public AccountRemovedFromListEvent(String accountID, String listID, String targetAccountID){
+		this.accountID=accountID;
+		this.listID=listID;
+		this.targetAccountID=targetAccountID;
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/events/FinishListCreationFragmentEvent.java b/mastodon/src/main/java/org/joinmastodon/android/events/FinishListCreationFragmentEvent.java
new file mode 100644
index 000000000..ec7a33346
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/events/FinishListCreationFragmentEvent.java
@@ -0,0 +1,11 @@
+package org.joinmastodon.android.events;
+
+public class FinishListCreationFragmentEvent{
+	public final String accountID;
+	public final String listID;
+
+	public FinishListCreationFragmentEvent(String accountID, String listID){
+		this.accountID=accountID;
+		this.listID=listID;
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/events/ListCreatedEvent.java b/mastodon/src/main/java/org/joinmastodon/android/events/ListCreatedEvent.java
new file mode 100644
index 000000000..00de72dcc
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/events/ListCreatedEvent.java
@@ -0,0 +1,13 @@
+package org.joinmastodon.android.events;
+
+import org.joinmastodon.android.model.FollowList;
+
+public class ListCreatedEvent{
+	public final String accountID;
+	public final FollowList list;
+
+	public ListCreatedEvent(String accountID, FollowList list){
+		this.accountID=accountID;
+		this.list=list;
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/events/ListDeletedEvent.java b/mastodon/src/main/java/org/joinmastodon/android/events/ListDeletedEvent.java
index 9824bb233..b12eaa222 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/events/ListDeletedEvent.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/events/ListDeletedEvent.java
@@ -1,9 +1,11 @@
 package org.joinmastodon.android.events;
 
-public class ListDeletedEvent {
-	public final String id;
+public class ListDeletedEvent{
+	public final String accountID;
+	public final String listID;
 
-	public ListDeletedEvent(String id) {
-		this.id = id;
+	public ListDeletedEvent(String accountID, String listID){
+		this.accountID=accountID;
+		this.listID=listID;
 	}
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/events/ListUpdatedCreatedEvent.java b/mastodon/src/main/java/org/joinmastodon/android/events/ListUpdatedCreatedEvent.java
index 26e0081e6..919a2950a 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/events/ListUpdatedCreatedEvent.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/events/ListUpdatedCreatedEvent.java
@@ -1,14 +1,14 @@
 package org.joinmastodon.android.events;
 
-import org.joinmastodon.android.model.ListTimeline;
+import org.joinmastodon.android.model.FollowList;
 
 public class ListUpdatedCreatedEvent {
 	public final String id;
 	public final String title;
-	public final ListTimeline.RepliesPolicy repliesPolicy;
+	public final FollowList.RepliesPolicy repliesPolicy;
 	public final boolean exclusive;
 
-	public ListUpdatedCreatedEvent(String id, String title, boolean exclusive, ListTimeline.RepliesPolicy repliesPolicy) {
+	public ListUpdatedCreatedEvent(String id, String title, boolean exclusive, FollowList.RepliesPolicy repliesPolicy) {
 		this.id = id;
 		this.title = title;
 		this.exclusive = exclusive;
diff --git a/mastodon/src/main/java/org/joinmastodon/android/events/ListUpdatedEvent.java b/mastodon/src/main/java/org/joinmastodon/android/events/ListUpdatedEvent.java
new file mode 100644
index 000000000..b27fe0142
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/events/ListUpdatedEvent.java
@@ -0,0 +1,13 @@
+package org.joinmastodon.android.events;
+
+import org.joinmastodon.android.model.FollowList;
+
+public class ListUpdatedEvent{
+	public final String accountID;
+	public final FollowList list;
+
+	public ListUpdatedEvent(String accountID, FollowList list){
+		this.accountID=accountID;
+		this.list=list;
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/AddAccountToListsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/AddAccountToListsFragment.java
new file mode 100644
index 000000000..deb59fce3
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/AddAccountToListsFragment.java
@@ -0,0 +1,114 @@
+package org.joinmastodon.android.fragments;
+
+import android.os.Bundle;
+import android.widget.TextView;
+
+import org.joinmastodon.android.E;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.ResultlessMastodonAPIRequest;
+import org.joinmastodon.android.api.requests.accounts.GetAccountLists;
+import org.joinmastodon.android.api.requests.lists.AddAccountsToList;
+import org.joinmastodon.android.api.requests.lists.RemoveAccountsFromList;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.events.AccountAddedToListEvent;
+import org.joinmastodon.android.events.AccountRemovedFromListEvent;
+import org.joinmastodon.android.fragments.settings.BaseSettingsFragment;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.FollowList;
+import org.joinmastodon.android.model.viewmodel.CheckableListItem;
+import org.joinmastodon.android.ui.utils.UiUtils;
+import org.parceler.Parcels;
+
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import androidx.recyclerview.widget.RecyclerView;
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
+import me.grishka.appkit.api.SimpleCallback;
+import me.grishka.appkit.utils.MergeRecyclerAdapter;
+import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
+import me.grishka.appkit.utils.V;
+
+public class AddAccountToListsFragment extends BaseSettingsFragment<FollowList>{
+	private Account account;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		setTitle(R.string.add_user_to_list_title);
+		account=Parcels.unwrap(getArguments().getParcelable("targetAccount"));
+		loadData();
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){
+		AccountSessionManager.get(accountID).getCacheController().getLists(new SimpleCallback<>(this){
+			@Override
+			public void onSuccess(List<FollowList> allLists){
+				if(getActivity()==null)
+					return;
+				loadAccountLists(allLists);
+			}
+		});
+	}
+
+	private void loadAccountLists(final List<FollowList> allLists){
+		currentRequest=new GetAccountLists(account.id)
+				.setCallback(new SimpleCallback<>(this){
+					@Override
+					public void onSuccess(List<FollowList> result){
+						Set<String> lists=result.stream().map(l->l.id).collect(Collectors.toSet());
+						onDataLoaded(allLists.stream()
+								.map(l->new CheckableListItem<>(l.title, null, CheckableListItem.Style.CHECKBOX, lists.contains(l.id),
+										R.drawable.ic_list_alt_24px, AddAccountToListsFragment.this::onItemClick, l))
+								.collect(Collectors.toList()), false);
+					}
+				})
+				.exec(accountID);
+	}
+
+	@Override
+	protected int indexOfItemsAdapter(){
+		return 1;
+	}
+
+	@Override
+	protected RecyclerView.Adapter<?> getAdapter(){
+		TextView topText=new TextView(getActivity());
+		topText.setTextAppearance(R.style.m3_body_medium);
+		topText.setTextColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3OnSurface));
+		topText.setPadding(V.dp(16), V.dp(8), V.dp(16), V.dp(8));
+		topText.setText(getString(R.string.manage_user_lists, account.getDisplayUsername()));
+
+		MergeRecyclerAdapter mergeAdapter=new MergeRecyclerAdapter();
+		mergeAdapter.addAdapter(new SingleViewRecyclerAdapter(topText));
+		mergeAdapter.addAdapter(super.getAdapter());
+		return mergeAdapter;
+	}
+
+	private void onItemClick(CheckableListItem<FollowList> item){
+		boolean add=!item.checked;
+		ResultlessMastodonAPIRequest req=add ? new AddAccountsToList(item.parentObject.id, Set.of(account.id)) : new RemoveAccountsFromList(item.parentObject.id, Set.of(account.id));
+		req.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Void result){
+						item.checked=add;
+						rebindItem(item);
+						if(add){
+							E.post(new AccountAddedToListEvent(accountID, item.parentObject.id, account));
+						}else{
+							E.post(new AccountRemovedFromListEvent(accountID, item.parentObject.id, account.id));
+						}
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						error.showToast(getActivity());
+					}
+				})
+				.wrapProgress(getActivity(), R.string.loading, false)
+				.exec(accountID);
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseEditListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseEditListFragment.java
new file mode 100644
index 000000000..5aa203f68
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseEditListFragment.java
@@ -0,0 +1,176 @@
+package org.joinmastodon.android.fragments;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.Spinner;
+
+import org.joinmastodon.android.E;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.lists.DeleteList;
+import org.joinmastodon.android.api.requests.lists.GetListAccounts;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.events.ListDeletedEvent;
+import org.joinmastodon.android.fragments.settings.BaseSettingsFragment;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.FollowList;
+import org.joinmastodon.android.model.HeaderPaginationList;
+import org.joinmastodon.android.model.viewmodel.AvatarPileListItem;
+import org.joinmastodon.android.model.viewmodel.CheckableListItem;
+import org.joinmastodon.android.model.viewmodel.ListItem;
+import org.joinmastodon.android.ui.views.FloatingHintEditTextLayout;
+import org.parceler.Parcels;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import androidx.recyclerview.widget.RecyclerView;
+import me.grishka.appkit.Nav;
+import me.grishka.appkit.api.APIRequest;
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
+import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
+import me.grishka.appkit.utils.MergeRecyclerAdapter;
+import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
+import me.grishka.appkit.utils.V;
+
+public abstract class BaseEditListFragment extends BaseSettingsFragment<Void>{
+	protected FollowList followList;
+	protected AvatarPileListItem<Void> membersItem;
+	protected CheckableListItem<Void> exclusiveItem;
+	protected FloatingHintEditTextLayout titleEditLayout;
+	protected EditText titleEdit;
+	protected Spinner showRepliesSpinner;
+	private APIRequest<?> getMembersRequest;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		followList=Parcels.unwrap(getArguments().getParcelable("list"));
+
+		membersItem=new AvatarPileListItem<>(getString(R.string.list_members), null, List.of(), 0, i->onMembersClick(), null, false);
+		List<ListItem<Void>> items=new ArrayList<>();
+		if(followList!=null){
+			items.add(membersItem);
+		}
+		exclusiveItem=new CheckableListItem<>(R.string.list_exclusive, R.string.list_exclusive_subtitle, CheckableListItem.Style.SWITCH, followList!=null && followList.exclusive, this::toggleCheckableItem);
+		items.add(exclusiveItem);
+		onDataLoaded(items);
+	}
+
+	@Override
+	public void onDestroy(){
+		super.onDestroy();
+		if(getMembersRequest!=null)
+			getMembersRequest.cancel();
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){}
+
+	@Override
+	protected RecyclerView.Adapter<?> getAdapter(){
+		LinearLayout topView=new LinearLayout(getActivity());
+		topView.setOrientation(LinearLayout.VERTICAL);
+
+		titleEditLayout=(FloatingHintEditTextLayout) getActivity().getLayoutInflater().inflate(R.layout.floating_hint_edit_text, topView, false);
+		titleEdit=titleEditLayout.findViewById(R.id.edit);
+		titleEdit.setHint(R.string.list_name);
+		titleEditLayout.updateHint();
+		if(followList!=null)
+			titleEdit.setText(followList.title);
+		topView.addView(titleEditLayout);
+
+		FloatingHintEditTextLayout showRepliesLayout=(FloatingHintEditTextLayout) getActivity().getLayoutInflater().inflate(R.layout.floating_hint_spinner, topView, false);
+		showRepliesSpinner=showRepliesLayout.findViewById(R.id.spinner);
+		showRepliesLayout.setHint(R.string.list_show_replies_to);
+		topView.addView(showRepliesLayout);
+		ArrayAdapter<String> spinnerAdapter=new ArrayAdapter<>(getActivity(), R.layout.item_spinner, List.of(
+				getString(R.string.list_replies_no_one),
+				getString(R.string.list_replies_members),
+				getString(R.string.list_replies_anyone)
+		));
+		showRepliesSpinner.setAdapter(spinnerAdapter);
+		showRepliesSpinner.setSelection(switch(followList!=null ? followList.repliesPolicy : FollowList.RepliesPolicy.LIST){
+			case FOLLOWED -> 2;
+			case LIST -> 1;
+			case NONE -> 0;
+		});
+		ViewGroup.MarginLayoutParams llp=(ViewGroup.MarginLayoutParams)showRepliesLayout.getLabel().getLayoutParams();
+		llp.setMarginStart(llp.getMarginStart()+V.dp(16));
+
+		MergeRecyclerAdapter adapter=new MergeRecyclerAdapter();
+		adapter.addAdapter(new SingleViewRecyclerAdapter(topView));
+		adapter.addAdapter(super.getAdapter());
+		return adapter;
+	}
+
+	@Override
+	protected int indexOfItemsAdapter(){
+		return 1;
+	}
+
+	protected void doDeleteList(){
+		new DeleteList(followList.id)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Void result){
+						AccountSessionManager.get(accountID).getCacheController().deleteList(followList.id);
+						E.post(new ListDeletedEvent(accountID, followList.id));
+						Nav.finish(BaseEditListFragment.this);
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						Activity activity=getActivity();
+						if(activity==null)
+							return;
+						error.showToast(activity);
+					}
+				})
+				.wrapProgress(getActivity(), R.string.loading, true)
+				.exec(accountID);
+	}
+
+	private void onMembersClick(){
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		args.putParcelable("list", Parcels.wrap(followList));
+		Nav.go(getActivity(), ListMembersFragment.class, args);
+	}
+
+	protected void loadMembers(){
+		getMembersRequest=new GetListAccounts(followList.id, null, 3)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(HeaderPaginationList<Account> result){
+						getMembersRequest=null;
+						membersItem.avatars=new ArrayList<>();
+						for(int i=0;i<Math.min(3, result.size());i++){
+							Account acc=result.get(i);
+							membersItem.avatars.add(new UrlImageLoaderRequest(acc.avatarStatic, V.dp(32), V.dp(32)));
+						}
+						rebindItem(membersItem);
+						imgLoader.updateImages();
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						getMembersRequest=null;
+					}
+				})
+				.exec(accountID);
+	}
+
+	protected FollowList.RepliesPolicy getSelectedRepliesPolicy(){
+		return switch(showRepliesSpinner.getSelectedItemPosition()){
+			case 0 -> FollowList.RepliesPolicy.NONE;
+			case 1 -> FollowList.RepliesPolicy.LIST;
+			case 2 -> FollowList.RepliesPolicy.FOLLOWED;
+			default -> throw new IllegalStateException("Unexpected value: "+showRepliesSpinner.getSelectedItemPosition());
+		};
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
index acaabf44a..ea6c5f99e 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
@@ -28,6 +28,8 @@ import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
 import org.joinmastodon.android.api.requests.polls.SubmitPollVote;
 import org.joinmastodon.android.api.requests.statuses.AkkomaTranslateStatus;
 import org.joinmastodon.android.api.requests.statuses.TranslateStatus;
+import org.joinmastodon.android.api.session.AccountLocalPreferences;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.PollUpdatedEvent;
@@ -40,6 +42,8 @@ import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.Translation;
 import org.joinmastodon.android.ui.BetterItemAnimator;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
+import org.joinmastodon.android.ui.NonMutualPreReplySheet;
+import org.joinmastodon.android.ui.OldPostPreReplySheet;
 import org.joinmastodon.android.ui.displayitems.AccountStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.FooterStatusDisplayItem;
@@ -63,6 +67,8 @@ import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.utils.ProvidesAssistContent;
 import org.joinmastodon.android.utils.TypedObjectPool;
 
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -145,6 +151,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		for(T s:items){
 			displayItems.addAll(buildDisplayItems(s));
 		}
+		loadRelationships(items.stream().map(DisplayItemsParent::getAccountID).filter(Objects::nonNull).collect(Collectors.toSet()));
 	}
 
 	@Override
@@ -166,6 +173,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		}
 		if(notify)
 			adapter.notifyItemRangeInserted(0, offset);
+		loadRelationships(items.stream().map(DisplayItemsParent::getAccountID).filter(Objects::nonNull).collect(Collectors.toSet()));
 		return offset;
 	}
 
@@ -222,7 +230,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	@Override
 	public void openPhotoViewer(String parentID, Status _status, int attachmentIndex, MediaGridStatusDisplayItem.Holder gridHolder){
 		final Status status=_status.getContentStatus();
-		currentPhotoViewer=new PhotoViewer(getActivity(), status.mediaAttachments, attachmentIndex, new PhotoViewer.Listener(){
+		currentPhotoViewer=new PhotoViewer(getActivity(), status.mediaAttachments, attachmentIndex, status, accountID, new PhotoViewer.Listener(){
 			private MediaAttachmentViewController transitioningHolder;
 
 			@Override
@@ -288,6 +296,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 			@Override
 			public void photoViewerDismissed(){
 				currentPhotoViewer=null;
+				gridHolder.itemView.setHasTransientState(false);
 			}
 
 			@Override
@@ -299,12 +308,13 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 				return gridHolder.getViewController(index);
 			}
 		});
+		gridHolder.itemView.setHasTransientState(true);
 	}
 
 
 	public void openPreviewlessMediaPhotoViewer(String parentID, Status _status, int attachmentIndex, PreviewlessMediaGridStatusDisplayItem.Holder gridHolder){
 		final Status status=_status.getContentStatus();
-		currentPhotoViewer=new PhotoViewer(getActivity(), status.mediaAttachments, attachmentIndex, new PhotoViewer.Listener(){
+		currentPhotoViewer=new PhotoViewer(getActivity(), status.mediaAttachments, attachmentIndex, status, accountID, new PhotoViewer.Listener(){
 			private PreviewlessMediaAttachmentViewController transitioningHolder;
 
 			@Override
@@ -775,6 +785,9 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	}
 
 	protected void loadRelationships(Set<String> ids){
+		if(ids.isEmpty())
+			return;
+		ids=ids.stream().filter(id->!relationships.containsKey(id)).collect(Collectors.toSet());
 		if(ids.isEmpty())
 			return;
 		// TODO somehow manage these and cancel outstanding requests on refresh
@@ -1066,6 +1079,26 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		adapter.notifyDataSetChanged();
 	}
 
+	public void maybeShowPreReplySheet(Status status, Runnable proceed){
+		Relationship rel=getRelationship(status.account.id);
+		if(!GlobalUserPreferences.isOptedOutOfPreReplySheet(GlobalUserPreferences.PreReplySheetType.NON_MUTUAL, status.account, accountID) &&
+				!status.account.id.equals(AccountSessionManager.get(accountID).self.id) && rel!=null && !rel.followedBy && status.account.followingCount>=1){
+			new NonMutualPreReplySheet(getActivity(), notAgain->{
+				GlobalUserPreferences.optOutOfPreReplySheet(GlobalUserPreferences.PreReplySheetType.NON_MUTUAL, notAgain ? null : status.account, accountID);
+				proceed.run();
+			}, status.account, accountID).show();
+		}else if(!GlobalUserPreferences.isOptedOutOfPreReplySheet(GlobalUserPreferences.PreReplySheetType.OLD_POST, null, null) &&
+				status.createdAt.isBefore(Instant.now().minus(90, ChronoUnit.DAYS))){
+			new OldPostPreReplySheet(getActivity(), notAgain->{
+				if(notAgain)
+					GlobalUserPreferences.optOutOfPreReplySheet(GlobalUserPreferences.PreReplySheetType.OLD_POST, null, null);
+				proceed.run();
+			}, status).show();
+		}else{
+			proceed.run();
+		}
+	}
+
 	protected void onModifyItemViewHolder(BindableViewHolder<StatusDisplayItem> holder){}
 
 	@Override
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
index 70cc98df3..90dee6085 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -7,6 +7,9 @@ import static org.joinmastodon.android.api.requests.statuses.CreateStatus.getDra
 
 import android.Manifest;
 import android.animation.ObjectAnimator;
+import android.animation.Animator;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.DatePickerDialog;
@@ -75,7 +78,7 @@ import org.joinmastodon.android.events.ScheduledStatusDeletedEvent;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
 import org.joinmastodon.android.events.StatusCreatedEvent;
 import org.joinmastodon.android.events.StatusUpdatedEvent;
-import org.joinmastodon.android.fragments.account_list.ComposeAccountSearchFragment;
+import org.joinmastodon.android.fragments.account_list.AccountSearchFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.ContentType;
 import org.joinmastodon.android.model.Emoji;
@@ -135,12 +138,14 @@ import java.util.stream.Collectors;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
+import me.grishka.appkit.fragments.CustomTransitionsFragment;
 import me.grishka.appkit.fragments.OnBackPressedListener;
 import me.grishka.appkit.imageloader.ViewImageLoader;
 import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
+import me.grishka.appkit.utils.CubicBezierInterpolator;
 import me.grishka.appkit.utils.V;
 
-public class ComposeFragment extends MastodonToolbarFragment implements OnBackPressedListener, ComposeEditText.SelectionListener, HasAccountID {
+public class ComposeFragment extends MastodonToolbarFragment implements OnBackPressedListener, ComposeEditText.SelectionListener, HasAccountID, CustomTransitionsFragment {
 
 	private static final int MEDIA_RESULT=717;
 	public static final int IMAGE_DESCRIPTION_RESULT=363;
@@ -527,7 +532,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			public void onLaunchAccountSearch(){
 				Bundle args=new Bundle();
 				args.putString("account", accountID);
-				Nav.goForResult(getActivity(), ComposeAccountSearchFragment.class, args, AUTOCOMPLETE_ACCOUNT_RESULT, ComposeFragment.this);
+				Nav.goForResult(getActivity(), AccountSearchFragment.class, args, AUTOCOMPLETE_ACCOUNT_RESULT, ComposeFragment.this);
 			}
 		});
 		View autocompleteView=autocompleteViewController.getView();
@@ -1806,8 +1811,26 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		return new String[]{"image/jpeg", "image/gif", "image/png", "video/mp4"};
 	}
 
+	private String sanitizeMediaDescription(String description){
+		if(description == null){
+			return null;
+		}
+
+		// The Gboard android keyboard attaches this text whenever the user
+		// pastes something from the keyboard's suggestion bar.
+		// Due to different end user locales, the exact text may vary, but at
+		// least in version 13.4.08, all of the translations contained the
+		// string "Gboard".
+		if (description.contains("Gboard")){
+			return null;
+		}
+
+		return description;
+	}
+
 	@Override
 	public boolean onAddMediaAttachmentFromEditText(Uri uri, String description){
+		description = sanitizeMediaDescription(description);
 		return mediaViewController.addMediaAttachment(uri, description);
 	}
 
@@ -1850,6 +1873,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		Editable e=mainEditText.getText();
 		int start=e.getSpanStart(currentAutocompleteSpan);
 		int end=e.getSpanEnd(currentAutocompleteSpan);
+		if(start==-1 || end==-1)
+			return;
 		e.replace(start, end, text+" ");
 		finishAutocomplete();
 		InputConnection conn=mainEditText.getCurrentInputConnection();
@@ -1918,4 +1943,35 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		languageButton.setText(opt.language.getLanguageName());
 		languageButton.setContentDescription(getActivity().getString(R.string.sk_post_language, opt.language.getDefaultName()));
 	}
+
+	@Override
+	public Animator onCreateEnterTransition(View prev, View container){
+		AnimatorSet anim=new AnimatorSet();
+		if(getArguments().getBoolean("fromThreadFragment")){
+			anim.playTogether(
+					ObjectAnimator.ofFloat(container, View.ALPHA, 0f, 1f),
+					ObjectAnimator.ofFloat(container, View.TRANSLATION_Y, V.dp(200), 0)
+			);
+		}else{
+			anim.playTogether(
+					ObjectAnimator.ofFloat(container, View.ALPHA, 0f, 1f),
+					ObjectAnimator.ofFloat(container, View.TRANSLATION_X, V.dp(100), 0)
+			);
+		}
+		anim.setDuration(300);
+		anim.setInterpolator(CubicBezierInterpolator.DEFAULT);
+		return anim;
+	}
+
+	@Override
+	public Animator onCreateExitTransition(View prev, View container){
+		AnimatorSet anim=new AnimatorSet();
+		anim.playTogether(
+				ObjectAnimator.ofFloat(container, View.TRANSLATION_X, V.dp(100)),
+				ObjectAnimator.ofFloat(container, View.ALPHA, 0)
+		);
+		anim.setDuration(200);
+		anim.setInterpolator(CubicBezierInterpolator.DEFAULT);
+		return anim;
+	}
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeImageDescriptionFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeImageDescriptionFragment.java
index 733bc0815..a82f95592 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeImageDescriptionFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeImageDescriptionFragment.java
@@ -7,10 +7,7 @@ import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.media.MediaMetadataRetriever;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
-import android.text.SpannableStringBuilder;
-import android.text.style.BulletSpan;
 import android.util.Log;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
@@ -135,20 +132,9 @@ public class ComposeImageDescriptionFragment extends MastodonToolbarFragment imp
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item){
 		if(item.getItemId()==R.id.help){
-			SpannableStringBuilder msg=new SpannableStringBuilder(getText(R.string.alt_text_help));
-			BulletSpan[] spans=msg.getSpans(0, msg.length(), BulletSpan.class);
-			for(BulletSpan span:spans){
-				BulletSpan betterSpan;
-				if(Build.VERSION.SDK_INT<Build.VERSION_CODES.Q)
-					betterSpan=new BulletSpan(V.dp(10), UiUtils.getThemeColor(themeWrapper, R.attr.colorM3OnSurface));
-				else
-					betterSpan=new BulletSpan(V.dp(10), UiUtils.getThemeColor(themeWrapper, R.attr.colorM3OnSurface), V.dp(1.5f));
-				msg.setSpan(betterSpan, msg.getSpanStart(span), msg.getSpanEnd(span), msg.getSpanFlags(span));
-				msg.removeSpan(span);
-			}
 			new M3AlertDialogBuilder(themeWrapper)
 					.setTitle(R.string.what_is_alt_text)
-					.setMessage(msg)
+					.setMessage(UiUtils.fixBulletListInString(themeWrapper, R.string.alt_text_help))
 					.setPositiveButton(R.string.ok, null)
 					.show();
 		}
@@ -185,7 +171,7 @@ public class ComposeImageDescriptionFragment extends MastodonToolbarFragment imp
 		fakeAttachment.meta.width=width;
 		fakeAttachment.meta.height=height;
 
-		photoViewer=new PhotoViewer(getActivity(), Collections.singletonList(fakeAttachment), 0, new PhotoViewer.Listener(){
+		photoViewer=new PhotoViewer(getActivity(), Collections.singletonList(fakeAttachment), 0, null, accountID, new PhotoViewer.Listener(){
 			@Override
 			public void setPhotoViewVisibility(int index, boolean visible){
 				image.setAlpha(visible ? 1f : 0f);
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/CreateListAddMembersFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/CreateListAddMembersFragment.java
new file mode 100644
index 000000000..0e0ef88d4
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/CreateListAddMembersFragment.java
@@ -0,0 +1,330 @@
+package org.joinmastodon.android.fragments;
+
+import android.content.res.TypedArray;
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewStub;
+import android.view.WindowInsets;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Button;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+
+import org.joinmastodon.android.E;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.lists.AddAccountsToList;
+import org.joinmastodon.android.api.requests.lists.GetListAccounts;
+import org.joinmastodon.android.api.requests.lists.RemoveAccountsFromList;
+import org.joinmastodon.android.events.FinishListCreationFragmentEvent;
+import org.joinmastodon.android.fragments.account_list.AddNewListMembersFragment;
+import org.joinmastodon.android.fragments.account_list.BaseAccountListFragment;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.FollowList;
+import org.joinmastodon.android.model.HeaderPaginationList;
+import org.joinmastodon.android.model.viewmodel.AccountViewModel;
+import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.ui.viewholders.AccountViewHolder;
+import org.joinmastodon.android.ui.views.CurlyArrowEmptyView;
+import org.parceler.Parcels;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import me.grishka.appkit.Nav;
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
+import me.grishka.appkit.api.SimpleCallback;
+import me.grishka.appkit.fragments.OnBackPressedListener;
+import me.grishka.appkit.fragments.WindowInsetsAwareFragment;
+import me.grishka.appkit.utils.CubicBezierInterpolator;
+import me.grishka.appkit.utils.V;
+import me.grishka.appkit.views.FragmentRootLinearLayout;
+
+public class CreateListAddMembersFragment extends BaseAccountListFragment implements OnBackPressedListener, AddNewListMembersFragment.Listener{
+	private FollowList followList;
+	private Button nextButton;
+	private View buttonBar;
+	private FragmentRootLinearLayout rootView;
+	private FrameLayout searchFragmentContainer;
+	private FrameLayout fragmentContentWrap;
+	private AddNewListMembersFragment searchFragment;
+	private WindowInsets lastInsets;
+	private boolean dismissingSearchFragment;
+	private HashSet<String> accountIDsInList=new HashSet<>();
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		setTitle(R.string.manage_list_members);
+		setSubtitle(getString(R.string.step_x_of_y, 2, 2));
+		setLayout(R.layout.fragment_login);
+		setEmptyText(R.string.list_no_members);
+		setHasOptionsMenu(true);
+
+		followList=Parcels.unwrap(getArguments().getParcelable("list"));
+		if(savedInstanceState!=null || getArguments().getBoolean("needLoadMembers", false)){
+			loadData();
+		}else{
+			onDataLoaded(List.of());
+		}
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){
+		currentRequest=new GetListAccounts(followList.id, null, 0)
+				.setCallback(new SimpleCallback<>(this){
+					@Override
+					public void onSuccess(HeaderPaginationList<Account> result){
+						for(Account acc:result)
+							accountIDsInList.add(acc.id);
+						onDataLoaded(result.stream().map(a->new AccountViewModel(a, accountID)).collect(Collectors.toList()));
+					}
+				})
+				.exec(accountID);
+	}
+
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){
+		View view=super.onCreateView(inflater, container, savedInstanceState);
+		FrameLayout wrapper=new FrameLayout(getActivity());
+		wrapper.addView(view);
+		rootView=(FragmentRootLinearLayout) view;
+		fragmentContentWrap=wrapper;
+		return wrapper;
+	}
+
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState){
+		nextButton=view.findViewById(R.id.btn_next);
+		nextButton.setOnClickListener(this::onNextClick);
+		nextButton.setText(R.string.done);
+		buttonBar=view.findViewById(R.id.button_bar);
+
+		super.onViewCreated(view, savedInstanceState);
+	}
+
+	@Override
+	public void onApplyWindowInsets(WindowInsets insets){
+		lastInsets=insets;
+		if(searchFragment!=null)
+			searchFragment.onApplyWindowInsets(insets);
+		insets=UiUtils.applyBottomInsetToFixedView(buttonBar, insets);
+		rootView.dispatchApplyWindowInsets(insets);
+	}
+
+	@Override
+	protected List<View> getViewsForElevationEffect(){
+		return List.of(getToolbar(), buttonBar);
+	}
+
+	@Override
+	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
+		MenuItem item=menu.add(R.string.add_list_member);
+		item.setIcon(R.drawable.ic_fluent_add_24_regular);
+		item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item){
+		if(searchFragmentContainer!=null)
+			return true;
+
+		searchFragmentContainer=new FrameLayout(getActivity());
+		searchFragmentContainer.setId(R.id.search_fragment);
+		fragmentContentWrap.addView(searchFragmentContainer);
+
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		args.putParcelable("list", Parcels.wrap(followList));
+		args.putBoolean("_can_go_back", true);
+		searchFragment=new AddNewListMembersFragment(this);
+		searchFragment.setArguments(args);
+		getChildFragmentManager().beginTransaction().add(R.id.search_fragment, searchFragment).commit();
+		getChildFragmentManager().executePendingTransactions();
+		if(lastInsets!=null)
+			searchFragment.onApplyWindowInsets(lastInsets);
+		searchFragmentContainer.setTranslationX(V.dp(100));
+		searchFragmentContainer.setAlpha(0f);
+		searchFragmentContainer.animate().translationX(0).alpha(1).setDuration(300).withLayer().setInterpolator(CubicBezierInterpolator.DEFAULT).withEndAction(()->{
+			rootView.setVisibility(View.GONE);
+		}).start();
+		return true;
+	}
+
+	@Override
+	protected void initializeEmptyView(View contentView){
+		ViewStub emptyStub=contentView.findViewById(R.id.empty);
+		emptyStub.setLayoutResource(R.layout.empty_with_arrow);
+		super.initializeEmptyView(contentView);
+		TextView emptySecondary=contentView.findViewById(R.id.empty_text_secondary);
+		emptySecondary.setText(R.string.list_find_users);
+		CurlyArrowEmptyView arrowView=(CurlyArrowEmptyView) emptyView;
+		arrowView.setGravityAndOffsets(Gravity.TOP | Gravity.END, 24, 2);
+	}
+
+	@Override
+	protected void setStatusBarColor(int color){
+		rootView.setStatusBarColor(color);
+	}
+
+	@Override
+	protected void setNavigationBarColor(int color){
+		rootView.setNavigationBarColor(color);
+	}
+
+	private void dismissSearchFragment(){
+		if(searchFragment==null || dismissingSearchFragment)
+			return;
+		dismissingSearchFragment=true;
+		rootView.setVisibility(View.VISIBLE);
+		searchFragmentContainer.animate().translationX(V.dp(100)).alpha(0).setDuration(200).withLayer().setInterpolator(CubicBezierInterpolator.DEFAULT).withEndAction(()->{
+			getChildFragmentManager().beginTransaction().remove(searchFragment).commit();
+			getChildFragmentManager().executePendingTransactions();
+			fragmentContentWrap.removeView(searchFragmentContainer);
+			searchFragmentContainer=null;
+			searchFragment=null;
+			dismissingSearchFragment=false;
+		}).start();
+		getActivity().getSystemService(InputMethodManager.class).hideSoftInputFromWindow(contentView.getWindowToken(), 0);
+	}
+
+	private void onNextClick(View v){
+		E.post(new FinishListCreationFragmentEvent(accountID, followList.id));
+		Nav.finish(this);
+	}
+
+	@Override
+	public boolean onBackPressed(){
+		if(searchFragment!=null){
+			dismissSearchFragment();
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public boolean isAccountInList(AccountViewModel account){
+		return accountIDsInList.contains(account.account.id);
+	}
+
+	@Override
+	public void addAccountToList(AccountViewModel account, Runnable onDone){
+		new AddAccountsToList(followList.id, Set.of(account.account.id))
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Void result){
+						accountIDsInList.add(account.account.id);
+						if(onDone!=null)
+							onDone.run();
+						int i=0;
+						for(AccountViewModel acc:data){
+							if(acc.account.id.equals(account.account.id)){
+								list.getAdapter().notifyItemChanged(i);
+								return;
+							}
+							i++;
+						}
+						int pos=data.size();
+						data.add(account);
+						list.getAdapter().notifyItemInserted(pos);
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						error.showToast(getActivity());
+					}
+				})
+				.exec(accountID);
+	}
+
+	@Override
+	public void removeAccountAccountFromList(AccountViewModel account, Runnable onDone){
+		new RemoveAccountsFromList(followList.id, Set.of(account.account.id))
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Void result){
+						accountIDsInList.remove(account.account.id);
+						if(onDone!=null)
+							onDone.run();
+						int i=0;
+						for(AccountViewModel acc:data){
+							if(acc.account.id.equals(account.account.id)){
+								list.getAdapter().notifyItemChanged(i);
+								return;
+							}
+							i++;
+						}
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						error.showToast(getActivity());
+					}
+				})
+				.exec(accountID);
+	}
+
+	@Override
+	protected void onConfigureViewHolder(AccountViewHolder holder){
+		holder.setStyle(AccountViewHolder.AccessoryType.CUSTOM_BUTTON, false);
+		holder.setOnLongClickListener(vh->false);
+		Button button=holder.getButton();
+		button.setPadding(V.dp(24), 0, V.dp(24), 0);
+		button.setMinimumWidth(0);
+		button.setMinWidth(0);
+		button.setOnClickListener(v->{
+			holder.setActionProgressVisible(true);
+			holder.itemView.setHasTransientState(true);
+			Runnable onDone=()->{
+				holder.setActionProgressVisible(false);
+				holder.itemView.setHasTransientState(false);
+			};
+			AccountViewModel account=holder.getItem();
+			if(isAccountInList(account)){
+				removeAccountAccountFromList(account, onDone);
+			}else{
+				addAccountToList(account, onDone);
+			}
+		});
+	}
+
+	@Override
+	protected void onBindViewHolder(AccountViewHolder holder){
+		Button button=holder.getButton();
+		int textRes, styleRes;
+		if(isAccountInList(holder.getItem())){
+			textRes=R.string.remove;
+			styleRes=R.style.Widget_Mastodon_M3_Button_Tonal_Error;
+		}else{
+			textRes=R.string.add;
+			styleRes=R.style.Widget_Mastodon_M3_Button_Filled;
+		}
+		button.setText(textRes);
+		TypedArray ta=button.getContext().obtainStyledAttributes(styleRes, new int[]{android.R.attr.background});
+		button.setBackground(ta.getDrawable(0));
+		ta.recycle();
+		ta=button.getContext().obtainStyledAttributes(styleRes, new int[]{android.R.attr.textColor});
+		button.setTextColor(ta.getColorStateList(0));
+		ta.recycle();
+	}
+
+	@Override
+	protected void loadRelationships(List<AccountViewModel> accounts){
+		// no-op
+	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base){
+		// TODO this
+		return null;
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/CreateListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/CreateListFragment.java
new file mode 100644
index 000000000..9ae409045
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/CreateListFragment.java
@@ -0,0 +1,149 @@
+package org.joinmastodon.android.fragments;
+
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.WindowInsets;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Button;
+
+import com.squareup.otto.Subscribe;
+
+import org.joinmastodon.android.E;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.lists.CreateList;
+import org.joinmastodon.android.api.requests.lists.UpdateList;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.events.FinishListCreationFragmentEvent;
+import org.joinmastodon.android.events.ListCreatedEvent;
+import org.joinmastodon.android.events.ListUpdatedEvent;
+import org.joinmastodon.android.model.FollowList;
+import org.joinmastodon.android.ui.utils.UiUtils;
+import org.parceler.Parcels;
+
+import java.util.List;
+
+import me.grishka.appkit.Nav;
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
+
+public class CreateListFragment extends BaseEditListFragment{
+	private Button nextButton;
+	private View buttonBar;
+	private FollowList followList;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		setTitle(R.string.create_list);
+		setSubtitle(getString(R.string.step_x_of_y, 1, 2));
+		setLayout(R.layout.fragment_login);
+		if(savedInstanceState!=null)
+			followList=Parcels.unwrap(savedInstanceState.getParcelable("list"));
+		E.register(this);
+	}
+
+	@Override
+	public void onDestroy(){
+		super.onDestroy();
+		E.unregister(this);
+	}
+
+	@Override
+	protected int getNavigationIconDrawableResource(){
+		return R.drawable.ic_baseline_arrow_drop_down_18;
+	}
+
+	@Override
+	public boolean wantsCustomNavigationIcon(){
+		return true;
+	}
+
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState){
+		nextButton=view.findViewById(R.id.btn_next);
+		nextButton.setOnClickListener(this::onNextClick);
+		nextButton.setText(R.string.create);
+		buttonBar=view.findViewById(R.id.button_bar);
+		super.onViewCreated(view, savedInstanceState);
+	}
+
+	@Override
+	public void onApplyWindowInsets(WindowInsets insets){
+		super.onApplyWindowInsets(UiUtils.applyBottomInsetToFixedView(buttonBar, insets));
+	}
+
+	@Override
+	protected List<View> getViewsForElevationEffect(){
+		return List.of(getToolbar(), buttonBar);
+	}
+
+	@Override
+	public void onSaveInstanceState(Bundle outState){
+		super.onSaveInstanceState(outState);
+		outState.putParcelable("list", Parcels.wrap(followList));
+	}
+
+	private void onNextClick(View v){
+		String title=titleEdit.getText().toString().trim();
+		if(TextUtils.isEmpty(title)){
+			titleEditLayout.setErrorState(getString(R.string.required_form_field_blank));
+			return;
+		}
+		if(followList==null){
+			new CreateList(title, getSelectedRepliesPolicy(), exclusiveItem.checked)
+					.setCallback(new Callback<>(){
+						@Override
+						public void onSuccess(FollowList result){
+							followList=result;
+							proceed(false);
+							E.post(new ListCreatedEvent(accountID, result));
+							AccountSessionManager.get(accountID).getCacheController().addList(result);
+						}
+
+						@Override
+						public void onError(ErrorResponse error){
+							error.showToast(getActivity());
+						}
+					})
+					.wrapProgress(getActivity(), R.string.loading, true)
+					.exec(accountID);
+		}else if(!title.equals(followList.title) || getSelectedRepliesPolicy()!=followList.repliesPolicy || exclusiveItem.checked!=followList.exclusive){
+			new UpdateList(followList.id, title, getSelectedRepliesPolicy(), exclusiveItem.checked)
+					.setCallback(new Callback<>(){
+						@Override
+						public void onSuccess(FollowList result){
+							followList=result;
+							proceed(true);
+							E.post(new ListUpdatedEvent(accountID, result));
+							AccountSessionManager.get(accountID).getCacheController().updateList(result);
+						}
+
+						@Override
+						public void onError(ErrorResponse error){
+							error.showToast(getActivity());
+						}
+					})
+					.wrapProgress(getActivity(), R.string.loading, true)
+					.exec(accountID);
+		}else{
+			proceed(true);
+		}
+	}
+
+	private void proceed(boolean needLoadMembers){
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		args.putParcelable("list", Parcels.wrap(followList));
+		args.putBoolean("needLoadMembers", needLoadMembers);
+		Nav.go(getActivity(), CreateListAddMembersFragment.class, args);
+		getActivity().getSystemService(InputMethodManager.class).hideSoftInputFromWindow(contentView.getWindowToken(), 0);
+	}
+
+	@Subscribe
+	public void onFinishListCreationFragment(FinishListCreationFragmentEvent ev){
+		if(ev.accountID.equals(accountID) && followList!=null && ev.listID.equals(followList.id)){
+			Nav.finish(this);
+		}
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/CustomLocalTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/CustomLocalTimelineFragment.java
index 2f499280e..9fd6bcef4 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/CustomLocalTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/CustomLocalTimelineFragment.java
@@ -46,7 +46,7 @@ public class CustomLocalTimelineFragment extends PinnableStatusListFragment impl
 
     @Override
     protected void doLoadData(int offset, int count){
-        currentRequest=new GetPublicTimeline(true, false, refreshing ? null : maxID, count, getLocalPrefs().timelineReplyVisibility)
+        currentRequest=new GetPublicTimeline(true, false, refreshing ? null : maxID, null, count, null, getLocalPrefs().timelineReplyVisibility)
                 .setCallback(new SimpleCallback<>(this){
                     @Override
                     public void onSuccess(List<Status> result){
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/EditListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/EditListFragment.java
new file mode 100644
index 000000000..0d8244159
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/EditListFragment.java
@@ -0,0 +1,67 @@
+package org.joinmastodon.android.fragments;
+
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+
+import org.joinmastodon.android.E;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.lists.UpdateList;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.events.ListUpdatedEvent;
+import org.joinmastodon.android.model.FollowList;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
+
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
+
+public class EditListFragment extends BaseEditListFragment{
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		setTitle(R.string.edit_list);
+		loadMembers();
+		setHasOptionsMenu(true);
+	}
+
+	@Override
+	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
+		menu.add(R.string.delete_list);
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item){
+		new M3AlertDialogBuilder(getActivity())
+				.setTitle(R.string.delete_list)
+				.setMessage(getString(R.string.delete_list_confirm, followList.title))
+				.setPositiveButton(R.string.delete, (dlg, which)->doDeleteList())
+				.setNegativeButton(R.string.cancel, null)
+				.show();
+		return true;
+	}
+
+	@Override
+	public void onDestroy(){
+		super.onDestroy();
+		String newTitle=titleEdit.getText().toString();
+		FollowList.RepliesPolicy newRepliesPolicy=getSelectedRepliesPolicy();
+		boolean newExclusive=exclusiveItem.checked;
+		if(!newTitle.equals(followList.title) || newRepliesPolicy!=followList.repliesPolicy || newExclusive!=followList.exclusive){
+			new UpdateList(followList.id, newTitle, newRepliesPolicy, newExclusive)
+					.setCallback(new Callback<>(){
+						@Override
+						public void onSuccess(FollowList result){
+							AccountSessionManager.get(accountID).getCacheController().updateList(result);
+							E.post(new ListUpdatedEvent(accountID, result));
+						}
+
+						@Override
+						public void onError(ErrorResponse error){
+							// TODO handle errors somehow
+						}
+					})
+					.exec(accountID);
+		}
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
index 9d03a10df..195de9796 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
@@ -41,17 +41,14 @@ import org.joinmastodon.android.api.requests.lists.GetLists;
 import org.joinmastodon.android.api.requests.tags.GetFollowedHashtags;
 import org.joinmastodon.android.api.session.AccountLocalPreferences;
 import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.CustomLocalTimeline;
+import org.joinmastodon.android.model.FollowList;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.HeaderPaginationList;
-import org.joinmastodon.android.model.ListTimeline;
 import org.joinmastodon.android.model.TimelineDefinition;
 import org.joinmastodon.android.ui.DividerItemDecoration;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.utils.UiUtils;
-import org.joinmastodon.android.ui.views.TextInputFrameLayout;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -74,7 +71,7 @@ public class EditTimelinesFragment extends MastodonRecyclerFragment<TimelineDefi
 	private Menu optionsMenu;
 	private boolean updated;
 	private final Map<MenuItem, TimelineDefinition> timelineByMenuItem=new HashMap<>();
-	private final List<ListTimeline> listTimelines=new ArrayList<>();
+	private final List<FollowList> followLists =new ArrayList<>();
 	private final List<Hashtag> hashtags=new ArrayList<>();
 	private MenuItem addHashtagItem;
     private final List<CustomLocalTimeline> localTimelines = new ArrayList<>();
@@ -94,8 +91,8 @@ public class EditTimelinesFragment extends MastodonRecyclerFragment<TimelineDefi
 
 		new GetLists().setCallback(new Callback<>(){
 			@Override
-			public void onSuccess(List<ListTimeline> result){
-				listTimelines.addAll(result);
+			public void onSuccess(List<FollowList> result){
+				followLists.addAll(result);
 				updateOptionsMenu();
 			}
 
@@ -224,7 +221,7 @@ public class EditTimelinesFragment extends MastodonRecyclerFragment<TimelineDefi
         makeBackItem(hashtagsMenu);
 
 		TimelineDefinition.getAllTimelines(accountID).stream().forEach(tl->addTimelineToOptions(tl, timelinesMenu));
-		listTimelines.stream().map(TimelineDefinition::ofList).forEach(tl->addTimelineToOptions(tl, listsMenu));
+		followLists.stream().map(TimelineDefinition::ofList).forEach(tl->addTimelineToOptions(tl, listsMenu));
 		addHashtagItem=addOptionsItem(hashtagsMenu, getContext().getString(R.string.sk_timelines_add), R.drawable.ic_fluent_add_24_regular);
 		hashtags.stream().map(TimelineDefinition::ofHashtag).forEach(tl->addTimelineToOptions(tl, hashtagsMenu));
 
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java
index 705d2738e..b049673ff 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java
@@ -32,6 +32,8 @@ import org.joinmastodon.android.model.FilterAction;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.FilterKeyword;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.TimelineDefinition;
@@ -63,6 +65,7 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment{
 	private MenuItem followMenuItem, pinMenuItem, muteMenuItem;
 	private boolean followRequestRunning;
 	private boolean toolbarContentVisible;
+	private String maxID;
 
 	private List<String> any;
 	private List<String> all;
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
index 78b8a3394..1217ee88a 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
@@ -5,8 +5,6 @@ import android.app.Fragment;
 import android.app.NotificationManager;
 import android.app.assist.AssistContent;
 import android.graphics.drawable.RippleDrawable;
-import android.content.Intent;
-import android.graphics.Outline;
 import android.os.Build;
 import android.os.Bundle;
 import android.service.notification.StatusBarNotification;
@@ -37,7 +35,7 @@ import org.joinmastodon.android.fragments.onboarding.OnboardingFollowSuggestions
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.PaginatedResponse;
-import org.joinmastodon.android.ui.AccountSwitcherSheet;
+import org.joinmastodon.android.ui.sheets.AccountSwitcherSheet;
 import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.TabBar;
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
index 42aacbd6b..802aae4bc 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
@@ -53,7 +53,7 @@ import org.joinmastodon.android.fragments.settings.SettingsMainFragment;
 import org.joinmastodon.android.model.Announcement;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.HeaderPaginationList;
-import org.joinmastodon.android.model.ListTimeline;
+import org.joinmastodon.android.model.FollowList;
 import org.joinmastodon.android.model.TimelineDefinition;
 import org.joinmastodon.android.ui.SimpleViewHolder;
 import org.joinmastodon.android.ui.utils.UiUtils;
@@ -95,7 +95,7 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 	private ImageView collapsedChevron;
 	private TextView timelineTitle;
 	private PopupMenu switcherPopup;
-	private final Map<Integer, ListTimeline> listItems = new HashMap<>();
+	private final Map<Integer, FollowList> listItems = new HashMap<>();
 	private final Map<Integer, Hashtag> hashtagsItems = new HashMap<>();
 	private List<TimelineDefinition> timelinesList;
 	private int count;
@@ -270,7 +270,7 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 
 		new GetLists().setCallback(new Callback<>() {
 			@Override
-			public void onSuccess(List<ListTimeline> lists) {
+			public void onSuccess(List<FollowList> lists) {
 				updateList(lists, listItems);
 			}
 
@@ -512,7 +512,7 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
 		int id = item.getItemId();
-		ListTimeline list;
+		FollowList list;
 		Hashtag hashtag;
 
 		if (item.getItemId() == R.id.menu_back) {
@@ -701,13 +701,13 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 
 	@Subscribe
 	public void onListDeletedEvent(ListDeletedEvent event) {
-		handleListEvent(listItems, l -> l.id.equals(event.id), false, null);
+		handleListEvent(listItems, l -> l.id.equals(event.listID), false, null);
 	}
 
 	@Subscribe
 	public void onListUpdatedCreatedEvent(ListUpdatedCreatedEvent event) {
 		handleListEvent(listItems, l -> l.id.equals(event.id), true, () -> {
-			ListTimeline list = new ListTimeline();
+			FollowList list = new FollowList();
 			list.id = event.id;
 			list.title = event.title;
 			list.repliesPolicy = event.repliesPolicy;
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListMembersFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListMembersFragment.java
new file mode 100644
index 000000000..83259e155
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListMembersFragment.java
@@ -0,0 +1,324 @@
+package org.joinmastodon.android.fragments;
+
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.ActionMode;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.WindowInsets;
+import android.widget.ImageButton;
+
+import com.squareup.otto.Subscribe;
+
+import org.joinmastodon.android.E;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.api.requests.lists.AddAccountsToList;
+import org.joinmastodon.android.api.requests.lists.GetListAccounts;
+import org.joinmastodon.android.api.requests.lists.RemoveAccountsFromList;
+import org.joinmastodon.android.events.AccountAddedToListEvent;
+import org.joinmastodon.android.events.AccountRemovedFromListEvent;
+import org.joinmastodon.android.fragments.account_list.AddListMembersFragment;
+import org.joinmastodon.android.fragments.account_list.PaginatedAccountListFragment;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.FollowList;
+import org.joinmastodon.android.model.viewmodel.AccountViewModel;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
+import org.joinmastodon.android.ui.utils.ActionModeHelper;
+import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.ui.viewholders.AccountViewHolder;
+import org.parceler.Parcels;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import me.grishka.appkit.Nav;
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
+import me.grishka.appkit.utils.V;
+
+public class ListMembersFragment extends PaginatedAccountListFragment{
+	private static final int ADD_MEMBER_RESULT=600;
+
+	private ImageButton fab;
+	private FollowList followList;
+	private boolean inSelectionMode;
+	private Set<String> selectedAccounts=new HashSet<>();
+	private ActionMode actionMode;
+	private MenuItem deleteItem;
+
+	public ListMembersFragment(){
+		setListLayoutId(R.layout.recycler_fragment_with_fab);
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		followList=Parcels.unwrap(getArguments().getParcelable("list"));
+		setTitle(R.string.list_members);
+		setHasOptionsMenu(true);
+		E.register(this);
+	}
+
+	@Override
+	public void onDestroy(){
+		super.onDestroy();
+		E.unregister(this);
+	}
+
+	@Override
+	public HeaderPaginationRequest<Account> onCreateRequest(String maxID, int count){
+		return new GetListAccounts(followList.id, maxID, count);
+	}
+
+	@Override
+	protected MastodonAPIRequest loadRemoteInfo(){
+		return null;
+	}
+
+	@Override
+	public Object getCurrentInfo(){
+		return null;
+	}
+
+	@Override
+	public String getRemoteDomain(){
+		return null;
+	}
+
+	@Override
+	protected void onConfigureViewHolder(AccountViewHolder holder){
+		super.onConfigureViewHolder(holder);
+		holder.setStyle(inSelectionMode ? AccountViewHolder.AccessoryType.CHECKBOX : AccountViewHolder.AccessoryType.MENU, false);
+		holder.setOnClickListener(this::onItemClick);
+		holder.setOnLongClickListener(this::onItemLongClick);
+		holder.getContextMenu().getMenu().add(0, R.id.remove_from_list, 0, R.string.remove_from_list);
+		holder.setOnCustomMenuItemSelectedListener(item->onItemMenuItemSelected(holder, item));
+	}
+
+	@Override
+	protected void onBindViewHolder(AccountViewHolder holder){
+		super.onBindViewHolder(holder);
+		holder.setStyle(inSelectionMode ? AccountViewHolder.AccessoryType.CHECKBOX : AccountViewHolder.AccessoryType.MENU, false);
+		if(inSelectionMode){
+			holder.setChecked(selectedAccounts.contains(holder.getItem().account.id));
+		}
+	}
+
+	@Override
+	public boolean wantsLightStatusBar(){
+		if(actionMode!=null)
+			return UiUtils.isDarkTheme();
+		return super.wantsLightStatusBar();
+	}
+
+	@Override
+	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
+		inflater.inflate(R.menu.selectable_list, menu);
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item){
+		int id=item.getItemId();
+		if(id==R.id.select){
+			enterSelectionMode();
+		}else if(id==R.id.select_all){
+			for(AccountViewModel a:(ArrayList<AccountViewModel>)data){
+				selectedAccounts.add(a.account.id);
+			}
+			enterSelectionMode();
+		}
+		return true;
+	}
+
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState){
+		super.onViewCreated(view, savedInstanceState);
+		fab=view.findViewById(R.id.fab);
+		fab.setImageResource(R.drawable.ic_fluent_add_24_regular);
+		fab.setContentDescription(getString(R.string.add_list_member));
+		fab.setOnClickListener(v->onFabClick());
+	}
+
+	@Override
+	public void onApplyWindowInsets(WindowInsets insets){
+		super.onApplyWindowInsets(insets);
+		UiUtils.applyBottomInsetToFAB(fab, insets);
+	}
+
+	@Override
+	public void onFragmentResult(int reqCode, boolean success, Bundle result){
+		if(reqCode==ADD_MEMBER_RESULT && success){
+			Account acc=Objects.requireNonNull(Parcels.unwrap(result.getParcelable("selectedAccount")));
+			addAccounts(List.of(acc));
+		}
+	}
+
+	@Subscribe
+	public void onAccountRemovedFromList(AccountRemovedFromListEvent ev){
+		if(ev.accountID.equals(accountID) && ev.listID.equals(followList.id)){
+			removeAccountRows(Set.of(ev.targetAccountID));
+		}
+	}
+
+	@Subscribe
+	public void onAccountAddedToList(AccountAddedToListEvent ev){
+		if(ev.accountID.equals(accountID) && ev.listID.equals(followList.id)){
+			data.add(new AccountViewModel(ev.account, accountID));
+			list.getAdapter().notifyItemInserted(data.size()-1);
+		}
+	}
+
+	private void onFabClick(){
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		Nav.goForResult(getActivity(), AddListMembersFragment.class, args, ADD_MEMBER_RESULT, this);
+	}
+
+	private void onItemClick(AccountViewHolder holder){
+		if(inSelectionMode){
+			String id=holder.getItem().account.id;
+			if(selectedAccounts.contains(id)){
+				selectedAccounts.remove(id);
+				holder.setChecked(false);
+			}else{
+				selectedAccounts.add(id);
+				holder.setChecked(true);
+			}
+			updateActionModeTitle();
+			deleteItem.setEnabled(!selectedAccounts.isEmpty());
+			return;
+		}
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		args.putParcelable("profileAccount", Parcels.wrap(holder.getItem().account));
+		Nav.go(getActivity(), ProfileFragment.class, args);
+	}
+
+	private boolean onItemLongClick(AccountViewHolder holder){
+		if(inSelectionMode)
+			return false;
+		selectedAccounts.add(holder.getItem().account.id);
+		enterSelectionMode();
+		return true;
+	}
+
+	private void onItemMenuItemSelected(AccountViewHolder holder, MenuItem item){
+		int id=item.getItemId();
+		if(id==R.id.remove_from_list){
+			new M3AlertDialogBuilder(getActivity())
+					.setTitle(R.string.confirm_remove_list_member)
+					.setPositiveButton(R.string.remove, (dlg, which)->removeAccounts(Set.of(holder.getItem().account.id)))
+					.setNegativeButton(R.string.cancel, null)
+					.show();
+		}
+	}
+
+	private void updateItemsForSelectionModeTransition(){
+		list.getAdapter().notifyItemRangeChanged(0, data.size());
+	}
+
+	private void enterSelectionMode(){
+		inSelectionMode=true;
+		updateItemsForSelectionModeTransition();
+		V.setVisibilityAnimated(fab, View.INVISIBLE);
+		actionMode=ActionModeHelper.startActionMode(this, ()->elevationOnScrollListener.getCurrentStatusBarColor(), new ActionMode.Callback(){
+			@Override
+			public boolean onCreateActionMode(ActionMode mode, Menu menu){
+				return true;
+			}
+
+			@Override
+			public boolean onPrepareActionMode(ActionMode mode, Menu menu){
+				mode.getMenuInflater().inflate(R.menu.settings_filter_words_action_mode, menu);
+				deleteItem=menu.findItem(R.id.delete);
+				return true;
+			}
+
+			@Override
+			public boolean onActionItemClicked(ActionMode mode, MenuItem item){
+				new M3AlertDialogBuilder(getActivity())
+						.setTitle(R.string.confirm_remove_list_members)
+						.setPositiveButton(R.string.remove, (dlg, which)->removeAccounts(new HashSet<>(selectedAccounts)))
+						.setNegativeButton(R.string.cancel, null)
+						.show();
+				return true;
+			}
+
+			@Override
+			public void onDestroyActionMode(ActionMode mode){
+				actionMode=null;
+				inSelectionMode=false;
+				selectedAccounts.clear();
+				updateItemsForSelectionModeTransition();
+				V.setVisibilityAnimated(fab, View.VISIBLE);
+			}
+		});
+		updateActionModeTitle();
+	}
+
+	private void updateActionModeTitle(){
+		actionMode.setTitle(getResources().getQuantityString(R.plurals.x_items_selected, selectedAccounts.size(), selectedAccounts.size()));
+	}
+
+	private void removeAccounts(Set<String> ids){
+		new RemoveAccountsFromList(followList.id, ids)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Void result){
+						if(inSelectionMode)
+							actionMode.finish();
+						removeAccountRows(ids);
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						error.showToast(getActivity());
+					}
+				})
+				.wrapProgress(getActivity(), R.string.loading, true)
+				.exec(accountID);
+	}
+
+	private void addAccounts(Collection<Account> accounts){
+		new AddAccountsToList(followList.id, accounts.stream().map(a->a.id).collect(Collectors.toSet()))
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Void result){
+						for(Account acc:accounts){
+							data.add(new AccountViewModel(acc, accountID));
+						}
+						list.getAdapter().notifyItemRangeInserted(data.size()-accounts.size(), accounts.size());
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						error.showToast(getActivity());
+					}
+				})
+				.wrapProgress(getActivity(), R.string.loading, true)
+				.exec(accountID);
+	}
+
+	private void removeAccountRows(Set<String> ids){
+		for(int i=data.size()-1;i>=0;i--){
+			if(ids.contains(((ArrayList<AccountViewModel>)data).get(i).account.id)){
+				data.remove(i);
+				list.getAdapter().notifyItemRemoved(i);
+			}
+		}
+	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base){
+		return null;
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
index fb357d991..514566874 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
@@ -20,7 +20,7 @@ import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.ListDeletedEvent;
 import org.joinmastodon.android.events.ListUpdatedCreatedEvent;
 import org.joinmastodon.android.model.FilterContext;
-import org.joinmastodon.android.model.ListTimeline;
+import org.joinmastodon.android.model.FollowList;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.TimelineDefinition;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
@@ -39,7 +39,7 @@ public class ListTimelineFragment extends PinnableStatusListFragment {
     private String listID;
     private String listTitle;
     @Nullable
-    private ListTimeline.RepliesPolicy repliesPolicy;
+    private FollowList.RepliesPolicy repliesPolicy;
     private boolean exclusive;
 
     @Override
@@ -54,19 +54,19 @@ public class ListTimelineFragment extends PinnableStatusListFragment {
         listID = args.getString("listID");
         listTitle = args.getString("listTitle");
         exclusive = args.getBoolean("listIsExclusive");
-        repliesPolicy = ListTimeline.RepliesPolicy.values()[args.getInt("repliesPolicy", 0)];
+        repliesPolicy = FollowList.RepliesPolicy.values()[args.getInt("repliesPolicy", 0)];
 
         setTitle(listTitle);
         setHasOptionsMenu(true);
 
         new GetList(listID).setCallback(new Callback<>() {
             @Override
-            public void onSuccess(ListTimeline listTimeline) {
+            public void onSuccess(FollowList followList) {
                 if(getActivity()==null) return;
                 // TODO: save updated info
-                if (!listTimeline.title.equals(listTitle)) setTitle(listTimeline.title);
-                if (listTimeline.repliesPolicy != null && !listTimeline.repliesPolicy.equals(repliesPolicy)) {
-                    repliesPolicy = listTimeline.repliesPolicy;
+                if (!followList.title.equals(listTitle)) setTitle(followList.title);
+                if (followList.repliesPolicy != null && !followList.repliesPolicy.equals(repliesPolicy)) {
+                    repliesPolicy = followList.repliesPolicy;
                 }
             }
 
@@ -97,9 +97,9 @@ public class ListTimelineFragment extends PinnableStatusListFragment {
                     .setPositiveButton(R.string.save, (d, which) -> {
                         String newTitle = editor.getTitle().trim();
                         setTitle(newTitle);
-                        new UpdateList(listID, newTitle, editor.isExclusive(), editor.getRepliesPolicy()).setCallback(new Callback<>() {
+                        new UpdateList(listID, newTitle, editor.getRepliesPolicy(), editor.isExclusive()).setCallback(new Callback<>() {
                             @Override
-                            public void onSuccess(ListTimeline list) {
+                            public void onSuccess(FollowList list) {
                                 if(getActivity()==null) return;
                                 setTitle(list.title);
                                 listTitle = list.title;
@@ -119,7 +119,7 @@ public class ListTimelineFragment extends PinnableStatusListFragment {
                     .show();
         } else if (item.getItemId() == R.id.delete) {
             UiUtils.confirmDeleteList(getActivity(), accountID, listID, listTitle, () -> {
-                E.post(new ListDeletedEvent(listID));
+                E.post(new ListDeletedEvent(accountID, listID));
                 Nav.finish(this);
             });
         }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListsFragment.java
index 8e92bb5ea..e996830b4 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListsFragment.java
@@ -24,7 +24,7 @@ import org.joinmastodon.android.api.requests.lists.GetLists;
 import org.joinmastodon.android.api.requests.lists.RemoveAccountsFromList;
 import org.joinmastodon.android.events.ListDeletedEvent;
 import org.joinmastodon.android.events.ListUpdatedCreatedEvent;
-import org.joinmastodon.android.model.ListTimeline;
+import org.joinmastodon.android.model.FollowList;
 import org.joinmastodon.android.ui.DividerItemDecoration;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.views.ListEditor;
@@ -42,7 +42,7 @@ import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class ListsFragment extends MastodonRecyclerFragment<ListTimeline> implements ScrollableToTop, ProvidesAssistContent.ProvidesWebUri {
+public class ListsFragment extends MastodonRecyclerFragment<FollowList> implements ScrollableToTop, ProvidesAssistContent.ProvidesWebUri {
 	private String accountID;
 	private String profileAccountId;
 	private final HashMap<String, Boolean> userInListBefore = new HashMap<>();
@@ -97,9 +97,9 @@ public class ListsFragment extends MastodonRecyclerFragment<ListTimeline> implem
 					.setIcon(R.drawable.ic_fluent_people_add_28_regular)
 					.setView(editor)
 					.setPositiveButton(R.string.sk_create, (d, which) ->
-							new CreateList(editor.getTitle(), editor.isExclusive(), editor.getRepliesPolicy()).setCallback(new Callback<>() {
+							new CreateList(editor.getTitle(), editor.getRepliesPolicy(), editor.isExclusive()).setCallback(new Callback<>() {
 								@Override
-								public void onSuccess(ListTimeline list) {
+								public void onSuccess(FollowList list) {
 									data.add(0, list);
 									adapter.notifyItemRangeInserted(0, 1);
 									E.post(new ListUpdatedCreatedEvent(list.id, list.title, list.exclusive, list.repliesPolicy));
@@ -120,16 +120,16 @@ public class ListsFragment extends MastodonRecyclerFragment<ListTimeline> implem
 	private void saveListMembership(String listId, boolean isMember) {
 		userInList.put(listId, isMember);
 		List<String> accountIdList = Collections.singletonList(profileAccountId);
-		MastodonAPIRequest<Object> req = isMember ? new AddAccountsToList(listId, accountIdList) : new RemoveAccountsFromList(listId, accountIdList);
-		req.setCallback(new Callback<>() {
-			@Override
-			public void onSuccess(Object o) {}
-
-			@Override
-			public void onError(ErrorResponse error) {
-				error.showToast(getContext());
-			}
-		}).exec(accountID);
+//		MastodonAPIRequest<Object> req = (MastodonAPIRequest<Object>) (isMember ? new AddAccountsToList(listId, accountIdList) : new RemoveAccountsFromList(listId, accountIdList));
+//		req.setCallback(new Callback<>() {
+//			@Override
+//			public void onSuccess(Object o) {}
+//
+//			@Override
+//			public void onError(ErrorResponse error) {
+//				error.showToast(getContext());
+//			}
+//		}).exec(accountID);
 	}
 
 	@Override
@@ -139,19 +139,19 @@ public class ListsFragment extends MastodonRecyclerFragment<ListTimeline> implem
 		currentRequest=(profileAccountId != null ? new GetLists(profileAccountId) : new GetLists())
 				.setCallback(new SimpleCallback<>(this) {
 					@Override
-					public void onSuccess(List<ListTimeline> lists) {
+					public void onSuccess(List<FollowList> lists) {
 						if(getActivity()==null) return;
-						for (ListTimeline l : lists) userInListBefore.put(l.id, true);
+						for (FollowList l : lists) userInListBefore.put(l.id, true);
 						userInList.putAll(userInListBefore);
 						if (profileAccountId == null || !lists.isEmpty()) onDataLoaded(lists, false);
 						if (profileAccountId == null) return;
 
 						currentRequest=new GetLists().setCallback(new SimpleCallback<>(ListsFragment.this) {
 							@Override
-							public void onSuccess(List<ListTimeline> allLists) {
+							public void onSuccess(List<FollowList> allLists) {
 								if(getActivity()==null) return;
-								List<ListTimeline> newLists = new ArrayList<>();
-								for (ListTimeline l : allLists) {
+								List<FollowList> newLists = new ArrayList<>();
+								for (FollowList l : allLists) {
 									if (lists.stream().noneMatch(e -> e.id.equals(l.id))) newLists.add(l);
 									if (!userInListBefore.containsKey(l.id)) {
 										userInListBefore.put(l.id, false);
@@ -169,8 +169,8 @@ public class ListsFragment extends MastodonRecyclerFragment<ListTimeline> implem
 	@Subscribe
 	public void onListDeletedEvent(ListDeletedEvent event) {
 		for (int i = 0; i < data.size(); i++) {
-			ListTimeline item = data.get(i);
-			if (item.id.equals(event.id)) {
+			FollowList item = data.get(i);
+			if (item.id.equals(event.listID)) {
 				data.remove(i);
 				adapter.notifyItemRemoved(i);
 				break;
@@ -181,7 +181,7 @@ public class ListsFragment extends MastodonRecyclerFragment<ListTimeline> implem
 	@Subscribe
 	public void onListUpdatedCreatedEvent(ListUpdatedCreatedEvent event) {
 		for (int i = 0; i < data.size(); i++) {
-			ListTimeline item = data.get(i);
+			FollowList item = data.get(i);
 			if (item.id.equals(event.id)) {
 				item.title = event.title;
 				item.repliesPolicy = event.repliesPolicy;
@@ -230,7 +230,7 @@ public class ListsFragment extends MastodonRecyclerFragment<ListTimeline> implem
 		}
 	}
 
-	private class ListViewHolder extends BindableViewHolder<ListTimeline> implements UsableRecyclerView.Clickable{
+	private class ListViewHolder extends BindableViewHolder<FollowList> implements UsableRecyclerView.Clickable{
 		private final TextView title;
 		private final CheckBox listToggle;
 
@@ -241,7 +241,7 @@ public class ListsFragment extends MastodonRecyclerFragment<ListTimeline> implem
 		}
 
 		@Override
-		public void onBind(ListTimeline item) {
+		public void onBind(FollowList item) {
 			title.setText(item.title);
 			title.setCompoundDrawablesRelativeWithIntrinsicBounds(itemView.getContext().getDrawable(
 					item.exclusive ? R.drawable.ic_fluent_rss_24_regular : R.drawable.ic_fluent_people_24_regular
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ManageFollowedHashtagsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ManageFollowedHashtagsFragment.java
new file mode 100644
index 000000000..e83aa5c5b
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ManageFollowedHashtagsFragment.java
@@ -0,0 +1,95 @@
+package org.joinmastodon.android.fragments;
+
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.tags.GetFollowedTags;
+import org.joinmastodon.android.api.requests.tags.SetTagFollowed;
+import org.joinmastodon.android.fragments.settings.BaseSettingsFragment;
+import org.joinmastodon.android.model.Hashtag;
+import org.joinmastodon.android.model.HeaderPaginationList;
+import org.joinmastodon.android.model.viewmodel.ListItemWithOptionsMenu;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
+import org.joinmastodon.android.ui.utils.UiUtils;
+
+import java.util.stream.Collectors;
+
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
+import me.grishka.appkit.api.SimpleCallback;
+
+public class ManageFollowedHashtagsFragment extends BaseSettingsFragment<Hashtag> implements ListItemWithOptionsMenu.OptionsMenuListener<Hashtag>{
+	private String maxID;
+
+	public ManageFollowedHashtagsFragment(){
+		super(100);
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		setTitle(R.string.manage_hashtags);
+		loadData();
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){
+		currentRequest=new GetFollowedTags(offset>0 ? maxID : null, count)
+				.setCallback(new SimpleCallback<>(this){
+					@Override
+					public void onSuccess(HeaderPaginationList<Hashtag> result){
+						maxID=null;
+						if(result.nextPageUri!=null)
+							maxID=result.nextPageUri.getQueryParameter("max_id");
+						onDataLoaded(result.stream().map(t->{
+							int posts=t.getWeekPosts();
+							return new ListItemWithOptionsMenu<>(t.name, getResources().getQuantityString(R.plurals.x_posts_recently, posts, posts), ManageFollowedHashtagsFragment.this,
+									R.drawable.ic_fluent_tag_24_regular, ManageFollowedHashtagsFragment.this::onItemClick, t, false);
+						}).collect(Collectors.toList()), maxID!=null);
+					}
+				})
+				.exec(accountID);
+	}
+
+	@Override
+	public void onConfigureListItemOptionsMenu(ListItemWithOptionsMenu<Hashtag> item, Menu menu){
+		menu.clear();
+		menu.add(getString(R.string.unfollow_user, "#"+item.parentObject.name));
+	}
+
+	@Override
+	public void onListItemOptionSelected(ListItemWithOptionsMenu<Hashtag> item, MenuItem menuItem){
+		new M3AlertDialogBuilder(getActivity())
+				.setTitle(getString(R.string.unfollow_confirmation, "#"+item.parentObject.name))
+				.setPositiveButton(R.string.unfollow, (dlg, which)->doUnfollow(item))
+				.setNegativeButton(R.string.cancel, null)
+				.show();
+	}
+
+	private void onItemClick(ListItemWithOptionsMenu<Hashtag> item){
+		UiUtils.openHashtagTimeline(getActivity(), accountID, item.parentObject);
+	}
+
+	private void doUnfollow(ListItemWithOptionsMenu<Hashtag> item){
+		new SetTagFollowed(item.parentObject.name, false)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Hashtag result){
+						int index=data.indexOf(item);
+						if(index==-1)
+							return;
+						data.remove(index);
+						list.getAdapter().notifyItemRemoved(index);
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						error.showToast(getActivity());
+					}
+				})
+				.wrapProgress(getActivity(), R.string.loading, true)
+				.exec(accountID);
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ManageListsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ManageListsFragment.java
new file mode 100644
index 000000000..796064d98
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ManageListsFragment.java
@@ -0,0 +1,199 @@
+package org.joinmastodon.android.fragments;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.WindowInsets;
+import android.widget.ImageButton;
+
+import com.squareup.otto.Subscribe;
+
+import org.joinmastodon.android.E;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.lists.DeleteList;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.events.ListCreatedEvent;
+import org.joinmastodon.android.events.ListDeletedEvent;
+import org.joinmastodon.android.events.ListUpdatedEvent;
+import org.joinmastodon.android.fragments.settings.BaseSettingsFragment;
+import org.joinmastodon.android.model.FollowList;
+import org.joinmastodon.android.model.viewmodel.ListItem;
+import org.joinmastodon.android.model.viewmodel.ListItemWithOptionsMenu;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
+import org.joinmastodon.android.ui.utils.UiUtils;
+import org.parceler.Parcels;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import me.grishka.appkit.Nav;
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
+import me.grishka.appkit.api.SimpleCallback;
+
+public class ManageListsFragment extends BaseSettingsFragment<FollowList> implements ListItemWithOptionsMenu.OptionsMenuListener<FollowList>{
+	private ImageButton fab;
+
+	public ManageListsFragment(){
+		setListLayoutId(R.layout.recycler_fragment_with_fab);
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		setTitle(R.string.manage_lists);
+		loadData();
+		setRefreshEnabled(true);
+		E.register(this);
+	}
+
+	@Override
+	public void onDestroy(){
+		super.onDestroy();
+		E.unregister(this);
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){
+		Callback<List<FollowList>> callback=new SimpleCallback<>(this){
+			@Override
+			public void onSuccess(List<FollowList> result){
+				onDataLoaded(result.stream().map(ManageListsFragment.this::makeItem).collect(Collectors.toList()), false);
+			}
+		};
+		if(refreshing){
+			AccountSessionManager.get(accountID)
+					.getCacheController()
+					.reloadLists(callback);
+		}else{
+			AccountSessionManager.get(accountID)
+					.getCacheController()
+					.getLists(callback);
+		}
+	}
+
+	private ListItem<FollowList> makeItem(FollowList l){
+		return new ListItemWithOptionsMenu<>(l.title, null, ManageListsFragment.this, R.drawable.ic_list_alt_24px, ManageListsFragment.this::onListClick, l, false);
+	}
+
+	private void onListClick(ListItemWithOptionsMenu<FollowList> item){
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		args.putParcelable("list", Parcels.wrap(item.parentObject));
+		Nav.go(getActivity(), ListTimelineFragment.class, args);
+	}
+
+	@Override
+	public void onConfigureListItemOptionsMenu(ListItemWithOptionsMenu<FollowList> item, Menu menu){
+		menu.add(0, R.id.edit, 0, R.string.edit_list);
+		menu.add(0, R.id.delete, 1, R.string.delete_list);
+	}
+
+	@Override
+	public void onListItemOptionSelected(ListItemWithOptionsMenu<FollowList> item, MenuItem menuItem){
+		int id=menuItem.getItemId();
+		if(id==R.id.edit){
+			Bundle args=new Bundle();
+			args.putString("account", accountID);
+			args.putParcelable("list", Parcels.wrap(item.parentObject));
+			Nav.go(getActivity(), EditListFragment.class, args);
+		}else if(id==R.id.delete){
+			new M3AlertDialogBuilder(getActivity())
+					.setTitle(R.string.delete_list)
+					.setMessage(getString(R.string.delete_list_confirm, item.parentObject.title))
+					.setPositiveButton(R.string.delete, (dlg, which)->doDeleteList(item.parentObject))
+					.setNegativeButton(R.string.cancel, null)
+					.show();
+		}
+	}
+
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState){
+		super.onViewCreated(view, savedInstanceState);
+		fab=view.findViewById(R.id.fab);
+		fab.setImageResource(R.drawable.ic_fluent_add_24_regular);
+		fab.setContentDescription(getString(R.string.create_list));
+		fab.setOnClickListener(v->onFabClick());
+	}
+
+	@Override
+	public void onApplyWindowInsets(WindowInsets insets){
+		super.onApplyWindowInsets(insets);
+		UiUtils.applyBottomInsetToFAB(fab, insets);
+	}
+
+	private void doDeleteList(FollowList list){
+		new DeleteList(list.id)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Void result){
+						for(int i=0;i<data.size();i++){
+							if(data.get(i).parentObject==list){
+								data.remove(i);
+								itemsAdapter.notifyItemRemoved(i);
+								AccountSessionManager.get(accountID).getCacheController().deleteList(list.id);
+								break;
+							}
+						}
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						Activity activity=getActivity();
+						if(activity==null)
+							return;
+						error.showToast(activity);
+					}
+				})
+				.wrapProgress(getActivity(), R.string.loading, true)
+				.exec(accountID);
+	}
+
+	@Subscribe
+	public void onListUpdated(ListUpdatedEvent ev){
+		if(!ev.accountID.equals(accountID))
+			return;
+		for(ListItem<FollowList> item:data){
+			if(item.parentObject.id.equals(ev.list.id)){
+				item.parentObject=ev.list;
+				item.title=ev.list.title;
+				rebindItem(item);
+				break;
+			}
+		}
+	}
+
+	@Subscribe
+	public void onListDeleted(ListDeletedEvent ev){
+		if(!ev.accountID.equals(accountID))
+			return;
+		int i=0;
+		for(ListItem<FollowList> item:data){
+			if(item.parentObject.id.equals(ev.listID)){
+				data.remove(i);
+				itemsAdapter.notifyItemRemoved(i);
+				break;
+			}
+			i++;
+		}
+	}
+
+	@Subscribe
+	public void onListCreated(ListCreatedEvent ev){
+		if(!ev.accountID.equals(accountID))
+			return;
+		ListItem<FollowList> item=makeItem(ev.list);
+		data.add(item);
+		((List<ListItem<FollowList>>)data).sort(Comparator.comparing(l->l.parentObject.title));
+		itemsAdapter.notifyItemInserted(data.indexOf(item));
+	}
+
+	private void onFabClick(){
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		Nav.go(getActivity(), CreateListFragment.class, args);
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/MastodonRecyclerFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/MastodonRecyclerFragment.java
index fc805457a..746bb77b0 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/MastodonRecyclerFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/MastodonRecyclerFragment.java
@@ -7,6 +7,7 @@ import android.widget.TextView;
 import android.widget.Toolbar;
 
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.ui.BetterItemAnimator;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.utils.ElevationOnScrollListener;
 
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
index 7ad134b7e..6c8b9f791 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
@@ -7,6 +7,10 @@ import android.graphics.Rect;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 
 import com.squareup.otto.Subscribe;
@@ -14,6 +18,7 @@ import com.squareup.otto.Subscribe;
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.markers.SaveMarkers;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.EmojiReactionsUpdatedEvent;
 import org.joinmastodon.android.events.PollUpdatedEvent;
@@ -47,12 +52,13 @@ import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.utils.MergeRecyclerAdapter;
 
-public class NotificationsListFragment extends BaseStatusListFragment<Notification> {
+public class NotificationsListFragment extends BaseStatusListFragment<Notification>{
 	private boolean onlyMentions;
-	private boolean onlyPosts;
 	private String maxID;
 	private boolean reloadingFromCache;
 	private DiscoverInfoBannerHelper bannerHelper;
+	private String unreadMarker, realUnreadMarker;
+	private MenuItem markAllReadItem;
 
 	@Override
 	protected boolean wantsComposeButton() {
@@ -63,13 +69,8 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
 		E.register(this);
-		if(savedInstanceState!=null){
-			onlyMentions=savedInstanceState.getBoolean("onlyMentions", false);
-			onlyPosts=savedInstanceState.getBoolean("onlyPosts", false);
-		}
-		if (onlyPosts) {
-			bannerHelper=new DiscoverInfoBannerHelper(DiscoverInfoBannerHelper.BannerType.POST_NOTIFICATIONS, accountID);
-		}
+		onlyMentions=AccountSessionManager.get(accountID).isNotificationsMentionsOnly();
+		setHasOptionsMenu(true);
 	}
 
 	@Override
@@ -81,14 +82,12 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 	@Override
 	public void onAttach(Activity activity){
 		super.onAttach(activity);
-		onlyMentions=getArguments().getBoolean("onlyMentions", false);
-		onlyPosts=getArguments().getBoolean("onlyPosts", false);
 		setTitle(R.string.notifications);
 	}
 
 	@Override
 	protected List<StatusDisplayItem> buildDisplayItems(Notification n){
-		if(!onlyMentions && !onlyPosts){
+		if(!onlyMentions){
 			switch(n.type){
 				case MENTION -> {
 					if(!getLocalPrefs().notificationFilters.mention)
@@ -164,7 +163,7 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 	protected void doLoadData(int offset, int count){
 		AccountSessionManager.getInstance()
 				.getAccount(accountID).getCacheController()
-				.getNotifications(offset>0 ? maxID : null, count, onlyMentions, onlyPosts, refreshing && !reloadingFromCache, new SimpleCallback<>(this){
+				.getNotifications(offset>0 ? maxID : null, count, onlyMentions, false, refreshing && !reloadingFromCache, new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(PaginatedResponse<List<Notification>> result){
 						if(getActivity()==null)
@@ -186,7 +185,7 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 					}
 				});
 	}
-	
+
 	@Override
 	protected void onRelationshipsLoaded(){
 		if(getActivity()==null)
@@ -201,13 +200,10 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 	@Override
 	protected void onShown(){
 		super.onShown();
-		if(!dataLoading){
-			if(onlyMentions){
-				refresh();
-			}else{
-				reloadingFromCache=true;
-				refresh();
-			}
+		unreadMarker=realUnreadMarker=AccountSessionManager.get(accountID).getLastKnownNotificationsMarker();
+		if(!dataLoading && canRefreshWithoutUpsettingUser()){
+			reloadingFromCache=true;
+			refresh();
 		}
 	}
 
@@ -268,13 +264,6 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		}
 	}
 
-	@Override
-	public void onSaveInstanceState(Bundle outState){
-		super.onSaveInstanceState(outState);
-		outState.putBoolean("onlyMentions", onlyMentions);
-		outState.putBoolean("onlyPosts", onlyPosts);
-	}
-
 	private Notification getNotificationByID(String id){
 		for(Notification n:data){
 			if(n.id.equals(id))
@@ -380,11 +369,38 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		adapter.notifyItemRangeRemoved(index, lastIndex-index);
 	}
 
+
 	@Override
 	protected boolean needDividerForExtraItem(View child, View bottomSibling, RecyclerView.ViewHolder holder, RecyclerView.ViewHolder siblingHolder){
 		return super.needDividerForExtraItem(child, bottomSibling, holder, siblingHolder) || (siblingHolder!=null && siblingHolder.getAbsoluteAdapterPosition()>=adapter.getItemCount());
 	}
 
+	@Override
+	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
+		inflater.inflate(R.menu.notifications, menu);
+		markAllReadItem=menu.findItem(R.id.mark_all_read);
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item){
+		if(item.getItemId()==R.id.mark_all_read){
+			markAsRead();
+			resetUnreadBackground();
+		}
+		return true;
+	}
+
+	private void markAsRead(){
+		if(data.isEmpty())
+			return;
+		String id=data.get(0).id;
+		if(ObjectIdComparator.INSTANCE.compare(id, realUnreadMarker)>0){
+			new SaveMarkers(null, id).exec(accountID);
+			AccountSessionManager.get(accountID).setNotificationsMarker(id, true);
+			realUnreadMarker=id;
+		}
+	}
+
 	void resetUnreadBackground(){
 		if (getParentFragment() instanceof NotificationsFragment nf) {
 			nf.unreadMarker=nf.realUnreadMarker;
@@ -396,13 +412,20 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 	public void onRefresh(){
 		super.onRefresh();
 		if (getParentFragment() instanceof NotificationsFragment nf) {
-			if (!onlyMentions && !onlyPosts) nf.markAsRead();
+			if (!onlyMentions) nf.markAsRead();
 			else AccountSessionManager.get(accountID).reloadNotificationsMarker(m->{
 				nf.unreadMarker=nf.realUnreadMarker=m;
 				nf.updateMarkAllReadButton();
 			});
 		}
 		resetUnreadBackground();
+		AccountSessionManager.get(accountID).reloadNotificationsMarker(m->{
+			unreadMarker=realUnreadMarker=m;
+		});
+	}
+
+	private void updateMarkAllReadButton(){
+		markAllReadItem.setEnabled(!data.isEmpty() && realUnreadMarker!=null && !realUnreadMarker.equals(data.get(0).id));
 	}
 
 	@Override
@@ -420,4 +443,20 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 				? "/users/" + getSession().self.username + "/interactions"
 				: "/notifications").build();
 	}
+
+	private boolean canRefreshWithoutUpsettingUser(){
+		// TODO maybe reload notifications the same way we reload the home timelines, i.e. with gaps and stuff
+		if(data.size()<=itemsPerPage)
+			return true;
+		for(int i=list.getChildCount()-1;i>=0;i--){
+			if(list.getChildViewHolder(list.getChildAt(i)) instanceof StatusDisplayItem.Holder<?> itemHolder){
+				String id=itemHolder.getItemID();
+				for(int j=0;j<data.size();j++){
+					if(data.get(j).id.equals(id))
+						return j<itemsPerPage; // Can refresh the list without losing scroll position if it is within the first page
+				}
+			}
+		}
+		return true;
+	}
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
index a392e4c80..854cc32df 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -8,6 +8,8 @@ import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Fragment;
 import android.app.assist.AssistContent;
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.content.Intent;
 import android.content.res.ColorStateList;
 import android.content.res.Configuration;
@@ -21,12 +23,9 @@ import android.graphics.drawable.LayerDrawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.text.Editable;
 import android.text.InputType;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
-import android.text.style.ImageSpan;
-import android.text.TextWatcher;
 import android.transition.ChangeBounds;
 import android.transition.Fade;
 import android.transition.TransitionManager;
@@ -43,8 +42,6 @@ import android.view.ViewOutlineProvider;
 import android.view.ViewTreeObserver;
 import android.view.WindowInsets;
 import android.view.inputmethod.InputMethodManager;
-import android.view.animation.TranslateAnimation;
-import android.widget.Button;
 import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
@@ -72,11 +69,9 @@ import org.joinmastodon.android.api.requests.accounts.UpdateAccountCredentials;
 import org.joinmastodon.android.api.requests.instance.GetInstance;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.account_list.BlockedAccountsListFragment;
-import org.joinmastodon.android.fragments.account_list.BlocksListFragment;
 import org.joinmastodon.android.fragments.account_list.FollowerListFragment;
 import org.joinmastodon.android.fragments.account_list.FollowingListFragment;
 import org.joinmastodon.android.fragments.account_list.MutedAccountsListFragment;
-import org.joinmastodon.android.fragments.account_list.MutesListFragment;
 import org.joinmastodon.android.fragments.report.ReportReasonChoiceFragment;
 import org.joinmastodon.android.fragments.settings.SettingsServerFragment;
 import org.joinmastodon.android.model.Account;
@@ -430,7 +425,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			if(!usernameString.contains("@")){
 				usernameString+="@"+domain;
 			}
-			UiUtils.copyText(username, '@'+usernameString);
+			getActivity().getSystemService(ClipboardManager.class).setPrimaryClip(ClipData.newPlainText(null, "@"+usernameString));
+			UiUtils.maybeShowTextCopiedToast(getActivity());
 			return true;
 		});
 
@@ -743,7 +739,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		followingCount.setText(UiUtils.abbreviateNumber(account.followingCount));
 		followersLabel.setText(getResources().getQuantityString(R.plurals.followers, (int)Math.min(999, account.followersCount)));
 		followingLabel.setText(getResources().getQuantityString(R.plurals.following, (int)Math.min(999, account.followingCount)));
-		
+
 		if (account.followersCount < 0) followersBtn.setVisibility(View.GONE);
 		if (account.followingCount < 0) followingBtn.setVisibility(View.GONE);
 		if (account.followersCount < 0 || account.followingCount < 0)
@@ -775,7 +771,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		}
 
 		for(AccountField field:account.fields){
-			field.parsedValue=ssb=HtmlParser.parse(field.value, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID);
+			field.parsedValue=ssb=HtmlParser.parse(field.value, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID, account);
 			field.valueEmojis=ssb.getSpans(0, ssb.length(), CustomEmojiSpan.class);
 			ssb=new SpannableStringBuilder(field.name);
 			HtmlParser.parseCustomEmoji(ssb, account.emojis);
@@ -973,6 +969,11 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 						.show();
 			}
 			invalidateOptionsMenu();
+		}else if(id==R.id.manage_user_lists){
+			Bundle args=new Bundle();
+			args.putString("account", accountID);
+			args.putParcelable("targetAccount", Parcels.wrap(account));
+			Nav.go(getActivity(), AddAccountToListsFragment.class, args);
 		}
 		return true;
 	}
@@ -1364,7 +1365,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 				return;
 			int radius=V.dp(25);
 			currentPhotoViewer=new PhotoViewer(getActivity(), createFakeAttachments(TextUtils.isEmpty(account.avatar) ? getSession().getDefaultAvatarUrl() : account.avatar, ava), 0,
-					new SingleImagePhotoViewerListener(avatar, avatarBorder, new int[]{radius, radius, radius, radius}, this, ()->currentPhotoViewer=null, ()->ava, null, null));
+					null, accountID, new SingleImagePhotoViewerListener(avatar, avatarBorder, new int[]{radius, radius, radius, radius}, this, ()->currentPhotoViewer=null, ()->ava, null, null));
 		}
 	}
 
@@ -1376,7 +1377,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			if(drawable==null || drawable instanceof ColorDrawable)
 				return;
 			currentPhotoViewer=new PhotoViewer(getActivity(), createFakeAttachments(account.header, drawable), 0,
-					new SingleImagePhotoViewerListener(cover, cover, null, this, ()->currentPhotoViewer=null, ()->drawable, ()->avatarBorder.setTranslationZ(2), ()->avatarBorder.setTranslationZ(0)));
+					null, accountID, new SingleImagePhotoViewerListener(cover, cover, null, this, ()->currentPhotoViewer=null, ()->drawable, ()->avatarBorder.setTranslationZ(2), ()->avatarBorder.setTranslationZ(0)));
 		}
 	}
 
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/SplashFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/SplashFragment.java
index 05622a216..d1326c589 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SplashFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SplashFragment.java
@@ -1,7 +1,12 @@
 package org.joinmastodon.android.fragments;
 
+import android.app.ProgressDialog;
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.graphics.drawable.ColorDrawable;
+import android.net.Uri;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -11,6 +16,8 @@ import android.widget.ProgressBar;
 
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.MastodonErrorResponse;
+import org.joinmastodon.android.api.requests.accounts.CheckInviteLink;
 import org.joinmastodon.android.api.requests.catalog.GetCatalogDefaultInstances;
 import org.joinmastodon.android.api.requests.instance.GetInstance;
 import org.joinmastodon.android.fragments.onboarding.InstanceCatalogSignupFragment;
@@ -20,6 +27,7 @@ import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.catalog.CatalogDefaultInstance;
 import org.joinmastodon.android.ui.InterpolatingMotionEffect;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
+import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.ProgressBarButton;
 import org.joinmastodon.android.ui.views.SizeListenerFrameLayout;
@@ -48,6 +56,9 @@ public class SplashFragment extends AppKitFragment{
 	private ProgressBar defaultServerProgress;
 	private String chosenDefaultServer=DEFAULT_SERVER;
 	private boolean loadingDefaultServer, loadedDefaultServer;
+	private Uri currentInviteLink;
+	private ProgressDialog instanceLoadingProgress;
+	private String inviteCode;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -110,19 +121,65 @@ public class SplashFragment extends AppKitFragment{
 		Bundle extras=new Bundle();
 		boolean isSignup=v.getId()==R.id.btn_get_started;
 		extras.putBoolean("signup", isSignup);
+		extras.putString("defaultServer", chosenDefaultServer);
 		Nav.go(getActivity(), isSignup ? InstanceCatalogSignupFragment.class : InstanceChooserLoginFragment.class, extras);
 	}
 
 	private void onJoinDefaultServerClick(View v){
 		if(loadingDefaultServer)
 			return;
+		instanceLoadingProgress=new ProgressDialog(getActivity());
+		instanceLoadingProgress.setCancelable(false);
+		instanceLoadingProgress.setMessage(getString(R.string.loading_instance));
+		instanceLoadingProgress.show();
+		if(currentInviteLink!=null){
+			new CheckInviteLink(currentInviteLink.getPath())
+					.setCallback(new Callback<>(){
+						@Override
+						public void onSuccess(CheckInviteLink.Response result){
+							inviteCode=result.inviteCode;
+							proceedWithServerDomain(currentInviteLink.getHost());
+						}
+
+						@Override
+						public void onError(ErrorResponse error){
+							if(getActivity()==null)
+								return;
+							instanceLoadingProgress.dismiss();
+							instanceLoadingProgress=null;
+							if(error instanceof MastodonErrorResponse mer){
+								switch(mer.httpStatus){
+									case 401 -> new M3AlertDialogBuilder(getActivity())
+											.setTitle(R.string.expired_invite_link)
+											.setMessage(getString(R.string.expired_clipboard_invite_link_alert, currentInviteLink.getHost(), chosenDefaultServer))
+											.setPositiveButton(R.string.ok, null)
+											.show();
+									case 404 -> new M3AlertDialogBuilder(getActivity())
+											.setTitle(R.string.invalid_invite_link)
+											.setMessage(getString(R.string.invalid_clipboard_invite_link_alert, currentInviteLink.getHost(), chosenDefaultServer))
+											.setPositiveButton(R.string.ok, null)
+											.show();
+									default -> error.showToast(getActivity());
+								}
+							}
+						}
+					})
+					.execNoAuth(currentInviteLink.getHost());
+			return;
+		}
+		proceedWithServerDomain(chosenDefaultServer);
+	}
+
+	private void proceedWithServerDomain(String domain){
 		new GetInstance()
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(Instance result){
 						if(getActivity()==null)
 							return;
-						if(!result.registrations){
+						instanceLoadingProgress.dismiss();
+						instanceLoadingProgress=null;
+						if(!result.registrations && TextUtils.isEmpty(inviteCode)){
 							new M3AlertDialogBuilder(getActivity())
 									.setTitle(R.string.error)
 									.setMessage(R.string.instance_signup_closed)
@@ -132,6 +189,8 @@ public class SplashFragment extends AppKitFragment{
 						}
 						Bundle args=new Bundle();
 						args.putParcelable("instance", Parcels.wrap(result));
+						if(inviteCode!=null)
+							args.putString("inviteCode", inviteCode);
 						Nav.go(getActivity(), InstanceRulesFragment.class, args);
 					}
 
@@ -139,11 +198,12 @@ public class SplashFragment extends AppKitFragment{
 					public void onError(ErrorResponse error){
 						if(getActivity()==null)
 							return;
+						instanceLoadingProgress.dismiss();
+						instanceLoadingProgress=null;
 						error.showToast(getActivity());
 					}
 				})
-				.wrapProgress(getActivity(), R.string.loading_instance, true)
-				.execNoAuth(chosenDefaultServer);
+				.execNoAuth(domain);
 	}
 
 	private void onLearnMoreClick(View v){
@@ -198,7 +258,18 @@ public class SplashFragment extends AppKitFragment{
 	}
 
 	private void loadAndChooseDefaultServer(){
-		loadingDefaultServer=true;
+		ClipData clipData=getActivity().getSystemService(ClipboardManager.class).getPrimaryClip();
+		if(clipData!=null && clipData.getItemCount()>0){
+			CharSequence clipText=clipData.getItemAt(0).coerceToText(getActivity());
+			if(HtmlParser.INVITE_LINK_PATTERN.matcher(clipText).find()){
+				currentInviteLink=Uri.parse(clipText.toString());
+				defaultServerButton.setText(getString(R.string.join_server_x_with_invite, currentInviteLink.getHost()));
+			}
+		}else{
+			loadingDefaultServer=true;
+			defaultServerButton.setTextVisible(false);
+			defaultServerProgress.setVisibility(View.VISIBLE);
+		}
 		new GetCatalogDefaultInstances()
 				.setCallback(new Callback<>(){
 					@Override
@@ -241,7 +312,7 @@ public class SplashFragment extends AppKitFragment{
 		chosenDefaultServer=domain;
 		loadingDefaultServer=false;
 		loadedDefaultServer=true;
-		if(defaultServerButton!=null && getActivity()!=null){
+		if(defaultServerButton!=null && getActivity()!=null && currentInviteLink==null){
 			defaultServerButton.setTextVisible(true);
 			defaultServerProgress.setVisibility(View.GONE);
 			defaultServerButton.setText(getString(R.string.join_default_server, chosenDefaultServer));
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
index d186059df..6bd70b5cd 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
@@ -2,11 +2,19 @@ package org.joinmastodon.android.fragments;
 
 import android.net.Uri;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowInsets;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
+import org.joinmastodon.android.GlobalUserPreferences;
 import com.squareup.otto.Subscribe;
 
 import org.joinmastodon.android.E;
@@ -23,6 +31,7 @@ import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.StatusContext;
+import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.BetterItemAnimator;
 import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.FooterStatusDisplayItem;
@@ -50,7 +59,13 @@ import java.util.stream.Collectors;
 
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
+import androidx.recyclerview.widget.RecyclerView;
+import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.SimpleCallback;
+import me.grishka.appkit.imageloader.ViewImageLoader;
+import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
+import me.grishka.appkit.utils.MergeRecyclerAdapter;
+import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
 import me.grishka.appkit.utils.V;
 
 public class ThreadFragment extends StatusListFragment implements ProvidesAssistContent {
@@ -58,10 +73,16 @@ public class ThreadFragment extends StatusListFragment implements ProvidesAssist
 	private final HashMap<String, NeighborAncestryInfo> ancestryMap = new HashMap<>();
 	private StatusContext result;
 	protected boolean contextInitiallyRendered, transitionFinished, preview;
+	private FrameLayout replyContainer;
+	private LinearLayout replyButton;
+	private ImageView replyButtonAva;
+	private TextView replyButtonText;
+	private int lastBottomInset;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
+		setLayout(R.layout.fragment_thread);
 		mainStatus=Parcels.unwrap(getArguments().getParcelable("status"));
 		replyTo=Parcels.unwrap(getArguments().getParcelable("inReplyTo"));
 		Account inReplyToAccount=Parcels.unwrap(getArguments().getParcelable("inReplyToAccount"));
@@ -143,7 +164,7 @@ public class ThreadFragment extends StatusListFragment implements ProvidesAssist
 				}
 			}
 		}
-    
+
 		for (int deleteThisItem : deleteTheseItems) itemsToModify.remove(deleteThisItem);
 		if(s.id.equals(mainStatus.id)) {
 			items.add(new ExtendedFooterStatusDisplayItem(s.id, this, accountID, s.getContentStatus()));
@@ -387,6 +408,20 @@ public class ThreadFragment extends StatusListFragment implements ProvidesAssist
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
+		replyContainer=view.findViewById(R.id.reply_button_wrapper);
+		replyButton=replyContainer.findViewById(R.id.reply_button);
+		replyButtonText=replyButton.findViewById(R.id.reply_btn_text);
+		replyButtonAva=replyButton.findViewById(R.id.avatar);
+		replyButton.setOutlineProvider(OutlineProviders.roundedRect(20));
+		replyButton.setClipToOutline(true);
+		replyButtonText.setText(getString(R.string.reply_to_user, mainStatus.account.displayName));
+		replyButtonAva.setOutlineProvider(OutlineProviders.OVAL);
+		replyButtonAva.setClipToOutline(true);
+		replyButton.setOnClickListener(v->openReply());
+		Account self=AccountSessionManager.get(accountID).self;
+		if(!TextUtils.isEmpty(self.avatar)){
+			ViewImageLoader.loadWithoutAnimation(replyButtonAva, getResources().getDrawable(R.drawable.image_placeholder), new UrlImageLoaderRequest(self.avatar, V.dp(24), V.dp(24)));
+		}
 		UiUtils.loadCustomEmojiInTextView(toolbarTitleView);
 		showContent();
 		if(!loaded)
@@ -526,4 +561,24 @@ public class ThreadFragment extends StatusListFragment implements ProvidesAssist
 		}
 		super.onErrorRetryClick();
 	}
+
+	@Override
+	public void onApplyWindowInsets(WindowInsets insets){
+		lastBottomInset=insets.getSystemWindowInsetBottom();
+		super.onApplyWindowInsets(UiUtils.applyBottomInsetToFixedView(replyContainer, insets));
+	}
+
+	private void openReply(){
+		maybeShowPreReplySheet(mainStatus, ()->{
+			Bundle args=new Bundle();
+			args.putString("account", accountID);
+			args.putParcelable("replyTo", Parcels.wrap(mainStatus));
+			args.putBoolean("fromThreadFragment", true);
+			Nav.go(getActivity(), ComposeFragment.class, args);
+		});
+	}
+
+	public int getSnackbarOffset(){
+		return replyContainer.getHeight()-lastBottomInset;
+	}
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/ComposeAccountSearchFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/AccountSearchFragment.java
similarity index 81%
rename from mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/ComposeAccountSearchFragment.java
rename to mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/AccountSearchFragment.java
index 965c2d49c..ce3579a8b 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/ComposeAccountSearchFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/AccountSearchFragment.java
@@ -6,7 +6,9 @@ import android.text.TextUtils;
 import android.view.View;
 
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.api.requests.search.GetSearchResults;
+import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.SearchResults;
 import org.joinmastodon.android.model.viewmodel.AccountViewModel;
 import org.joinmastodon.android.ui.SearchViewHelper;
@@ -14,13 +16,14 @@ import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.viewholders.AccountViewHolder;
 import org.parceler.Parcels;
 
+import java.util.List;
 import java.util.stream.Collectors;
 
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.SimpleCallback;
 
-public class ComposeAccountSearchFragment extends BaseAccountListFragment{
-	private String currentQuery;
+public class AccountSearchFragment extends BaseAccountListFragment{
+	protected String currentQuery;
 	private boolean resultDelivered;
 	private SearchViewHelper searchViewHelper;
 
@@ -29,12 +32,11 @@ public class ComposeAccountSearchFragment extends BaseAccountListFragment{
 		super.onCreate(savedInstanceState);
 		setRefreshEnabled(false);
 		setEmptyText("");
-		dataLoaded();
 	}
 
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
-		searchViewHelper=new SearchViewHelper(getActivity(), getToolbarContext(), getString(R.string.search_hint));
+		searchViewHelper=new SearchViewHelper(getActivity(), getToolbarContext(), getSearchViewPlaceholder());
 		searchViewHelper.setListeners(this::onQueryChanged, null);
 		searchViewHelper.addDivider(contentView);
 		super.onViewCreated(view, savedInstanceState);
@@ -52,13 +54,21 @@ public class ComposeAccountSearchFragment extends BaseAccountListFragment{
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(SearchResults result){
-						setEmptyText(R.string.no_search_results);
-						onDataLoaded(result.accounts.stream().map(a->new AccountViewModel(a, accountID)).collect(Collectors.toList()), false);
+						AccountSearchFragment.this.onSuccess(result.accounts);
 					}
 				})
 				.exec(accountID);
 	}
 
+	protected void onSuccess(List<Account> result){
+		setEmptyText(R.string.no_search_results);
+		onDataLoaded(result.stream().map(a->new AccountViewModel(a, accountID)).collect(Collectors.toList()), false);
+	}
+
+	protected String getSearchViewPlaceholder(){
+		return getString(R.string.search_hint);
+	}
+
 	@Override
 	protected void onUpdateToolbar(){
 		super.onUpdateToolbar();
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/AddListMembersFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/AddListMembersFragment.java
new file mode 100644
index 000000000..28afce3e2
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/AddListMembersFragment.java
@@ -0,0 +1,37 @@
+package org.joinmastodon.android.fragments.account_list;
+
+import android.os.Bundle;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.accounts.SearchAccounts;
+import org.joinmastodon.android.model.Account;
+
+import java.util.List;
+
+import me.grishka.appkit.api.SimpleCallback;
+
+public class AddListMembersFragment extends AccountSearchFragment{
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		dataLoaded();
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){
+		refreshing=true;
+		currentRequest=new SearchAccounts(currentQuery, 0, 0, false, true)
+				.setCallback(new SimpleCallback<>(this){
+					@Override
+					public void onSuccess(List<Account> result){
+						AddListMembersFragment.this.onSuccess(result);
+					}
+				})
+				.exec(accountID);
+	}
+
+	@Override
+	protected String getSearchViewPlaceholder(){
+		return getString(R.string.search_among_people_you_follow);
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/AddNewListMembersFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/AddNewListMembersFragment.java
new file mode 100644
index 000000000..802318b9d
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/AddNewListMembersFragment.java
@@ -0,0 +1,125 @@
+package org.joinmastodon.android.fragments.account_list;
+
+import android.annotation.SuppressLint;
+import android.content.res.TypedArray;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.widget.Button;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.accounts.GetAccountFollowing;
+import org.joinmastodon.android.api.requests.accounts.SearchAccounts;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.HeaderPaginationList;
+import org.joinmastodon.android.model.viewmodel.AccountViewModel;
+import org.joinmastodon.android.ui.viewholders.AccountViewHolder;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import me.grishka.appkit.api.SimpleCallback;
+import me.grishka.appkit.utils.V;
+
+@SuppressLint("ValidFragment") // This shouldn't be part of any saved states anyway
+public class AddNewListMembersFragment extends AccountSearchFragment{
+	private Listener listener;
+	private String maxID;
+
+	public AddNewListMembersFragment(Listener listener){
+		this.listener=listener;
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		loadData();
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){
+		if(TextUtils.isEmpty(currentQuery)){
+			currentRequest=new GetAccountFollowing(AccountSessionManager.get(accountID).self.id, offset>0 ? maxID : null, count)
+					.setCallback(new SimpleCallback<>(this){
+						@Override
+						public void onSuccess(HeaderPaginationList<Account> result){
+							setEmptyText("");
+							onDataLoaded(result.stream().map(a->new AccountViewModel(a, accountID)).collect(Collectors.toList()), result.nextPageUri!=null);
+							maxID=result.getNextPageMaxID();
+						}
+					})
+					.exec(accountID);
+		}else{
+			refreshing=true;
+			currentRequest=new SearchAccounts(currentQuery, 0, 0, false, true)
+					.setCallback(new SimpleCallback<>(this){
+						@Override
+						public void onSuccess(List<Account> result){
+							AddNewListMembersFragment.this.onSuccess(result);
+						}
+					})
+					.exec(accountID);
+		}
+	}
+
+	@Override
+	protected String getSearchViewPlaceholder(){
+		return getString(R.string.search_among_people_you_follow);
+	}
+
+	@Override
+	protected void onConfigureViewHolder(AccountViewHolder holder){
+		holder.setStyle(AccountViewHolder.AccessoryType.CUSTOM_BUTTON, false);
+		holder.setOnLongClickListener(vh->false);
+		Button button=holder.getButton();
+		button.setPadding(V.dp(24), 0, V.dp(24), 0);
+		button.setMinimumWidth(0);
+		button.setMinWidth(0);
+		button.setOnClickListener(v->{
+			holder.setActionProgressVisible(true);
+			holder.itemView.setHasTransientState(true);
+			Runnable onDone=()->{
+				holder.setActionProgressVisible(false);
+				holder.itemView.setHasTransientState(false);
+				onBindViewHolder(holder);
+			};
+			AccountViewModel account=holder.getItem();
+			if(listener.isAccountInList(account)){
+				listener.removeAccountAccountFromList(account, onDone);
+			}else{
+				listener.addAccountToList(account, onDone);
+			}
+		});
+	}
+
+	@Override
+	protected void onBindViewHolder(AccountViewHolder holder){
+		Button button=holder.getButton();
+		int textRes, styleRes;
+		if(listener.isAccountInList(holder.getItem())){
+			textRes=R.string.remove;
+			styleRes=R.style.Widget_Mastodon_M3_Button_Tonal_Error;
+		}else{
+			textRes=R.string.add;
+			styleRes=R.style.Widget_Mastodon_M3_Button_Filled;
+		}
+		button.setText(textRes);
+		TypedArray ta=button.getContext().obtainStyledAttributes(styleRes, new int[]{android.R.attr.background});
+		button.setBackground(ta.getDrawable(0));
+		ta.recycle();
+		ta=button.getContext().obtainStyledAttributes(styleRes, new int[]{android.R.attr.textColor});
+		button.setTextColor(ta.getColorStateList(0));
+		ta.recycle();
+	}
+
+	@Override
+	protected void loadRelationships(List<AccountViewModel> accounts){
+		// no-op
+	}
+
+	public interface Listener{
+		boolean isAccountInList(AccountViewModel account);
+		void addAccountToList(AccountViewModel account, Runnable onDone);
+		void removeAccountAccountFromList(AccountViewModel account, Runnable onDone);
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java
index ca95f4697..f758bb927 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java
@@ -39,6 +39,7 @@ public abstract class BaseAccountListFragment extends MastodonRecyclerFragment<A
 	protected HashMap<String, Relationship> relationships=new HashMap<>();
 	protected String accountID;
 	protected ArrayList<APIRequest<?>> relationshipsRequests=new ArrayList<>();
+	protected int itemLayoutRes=R.layout.item_account_list;
 
 	public BaseAccountListFragment(){
 		super(40);
@@ -74,6 +75,8 @@ public abstract class BaseAccountListFragment extends MastodonRecyclerFragment<A
 
 	protected void loadRelationships(List<AccountViewModel> accounts){
 		Set<String> ids=accounts.stream().map(ai->ai.account.id).collect(Collectors.toSet());
+		if(ids.isEmpty())
+			return;
 		GetAccountRelationships req=new GetAccountRelationships(ids);
 		relationshipsRequests.add(req);
 		req.setCallback(new Callback<>(){
@@ -124,13 +127,6 @@ public abstract class BaseAccountListFragment extends MastodonRecyclerFragment<A
 		Toolbar toolbar=getToolbar();
 		if(toolbar!=null && toolbar.getNavigationIcon()!=null){
 			toolbar.setNavigationContentDescription(R.string.back);
-			if(hasSubtitle()){
-				toolbar.setTitleTextAppearance(getActivity(), R.style.m3_title_medium);
-				toolbar.setSubtitleTextAppearance(getActivity(), R.style.m3_body_medium);
-				int color=UiUtils.getThemeColor(getActivity(), android.R.attr.textColorPrimary);
-				toolbar.setTitleTextColor(color);
-				toolbar.setSubtitleTextColor(color);
-			}
 		}
 	}
 
@@ -162,6 +158,7 @@ public abstract class BaseAccountListFragment extends MastodonRecyclerFragment<A
 	}
 
 	protected void onConfigureViewHolder(AccountViewHolder holder){}
+	protected void onBindViewHolder(AccountViewHolder holder){}
 
 	protected class AccountsAdapter extends UsableRecyclerView.Adapter<AccountViewHolder> implements ImageLoaderRecyclerAdapter{
 		public AccountsAdapter(){
@@ -171,7 +168,7 @@ public abstract class BaseAccountListFragment extends MastodonRecyclerFragment<A
 		@NonNull
 		@Override
 		public AccountViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
-			AccountViewHolder holder=new AccountViewHolder(BaseAccountListFragment.this, parent, relationships);
+			AccountViewHolder holder=new AccountViewHolder(BaseAccountListFragment.this, parent, relationships, itemLayoutRes);
 			onConfigureViewHolder(holder);
 			return holder;
 		}
@@ -179,6 +176,7 @@ public abstract class BaseAccountListFragment extends MastodonRecyclerFragment<A
 		@Override
 		public void onBindViewHolder(AccountViewHolder holder, int position){
 			holder.bind(data.get(position));
+			BaseAccountListFragment.this.onBindViewHolder(holder);
 			super.onBindViewHolder(holder, position);
 		}
 
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/PaginatedAccountListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/PaginatedAccountListFragment.java
index 6f293b821..bd98dbf69 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/PaginatedAccountListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/PaginatedAccountListFragment.java
@@ -45,7 +45,8 @@ public abstract class PaginatedAccountListFragment<T> extends BaseAccountListFra
 		}
 
 		remoteDisabled = !GlobalUserPreferences.allowRemoteLoading
-				|| getSession().domain.equals(getRemoteDomain());
+				|| getSession().domain.equals(getRemoteDomain())
+				|| remoteInfoRequest == null;
 		if (!remoteDisabled) {
 			remoteInfoRequest = loadRemoteInfo().setCallback(new Callback<>() {
 				@Override
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverPostsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverPostsFragment.java
index fb25819ed..28f34be35 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverPostsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverPostsFragment.java
@@ -18,7 +18,7 @@ import me.grishka.appkit.utils.MergeRecyclerAdapter;
 
 public class DiscoverPostsFragment extends StatusListFragment{
 	private DiscoverInfoBannerHelper bannerHelper;
-	private int offset;
+	private int realOffset=0;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -26,26 +26,23 @@ public class DiscoverPostsFragment extends StatusListFragment{
 		bannerHelper=new DiscoverInfoBannerHelper(DiscoverInfoBannerHelper.BannerType.TRENDING_POSTS, accountID);
 	}
 
-
 	@Override
-	protected void doLoadData(int o, int count){
-		if(refreshing) offset=0;
-		currentRequest=new GetTrendingStatuses(offset, count)
+	protected void doLoadData(int offset, int count){
+		currentRequest=new GetTrendingStatuses(offset==0 ? 0 : realOffset, count)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){
 						if(getActivity()==null) return;
-						boolean empty=result.isEmpty();
-						offset+=result.size();
+						realOffset+=result.size();
 						AccountSessionManager.get(accountID).filterStatuses(result, getFilterContext());
-						onDataLoaded(result, !empty);
+						onDataLoaded(result, !result.isEmpty());
 						bannerHelper.onBannerBecameVisible();
 					}
 				}).exec(accountID);
 	}
 
 	@Override
-	protected RecyclerView.Adapter<?> getAdapter(){
+	protected RecyclerView.Adapter getAdapter(){
 		MergeRecyclerAdapter adapter=new MergeRecyclerAdapter();
 		bannerHelper.maybeAddBanner(list, adapter);
 		adapter.addAdapter(super.getAdapter());
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/FederatedTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/FederatedTimelineFragment.java
index 5ff063738..eb74bd278 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/FederatedTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/FederatedTimelineFragment.java
@@ -29,7 +29,7 @@ public class FederatedTimelineFragment extends StatusListFragment{
 
 	@Override
 	protected void doLoadData(int offset, int count){
-		currentRequest=new GetPublicTimeline(false, false, getMaxID(), count, getLocalPrefs().timelineReplyVisibility)
+		currentRequest=new GetPublicTimeline(false, false, getMaxID(), null, count, null, getLocalPrefs().timelineReplyVisibility)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java
index aae59908c..d6975f9af 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java
@@ -29,7 +29,7 @@ public class LocalTimelineFragment extends StatusListFragment{
 
 	@Override
 	protected void doLoadData(int offset, int count){
-		currentRequest=new GetPublicTimeline(true, false, getMaxID(), count, getLocalPrefs().timelineReplyVisibility)
+		currentRequest=new GetPublicTimeline(true, false, getMaxID(), null, count, null, getLocalPrefs().timelineReplyVisibility)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
index 599d82077..f5c605a94 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
@@ -143,7 +143,7 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 		}*/
 		int offset=_offset;
 		currentRequest=new GetSearchResults(currentQuery, type, type==null, maxID, offset, type==null ? 0 : count)
-				.setCallback(new SimpleCallback<>(this){
+				.setCallback(new SimpleCallback<SearchResults>(this){
 					@Override
 					public void onSuccess(SearchResults result){
 						ArrayList<SearchResult> results=new ArrayList<>();
@@ -164,7 +164,10 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 						}
 						prevDisplayItems=new ArrayList<>(displayItems);
 						unfilteredResults=results;
+						boolean wasRefreshing=refreshing;
 						onDataLoaded(filterSearchResults(results), type!=null && !results.isEmpty());
+						if(wasRefreshing)
+							list.scrollToPosition(0);
 					}
 				})
 				.setTimeout(180000) // 3 minutes (searches can take a long time)
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/AccountActivationFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/AccountActivationFragment.java
index 75325ad4a..c3d36b9f2 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/AccountActivationFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/AccountActivationFragment.java
@@ -24,7 +24,7 @@ import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.settings.SettingsMainFragment;
 import org.joinmastodon.android.model.Account;
-import org.joinmastodon.android.ui.AccountSwitcherSheet;
+import org.joinmastodon.android.ui.sheets.AccountSwitcherSheet;
 import org.joinmastodon.android.ui.utils.UiUtils;
 
 import java.io.File;
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/GoogleMadeMeAddThisFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/GoogleMadeMeAddThisFragment.java
index 05746a5a4..03d0c3557 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/GoogleMadeMeAddThisFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/GoogleMadeMeAddThisFragment.java
@@ -137,6 +137,9 @@ public class GoogleMadeMeAddThisFragment extends ToolbarFragment{
 	protected void onButtonClick(){
 		Bundle args=new Bundle();
 		args.putParcelable("instance", Parcels.wrap(instance));
+		if(getArguments().containsKey("inviteCode")){
+			args.putString("inviteCode", getArguments().getString("inviteCode"));
+		}
 		Nav.goForResult(getActivity(), SignupFragment.class, args, SIGNUP_REQUEST, this);
 	}
 
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogFragment.java
index ed9de50e4..0980f6673 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogFragment.java
@@ -3,7 +3,6 @@ package org.joinmastodon.android.fragments.onboarding;
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.KeyEvent;
@@ -38,6 +37,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -48,7 +48,6 @@ import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.MergeRecyclerAdapter;
-import me.grishka.appkit.utils.V;
 import okhttp3.Call;
 import okhttp3.Request;
 import okhttp3.Response;
@@ -61,6 +60,7 @@ abstract class InstanceCatalogFragment extends MastodonRecyclerFragment<CatalogI
 	protected EditText searchEdit;
 	protected Runnable searchDebouncer=this::onSearchChangedDebounced;
 	protected String currentSearchQuery;
+	protected String currentSearchQueryButWithCasePreserved;
 	protected String loadingInstanceDomain;
 	protected HashMap<String, Instance> instancesCache=new HashMap<>();
 	protected View buttonBar;
@@ -91,6 +91,7 @@ abstract class InstanceCatalogFragment extends MastodonRecyclerFragment<CatalogI
 		if(event!=null && event.getAction()!=KeyEvent.ACTION_DOWN)
 			return true;
 		currentSearchQuery=searchEdit.getText().toString().toLowerCase().trim();
+		currentSearchQueryButWithCasePreserved=searchEdit.getText().toString().trim();
 		updateFilteredList();
 		searchEdit.removeCallbacks(searchDebouncer);
 		Instance instance=instancesCache.get(normalizeInstanceDomain(getCurrentSearchQuery()));
@@ -105,6 +106,7 @@ abstract class InstanceCatalogFragment extends MastodonRecyclerFragment<CatalogI
 
 	protected void onSearchChangedDebounced(){
 		currentSearchQuery=searchEdit.getText().toString().toLowerCase().trim();
+		currentSearchQueryButWithCasePreserved=searchEdit.getText().toString().trim();
 		updateFilteredList();
 		loadInstanceInfo(getCurrentSearchQuery(), false);
 	}
@@ -156,6 +158,10 @@ abstract class InstanceCatalogFragment extends MastodonRecyclerFragment<CatalogI
 	}
 
 	protected void loadInstanceInfo(String _domain, boolean isFromRedirect){
+		loadInstanceInfo(_domain, isFromRedirect, null);
+	}
+
+	protected void loadInstanceInfo(String _domain, boolean isFromRedirect, Consumer<Object> onError){
 		if(TextUtils.isEmpty(_domain))
 			return;
 		String domain=normalizeInstanceDomain(_domain);
@@ -180,7 +186,10 @@ abstract class InstanceCatalogFragment extends MastodonRecyclerFragment<CatalogI
 		try{
 			new URI("https://"+domain+"/api/v1/instance"); // Validate the host by trying to parse the URI
 		}catch(URISyntaxException x){
-			showInstanceInfoLoadError(domain, x);
+			if(onError!=null)
+				onError.accept(x);
+			else
+				showInstanceInfoLoadError(domain, x);
 			if(fakeInstance!=null){
 				fakeInstance.description=getString(R.string.error);
 				if(filteredData.size()>0 && filteredData.get(0)==fakeInstance){
@@ -200,10 +209,11 @@ abstract class InstanceCatalogFragment extends MastodonRecyclerFragment<CatalogI
 				loadingInstanceDomain=null;
 				result.uri=domain; // needed for instances that use domain redirection
 				instancesCache.put(domain, result);
+				if(instanceProgressDialog!=null || onError!=null)
+					proceedWithAuthOrSignup(result);
 				if(instanceProgressDialog!=null){
 					instanceProgressDialog.dismiss();
 					instanceProgressDialog=null;
-					proceedWithAuthOrSignup(result);
 				}
 				if(Objects.equals(domain, getCurrentSearchQuery()) || Objects.equals(getCurrentSearchQuery(), redirects.get(domain)) || Objects.equals(getCurrentSearchQuery(), redirectsInverse.get(domain))){
 					boolean found=false;
@@ -230,11 +240,14 @@ abstract class InstanceCatalogFragment extends MastodonRecyclerFragment<CatalogI
 			public void onError(ErrorResponse error){
 				loadingInstanceRequest=null;
 				if(!isFromRedirect && error instanceof MastodonErrorResponse me && me.httpStatus==404){
-					fetchDomainFromHostMetaAndMaybeRetry(domain, error);
+					fetchDomainFromHostMetaAndMaybeRetry(domain, error, onError);
 					return;
 				}
 				loadingInstanceDomain=null;
-				showInstanceInfoLoadError(domain, error);
+				if(onError!=null)
+					onError.accept(error);
+				else
+					showInstanceInfoLoadError(domain, error);
 				if(fakeInstance!=null && getActivity()!=null){
 					fakeInstance.description=getString(R.string.error);
 					if(filteredData.size()>0 && filteredData.get(0)==fakeInstance){
@@ -283,7 +296,7 @@ abstract class InstanceCatalogFragment extends MastodonRecyclerFragment<CatalogI
 		}
 	}
 
-	private void fetchDomainFromHostMetaAndMaybeRetry(String domain, Object origError){
+	private void fetchDomainFromHostMetaAndMaybeRetry(String domain, Object origError, Consumer<Object> onError){
 		String url="https://"+domain+"/.well-known/host-meta";
 		Request req=new Request.Builder()
 				.url(url)
@@ -297,7 +310,12 @@ abstract class InstanceCatalogFragment extends MastodonRecyclerFragment<CatalogI
 				Activity a=getActivity();
 				if(a==null)
 					return;
-				a.runOnUiThread(()->showInstanceInfoLoadError(domain, e));
+				a.runOnUiThread(()->{
+					if(onError!=null)
+						onError.accept(e);
+					else
+						showInstanceInfoLoadError(domain, e);
+				});
 			}
 
 			@Override
@@ -309,7 +327,13 @@ abstract class InstanceCatalogFragment extends MastodonRecyclerFragment<CatalogI
 					return;
 				try(response){
 					if(!response.isSuccessful()){
-						a.runOnUiThread(()->showInstanceInfoLoadError(domain, response.code()+" "+response.message()));
+						a.runOnUiThread(()->{
+							String err=response.code()+" "+response.message();
+							if(onError!=null)
+								onError.accept(err);
+							else
+								showInstanceInfoLoadError(domain, err);
+						});
 						return;
 					}
 					InputSource source=new InputSource(response.body().charStream());
@@ -328,9 +352,19 @@ abstract class InstanceCatalogFragment extends MastodonRecyclerFragment<CatalogI
 							}
 						}
 					}
-					a.runOnUiThread(()->showInstanceInfoLoadError(domain, origError));
+					a.runOnUiThread(()->{
+						if(onError!=null)
+							onError.accept(origError);
+						else
+							showInstanceInfoLoadError(domain, origError);
+					});
 				}catch(Exception x){
-					a.runOnUiThread(()->showInstanceInfoLoadError(domain, x));
+					a.runOnUiThread(()->{
+						if(onError!=null)
+							onError.accept(x);
+						else
+							showInstanceInfoLoadError(domain, x);
+					});
 				}
 			}
 		});
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..68decec3e 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
@@ -1,8 +1,13 @@
 package org.joinmastodon.android.fragments.onboarding;
 
 import android.annotation.SuppressLint;
+import android.app.AlertDialog;
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.res.ColorStateList;
+import android.net.Uri;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextUtils;
@@ -12,6 +17,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
 import android.view.inputmethod.InputMethodManager;
+import android.widget.Button;
+import android.widget.EditText;
 import android.widget.HorizontalScrollView;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
@@ -19,9 +26,12 @@ import android.widget.PopupMenu;
 import android.widget.RadioButton;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.api.MastodonErrorResponse;
+import org.joinmastodon.android.api.requests.accounts.CheckInviteLink;
 import org.joinmastodon.android.api.requests.catalog.GetCatalogCategories;
 import org.joinmastodon.android.api.requests.catalog.GetCatalogInstances;
 import org.joinmastodon.android.model.Instance;
@@ -29,6 +39,8 @@ import org.joinmastodon.android.model.catalog.CatalogCategory;
 import org.joinmastodon.android.model.catalog.CatalogInstance;
 import org.joinmastodon.android.ui.BetterItemAnimator;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
+import org.joinmastodon.android.ui.text.HtmlParser;
+import org.joinmastodon.android.ui.utils.SimpleTextWatcher;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.FilterChipView;
 import org.joinmastodon.android.utils.ElevationOnScrollListener;
@@ -40,7 +52,9 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
+import java.util.Objects;
 import java.util.Random;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 import androidx.annotation.NonNull;
@@ -77,6 +91,9 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment imple
 	private CatalogInstance.Region chosenRegion;
 	private CategoryChoice categoryChoice=CategoryChoice.GENERAL;
 
+	private String inviteCode, inviteCodeHost;
+	private AlertDialog currentInviteLinkAlert;
+
 	public InstanceCatalogSignupFragment(){
 		super(R.layout.fragment_onboarding_common, 10);
 	}
@@ -317,7 +334,7 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment imple
 		focusThing=view.findViewById(R.id.focus_thing);
 		focusThing.requestFocus();
 
-		view.findViewById(R.id.btn_random_instance).setOnClickListener(this::onPickRandomInstanceClick);
+		view.findViewById(R.id.btn_use_invite).setOnClickListener(this::onUseInviteClick);
 		nextButton.setEnabled(chosenInstance!=null);
 	}
 
@@ -351,91 +368,191 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment imple
 
 	@Override
 	protected void proceedWithAuthOrSignup(Instance instance){
+		if(currentInviteLinkAlert!=null){
+			currentInviteLinkAlert.dismiss();
+		}else if(!TextUtils.isEmpty(currentSearchQuery) && HtmlParser.INVITE_LINK_PATTERN.matcher(currentSearchQueryButWithCasePreserved).find()){
+			if(TextUtils.isEmpty(inviteCode) || !Objects.equals(instance.uri, inviteCodeHost)){
+				Uri inviteLink=Uri.parse(currentSearchQueryButWithCasePreserved);
+				new CheckInviteLink(inviteLink.getPath())
+						.setCallback(new Callback<>(){
+							@Override
+							public void onSuccess(CheckInviteLink.Response result){
+								inviteCodeHost=inviteLink.getHost();
+								inviteCode=result.inviteCode;
+								proceedWithAuthOrSignup(instance);
+							}
+
+							@Override
+							public void onError(ErrorResponse error){
+								if(getActivity()==null)
+									return;
+								if(error instanceof MastodonErrorResponse mer){
+									switch(mer.httpStatus){
+										case 401 -> new M3AlertDialogBuilder(getActivity())
+												.setTitle(R.string.expired_invite_link)
+												.setMessage(getString(R.string.expired_clipboard_invite_link_alert, inviteLink.getHost(), getArguments().getString("defaultServer")))
+												.setPositiveButton(R.string.ok, null)
+												.show();
+										case 404 -> new M3AlertDialogBuilder(getActivity())
+												.setTitle(R.string.invalid_invite_link)
+												.setMessage(getString(R.string.invalid_clipboard_invite_link_alert, inviteLink.getHost(), getArguments().getString("defaultServer")))
+												.setPositiveButton(R.string.ok, null)
+												.show();
+										default -> error.showToast(getActivity());
+									}
+								}
+							}
+						})
+						.wrapProgress(getActivity(), R.string.loading_instance, true)
+						.execNoAuth(inviteLink.getHost());
+				return;
+			}
+		}
 		getActivity().getSystemService(InputMethodManager.class).hideSoftInputFromWindow(contentView.getWindowToken(), 0);
-		if(!instance.registrations){
-			new M3AlertDialogBuilder(getActivity())
-					.setTitle(R.string.error)
-					.setMessage(R.string.instance_signup_closed)
-					.setPositiveButton(R.string.ok, null)
-					.show();
+		if(!instance.registrations && (TextUtils.isEmpty(inviteCode) || !Objects.equals(instance.uri, inviteCodeHost))){
+			if(instance.invitesEnabled){
+				showInviteLinkAlert(instance.uri);
+			}else{
+				new M3AlertDialogBuilder(getActivity())
+						.setTitle(R.string.error)
+						.setMessage(R.string.instance_signup_closed)
+						.setPositiveButton(R.string.ok, null)
+						.show();
+			}
 			return;
 		}
 		Bundle args=new Bundle();
 		args.putParcelable("instance", Parcels.wrap(instance));
+		if(!TextUtils.isEmpty(inviteCode) && Objects.equals(instance.uri, inviteCodeHost))
+			args.putString("inviteCode", inviteCode);
 		Nav.go(getActivity(), InstanceRulesFragment.class, args);
 	}
 
-	private void onPickRandomInstanceClick(View v){
-		String lang=Locale.getDefault().getLanguage();
-		List<CatalogInstance> instances=data.stream().filter(ci->!ci.approvalRequired && ("general".equals(ci.category) || (ci.categories!=null && ci.categories.contains("general"))) && (lang.equals(ci.language) || (ci.languages!=null && ci.languages.contains(lang)))).collect(Collectors.toList());
-		if(instances.isEmpty()){
-			instances=data.stream().filter(ci->!ci.approvalRequired && ("general".equals(ci.category) || (ci.categories!=null && ci.categories.contains("general")))).collect(Collectors.toList());
-		}
-		if(instances.isEmpty()){
-			instances=data.stream().filter(ci->("general".equals(ci.category) || (ci.categories!=null && ci.categories.contains("general")))).collect(Collectors.toList());
-		}
-		if(instances.isEmpty()){
-			return;
-		}
-		chosenInstance=instances.get(new Random().nextInt(instances.size()));
-		onNextClick(v);
+	private void onUseInviteClick(View v){
+		showInviteLinkAlert(null);
 	}
 
-//	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 void showInviteLinkAlert(String domain){
+		AlertDialog alert=new M3AlertDialogBuilder(getActivity())
+				.setView(R.layout.alert_invite_link)
+				.setPositiveButton(R.string.next, null)
+				.setNegativeButton(R.string.cancel, null)
+				.create();
 
-	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;
-		};
-	}
+		Button next=alert.getButton(AlertDialog.BUTTON_POSITIVE);
+		EditText edit=alert.findViewById(R.id.edit);
+		TextView supportingText=alert.findViewById(R.id.supporting_text);
+		TextView label=alert.findViewById(R.id.label);
+		TextView subtitle=alert.findViewById(R.id.subtitle);
+		ImageButton clear=alert.findViewById(R.id.clear);
+		clear.setVisibility(View.GONE);
 
-	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;
+		if(TextUtils.isEmpty(domain)){
+			subtitle.setVisibility(View.GONE);
+		}else{
+			subtitle.setText(getString(R.string.need_invite_to_join_server, domain));
+		}
+
+		Consumer<String> errorSetter=err->{
+			supportingText.setText(err);
+			int errorColor=UiUtils.getThemeColor(getActivity(), R.attr.colorM3Error);
+			supportingText.setTextColor(errorColor);
+			label.setTextColor(errorColor);
+			edit.setBackgroundResource(R.drawable.bg_m3_filled_text_field_error);
 		};
+
+		next.setOnClickListener(_v->{
+			Uri inviteLink=Uri.parse(edit.getText().toString());
+			if(TextUtils.isEmpty(inviteLink.getHost()) || TextUtils.isEmpty(inviteLink.getPath())){
+				errorSetter.accept(getString(R.string.this_invite_is_invalid));
+				return;
+			}
+			UiUtils.showProgressForAlertButton(next, true);
+			new CheckInviteLink(inviteLink.getPath())
+					.setCallback(new Callback<>(){
+						@Override
+						public void onSuccess(CheckInviteLink.Response result){
+							if(getActivity()==null || !alert.isShowing())
+								return;
+
+							String host=inviteLink.getHost();
+							inviteCode=result.inviteCode;
+							inviteCodeHost=host;
+
+							Instance instance=instancesCache.get(normalizeInstanceDomain(host));
+							if(instance==null){
+								loadInstanceInfo(host, false, err->{
+									String errorStr;
+									if(err instanceof String str){
+										errorStr=str;
+									}else if(err instanceof Throwable x){
+										errorStr=x.getMessage();
+									}else if(err instanceof MastodonErrorResponse mer){
+										errorStr=mer.error;
+									}else{
+										errorStr=getString(R.string.error);
+									}
+									errorSetter.accept(errorStr);
+									UiUtils.showProgressForAlertButton(next, false);
+								});
+							}else{
+								proceedWithAuthOrSignup(instance);
+							}
+						}
+
+						@Override
+						public void onError(ErrorResponse error){
+							if(getActivity()==null || !alert.isShowing())
+								return;
+							UiUtils.showProgressForAlertButton(next, false);
+							if(error instanceof MastodonErrorResponse mer){
+								errorSetter.accept(switch(mer.httpStatus){
+									case 404 -> getString(R.string.this_invite_is_invalid);
+									case 401 -> getString(R.string.this_invite_has_expired);
+									default -> mer.error;
+								});
+							}
+						}
+					})
+					.execNoAuth(inviteLink.getHost());
+		});
+		next.setEnabled(false);
+		edit.addTextChangedListener(new SimpleTextWatcher(e->{
+			boolean wasEmpty=!next.isEnabled();
+			next.setEnabled(e.length()>0);
+			if(supportingText.length()>0){
+				supportingText.setText("");
+				int regularColor=UiUtils.getThemeColor(getActivity(), R.attr.colorM3OnSurfaceVariant);
+				supportingText.setTextColor(regularColor);
+				label.setTextColor(regularColor);
+				edit.setBackgroundResource(R.drawable.bg_m3_filled_text_field);
+			}
+			if(wasEmpty!=(e.length()==0)){
+				int padEnd;
+				if(e.length()==0){
+					clear.setVisibility(View.GONE);
+					padEnd=V.dp(16);
+				}else{
+					clear.setVisibility(View.VISIBLE);
+					padEnd=V.dp(48);
+				}
+				edit.setPaddingRelative(edit.getPaddingStart(), edit.getPaddingTop(), padEnd, edit.getPaddingBottom());
+			}
+		}));
+		clear.setOnClickListener(_v->edit.setText(""));
+
+		ClipData clipData=getActivity().getSystemService(ClipboardManager.class).getPrimaryClip();
+		if(clipData!=null && clipData.getItemCount()>0){
+			CharSequence clipText=clipData.getItemAt(0).coerceToText(getActivity());
+			if(HtmlParser.INVITE_LINK_PATTERN.matcher(clipText).find()){
+				edit.setText(clipText);
+				supportingText.setText(R.string.invite_link_pasted);
+			}
+		}
+
+		currentInviteLinkAlert=alert;
+		alert.setOnDismissListener(dialog->currentInviteLinkAlert=null);
+		alert.show();
 	}
 
 	@Override
@@ -444,8 +561,14 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment imple
 		filteredData.clear();
 		if(searchQueryMode){
 			if(!TextUtils.isEmpty(currentSearchQuery)){
+				String actualQuery;
+				if(currentSearchQuery.startsWith("https:")){
+					actualQuery=Uri.parse(currentSearchQuery).getHost();
+				}else{
+					actualQuery=currentSearchQuery;
+				}
 				for(CatalogInstance instance:data){
-					if(instance.domain.contains(currentSearchQuery)){
+					if(instance.domain.contains(actualQuery)){
 						filteredData.add(instance);
 					}
 				}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java
index bbf7eac0c..7432db287 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java
@@ -111,6 +111,9 @@ public class InstanceRulesFragment extends ToolbarFragment implements ProvidesAs
 	protected void onButtonClick(){
 		Bundle args=new Bundle();
 		args.putParcelable("instance", Parcels.wrap(instance));
+		if(getArguments().containsKey("inviteCode")){
+			args.putString("inviteCode", getArguments().getString("inviteCode"));
+		}
 		Nav.goForResult(getActivity(), GoogleMadeMeAddThisFragment.class, args, RULES_REQUEST, this);
 	}
 
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/OnboardingFollowSuggestionsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/OnboardingFollowSuggestionsFragment.java
index a59d97749..326e54db6 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/OnboardingFollowSuggestionsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/OnboardingFollowSuggestionsFragment.java
@@ -5,6 +5,7 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
 import android.view.WindowInsets;
+import android.widget.TextView;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetFollowSuggestions;
@@ -13,35 +14,38 @@ import org.joinmastodon.android.fragments.account_list.BaseAccountListFragment;
 import org.joinmastodon.android.model.FollowSuggestion;
 import org.joinmastodon.android.model.Relationship;
 import org.joinmastodon.android.model.viewmodel.AccountViewModel;
+import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.viewholders.AccountViewHolder;
-import org.joinmastodon.android.utils.ElevationOnScrollListener;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.api.SimpleCallback;
-import me.grishka.appkit.views.FragmentRootLinearLayout;
+import me.grishka.appkit.utils.MergeRecyclerAdapter;
+import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
+import me.grishka.appkit.utils.V;
 
 public class OnboardingFollowSuggestionsFragment extends BaseAccountListFragment{
 	private String accountID;
 	private View buttonBar;
-	private ElevationOnScrollListener onScrollListener;
 	private int numRunningFollowRequests=0;
 
 	public OnboardingFollowSuggestionsFragment(){
 		super(R.layout.fragment_onboarding_follow_suggestions, 40);
+		itemLayoutRes=R.layout.item_account_list;
 	}
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
 		setRetainInstance(true);
-		setTitle(R.string.popular_on_mastodon);
+		setTitle(R.string.onboarding_recommendations_title);
 		accountID=getArguments().getString("account");
 		loadData();
 	}
@@ -50,7 +54,6 @@ public class OnboardingFollowSuggestionsFragment extends BaseAccountListFragment
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
 		buttonBar=view.findViewById(R.id.button_bar);
-		list.addOnScrollListener(onScrollListener=new ElevationOnScrollListener((FragmentRootLinearLayout) view, buttonBar, getToolbar()));
 
 		view.findViewById(R.id.btn_next).setOnClickListener(UiUtils.rateLimitedClickListener(this::onFollowAllClick));
 //		view.findViewById(R.id.btn_skip).setOnClickListener(UiUtils.rateLimitedClickListener(v->proceed()));
@@ -59,9 +62,7 @@ public class OnboardingFollowSuggestionsFragment extends BaseAccountListFragment
 	@Override
 	protected void onUpdateToolbar(){
 		super.onUpdateToolbar();
-		if(onScrollListener!=null){
-			onScrollListener.setViews(buttonBar, getToolbar());
-		}
+		getToolbar().setContentInsetsRelative(V.dp(56), 0);
 	}
 
 	@Override
@@ -70,7 +71,7 @@ public class OnboardingFollowSuggestionsFragment extends BaseAccountListFragment
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<FollowSuggestion> result){
-						onDataLoaded(result.stream().map(fs->new AccountViewModel(fs.account, accountID)).collect(Collectors.toList()), false);
+						onDataLoaded(result.stream().map(fs->new AccountViewModel(fs.account, accountID).stripLinksFromBio()).collect(Collectors.toList()), false);
 					}
 				})
 				.exec(accountID);
@@ -81,6 +82,20 @@ public class OnboardingFollowSuggestionsFragment extends BaseAccountListFragment
 		super.onApplyWindowInsets(UiUtils.applyBottomInsetToFixedView(buttonBar, insets));
 	}
 
+	@Override
+	protected RecyclerView.Adapter<?> getAdapter(){
+//		Unused in Moshidon
+//		TextView introText=new TextView(getActivity());
+//		introText.setTextAppearance(R.style.m3_body_large);
+//		introText.setTextColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3OnSurface));
+//		introText.setPaddingRelative(V.dp(56), 0, V.dp(24), V.dp(8));
+//		introText.setText(R.string.onboarding_recommendations_intro);
+		MergeRecyclerAdapter mergeAdapter=new MergeRecyclerAdapter();
+//		mergeAdapter.addAdapter(new SingleViewRecyclerAdapter(introText));
+		mergeAdapter.addAdapter(super.getAdapter());
+		return mergeAdapter;
+	}
+
 	private void onFollowAllClick(View v){
 		if(!loaded || relationships.isEmpty())
 			return;
@@ -156,6 +171,12 @@ public class OnboardingFollowSuggestionsFragment extends BaseAccountListFragment
 	protected void onConfigureViewHolder(AccountViewHolder holder){
 		super.onConfigureViewHolder(holder);
 		holder.setStyle(AccountViewHolder.AccessoryType.BUTTON, true);
+		holder.avatar.setOutlineProvider(OutlineProviders.roundedRect(8));
+	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base){
+		return null;
 	}
 
 	@Override
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/OnboardingProfileSetupFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/OnboardingProfileSetupFragment.java
index 086bef065..892261e4d 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/OnboardingProfileSetupFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/OnboardingProfileSetupFragment.java
@@ -11,6 +11,7 @@ import android.view.WindowInsets;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.ScrollView;
 
 import org.joinmastodon.android.R;
@@ -19,12 +20,17 @@ import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.HomeFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.AccountField;
+import org.joinmastodon.android.model.viewmodel.CheckableListItem;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.OutlineProviders;
+import org.joinmastodon.android.ui.adapters.GenericListItemsAdapter;
 import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.ui.viewholders.ListItemViewHolder;
 import org.joinmastodon.android.ui.views.ReorderableLinearLayout;
 import org.joinmastodon.android.utils.ElevationOnScrollListener;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
@@ -35,7 +41,7 @@ import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.FragmentRootLinearLayout;
 
-public class OnboardingProfileSetupFragment extends ToolbarFragment implements ReorderableLinearLayout.OnDragListener{
+public class OnboardingProfileSetupFragment extends ToolbarFragment{
 	private Button btn;
 	private View buttonBar;
 	private String accountID;
@@ -43,9 +49,9 @@ public class OnboardingProfileSetupFragment extends ToolbarFragment implements R
 	private ScrollView scroller;
 	private EditText nameEdit, bioEdit;
 	private ImageView avaImage, coverImage;
-	private Button addRow;
-	private ReorderableLinearLayout profileFieldsLayout;
 	private Uri avatarUri, coverUri;
+	private LinearLayout scrollContent;
+	private CheckableListItem<Void> discoverableItem;
 
 	private static final int AVATAR_RESULT=348;
 	private static final int COVER_RESULT=183;
@@ -73,8 +79,6 @@ public class OnboardingProfileSetupFragment extends ToolbarFragment implements R
 		bioEdit=view.findViewById(R.id.bio);
 		avaImage=view.findViewById(R.id.avatar);
 		coverImage=view.findViewById(R.id.header);
-		addRow=view.findViewById(R.id.add_row);
-		profileFieldsLayout=view.findViewById(R.id.profile_fields);
 
 		btn=view.findViewById(R.id.btn_next);
 		btn.setOnClickListener(v->onButtonClick());
@@ -86,31 +90,20 @@ public class OnboardingProfileSetupFragment extends ToolbarFragment implements R
 		Account account=AccountSessionManager.getInstance().getAccount(accountID).self;
 		if(savedInstanceState==null){
 			nameEdit.setText(account.displayName);
-			makeFieldsRow();
-		}else{
-			ArrayList<String> fieldTitles=savedInstanceState.getStringArrayList("fieldTitles");
-			ArrayList<String> fieldValues=savedInstanceState.getStringArrayList("fieldValues");
-			for(int i=0;i<fieldTitles.size();i++){
-				View row=makeFieldsRow();
-				EditText title=row.findViewById(R.id.title);
-				EditText content=row.findViewById(R.id.content);
-				title.setText(fieldTitles.get(i));
-				content.setText(fieldValues.get(i));
-			}
-			if(fieldTitles.size()==4)
-				addRow.setVisibility(View.GONE);
 		}
 
-		addRow.setOnClickListener(v->{
-			makeFieldsRow();
-			if(profileFieldsLayout.getChildCount()==4){
-				addRow.setVisibility(View.GONE);
-			}
-		});
-		profileFieldsLayout.setDragListener(this);
 		avaImage.setOnClickListener(v->startActivityForResult(UiUtils.getMediaPickerIntent(new String[]{"image/*"}, 1), AVATAR_RESULT));
 		coverImage.setOnClickListener(v->startActivityForResult(UiUtils.getMediaPickerIntent(new String[]{"image/*"}, 1), COVER_RESULT));
 
+		scrollContent=view.findViewById(R.id.scrollable_content);
+		discoverableItem=new CheckableListItem<>(R.string.make_profile_discoverable, 0, CheckableListItem.Style.SWITCH_SEPARATED, true, R.drawable.ic_campaign_24px, item->showDiscoverabilityAlert());
+		GenericListItemsAdapter<Void> fakeAdapter=new GenericListItemsAdapter<>(List.of(discoverableItem));
+		ListItemViewHolder<?> holder=fakeAdapter.onCreateViewHolder(scrollContent, fakeAdapter.getItemViewType(0));
+		fakeAdapter.bindViewHolder(holder, 0);
+		holder.itemView.setBackground(UiUtils.getThemeDrawable(getActivity(), android.R.attr.selectableItemBackground));
+		holder.itemView.setOnClickListener(v->holder.onClick());
+		scrollContent.addView(holder.itemView);
+
 		return view;
 	}
 
@@ -129,17 +122,8 @@ public class OnboardingProfileSetupFragment extends ToolbarFragment implements R
 	}
 
 	protected void onButtonClick(){
-		ArrayList<AccountField> fields=new ArrayList<>();
-		for(int i=0;i<profileFieldsLayout.getChildCount();i++){
-			View row=profileFieldsLayout.getChildAt(i);
-			EditText title=row.findViewById(R.id.title);
-			EditText content=row.findViewById(R.id.content);
-			AccountField fld=new AccountField();
-			fld.name=title.getText().toString();
-			fld.value=content.getText().toString();
-			fields.add(fld);
-		}
-		new UpdateAccountCredentials(nameEdit.getText().toString(), bioEdit.getText().toString(), avatarUri, coverUri, fields)
+		new UpdateAccountCredentials(nameEdit.getText().toString(), bioEdit.getText().toString(), avatarUri, coverUri, null)
+				.setDiscoverableIndexable(discoverableItem.checked, discoverableItem.checked)
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(Account result){
@@ -163,39 +147,6 @@ public class OnboardingProfileSetupFragment extends ToolbarFragment implements R
 		super.onApplyWindowInsets(UiUtils.applyBottomInsetToFixedView(buttonBar, insets));
 	}
 
-	private View makeFieldsRow(){
-		View view=LayoutInflater.from(getActivity()).inflate(R.layout.onboarding_profile_field, profileFieldsLayout, false);
-		profileFieldsLayout.addView(view);
-		view.findViewById(R.id.dragger_thingy).setOnLongClickListener(v->{
-			profileFieldsLayout.startDragging(view);
-			return true;
-		});
-		view.findViewById(R.id.delete).setOnClickListener(v->{
-			profileFieldsLayout.removeView(view);
-			if(addRow.getVisibility()==View.GONE)
-				addRow.setVisibility(View.VISIBLE);
-		});
-		return view;
-	}
-
-	@Override
-	public void onSwapItems(int oldIndex, int newIndex){}
-
-	@Override
-	public void onSaveInstanceState(Bundle outState){
-		super.onSaveInstanceState(outState);
-		ArrayList<String> fieldTitles=new ArrayList<>(), fieldValues=new ArrayList<>();
-		for(int i=0;i<profileFieldsLayout.getChildCount();i++){
-			View row=profileFieldsLayout.getChildAt(i);
-			EditText title=row.findViewById(R.id.title);
-			EditText content=row.findViewById(R.id.content);
-			fieldTitles.add(title.getText().toString());
-			fieldValues.add(content.getText().toString());
-		}
-		outState.putStringArrayList("fieldTitles", fieldTitles);
-		outState.putStringArrayList("fieldValues", fieldValues);
-	}
-
 	@Override
 	public void onActivityResult(int requestCode, int resultCode, Intent data){
 		if(resultCode!=Activity.RESULT_OK)
@@ -215,4 +166,12 @@ public class OnboardingProfileSetupFragment extends ToolbarFragment implements R
 		img.setForeground(null);
 		ViewImageLoader.load(img, null, new UrlImageLoaderRequest(uri, size, size));
 	}
+
+	private void showDiscoverabilityAlert(){
+		new M3AlertDialogBuilder(getActivity())
+				.setTitle(R.string.discoverability)
+				.setMessage(R.string.discoverability_help)
+				.setPositiveButton(R.string.ok, null)
+				.show();
+	}
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/SignupFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/SignupFragment.java
index d457cca1f..26d30ab66 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/SignupFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/SignupFragment.java
@@ -1,18 +1,15 @@
 package org.joinmastodon.android.fragments.onboarding;
 
 import android.app.ProgressDialog;
-import android.graphics.Typeface;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.LocaleList;
 import android.text.Editable;
-import android.text.Html;
-import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.text.style.TypefaceSpan;
-import android.text.style.URLSpan;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -46,10 +43,13 @@ import org.jsoup.select.NodeVisitor;
 import org.parceler.Parcels;
 
 import java.time.ZoneId;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import androidx.annotation.Nullable;
@@ -58,7 +58,6 @@ import me.grishka.appkit.api.APIRequest;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.fragments.ToolbarFragment;
-import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.FragmentRootLinearLayout;
 
 public class SignupFragment extends ToolbarFragment{
@@ -79,6 +78,7 @@ public class SignupFragment extends ToolbarFragment{
 	private ProgressDialog progressDialog;
 	private HashSet<EditText> errorFields=new HashSet<>();
 	private ElevationOnScrollListener onScrollListener;
+	private Set<String> serverSupportedTimezones, serverSupportedLocales;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -87,6 +87,8 @@ public class SignupFragment extends ToolbarFragment{
 		instance=Parcels.unwrap(getArguments().getParcelable("instance"));
 		createAppAndGetToken();
 		setTitle(R.string.signup_title);
+		serverSupportedTimezones=Arrays.stream(getResources().getStringArray(R.array.server_supported_timezones)).collect(Collectors.toSet());
+		serverSupportedLocales=Arrays.stream(getResources().getStringArray(R.array.server_supported_locales)).collect(Collectors.toSet());
 	}
 
 	@Nullable
@@ -190,7 +192,36 @@ public class SignupFragment extends ToolbarFragment{
 			edit.setError(null);
 		}
 		errorFields.clear();
-		new RegisterAccount(username, email, password.getText().toString(), getResources().getConfiguration().locale.getLanguage(), reason.getText().toString(), ZoneId.systemDefault().getId())
+		String locale=null;
+		String timezone=ZoneId.systemDefault().getId();
+
+		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N){
+			LocaleList localeList=getResources().getConfiguration().getLocales();
+			for(int i=0;i<localeList.size();i++){
+				Locale l=localeList.get(i);
+				if(serverSupportedLocales.contains(l.toLanguageTag())){
+					locale=l.toLanguageTag();
+					break;
+				}else if(serverSupportedLocales.contains(l.getLanguage())){
+					locale=l.getLanguage();
+					break;
+				}
+			}
+		}else{
+			Locale l=getResources().getConfiguration().locale;
+			if(serverSupportedLocales.contains(l.toLanguageTag())){
+				locale=l.toLanguageTag();
+			}else if(serverSupportedLocales.contains(l.getLanguage())){
+				locale=l.getLanguage();
+			}
+		}
+
+		if(!serverSupportedTimezones.contains(timezone))
+			timezone=null;
+
+		String inviteCode=getArguments().getString("inviteCode");
+
+		new RegisterAccount(username, email, password.getText().toString(), locale, reason.getText().toString(), timezone, inviteCode)
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(Token result){
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/BaseSettingsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/BaseSettingsFragment.java
index e0ee967be..8f0643841 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/BaseSettingsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/BaseSettingsFragment.java
@@ -12,12 +12,10 @@ import org.joinmastodon.android.model.viewmodel.ListItem;
 import org.joinmastodon.android.ui.BetterItemAnimator;
 import org.joinmastodon.android.ui.DividerItemDecoration;
 import org.joinmastodon.android.ui.adapters.GenericListItemsAdapter;
-import org.joinmastodon.android.ui.viewholders.CheckableListItemViewHolder;
 import org.joinmastodon.android.ui.viewholders.ListItemViewHolder;
 import org.joinmastodon.android.ui.viewholders.SimpleListItemViewHolder;
 
 import androidx.recyclerview.widget.RecyclerView;
-import me.grishka.appkit.utils.V;
 
 public abstract class BaseSettingsFragment<T> extends MastodonRecyclerFragment<ListItem<T>>{
 	protected GenericListItemsAdapter<T> itemsAdapter;
@@ -45,7 +43,7 @@ public abstract class BaseSettingsFragment<T> extends MastodonRecyclerFragment<L
 
 	@Override
 	protected RecyclerView.Adapter<?> getAdapter(){
-		return itemsAdapter=new GenericListItemsAdapter<T>(data);
+		return itemsAdapter=new GenericListItemsAdapter<T>(imgLoader, data);
 	}
 
 	@Override
@@ -59,12 +57,13 @@ public abstract class BaseSettingsFragment<T> extends MastodonRecyclerFragment<L
 		return 0;
 	}
 
-	protected void toggleCheckableItem(CheckableListItem<T> item){
-		item.toggle();
+	protected void toggleCheckableItem(ListItem<?> item){
+		if(item instanceof CheckableListItem<?> checkable)
+			checkable.toggle();
 		rebindItem(item);
 	}
 
-	protected void rebindItem(ListItem<T> item){
+	protected void rebindItem(ListItem<?> item){
 		if(list==null)
 			return;
 		if(list.findViewHolderForAdapterPosition(indexOfItemsAdapter()+data.indexOf(item)) instanceof ListItemViewHolder<?> holder){
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java
index acfb37cb7..6bd3a77b8 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java
@@ -1,6 +1,9 @@
 package org.joinmastodon.android.fragments.settings;
 
 import android.app.Activity;
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Gravity;
@@ -18,6 +21,7 @@ import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.HasAccountID;
 import org.joinmastodon.android.model.viewmodel.CheckableListItem;
 import org.joinmastodon.android.model.viewmodel.ListItem;
+import org.joinmastodon.android.ui.Snackbar;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.updater.GithubSelfUpdater;
 
@@ -106,6 +110,14 @@ public class SettingsAboutAppFragment extends BaseSettingsFragment<Void> impleme
 		versionInfo.setTextColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Outline));
 		versionInfo.setGravity(Gravity.CENTER);
 		versionInfo.setText(getString(R.string.mo_settings_app_version, BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE));
+		versionInfo.setOnClickListener(v->{
+			getActivity().getSystemService(ClipboardManager.class).setPrimaryClip(ClipData.newPlainText("", BuildConfig.VERSION_NAME+" ("+BuildConfig.VERSION_CODE+")"));
+			if(Build.VERSION.SDK_INT<=Build.VERSION_CODES.S_V2){
+				new Snackbar.Builder(getActivity())
+						.setText(R.string.app_version_copied)
+						.show();
+			}
+		});
 		adapter.addAdapter(new SingleViewRecyclerAdapter(versionInfo));
 
 		return adapter;
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsDebugFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsDebugFragment.java
index bc3b59496..f67af8a72 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsDebugFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsDebugFragment.java
@@ -1,10 +1,9 @@
 package org.joinmastodon.android.fragments.settings;
 
-import android.content.Context;
-import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.widget.Toast;
 
-import org.joinmastodon.android.MastodonApp;
+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.api.session.AccountActivationInfo;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
@@ -28,7 +27,8 @@ public class SettingsDebugFragment extends BaseSettingsFragment<Void>{
 				new ListItem<>("Test email confirmation flow", null, this::onTestEmailConfirmClick),
 				selfUpdateItem=new ListItem<>("Force self-update", null, this::onForceSelfUpdateClick),
 				resetUpdateItem=new ListItem<>("Reset self-updater", null, this::onResetUpdaterClick),
-				new ListItem<>("Reset search info banners", null, this::onResetDiscoverBannersClick)
+				new ListItem<>("Reset search info banners", null, this::onResetDiscoverBannersClick),
+				new ListItem<>("Reset pre-reply sheets", null, this::onResetPreReplySheetsClick)
 		));
 		if(!GithubSelfUpdater.needSelfUpdating()){
 			resetUpdateItem.isEnabled=selfUpdateItem.isEnabled=false;
@@ -65,6 +65,12 @@ public class SettingsDebugFragment extends BaseSettingsFragment<Void>{
 		restartUI();
 	}
 
+	private void onResetPreReplySheetsClick(ListItem<?> item){
+		// TODO fix this
+//		GlobalUserPreferences.resetPreReplySheets();
+		Toast.makeText(getActivity(), "Pre-reply sheets were reset", Toast.LENGTH_SHORT).show();
+	}
+
 	private void restartUI(){
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java
index c126c3986..20142ebbd 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java
@@ -1,6 +1,5 @@
 package org.joinmastodon.android.fragments.settings;
 
-import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
@@ -18,7 +17,7 @@ import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.SelfUpdateStateChangedEvent;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.viewmodel.ListItem;
-import org.joinmastodon.android.ui.AccountSwitcherSheet;
+import org.joinmastodon.android.ui.sheets.AccountSwitcherSheet;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.utils.HideableSingleViewRecyclerAdapter;
 import org.joinmastodon.android.ui.utils.UiUtils;
diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/Card.java b/mastodon/src/main/java/org/joinmastodon/android/model/Card.java
index de4554ca9..0f197ab33 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/model/Card.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/Card.java
@@ -12,6 +12,7 @@ import org.joinmastodon.android.ui.utils.BlurHashDecoder;
 import org.joinmastodon.android.ui.utils.BlurHashDrawable;
 import org.parceler.Parcel;
 
+import java.time.Instant;
 import java.util.List;
 
 @Parcel
@@ -35,11 +36,14 @@ public class Card extends BaseModel{
 	public String embedUrl;
 	public String blurhash;
 	public List<History> history;
+	public Instant publishedAt;
 
 	public transient Drawable blurhashPlaceholder;
 
 	@Override
 	public void postprocess() throws ObjectValidationException{
+		if(type==null)
+			type=Type.LINK;
 		super.postprocess();
 		if(blurhash!=null){
 			Bitmap placeholder=BlurHashDecoder.decode(blurhash, 16, 16);
@@ -72,6 +76,7 @@ public class Card extends BaseModel{
 				", embedUrl='"+embedUrl+'\''+
 				", blurhash='"+blurhash+'\''+
 				", history="+history+
+				", publishedAt="+publishedAt+
 				'}';
 	}
 
diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/DisplayItemsParent.java b/mastodon/src/main/java/org/joinmastodon/android/model/DisplayItemsParent.java
index 911ba1ddc..25e6c408b 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/model/DisplayItemsParent.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/DisplayItemsParent.java
@@ -5,4 +5,8 @@ package org.joinmastodon.android.model;
  */
 public interface DisplayItemsParent{
 	String getID();
+
+	default String getAccountID(){
+		return null;
+	}
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/FollowList.java b/mastodon/src/main/java/org/joinmastodon/android/model/FollowList.java
new file mode 100644
index 000000000..cb6b03c31
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/FollowList.java
@@ -0,0 +1,38 @@
+package org.joinmastodon.android.model;
+
+import androidx.annotation.NonNull;
+
+import com.google.gson.annotations.SerializedName;
+
+import org.joinmastodon.android.api.RequiredField;
+import org.parceler.Parcel;
+
+@Parcel
+public class FollowList extends BaseModel {
+    @RequiredField
+    public String id;
+    @RequiredField
+    public String title;
+    public RepliesPolicy repliesPolicy;
+    public boolean exclusive;
+
+    @NonNull
+    @Override
+    public String toString() {
+        return "List{" +
+                "id='" + id + '\'' +
+                ", title='" + title + '\'' +
+                ", repliesPolicy=" + repliesPolicy +
+                ", exclusive=" + exclusive +
+                '}';
+    }
+
+    public enum RepliesPolicy{
+        @SerializedName("followed")
+        FOLLOWED,
+        @SerializedName("list")
+        LIST,
+        @SerializedName("none")
+        NONE
+    }
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/Hashtag.java b/mastodon/src/main/java/org/joinmastodon/android/model/Hashtag.java
index 0566ea85f..d5f923533 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/model/Hashtag.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/Hashtag.java
@@ -46,4 +46,8 @@ public class Hashtag extends BaseModel implements DisplayItemsParent{
 	public int hashCode(){
 		return name.hashCode();
 	}
+
+	public int getWeekPosts(){
+		return history.stream().mapToInt(h->h.uses).sum();
+	}
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/HeaderPaginationList.java b/mastodon/src/main/java/org/joinmastodon/android/model/HeaderPaginationList.java
index 10390e316..37c56e931 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/model/HeaderPaginationList.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/HeaderPaginationList.java
@@ -21,4 +21,10 @@ public class HeaderPaginationList<T> extends ArrayList<T>{
 	public HeaderPaginationList(@NonNull Collection<? extends T> c){
 		super(c);
 	}
+
+	public String getNextPageMaxID(){
+		if(nextPageUri==null)
+			return null;
+		return nextPageUri.getQueryParameter("max_id");
+	}
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/Notification.java b/mastodon/src/main/java/org/joinmastodon/android/model/Notification.java
index b4340fd09..3353eea9c 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/model/Notification.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/Notification.java
@@ -36,6 +36,11 @@ public class Notification extends BaseModel implements DisplayItemsParent{
 		return id;
 	}
 
+	@Override
+	public String getAccountID(){
+		return status!=null ? account.id : null;
+	}
+
 	public enum Type{
 		@SerializedName("follow")
 		FOLLOW,
diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/SearchResult.java b/mastodon/src/main/java/org/joinmastodon/android/model/SearchResult.java
index 6e4f4a2ed..f56b757ea 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/model/SearchResult.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/SearchResult.java
@@ -34,10 +34,18 @@ public class SearchResult extends BaseModel implements DisplayItemsParent{
 		generateID();
 	}
 
+	@Override
 	public String getID(){
 		return id;
 	}
 
+	@Override
+	public String getAccountID(){
+		if(type==Type.STATUS)
+			return status.getAccountID();
+		return null;
+	}
+
 	@Override
 	public void postprocess() throws ObjectValidationException{
 		super.postprocess();
diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/Status.java b/mastodon/src/main/java/org/joinmastodon/android/model/Status.java
index eec327e16..83ebe6ff6 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/model/Status.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/Status.java
@@ -55,7 +55,7 @@ public class Status extends BaseModel implements DisplayItemsParent, Searchable{
 	public StatusPrivacy visibility;
 	public boolean sensitive;
 	@RequiredField
-	public String spoilerText;
+	public String spoilerText="";
 	public List<Attachment> mediaAttachments;
 	public Application application;
 	@RequiredField
@@ -186,6 +186,11 @@ public class Status extends BaseModel implements DisplayItemsParent, Searchable{
 		return id;
 	}
 
+	@Override
+	public String getAccountID(){
+		return getContentStatus().account.id;
+	}
+
 	public void update(StatusCountersUpdatedEvent ev){
 		favouritesCount=ev.favorites;
 		reblogsCount=ev.reblogs;
@@ -225,7 +230,10 @@ public class Status extends BaseModel implements DisplayItemsParent, Searchable{
 	@NonNull
 	@Override
 	public Status clone(){
-		return (Status) super.clone();
+		Status copy=(Status) super.clone();
+		copy.spoilerRevealed=false;
+		copy.translationState=TranslationState.HIDDEN;
+		return copy;
 	}
 
 	public static final Pattern BOTTOM_TEXT_PATTERN = Pattern.compile("(?:[\uD83E\uDEC2\uD83D\uDC96✨\uD83E\uDD7A,]+|❤️)(?:\uD83D\uDC49\uD83D\uDC48(?:[\uD83E\uDEC2\uD83D\uDC96✨\uD83E\uDD7A,]+|❤️))*\uD83D\uDC49\uD83D\uDC48");
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 ec21ded0b..789c1c5c9 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
@@ -9,7 +9,6 @@ import androidx.annotation.DrawableRes;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 
-import org.joinmastodon.android.BuildConfig;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.CustomLocalTimelineFragment;
 import org.joinmastodon.android.api.session.AccountSession;
@@ -53,7 +52,7 @@ public class TimelineDefinition {
         return def;
     }
 
-    public static TimelineDefinition ofList(ListTimeline list) {
+    public static TimelineDefinition ofList(FollowList list) {
         return ofList(list.id, list.title, list.exclusive);
     }
 
diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/viewmodel/AccountViewModel.java b/mastodon/src/main/java/org/joinmastodon/android/model/viewmodel/AccountViewModel.java
index 1614f728f..2df24df8c 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/model/viewmodel/AccountViewModel.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/viewmodel/AccountViewModel.java
@@ -1,5 +1,6 @@
 package org.joinmastodon.android.model.viewmodel;
 
+import android.text.Spannable;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 
@@ -9,6 +10,7 @@ import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.AccountField;
 import org.joinmastodon.android.ui.text.HtmlParser;
+import org.joinmastodon.android.ui.text.LinkSpan;
 import org.joinmastodon.android.ui.utils.CustomEmojiHelper;
 
 import java.util.Collections;
@@ -36,7 +38,7 @@ public class AccountViewModel{
 			parsedName=HtmlParser.parseCustomEmoji(account.getDisplayName(), account.emojis);
 		else
 			parsedName=account.getDisplayName();
-		parsedBio=HtmlParser.parse(account.note, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID);
+		parsedBio=HtmlParser.parse(account.note, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID, account);
 		SpannableStringBuilder ssb=new SpannableStringBuilder(parsedName);
 		ssb.append(parsedBio);
 		emojiHelper.setText(ssb);
@@ -49,4 +51,13 @@ public class AccountViewModel{
 		}
 		this.verifiedLink=verifiedLink;
 	}
+
+	public AccountViewModel stripLinksFromBio(){
+		if(parsedBio instanceof Spannable spannable){
+			for(LinkSpan span:spannable.getSpans(0, spannable.length(), LinkSpan.class)){
+				spannable.removeSpan(span);
+			}
+		}
+		return this;
+	}
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/viewmodel/AvatarPileListItem.java b/mastodon/src/main/java/org/joinmastodon/android/model/viewmodel/AvatarPileListItem.java
new file mode 100644
index 000000000..6839de1d0
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/viewmodel/AvatarPileListItem.java
@@ -0,0 +1,22 @@
+package org.joinmastodon.android.model.viewmodel;
+
+import org.joinmastodon.android.R;
+
+import java.util.List;
+import java.util.function.Consumer;
+
+import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
+
+public class AvatarPileListItem<T> extends ListItem<T>{
+	public List<ImageLoaderRequest> avatars;
+
+	public AvatarPileListItem(String title, String subtitle, List<ImageLoaderRequest> avatars, int iconRes, Consumer<AvatarPileListItem<T>> onClick, T parentObject, boolean dividerAfter){
+		super(title, subtitle, iconRes, (Consumer<ListItem<T>>)(Object)onClick, parentObject, 0, dividerAfter);
+		this.avatars=avatars;
+	}
+
+	@Override
+	public int getItemViewType(){
+		return R.id.list_item_avatar_pile;
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/viewmodel/CheckableListItem.java b/mastodon/src/main/java/org/joinmastodon/android/model/viewmodel/CheckableListItem.java
index 0363f81f5..b8dde665e 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/model/viewmodel/CheckableListItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/viewmodel/CheckableListItem.java
@@ -55,6 +55,7 @@ public class CheckableListItem<T> extends ListItem<T>{
 			case CHECKBOX -> R.id.list_item_checkbox;
 			case RADIO -> R.id.list_item_radio;
 			case SWITCH -> R.id.list_item_switch;
+			case SWITCH_SEPARATED -> R.id.list_item_switch_separated;
 		};
 	}
 
@@ -69,6 +70,7 @@ public class CheckableListItem<T> extends ListItem<T>{
 	public enum Style{
 		CHECKBOX,
 		RADIO,
-		SWITCH
+		SWITCH,
+		SWITCH_SEPARATED
 	}
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/viewmodel/ListItemWithOptionsMenu.java b/mastodon/src/main/java/org/joinmastodon/android/model/viewmodel/ListItemWithOptionsMenu.java
new file mode 100644
index 000000000..7f3f60803
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/viewmodel/ListItemWithOptionsMenu.java
@@ -0,0 +1,35 @@
+package org.joinmastodon.android.model.viewmodel;
+
+import android.view.Menu;
+import android.view.MenuItem;
+
+import org.joinmastodon.android.R;
+
+import java.util.function.Consumer;
+
+public class ListItemWithOptionsMenu<T> extends ListItem<T>{
+	public OptionsMenuListener<T> listener;
+
+	public ListItemWithOptionsMenu(String title, String subtitle, OptionsMenuListener<T> listener, int iconRes, Consumer<ListItemWithOptionsMenu<T>> onClick, T parentObject, boolean dividerAfter){
+		super(title, subtitle, iconRes, (Consumer<ListItem<T>>)(Object)onClick, parentObject, 0, dividerAfter);
+		this.listener=listener;
+	}
+
+	@Override
+	public int getItemViewType(){
+		return R.id.list_item_options;
+	}
+
+	public void performConfigureMenu(Menu menu){
+		listener.onConfigureListItemOptionsMenu(this, menu);
+	}
+
+	public void performItemSelected(MenuItem item){
+		listener.onListItemOptionSelected(this, item);
+	}
+
+	public interface OptionsMenuListener<T>{
+		void onConfigureListItemOptionsMenu(ListItemWithOptionsMenu<T> item, Menu menu);
+		void onListItemOptionSelected(ListItemWithOptionsMenu<T> item, MenuItem menuItem);
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/NonMutualPreReplySheet.java b/mastodon/src/main/java/org/joinmastodon/android/ui/NonMutualPreReplySheet.java
new file mode 100644
index 000000000..a86ba1649
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/NonMutualPreReplySheet.java
@@ -0,0 +1,130 @@
+package org.joinmastodon.android.ui;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.text.TextUtils;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.ui.text.HtmlParser;
+import org.joinmastodon.android.ui.utils.UiUtils;
+
+import androidx.annotation.NonNull;
+import me.grishka.appkit.imageloader.ViewImageLoader;
+import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
+import me.grishka.appkit.utils.V;
+
+public class NonMutualPreReplySheet extends PreReplySheet{
+	private boolean fullBioShown=false;
+
+	@SuppressLint("DefaultLocale")
+	public NonMutualPreReplySheet(@NonNull Context context, ResultListener resultListener, Account account, String accountID){
+		super(context, resultListener);
+		icon.setImageResource(R.drawable.ic_waving_hand_24px);
+		title.setText(R.string.non_mutual_sheet_title);
+		text.setText(R.string.non_mutual_sheet_text);
+
+		LinearLayout userInfo=new LinearLayout(context);
+		userInfo.setOrientation(LinearLayout.HORIZONTAL);
+		userInfo.setBackgroundResource(R.drawable.bg_user_info);
+		UiUtils.setAllPaddings(userInfo, 12);
+
+		ImageView ava=new ImageView(context);
+		ava.setScaleType(ImageView.ScaleType.CENTER_CROP);
+		ava.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
+		ava.setOutlineProvider(OutlineProviders.roundedRect(12));
+		ava.setClipToOutline(true);
+		ava.setForeground(context.getResources().getDrawable(R.drawable.fg_user_info_ava, context.getTheme()));
+		userInfo.addView(ava, UiUtils.makeLayoutParams(56, 56, 0, 0, 12, 0));
+		ViewImageLoader.loadWithoutAnimation(ava, context.getResources().getDrawable(R.drawable.image_placeholder), new UrlImageLoaderRequest(account.avatarStatic, V.dp(56), V.dp(56)));
+
+		LinearLayout nameAndFields=new LinearLayout(context);
+		nameAndFields.setOrientation(LinearLayout.VERTICAL);
+		nameAndFields.setMinimumHeight(V.dp(56));
+		nameAndFields.setGravity(Gravity.CENTER_VERTICAL);
+		userInfo.addView(nameAndFields, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+		TextView name=new TextView(context);
+		name.setSingleLine();
+		name.setEllipsize(TextUtils.TruncateAt.END);
+		name.setTextAppearance(R.style.m3_title_medium);
+		name.setTextColor(UiUtils.getThemeColor(context, R.attr.colorM3OnSurface));
+		if(AccountSessionManager.get(accountID).getLocalPreferences().customEmojiInNames){
+			name.setText(HtmlParser.parseCustomEmoji(account.displayName, account.emojis));
+			UiUtils.loadCustomEmojiInTextView(name);
+		}else{
+			name.setText(account.displayName);
+		}
+		name.setGravity(Gravity.CENTER_VERTICAL | Gravity.START);
+		nameAndFields.addView(name, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, V.dp(24)));
+		if(!TextUtils.isEmpty(account.note)){
+			CharSequence strippedBio=HtmlParser.parseCustomEmoji(HtmlParser.stripAndRemoveInvisibleSpans(account.note), account.emojis);
+			TextView bioShort=new TextView(context);
+			bioShort.setTextAppearance(R.style.m3_body_medium);
+			bioShort.setTextColor(UiUtils.getThemeColor(context, R.attr.colorM3Secondary));
+			bioShort.setMaxLines(2);
+			bioShort.setEllipsize(TextUtils.TruncateAt.END);
+			bioShort.setText(strippedBio);
+			nameAndFields.addView(bioShort, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+
+			TextView bioFull=new TextView(context);
+			bioFull.setTextAppearance(R.style.m3_body_medium);
+			bioFull.setTextColor(UiUtils.getThemeColor(context, R.attr.colorM3Secondary));
+			bioFull.setText(strippedBio);
+			bioFull.setVisibility(View.GONE);
+			nameAndFields.addView(bioFull, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+			nameAndFields.setOnClickListener(v->{
+				UiUtils.beginLayoutTransition((ViewGroup) getWindow().getDecorView());
+				fullBioShown=!fullBioShown;
+				if(fullBioShown){
+					bioFull.setVisibility(View.VISIBLE);
+					bioShort.setVisibility(View.GONE);
+				}else{
+					bioFull.setVisibility(View.GONE);
+					bioShort.setVisibility(View.VISIBLE);
+				}
+			});
+			UiUtils.loadCustomEmojiInTextView(bioShort);
+			UiUtils.loadCustomEmojiInTextView(bioFull);
+		}else{
+			TextView username=new TextView(context);
+			username.setTextAppearance(R.style.m3_body_medium);
+			username.setTextColor(UiUtils.getThemeColor(context, R.attr.colorM3Secondary));
+			username.setSingleLine();
+			username.setEllipsize(TextUtils.TruncateAt.END);
+			username.setText(account.getDisplayUsername());
+			username.setGravity(Gravity.CENTER_VERTICAL | Gravity.START);
+			nameAndFields.addView(username, new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, V.dp(20)));
+		}
+
+		contentWrap.addView(userInfo, UiUtils.makeLayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT, 0, 0, 0, 8));
+
+		for(int i=0;i<3;i++){
+			View item=context.getSystemService(LayoutInflater.class).inflate(R.layout.item_other_numbered_rule, contentWrap, false);
+			TextView number=item.findViewById(R.id.number);
+			number.setText(String.format("%d", i+1));
+			TextView title=item.findViewById(R.id.title);
+			TextView text=item.findViewById(R.id.text);
+			title.setText(switch(i){
+				case 0 -> R.string.non_mutual_title1;
+				case 1 -> R.string.non_mutual_title2;
+				case 2 -> R.string.non_mutual_title3;
+				default -> throw new IllegalStateException("Unexpected value: "+i);
+			});
+			text.setText(switch(i){
+				case 0 -> R.string.non_mutual_text1;
+				case 1 -> R.string.non_mutual_text2;
+				case 2 -> R.string.non_mutual_text3;
+				default -> throw new IllegalStateException("Unexpected value: "+i);
+			});
+			contentWrap.addView(item);
+		}
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/OldPostPreReplySheet.java b/mastodon/src/main/java/org/joinmastodon/android/ui/OldPostPreReplySheet.java
new file mode 100644
index 000000000..6897859cc
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/OldPostPreReplySheet.java
@@ -0,0 +1,23 @@
+package org.joinmastodon.android.ui;
+
+import android.content.Context;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.model.Status;
+
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.temporal.ChronoUnit;
+
+import androidx.annotation.NonNull;
+
+public class OldPostPreReplySheet extends PreReplySheet{
+	public OldPostPreReplySheet(@NonNull Context context, ResultListener resultListener, Status status){
+		super(context, resultListener);
+		int months=(int)status.createdAt.atZone(ZoneId.systemDefault()).until(ZonedDateTime.now(), ChronoUnit.MONTHS);
+		String monthsStr=months>24 ? context.getString(R.string.more_than_two_years) : context.getResources().getQuantityString(R.plurals.x_months, months, months);
+		title.setText(context.getString(R.string.old_post_sheet_title, monthsStr));
+		text.setText(R.string.old_post_sheet_text);
+		icon.setImageResource(R.drawable.ic_fluent_clock_24_regular);
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/PreReplySheet.java b/mastodon/src/main/java/org/joinmastodon/android/ui/PreReplySheet.java
new file mode 100644
index 000000000..2fb3c9a7a
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/PreReplySheet.java
@@ -0,0 +1,54 @@
+package org.joinmastodon.android.ui;
+
+import android.content.Context;
+import android.graphics.drawable.ColorDrawable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.ui.utils.UiUtils;
+
+import androidx.annotation.NonNull;
+import me.grishka.appkit.views.BottomSheet;
+
+public abstract class PreReplySheet extends BottomSheet{
+	protected ImageView icon;
+	protected TextView title, text;
+	protected Button gotItButton, dontRemindButton;
+	protected LinearLayout contentWrap;
+
+	public PreReplySheet(@NonNull Context context, ResultListener resultListener){
+		super(context);
+
+		View content=context.getSystemService(LayoutInflater.class).inflate(R.layout.sheet_pre_reply, null);
+		setContentView(content);
+
+		setNavigationBarBackground(new ColorDrawable(UiUtils.alphaBlendColors(UiUtils.getThemeColor(context, R.attr.colorM3Surface),
+				UiUtils.getThemeColor(context, R.attr.colorM3Primary), 0.05f)), !UiUtils.isDarkTheme());
+
+		icon=findViewById(R.id.icon);
+		title=findViewById(R.id.title);
+		text=findViewById(R.id.text);
+		gotItButton=findViewById(R.id.btn_got_it);
+		dontRemindButton=findViewById(R.id.btn_dont_remind_again);
+		contentWrap=findViewById(R.id.content_wrap);
+
+		gotItButton.setOnClickListener(v->{
+			dismiss();
+			resultListener.onButtonClicked(false);
+		});
+		dontRemindButton.setOnClickListener(v->{
+			dismiss();
+			resultListener.onButtonClicked(true);
+		});
+	}
+
+	@FunctionalInterface
+	public interface ResultListener{
+		void onButtonClicked(boolean notAgain);
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/SearchViewHelper.java b/mastodon/src/main/java/org/joinmastodon/android/ui/SearchViewHelper.java
index 96d4c5480..53e4fd75c 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/SearchViewHelper.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/SearchViewHelper.java
@@ -48,7 +48,7 @@ public class SearchViewHelper{
 		searchEdit.setPadding(0, 0, 0, 0);
 		searchEdit.addTextChangedListener(new SimpleTextWatcher(e->{
 			searchEdit.removeCallbacks(debouncer);
-			searchEdit.postDelayed(debouncer, 300);
+			searchEdit.postDelayed(debouncer, 500);
 			boolean newIsEmpty=e.length()==0;
 			if(isEmpty!=newIsEmpty){
 				isEmpty=newIsEmpty;
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/Snackbar.java b/mastodon/src/main/java/org/joinmastodon/android/ui/Snackbar.java
new file mode 100644
index 000000000..7ee499756
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/Snackbar.java
@@ -0,0 +1,217 @@
+package org.joinmastodon.android.ui;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
+import android.content.Context;
+import android.content.res.ColorStateList;
+import android.graphics.Outline;
+import android.graphics.PixelFormat;
+import android.text.TextUtils;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewOutlineProvider;
+import android.view.ViewTreeObserver;
+import android.view.WindowManager;
+import android.view.animation.AnimationUtils;
+import android.widget.Button;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.ui.utils.UiUtils;
+
+import androidx.annotation.Keep;
+import androidx.annotation.StringRes;
+import me.grishka.appkit.utils.CubicBezierInterpolator;
+import me.grishka.appkit.utils.V;
+
+public class Snackbar{
+	private static Snackbar current;
+
+	private final Context context;
+	private int bottomOffset;
+	private FrameLayout windowView;
+	private LinearLayout contentView;
+	private boolean hasAction;
+	private AnimatableOutlineProvider outlineProvider;
+	private Animator currentAnim;
+	private Runnable dismissRunnable=this::dismiss;
+
+	private Snackbar(Context context, String text, String action, Runnable onActionClick, int bottomOffset){
+		this.context=context;
+		this.bottomOffset=bottomOffset;
+		hasAction=onActionClick!=null;
+
+		windowView=new FrameLayout(context);
+		windowView.setClipToPadding(false);
+		contentView=new LinearLayout(context);
+		contentView.setOrientation(LinearLayout.HORIZONTAL);
+		contentView.setBaselineAligned(false);
+		contentView.setBackgroundColor(UiUtils.getThemeColor(context, R.attr.colorM3SurfaceInverse));
+		contentView.setOutlineProvider(outlineProvider=new AnimatableOutlineProvider(contentView));
+		contentView.setClipToOutline(true);
+		contentView.setElevation(V.dp(6));
+		contentView.setPaddingRelative(V.dp(16), 0, V.dp(8), 0);
+		FrameLayout.LayoutParams lp=new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+		lp.leftMargin=lp.topMargin=lp.rightMargin=lp.bottomMargin=V.dp(16);
+		windowView.addView(contentView, lp);
+
+		TextView textView=new TextView(context);
+		textView.setTextAppearance(R.style.m3_body_medium);
+		textView.setTextColor(UiUtils.getThemeColor(context, R.attr.colorM3OnSurfaceInverse));
+		textView.setMaxLines(2);
+		textView.setEllipsize(TextUtils.TruncateAt.END);
+		textView.setText(text);
+		textView.setMinHeight(V.dp(48));
+		textView.setGravity(Gravity.CENTER_VERTICAL | Gravity.START);
+		textView.setPadding(0, V.dp(14), 0, V.dp(14));
+		contentView.addView(textView, new LinearLayout.LayoutParams(0, ViewGroup.LayoutParams.WRAP_CONTENT, 1f));
+
+		if(action!=null){
+			Button button=new Button(context);
+			int primaryInverse=UiUtils.getThemeColor(context, R.attr.colorM3PrimaryInverse);
+			button.setTextColor(primaryInverse);
+			button.setBackgroundResource(R.drawable.bg_rect_4dp_ripple);
+			button.setBackgroundTintList(ColorStateList.valueOf(primaryInverse));
+			button.setText(action);
+			button.setPadding(V.dp(8), 0, V.dp(8), 0);
+			button.setOnClickListener(v->onActionClick.run());
+			LinearLayout.LayoutParams blp=new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, V.dp(40));
+			blp.leftMargin=blp.topMargin=blp.rightMargin=blp.bottomMargin=V.dp(4);
+			contentView.addView(button, blp);
+		}
+	}
+
+	public void show(){
+		if(current!=null)
+			current.dismiss();
+		current=this;
+		WindowManager.LayoutParams lp=new WindowManager.LayoutParams(WindowManager.LayoutParams.TYPE_APPLICATION_PANEL, WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN, PixelFormat.TRANSLUCENT);
+		lp.width=ViewGroup.LayoutParams.MATCH_PARENT;
+		lp.height=ViewGroup.LayoutParams.WRAP_CONTENT;
+		lp.gravity=Gravity.BOTTOM;
+		lp.y=bottomOffset;
+		WindowManager wm=context.getSystemService(WindowManager.class);
+		wm.addView(windowView, lp);
+		windowView.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener(){
+			@Override
+			public boolean onPreDraw(){
+				windowView.getViewTreeObserver().removeOnPreDrawListener(this);
+
+				AnimatorSet set=new AnimatorSet();
+				set.playTogether(
+						ObjectAnimator.ofFloat(outlineProvider, "fraction", 0, 1),
+						ObjectAnimator.ofFloat(contentView, View.ALPHA, 0, 1)
+				);
+				set.setInterpolator(AnimationUtils.loadInterpolator(context, R.interpolator.m3_sys_motion_easing_standard_decelerate));
+				set.setDuration(350);
+				set.addListener(new AnimatorListenerAdapter(){
+					@Override
+					public void onAnimationEnd(Animator animation){
+						currentAnim=null;
+					}
+				});
+				currentAnim=set;
+				set.start();
+
+				return true;
+			}
+		});
+		windowView.postDelayed(dismissRunnable, 4000);
+	}
+
+	public void dismiss(){
+		current=null;
+		if(currentAnim!=null){
+			currentAnim.cancel();
+		}
+		windowView.removeCallbacks(dismissRunnable);
+		ObjectAnimator anim=ObjectAnimator.ofFloat(contentView, View.ALPHA, 0);
+		anim.setInterpolator(CubicBezierInterpolator.DEFAULT);
+		anim.setDuration(200);
+		anim.addListener(new AnimatorListenerAdapter(){
+			@Override
+			public void onAnimationEnd(Animator animation){
+				WindowManager wm=context.getSystemService(WindowManager.class);
+				wm.removeView(windowView);
+			}
+		});
+		anim.start();
+	}
+
+	private static class AnimatableOutlineProvider extends ViewOutlineProvider{
+		private float fraction=1f;
+		private final View view;
+
+		private AnimatableOutlineProvider(View view){
+			this.view=view;
+		}
+
+		@Override
+		public void getOutline(View view, Outline outline){
+			outline.setRoundRect(0, Math.round(view.getHeight()*(1f-fraction)), view.getWidth(), view.getHeight(), V.dp(4));
+		}
+
+		@Keep
+		public float getFraction(){
+			return fraction;
+		}
+
+		@Keep
+		public void setFraction(float fraction){
+			this.fraction=fraction;
+			view.invalidateOutline();
+		}
+	}
+
+	public static class Builder{
+		private final Context context;
+		private String text;
+		private String action;
+		private Runnable onActionClick;
+		private int bottomOffset;
+
+		public Builder(Context context){
+			this.context=context;
+		}
+
+		public Builder setText(String text){
+			this.text=text;
+			return this;
+		}
+
+		public Builder setText(@StringRes int res){
+			text=context.getString(res);
+			return this;
+		}
+
+		public Builder setAction(String action, Runnable onActionClick){
+			this.action=action;
+			this.onActionClick=onActionClick;
+			return this;
+		}
+
+		public Builder setAction(@StringRes int action, Runnable onActionClick){
+			this.action=context.getString(action);
+			this.onActionClick=onActionClick;
+			return this;
+		}
+
+		public Builder setBottomOffset(int offset){
+			bottomOffset=offset;
+			return this;
+		}
+
+		public Snackbar create(){
+			return new Snackbar(context, text, action, onActionClick, bottomOffset);
+		}
+
+		public void show(){
+			create().show();
+		}
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/adapters/GenericListItemsAdapter.java b/mastodon/src/main/java/org/joinmastodon/android/ui/adapters/GenericListItemsAdapter.java
index d5b5655b8..bd057a428 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/adapters/GenericListItemsAdapter.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/adapters/GenericListItemsAdapter.java
@@ -3,9 +3,12 @@ package org.joinmastodon.android.ui.adapters;
 import android.view.ViewGroup;
 
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.model.viewmodel.AvatarPileListItem;
 import org.joinmastodon.android.model.viewmodel.ListItem;
+import org.joinmastodon.android.ui.viewholders.AvatarPileListItemViewHolder;
 import org.joinmastodon.android.ui.viewholders.CheckboxOrRadioListItemViewHolder;
 import org.joinmastodon.android.ui.viewholders.ListItemViewHolder;
+import org.joinmastodon.android.ui.viewholders.OptionsListItemViewHolder;
 import org.joinmastodon.android.ui.viewholders.SimpleListItemViewHolder;
 import org.joinmastodon.android.ui.viewholders.SwitchListItemViewHolder;
 
@@ -13,11 +16,21 @@ import java.util.List;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
+import me.grishka.appkit.imageloader.ImageLoaderRecyclerAdapter;
+import me.grishka.appkit.imageloader.ListImageLoaderWrapper;
+import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
+import me.grishka.appkit.views.UsableRecyclerView;
 
-public class GenericListItemsAdapter<T> extends RecyclerView.Adapter<ListItemViewHolder<?>>{
+public class GenericListItemsAdapter<T> extends UsableRecyclerView.Adapter<ListItemViewHolder<?>> implements ImageLoaderRecyclerAdapter{
 	private List<ListItem<T>> items;
 
 	public GenericListItemsAdapter(List<ListItem<T>> items){
+		super(null);
+		this.items=items;
+	}
+
+	public GenericListItemsAdapter(ListImageLoaderWrapper imgLoader, List<ListItem<T>> items){
+		super(imgLoader);
 		this.items=items;
 	}
 
@@ -26,12 +39,16 @@ public class GenericListItemsAdapter<T> extends RecyclerView.Adapter<ListItemVie
 	public ListItemViewHolder<?> onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
 		if(viewType==R.id.list_item_simple || viewType==R.id.list_item_simple_tinted)
 			return new SimpleListItemViewHolder(parent.getContext(), parent);
-		if(viewType==R.id.list_item_switch)
-			return new SwitchListItemViewHolder(parent.getContext(), parent);
+		if(viewType==R.id.list_item_switch || viewType==R.id.list_item_switch_separated)
+			return new SwitchListItemViewHolder(parent.getContext(), parent, viewType==R.id.list_item_switch_separated);
 		if(viewType==R.id.list_item_checkbox)
 			return new CheckboxOrRadioListItemViewHolder(parent.getContext(), parent, false);
 		if(viewType==R.id.list_item_radio)
 			return new CheckboxOrRadioListItemViewHolder(parent.getContext(), parent, true);
+		if(viewType==R.id.list_item_options)
+			return new OptionsListItemViewHolder(parent.getContext(), parent);
+		if(viewType==R.id.list_item_avatar_pile)
+			return new AvatarPileListItemViewHolder(parent.getContext(), parent);
 
 		throw new IllegalArgumentException("Unexpected view type "+viewType);
 	}
@@ -51,4 +68,20 @@ public class GenericListItemsAdapter<T> extends RecyclerView.Adapter<ListItemVie
 	public int getItemViewType(int position){
 		return items.get(position).getItemViewType();
 	}
+
+	@Override
+	public int getImageCountForItem(int position){
+		ListItem<?> item=items.get(position);
+		if(item instanceof AvatarPileListItem<?> avatarPileListItem)
+			return avatarPileListItem.avatars.size();
+		return 0;
+	}
+
+	@Override
+	public ImageLoaderRequest getImageRequest(int position, int image){
+		ListItem<?> item=items.get(position);
+		if(item instanceof AvatarPileListItem<?> avatarPileListItem)
+			return avatarPileListItem.avatars.get(image);
+		return null;
+	}
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java
index c851a9e07..8d623262a 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java
@@ -2,16 +2,20 @@ package org.joinmastodon.android.ui.displayitems;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.graphics.Typeface;
+import android.os.Build;
 import android.os.Bundle;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.style.ForegroundColorSpan;
+import android.text.style.StyleSpan;
 import android.text.style.TypefaceSpan;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
@@ -20,26 +24,34 @@ import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.fragments.StatusEditHistoryFragment;
+import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.fragments.account_list.StatusFavoritesListFragment;
 import org.joinmastodon.android.fragments.account_list.StatusReblogsListFragment;
 import org.joinmastodon.android.fragments.account_list.StatusRelatedAccountListFragment;
 import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.ui.Snackbar;
 import org.joinmastodon.android.model.StatusPrivacy;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.parceler.Parcels;
 
+import java.time.LocalDate;
 import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.FormatStyle;
 import java.util.Locale;
 
 import androidx.annotation.PluralsRes;
+import androidx.annotation.StringRes;
 import me.grishka.appkit.Nav;
+import me.grishka.appkit.utils.V;
 
 public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{
 	public final String accountID;
 
-	private static final DateTimeFormatter TIME_FORMATTER=DateTimeFormatter.ofLocalizedDateTime(FormatStyle.LONG, FormatStyle.SHORT);
+	private static final DateTimeFormatter TIME_FORMATTER=DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT);
+	private static final DateTimeFormatter TIME_FORMATTER_LONG=DateTimeFormatter.ofLocalizedTime(FormatStyle.MEDIUM);
+	private static final DateTimeFormatter DATE_FORMATTER=DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM);
 
 	public ExtendedFooterStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, String accountID, Status status){
 		super(parentID, parentFragment);
@@ -53,8 +65,8 @@ public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{
 	}
 
 	public static class Holder extends StatusDisplayItem.Holder<ExtendedFooterStatusDisplayItem>{
-		private final TextView time;
-		private final Button favorites, reblogs, editHistory, applicationName;
+		private final TextView time, date, app, dateAppSeparator;
+		private final TextView favorites, reblogs, editHistory;
 		private final ImageView visibility;
 		private final Context context;
 
@@ -64,45 +76,50 @@ public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{
 			reblogs=findViewById(R.id.reblogs);
 			favorites=findViewById(R.id.favorites);
 			editHistory=findViewById(R.id.edit_history);
-			applicationName=findViewById(R.id.application_name);
+			time=findViewById(R.id.time);
+			date=findViewById(R.id.date);
+			app=findViewById(R.id.app_name);
 			visibility=findViewById(R.id.visibility);
-			time=findViewById(R.id.timestamp);
+			dateAppSeparator=findViewById(R.id.date_app_separator);
 
 			reblogs.setOnClickListener(v->startAccountListFragment(StatusReblogsListFragment.class));
 			favorites.setOnClickListener(v->startAccountListFragment(StatusFavoritesListFragment.class));
 			editHistory.setOnClickListener(v->startEditHistoryFragment());
+			time.setOnClickListener(v->showTimeSnackbar());
+			app.setOnClickListener(v->UiUtils.launchWebBrowser(context, item.status.application.website));
 		}
 
 		@SuppressLint("DefaultLocale")
 		@Override
 		public void onBind(ExtendedFooterStatusDisplayItem item){
 			Status s=item.status;
-			favorites.setCompoundDrawablesRelativeWithIntrinsicBounds(GlobalUserPreferences.likeIcon ? R.drawable.ic_fluent_heart_20_regular : R.drawable.ic_fluent_star_20_regular, 0, 0, 0);
-			favorites.setText(context.getResources().getQuantityString(R.plurals.x_favorites, (int)(s.favouritesCount%1000), s.favouritesCount));
-			reblogs.setText(context.getResources().getQuantityString(R.plurals.x_reblogs, (int) (s.reblogsCount % 1000), s.reblogsCount));
-			reblogs.setVisibility(s.visibility != StatusPrivacy.DIRECT ? View.VISIBLE : View.GONE);
-
+			favorites.setText(getFormattedPlural(R.plurals.x_favorites, item.status.favouritesCount));
+			reblogs.setText(getFormattedPlural(R.plurals.x_reblogs, item.status.reblogsCount));
 			if(s.editedAt!=null){
 				editHistory.setVisibility(View.VISIBLE);
-				editHistory.setText(UiUtils.formatRelativeTimestampAsMinutesAgo(itemView.getContext(), s.editedAt, false));
+				ZonedDateTime dt=s.editedAt.atZone(ZoneId.systemDefault());
+				String time=TIME_FORMATTER.format(dt);
+				if(!dt.toLocalDate().equals(LocalDate.now())){
+					time+=" · "+DATE_FORMATTER.format(dt);
+				}
+				editHistory.setText(getFormattedSubstitutedString(R.string.last_edit_at_x, time));
 			}else{
 				editHistory.setVisibility(View.GONE);
 			}
-			String timeStr=item.status.createdAt != null ? TIME_FORMATTER.format(item.status.createdAt.atZone(ZoneId.systemDefault())) : null;
-			
-			if (item.status.application!=null && !TextUtils.isEmpty(item.status.application.name)) {
-				time.setText(timeStr != null ? item.parentFragment.getString(R.string.timestamp_via_app, timeStr, "") : "");
-				applicationName.setText(item.status.application.name);
-				if (item.status.application.website != null && item.status.application.website.toLowerCase().startsWith("https://")) {
-					applicationName.setOnClickListener(e -> UiUtils.openURL(context, null, item.status.application.website));
-				} else {
-					applicationName.setEnabled(false);
-				}
-			} else {
-				time.setText(timeStr);
-				applicationName.setVisibility(View.GONE);
+			ZonedDateTime dt=item.status.createdAt.atZone(ZoneId.systemDefault());
+			time.setText(TIME_FORMATTER.format(dt));
+			date.setText(DATE_FORMATTER.format(dt));
+			if(item.status.application!=null && !TextUtils.isEmpty(item.status.application.name)){
+				app.setVisibility(View.VISIBLE);
+				dateAppSeparator.setVisibility(View.VISIBLE);
+				app.setText(item.status.application.name);
+				app.setEnabled(!TextUtils.isEmpty(item.status.application.website));
+			}else{
+				app.setVisibility(View.GONE);
+				dateAppSeparator.setVisibility(View.GONE);
 			}
 
+			//TODO: make a snackbar pop up on hold of this
 			visibility.setImageResource(switch (s.visibility) {
 				case PUBLIC -> R.drawable.ic_fluent_earth_20_regular;
 				case UNLISTED -> R.drawable.ic_fluent_lock_open_20_regular;
@@ -117,14 +134,39 @@ public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{
 			return false;
 		}
 
-		private SpannableStringBuilder getFormattedPlural(@PluralsRes int res, int quantity){
-			String str=item.parentFragment.getResources().getQuantityString(res, quantity, quantity);
+		private SpannableStringBuilder getFormattedPlural(@PluralsRes int res, long quantity){
+			String str=item.parentFragment.getResources().getQuantityString(res, (int)quantity, quantity);
 			String formattedNumber=String.format(Locale.getDefault(), "%,d", quantity);
 			int index=str.indexOf(formattedNumber);
 			SpannableStringBuilder ssb=new SpannableStringBuilder(str);
 			if(index>=0){
-				ssb.setSpan(new TypefaceSpan("sans-serif-medium"), index, index+formattedNumber.length(), 0);
-				ssb.setSpan(new ForegroundColorSpan(UiUtils.getThemeColor(item.parentFragment.getActivity(), android.R.attr.textColorPrimary)), index, index+formattedNumber.length(), 0);
+				ForegroundColorSpan colorSpan=new ForegroundColorSpan(UiUtils.getThemeColor(itemView.getContext(), R.attr.colorM3OnSurfaceVariant));
+				ssb.setSpan(colorSpan, index, index+formattedNumber.length(), 0);
+				Object typefaceSpan;
+				if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.S){
+					typefaceSpan=new TypefaceSpan(Typeface.create(Typeface.DEFAULT, 600, false));
+				}else{
+					typefaceSpan=new StyleSpan(Typeface.BOLD);
+				}
+				ssb.setSpan(typefaceSpan, index, index+formattedNumber.length(), 0);
+			}
+			return ssb;
+		}
+
+		private SpannableStringBuilder getFormattedSubstitutedString(@StringRes int res, String substitution){
+			String str=item.parentFragment.getString(res, substitution);
+			int index=item.parentFragment.getString(res).indexOf("%s");
+			SpannableStringBuilder ssb=new SpannableStringBuilder(str);
+			if(index>=0){
+				ForegroundColorSpan colorSpan=new ForegroundColorSpan(UiUtils.getThemeColor(itemView.getContext(), R.attr.colorM3OnSurfaceVariant));
+				ssb.setSpan(colorSpan, index, index+substitution.length(), 0);
+				Object typefaceSpan;
+				if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.S){
+					typefaceSpan=new TypefaceSpan(Typeface.create(Typeface.DEFAULT, 600, false));
+				}else{
+					typefaceSpan=new StyleSpan(Typeface.BOLD);
+				}
+				ssb.setSpan(typefaceSpan, index, index+substitution.length(), 0);
 			}
 			return ssb;
 		}
@@ -145,5 +187,16 @@ public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{
 			args.putString("url", item.status.url);
 			Nav.go(item.parentFragment.getActivity(), StatusEditHistoryFragment.class, args);
 		}
+
+		private void showTimeSnackbar(){
+			int bottomOffset=0;
+			if(item.parentFragment instanceof ThreadFragment tf){
+				bottomOffset=tf.getSnackbarOffset();
+			}
+			new Snackbar.Builder(itemView.getContext())
+					.setText(itemView.getContext().getString(R.string.posted_at, TIME_FORMATTER_LONG.format(item.status.createdAt.atZone(ZoneId.systemDefault()))))
+					.setBottomOffset(bottomOffset)
+					.show();
+		}
 	}
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/LinkCardStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/LinkCardStatusDisplayItem.java
index c10570454..c06ce66b6 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/LinkCardStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/LinkCardStatusDisplayItem.java
@@ -1,6 +1,8 @@
 package org.joinmastodon.android.ui.displayitems;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
+import android.content.res.ColorStateList;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.text.TextUtils;
@@ -37,7 +39,7 @@ public class LinkCardStatusDisplayItem extends StatusDisplayItem{
 
 	@Override
 	public Type getType(){
-		return Type.CARD;
+		return status.card.type==Card.Type.VIDEO || (status.card.image!=null && status.card.width>status.card.height) ? Type.CARD_LARGE : Type.CARD_COMPACT;
 	}
 
 	@Override
@@ -51,32 +53,54 @@ public class LinkCardStatusDisplayItem extends StatusDisplayItem{
 	}
 
 	public static class Holder extends StatusDisplayItem.Holder<LinkCardStatusDisplayItem> implements ImageLoaderViewHolder{
-		private final TextView title, description, domain;
+		private final TextView title, description, domain, timestamp;
 		private final ImageView photo;
-		private final View inner;
 		private BlurhashCrossfadeDrawable crossfadeDrawable=new BlurhashCrossfadeDrawable();
 		private boolean didClear;
+		private final View inner;
+		private final boolean isLarge;
 
-		public Holder(Context context, ViewGroup parent){
-			super(context, R.layout.display_item_link_card, parent);
+		public Holder(Context context, ViewGroup parent, boolean isLarge){
+			super(context, isLarge ? R.layout.display_item_link_card : R.layout.display_item_link_card_compact, parent);
+			this.isLarge=isLarge;
 			title=findViewById(R.id.title);
 			description=findViewById(R.id.description);
 			domain=findViewById(R.id.domain);
+			timestamp=findViewById(R.id.timestamp);
 			photo=findViewById(R.id.photo);
 			inner=findViewById(R.id.inner);
 			inner.setOnClickListener(this::onClick);
+			inner.setOutlineProvider(OutlineProviders.roundedRect(12));
+			inner.setClipToOutline(true);
 		}
 
+		@SuppressLint("SetTextI18n")
 		@Override
 		public void onBind(LinkCardStatusDisplayItem item){
 			Card card=item.status.card;
 			title.setText(card.title);
-			description.setText(card.description);
-			description.setVisibility(TextUtils.isEmpty(card.description) ? View.GONE : View.VISIBLE);
-			domain.setText(Uri.parse(card.url).getHost());
+			if(description!=null){
+				description.setText(card.description);
+				description.setVisibility(TextUtils.isEmpty(card.description) ? View.GONE : View.VISIBLE);
+			}
+			String cardDomain=Uri.parse(card.url).getHost();
+			if(isLarge && !TextUtils.isEmpty(card.authorName)){
+				domain.setText(itemView.getContext().getString(R.string.article_by_author, card.authorName)+" · "+cardDomain);
+			}else{
+				domain.setText(cardDomain);
+			}
+			if(card.publishedAt!=null){
+				timestamp.setVisibility(View.VISIBLE);
+				timestamp.setText(" · "+UiUtils.formatRelativeTimestamp(itemView.getContext(), card.publishedAt));
+			}else{
+				timestamp.setVisibility(View.GONE);
+			}
 
 			photo.setImageDrawable(null);
 			if(item.imgRequest!=null){
+				photo.setScaleType(ImageView.ScaleType.CENTER_CROP);
+				photo.setBackground(null);
+				photo.setImageTintList(null);
 				crossfadeDrawable.setSize(card.width, card.height);
 				if (card.width > 0) {
 					// akkoma servers don't provide width and height
@@ -85,22 +109,17 @@ public class LinkCardStatusDisplayItem extends StatusDisplayItem{
 					crossfadeDrawable.setSize(itemView.getWidth(), itemView.getHeight());
 				}
 				crossfadeDrawable.setBlurhashDrawable(card.blurhashPlaceholder);
-				crossfadeDrawable.setCrossfadeAlpha(item.status.spoilerRevealed ? 0f : 1f);
+				crossfadeDrawable.setCrossfadeAlpha(0f);
+				photo.setImageDrawable(null);
 				photo.setImageDrawable(crossfadeDrawable);
 				photo.setVisibility(View.VISIBLE);
 				didClear=false;
 			} else {
-				photo.setVisibility(View.GONE);
+				photo.setBackgroundColor(UiUtils.getThemeColor(itemView.getContext(), R.attr.colorM3SurfaceVariant));
+				photo.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(itemView.getContext(), R.attr.colorM3Outline)));
+				photo.setScaleType(ImageView.ScaleType.CENTER);
+				photo.setImageResource(R.drawable.ic_feed_48px);
 			}
-
-			// if there's no image, we don't want to cover the inset borders
-			FrameLayout.LayoutParams params=(FrameLayout.LayoutParams) inner.getLayoutParams();
-			int margin=item.inset && item.imgRequest == null ? V.dp(1) : 0;
-			params.setMargins(margin, 0, margin, margin);
-
-			boolean insetAndLast=item.inset && isLastDisplayItemForStatus();
-			inner.setClipToOutline(insetAndLast);
-			inner.setOutlineProvider(insetAndLast ? OutlineProviders.bottomRoundedRect(12) : null);
 		}
 
 		@Override
@@ -108,6 +127,12 @@ public class LinkCardStatusDisplayItem extends StatusDisplayItem{
 			crossfadeDrawable.setImageDrawable(drawable);
 			if(didClear && item.status.spoilerRevealed)
 				crossfadeDrawable.animateAlpha(0f);
+			Card card=item.status.card;
+			// Make sure the image is not stretched if the server returned wrong dimensions
+			if(drawable!=null && (drawable.getIntrinsicWidth()!=card.width || drawable.getIntrinsicHeight()!=card.height)){
+				photo.setImageDrawable(null);
+				photo.setImageDrawable(crossfadeDrawable);
+			}
 		}
 
 		@Override
@@ -121,4 +146,3 @@ public class LinkCardStatusDisplayItem extends StatusDisplayItem{
 		}
 	}
 }
-
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/MediaGridStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/MediaGridStatusDisplayItem.java
index bebf42351..fbd8a580f 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/MediaGridStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/MediaGridStatusDisplayItem.java
@@ -31,6 +31,7 @@ import org.joinmastodon.android.model.Translation;
 import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.PhotoLayoutHelper;
 import org.joinmastodon.android.ui.drawables.SpoilerStripesDrawable;
+import org.joinmastodon.android.ui.photoviewer.AltTextSheet;
 import org.joinmastodon.android.ui.photoviewer.PhotoViewerHost;
 import org.joinmastodon.android.ui.utils.MediaAttachmentViewController;
 import org.joinmastodon.android.ui.utils.UiUtils;
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
index 23de5b4b1..e08cec622 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
@@ -125,7 +125,8 @@ public abstract class StatusDisplayItem{
 			case AUDIO -> new AudioStatusDisplayItem.Holder(activity, parent);
 			case POLL_OPTION -> new PollOptionStatusDisplayItem.Holder(activity, parent);
 			case POLL_FOOTER -> new PollFooterStatusDisplayItem.Holder(activity, parent);
-			case CARD -> new LinkCardStatusDisplayItem.Holder(activity, parent);
+			case CARD_LARGE -> new LinkCardStatusDisplayItem.Holder(activity, parent, true);
+			case CARD_COMPACT -> new LinkCardStatusDisplayItem.Holder(activity, parent, false);
 			case EMOJI_REACTIONS -> new EmojiReactionsStatusDisplayItem.Holder(activity, parent);
 			case FOOTER -> new FooterStatusDisplayItem.Holder(activity, parent);
 			case ACCOUNT_CARD -> new AccountCardStatusDisplayItem.Holder(activity, parent);
@@ -392,7 +393,8 @@ public abstract class StatusDisplayItem{
 		AUDIO,
 		POLL_OPTION,
 		POLL_FOOTER,
-		CARD,
+		CARD_LARGE,
+		CARD_COMPACT,
 		EMOJI_REACTIONS,
 		FOOTER,
 		ACCOUNT_CARD,
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
index b1bc84ae2..2550fdaa4 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
@@ -68,7 +68,7 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 
 	public void setTranslatedText(String text){
 		Status statusForContent=status.getContentStatus();
-		translatedText=HtmlParser.parse(text, statusForContent.emojis, statusForContent.mentions, statusForContent.tags, parentFragment.getAccountID());
+		translatedText=HtmlParser.parse(text, statusForContent.emojis, statusForContent.mentions, statusForContent.tags, parentFragment.getAccountID(), statusForContent);
 		translationEmojiHelper.setText(translatedText);
 	}
 
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/AltTextSheet.java b/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/AltTextSheet.java
new file mode 100644
index 000000000..b4affaf3c
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/AltTextSheet.java
@@ -0,0 +1,37 @@
+package org.joinmastodon.android.ui.photoviewer;
+
+import android.content.Context;
+import android.graphics.drawable.ColorDrawable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.model.Attachment;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
+import org.joinmastodon.android.ui.utils.UiUtils;
+
+import androidx.annotation.NonNull;
+import me.grishka.appkit.views.BottomSheet;
+
+public class AltTextSheet extends BottomSheet{
+	public AltTextSheet(@NonNull Context context, Attachment attachment){
+		super(context);
+
+		View content=context.getSystemService(LayoutInflater.class).inflate(R.layout.sheet_alt_text, null);
+		setContentView(content);
+		TextView altText=findViewById(R.id.alt_text);
+		altText.setText(attachment.description);
+		findViewById(R.id.alt_text_help).setOnClickListener(v->showAltTextHelp());
+		setNavigationBarBackground(new ColorDrawable(UiUtils.alphaBlendColors(UiUtils.getThemeColor(context, R.attr.colorM3Surface),
+				UiUtils.getThemeColor(context, R.attr.colorM3Primary), 0.05f)), !UiUtils.isDarkTheme());
+	}
+
+	private void showAltTextHelp(){
+		new M3AlertDialogBuilder(getContext())
+				.setTitle(R.string.what_is_alt_text)
+				.setMessage(UiUtils.fixBulletListInString(getContext(), R.string.alt_text_help))
+				.setPositiveButton(R.string.ok, null)
+				.show();
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java b/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java
index c249439b0..f87856b4f 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java
@@ -1,6 +1,10 @@
 package org.joinmastodon.android.ui.photoviewer;
 
 import android.Manifest;
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.DownloadManager;
@@ -13,6 +17,7 @@ import android.graphics.Insets;
 import android.graphics.PixelFormat;
 import android.graphics.Rect;
 import android.graphics.SurfaceTexture;
+import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.media.AudioManager;
@@ -25,6 +30,8 @@ import android.os.SystemClock;
 import android.provider.MediaStore;
 import android.provider.Settings;
 import android.util.Log;
+import android.util.Property;
+import android.view.ContextThemeWrapper;
 import android.view.DisplayCutout;
 import android.view.Gravity;
 import android.view.KeyEvent;
@@ -48,10 +55,14 @@ import android.widget.Toolbar;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.MastodonAPIController;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
 import org.joinmastodon.android.model.Attachment;
 import org.joinmastodon.android.ui.ImageDescriptionSheet;
+import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.utils.FileProvider;
+import org.joinmastodon.android.ui.utils.UiUtils;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -91,6 +102,8 @@ public class PhotoViewer implements ZoomPanView.Listener{
 	private int currentIndex;
 	private WindowManager wm;
 	private Listener listener;
+	private Status status;
+	private String accountID;
 
 	private FrameLayout windowView;
 	private FragmentRootLinearLayout uiOverlay;
@@ -111,17 +124,32 @@ public class PhotoViewer implements ZoomPanView.Listener{
 		if(uiVisible)
 			toggleUI();
 	};
+	private Animator currentSheetRelatedToolbarAnimation;
 
 	private boolean videoPositionNeedsUpdating;
 	private Runnable videoPositionUpdater=this::updateVideoPosition;
 	private int videoDuration, videoInitialPosition, videoLastTimeUpdatePosition;
 	private long videoInitialPositionTime;
 
-	public PhotoViewer(Activity activity, List<Attachment> attachments, int index, Listener listener){
+	private static final Property<FragmentRootLinearLayout, Integer> STATUS_BAR_COLOR_PROPERTY=new Property<>(Integer.class, "Fdsafdsa"){
+		@Override
+		public Integer get(FragmentRootLinearLayout object){
+			return object.getStatusBarColor();
+		}
+
+		@Override
+		public void set(FragmentRootLinearLayout object, Integer value){
+			object.setStatusBarColor(value);
+		}
+	};
+
+	public PhotoViewer(Activity activity, List<Attachment> attachments, int index, Status status, String accountID, Listener listener){
 		this.activity=activity;
 		this.attachments=attachments.stream().filter(a->a.type==Attachment.Type.IMAGE || a.type==Attachment.Type.GIFV || a.type==Attachment.Type.VIDEO).collect(Collectors.toList());
 		currentIndex=index;
 		this.listener=listener;
+		this.status=status;
+		this.accountID=accountID;
 
 		wm=activity.getWindowManager();
 
@@ -208,12 +236,23 @@ public class PhotoViewer implements ZoomPanView.Listener{
 					return true;
 				})
 				.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+		if(status!=null)
+			toolbar.getMenu().add(R.string.info).setIcon(R.drawable.ic_fluent_info_24_regular).setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+		else
+			toolbar.getMenu().add(R.string.download).setIcon(R.drawable.ic_fluent_arrow_download_24_regular).setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+		toolbar.setOnMenuItemClickListener(item->{
+			if(status!=null)
+				showInfoSheet();
+			else
+				saveCurrentFile();
+			return true;
+		});
 		uiOverlay.setAlpha(0f);
 		videoControls=uiOverlay.findViewById(R.id.video_player_controls);
 		videoSeekBar=uiOverlay.findViewById(R.id.seekbar);
 		videoTimeView=uiOverlay.findViewById(R.id.time);
 		videoPlayPauseButton=uiOverlay.findViewById(R.id.play_pause_btn);
-		if(attachments.get(index).type==Attachment.Type.IMAGE){
+		if(attachments.get(index).type!=Attachment.Type.VIDEO){
 			videoControls.setVisibility(View.GONE);
 		}else{
 			videoDuration=(int)Math.round(attachments.get(index).getDuration()*1000);
@@ -350,7 +389,7 @@ public class PhotoViewer implements ZoomPanView.Listener{
 		listener.setPhotoViewVisibility(pager.getCurrentItem(), true);
 		if(!uiVisible){
 			windowView.setSystemUiVisibility(windowView.getSystemUiVisibility() | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY | View.SYSTEM_UI_FLAG_FULLSCREEN);
-		}else if(attachments.get(currentIndex).type!=Attachment.Type.IMAGE){
+		}else if(attachments.get(currentIndex).type==Attachment.Type.VIDEO){
 			hideUiDelayed();
 		}
 	}
@@ -389,7 +428,7 @@ public class PhotoViewer implements ZoomPanView.Listener{
 					.setInterpolator(CubicBezierInterpolator.DEFAULT)
 					.start();
 			windowView.setSystemUiVisibility(windowView.getSystemUiVisibility() & ~(View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY | View.SYSTEM_UI_FLAG_FULLSCREEN));
-			if(attachments.get(currentIndex).type!=Attachment.Type.IMAGE)
+			if(attachments.get(currentIndex).type==Attachment.Type.VIDEO)
 				hideUiDelayed(5000);
 		}
 		uiVisible=!uiVisible;
@@ -408,7 +447,7 @@ public class PhotoViewer implements ZoomPanView.Listener{
 		currentIndex=index;
 		Attachment att=attachments.get(index);
 		imageDescriptionButton.setVisible(att.description != null && !att.description.isEmpty());
-		V.setVisibilityAnimated(videoControls, att.type!=Attachment.Type.IMAGE ? View.VISIBLE : View.GONE);
+		V.setVisibilityAnimated(videoControls, att.type==Attachment.Type.VIDEO ? View.VISIBLE : View.GONE);
 		if(att.type==Attachment.Type.VIDEO){
 			videoSeekBar.setSecondaryProgress(0);
 			videoDuration=(int)Math.round(att.getDuration()*1000);
@@ -643,23 +682,31 @@ public class PhotoViewer implements ZoomPanView.Listener{
 		}
 	}
 
-	private MediaPlayer findCurrentVideoPlayer(){
+	private GifVViewHolder findCurrentVideoPlayerHolder(){
 		RecyclerView rv=(RecyclerView) pager.getChildAt(0);
 		if(rv.findViewHolderForAdapterPosition(pager.getCurrentItem()) instanceof GifVViewHolder vvh && vvh.playerReady){
-			return vvh.player;
+			return vvh;
 		}
 		return null;
 	}
 
+	private MediaPlayer findCurrentVideoPlayer(){
+		GifVViewHolder holder=findCurrentVideoPlayerHolder();
+		return holder!=null ? holder.player : null;
+	}
+
 	private void pauseVideo(){
-		MediaPlayer player=findCurrentVideoPlayer();
-		if(player==null || !player.isPlaying())
+		GifVViewHolder holder=findCurrentVideoPlayerHolder();
+		if(holder==null || !holder.player.isPlaying())
 			return;
-		player.pause();
+		holder.player.pause();
 		videoPlayPauseButton.setImageResource(R.drawable.ic_fluent_play_24_filled);
 		videoPlayPauseButton.setContentDescription(activity.getString(R.string.play));
 		stopUpdatingVideoPosition();
 		windowView.removeCallbacks(uiAutoHider);
+		// Some MediaPlayer implementations clear the texture when the app goes into background.
+		// This makes sure the frame on which the video was paused is retained on the screen.
+		holder.wrap.setBackground(new BitmapDrawable(holder.textureView.getBitmap()));
 	}
 
 	private void resumeVideo(){
@@ -694,7 +741,7 @@ public class PhotoViewer implements ZoomPanView.Listener{
 
 	private void updateVideoPosition(){
 		if(videoPositionNeedsUpdating){
-			int currentPosition=(videoInitialPosition+(int)(SystemClock.uptimeMillis()-videoInitialPositionTime))%videoDuration;
+			int currentPosition=videoInitialPosition+(int)(SystemClock.uptimeMillis()-videoInitialPositionTime);
 			videoSeekBar.setProgress(Math.round((float)currentPosition/videoDuration*10000f));
 			updateVideoTimeText(currentPosition);
 			windowView.postOnAnimation(videoPositionUpdater);
@@ -711,6 +758,93 @@ public class PhotoViewer implements ZoomPanView.Listener{
 		}
 	}
 
+	private void showInfoSheet(){
+		pauseVideo();
+		PhotoViewerInfoSheet sheet=new PhotoViewerInfoSheet(new ContextThemeWrapper(activity, R.style.Theme_Mastodon_Dark), attachments.get(currentIndex), toolbar.getHeight(), new PhotoViewerInfoSheet.Listener(){
+			private boolean ignoreBeforeDismiss;
+
+			@Override
+			public void onBeforeDismiss(int duration){
+				if(ignoreBeforeDismiss)
+					return;
+				if(currentSheetRelatedToolbarAnimation!=null)
+					currentSheetRelatedToolbarAnimation.cancel();
+				AnimatorSet set=new AnimatorSet();
+				set.playTogether(
+						ObjectAnimator.ofFloat(pager, View.TRANSLATION_Y, 0),
+						ObjectAnimator.ofFloat(toolbarWrap, View.ALPHA, 1f),
+						ObjectAnimator.ofArgb(uiOverlay, STATUS_BAR_COLOR_PROPERTY, 0x80000000)
+				);
+				set.setDuration(duration);
+				set.setInterpolator(CubicBezierInterpolator.EASE_OUT);
+				currentSheetRelatedToolbarAnimation=set;
+				set.addListener(new AnimatorListenerAdapter(){
+					@Override
+					public void onAnimationEnd(Animator animation){
+						currentSheetRelatedToolbarAnimation=null;
+					}
+				});
+				set.start();
+			}
+
+			@Override
+			public void onDismissEntireViewer(){
+				ignoreBeforeDismiss=true;
+				onStartSwipeToDismissTransition(0);
+			}
+
+			@Override
+			public void onButtonClick(int id){
+				if(id==R.id.btn_boost){
+					if(status!=null){
+						AccountSessionManager.get(accountID).getStatusInteractionController().setReblogged(status, !status.reblogged, null, r->{});
+					}
+				}else if(id==R.id.btn_favorite){
+					if(status!=null){
+						AccountSessionManager.get(accountID).getStatusInteractionController().setFavorited(status, !status.favourited, r->{});
+					}
+				}else if(id==R.id.btn_share){
+					if(status!=null){
+						UiUtils.openSystemShareSheet(activity, status.url);
+					}
+				}else if(id==R.id.btn_bookmark){
+					if(status!=null){
+						AccountSessionManager.get(accountID).getStatusInteractionController().setBookmarked(status, !status.bookmarked);
+					}
+				}else if(id==R.id.btn_download){
+					saveCurrentFile();
+				}
+			}
+		});
+		sheet.setStatus(status);
+		sheet.show();
+		if(currentSheetRelatedToolbarAnimation!=null)
+			currentSheetRelatedToolbarAnimation.cancel();
+		sheet.getWindow().getDecorView().getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener(){
+			@Override
+			public boolean onPreDraw(){
+				sheet.getWindow().getDecorView().getViewTreeObserver().removeOnPreDrawListener(this);
+				AnimatorSet set=new AnimatorSet();
+				set.playTogether(
+						ObjectAnimator.ofFloat(pager, View.TRANSLATION_Y, -pager.getHeight()*0.2f),
+						ObjectAnimator.ofFloat(toolbarWrap, View.ALPHA, 0f),
+						ObjectAnimator.ofArgb(uiOverlay, STATUS_BAR_COLOR_PROPERTY, 0)
+				);
+				set.setDuration(300);
+				set.setInterpolator(CubicBezierInterpolator.DEFAULT);
+				currentSheetRelatedToolbarAnimation=set;
+				set.addListener(new AnimatorListenerAdapter(){
+					@Override
+					public void onAnimationEnd(Animator animation){
+						currentSheetRelatedToolbarAnimation=null;
+					}
+				});
+				set.start();
+				return true;
+			}
+		});
+	}
+
 	public interface Listener{
 		void setPhotoViewVisibility(int index, boolean visible);
 
@@ -927,7 +1061,10 @@ public class PhotoViewer implements ZoomPanView.Listener{
 
 		@Override
 		public void onSurfaceTextureUpdated(@NonNull SurfaceTexture surface){
-
+			// A new frame of video was rendered. Clear the thumbnail or paused frame, if any, to avoid overdraw and free up some memory.
+			if(player.isPlaying() && wrap.getBackground()!=null){
+				wrap.setBackground(null);
+			}
 		}
 
 		private void startPlayer(){
@@ -935,13 +1072,12 @@ public class PhotoViewer implements ZoomPanView.Listener{
 			if(item.type==Attachment.Type.VIDEO){
 				incKeepScreenOn();
 				keepingScreenOn=true;
-			}
 				if(getAbsoluteAdapterPosition()==currentIndex){
 					player.start();
 					startUpdatingVideoPosition(player);
 					hideUiDelayed();
 				}
-			if (item.type == Attachment.Type.GIFV) {
+			}else{
 				keepingScreenOn=false;
 				player.setLooping(true);
 				player.start();
@@ -963,7 +1099,7 @@ public class PhotoViewer implements ZoomPanView.Listener{
 			player.setOnPreparedListener(this);
 			player.setOnErrorListener(this);
 			player.setOnVideoSizeChangedListener(this);
-			if(item.type!=Attachment.Type.IMAGE){
+			if(item.type==Attachment.Type.VIDEO){
 				player.setOnBufferingUpdateListener(this);
 				player.setOnInfoListener(this);
 				player.setOnSeekCompleteListener(this);
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewerInfoSheet.java b/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewerInfoSheet.java
new file mode 100644
index 000000000..565d198ca
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewerInfoSheet.java
@@ -0,0 +1,180 @@
+package org.joinmastodon.android.ui.photoviewer;
+
+import android.content.Context;
+import android.content.res.ColorStateList;
+import android.graphics.drawable.ColorDrawable;
+import android.text.TextUtils;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewOutlineProvider;
+import android.view.ViewTreeObserver;
+import android.widget.Button;
+import android.widget.FrameLayout;
+import android.widget.ImageButton;
+import android.widget.TextView;
+
+import com.squareup.otto.Subscribe;
+
+import org.joinmastodon.android.E;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
+import org.joinmastodon.android.model.Attachment;
+import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.model.StatusPrivacy;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
+import org.joinmastodon.android.ui.utils.UiUtils;
+
+import androidx.annotation.NonNull;
+import me.grishka.appkit.utils.CubicBezierInterpolator;
+import me.grishka.appkit.utils.V;
+import me.grishka.appkit.views.BottomSheet;
+
+public class PhotoViewerInfoSheet extends BottomSheet{
+	private final Attachment attachment;
+	private final View buttonsContainer;
+	private final TextView altText;
+	private final ImageButton backButton, infoButton;
+	private final Button boostBtn, favoriteBtn, bookmarkBtn;
+	private final Listener listener;
+	private String statusID;
+
+	public PhotoViewerInfoSheet(@NonNull Context context, Attachment attachment, int toolbarHeight, Listener listener){
+		super(context);
+		this.attachment=attachment;
+		this.listener=listener;
+
+		dimAmount=0;
+		View content=context.getSystemService(LayoutInflater.class).inflate(R.layout.sheet_photo_viewer_info, null);
+		setContentView(content);
+		setNavigationBarBackground(new ColorDrawable(UiUtils.alphaBlendColors(UiUtils.getThemeColor(context, R.attr.colorM3Surface),
+				UiUtils.getThemeColor(context, R.attr.colorM3Primary), 0.05f)), !UiUtils.isDarkTheme());
+
+		buttonsContainer=findViewById(R.id.buttons_container);
+		altText=findViewById(R.id.alt_text);
+
+		if(TextUtils.isEmpty(attachment.description)){
+			findViewById(R.id.alt_text).setVisibility(View.GONE);
+			findViewById(R.id.alt_text_title).setVisibility(View.GONE);
+			findViewById(R.id.divider).setVisibility(View.GONE);
+		}else{
+			altText.setText(attachment.description);
+			findViewById(R.id.alt_text_help).setOnClickListener(v->showAltTextHelp());
+		}
+
+		backButton=new ImageButton(context);
+		backButton.setImageResource(R.drawable.ic_fluent_arrow_left_24_regular);
+		backButton.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(context, R.attr.colorM3OnSurfaceVariant)));
+		backButton.setBackgroundResource(R.drawable.bg_button_m3_tonal_icon);
+		backButton.setOutlineProvider(ViewOutlineProvider.BACKGROUND);
+		backButton.setElevation(V.dp(2));
+		backButton.setAlpha(0f);
+		backButton.setOnClickListener(v->{
+			listener.onDismissEntireViewer();
+			dismiss();
+		});
+
+		infoButton=new ImageButton(context);
+		infoButton.setImageResource(R.drawable.ic_info_fill1_24px);
+		infoButton.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(context, R.attr.colorM3OnPrimary)));
+		infoButton.setBackgroundResource(R.drawable.bg_button_m3_filled_icon);
+		infoButton.setOutlineProvider(ViewOutlineProvider.BACKGROUND);
+		infoButton.setElevation(V.dp(2));
+		infoButton.setAlpha(0f);
+		infoButton.setSelected(true);
+		infoButton.setOnClickListener(v->dismiss());
+
+		FrameLayout.LayoutParams lp=new FrameLayout.LayoutParams(V.dp(48), V.dp(48));
+		lp.topMargin=toolbarHeight/2-V.dp(24);
+		lp.leftMargin=lp.rightMargin=V.dp(4);
+		lp.gravity=Gravity.START | Gravity.TOP;
+		container.addView(backButton, lp);
+
+		lp=new FrameLayout.LayoutParams(lp);
+		lp.leftMargin=lp.rightMargin=0;
+		lp.gravity=Gravity.END | Gravity.TOP;
+		container.addView(infoButton, lp);
+
+		boostBtn=findViewById(R.id.btn_boost);
+		favoriteBtn=findViewById(R.id.btn_favorite);
+		bookmarkBtn=findViewById(R.id.btn_bookmark);
+		View.OnClickListener clickListener=v->listener.onButtonClick(v.getId());
+
+		boostBtn.setOnClickListener(clickListener);
+		favoriteBtn.setOnClickListener(clickListener);
+		findViewById(R.id.btn_share).setOnClickListener(clickListener);
+		bookmarkBtn.setOnClickListener(clickListener);
+		findViewById(R.id.btn_download).setOnClickListener(clickListener);
+	}
+
+	private void showAltTextHelp(){
+		new M3AlertDialogBuilder(getContext())
+				.setTitle(R.string.what_is_alt_text)
+				.setMessage(UiUtils.fixBulletListInString(getContext(), R.string.alt_text_help))
+				.setPositiveButton(R.string.ok, null)
+				.show();
+	}
+
+	@Override
+	public void dismiss(){
+		if(dismissed)
+			return;
+		int height=content.getHeight();
+		int duration=Math.max(60, (int) (180 * (height - content.getTranslationY()) / (float) height));
+		listener.onBeforeDismiss(duration);
+		backButton.animate().alpha(0).setDuration(duration).setInterpolator(CubicBezierInterpolator.EASE_OUT).start();
+		infoButton.animate().alpha(0).setDuration(duration).setInterpolator(CubicBezierInterpolator.EASE_OUT).start();
+		super.dismiss();
+		E.unregister(this);
+	}
+
+	@Override
+	public void show(){
+		super.show();
+		E.register(this);
+		content.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener(){
+			@Override
+			public boolean onPreDraw(){
+				content.getViewTreeObserver().removeOnPreDrawListener(this);
+				backButton.animate().alpha(1).setDuration(300).setInterpolator(CubicBezierInterpolator.DEFAULT).start();
+				infoButton.animate().alpha(1).setDuration(300).setInterpolator(CubicBezierInterpolator.DEFAULT).start();
+				return true;
+			}
+		});
+	}
+
+	public void setStatus(Status status){
+		statusID=status.id;
+		boostBtn.setCompoundDrawablesWithIntrinsicBounds(0, switch(status.visibility){
+			case DIRECT -> R.drawable.ic_boost_disabled_24px;
+			case PUBLIC, UNLISTED, LOCAL -> R.drawable.ic_boost;
+			case PRIVATE -> R.drawable.ic_boost_private;
+		}, 0, 0);
+		boostBtn.setEnabled(status.visibility!=StatusPrivacy.DIRECT);
+		setButtonStates(status.reblogged, status.favourited, status.bookmarked);
+	}
+
+	@Subscribe
+	public void onCountersUpdated(StatusCountersUpdatedEvent ev){
+		if(ev.id.equals(statusID)){
+			setButtonStates(ev.reblogged, ev.favorited, ev.bookmarked);
+		}
+	}
+
+	private void setButtonStates(boolean reblogged, boolean favorited, boolean bookmarked){
+		boostBtn.setText(reblogged ? R.string.button_reblogged : R.string.button_reblog);
+		boostBtn.setSelected(reblogged);
+
+		favoriteBtn.setText(favorited ? R.string.button_favorited : R.string.button_favorite);
+		favoriteBtn.setSelected(favorited);
+
+		bookmarkBtn.setText(bookmarked ? R.string.bookmarked : R.string.add_bookmark);
+		bookmarkBtn.setSelected(bookmarked);
+	}
+
+	public interface Listener{
+		void onBeforeDismiss(int duration);
+		void onDismissEntireViewer();
+		void onButtonClick(int id);
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/sheets/AccountRestrictionConfirmationSheet.java b/mastodon/src/main/java/org/joinmastodon/android/ui/sheets/AccountRestrictionConfirmationSheet.java
new file mode 100644
index 000000000..accda39a0
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/sheets/AccountRestrictionConfirmationSheet.java
@@ -0,0 +1,90 @@
+package org.joinmastodon.android.ui.sheets;
+
+import android.content.Context;
+import android.content.res.ColorStateList;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.InsetDrawable;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.ui.drawables.EmptyDrawable;
+import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.ui.views.ProgressBarButton;
+
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+import me.grishka.appkit.utils.V;
+import me.grishka.appkit.views.BottomSheet;
+
+public abstract class AccountRestrictionConfirmationSheet extends BottomSheet{
+	private LinearLayout contentWrap;
+	protected Button cancelBtn;
+	protected ProgressBarButton confirmBtn, secondaryBtn;
+	protected TextView titleView, subtitleView;
+	protected ImageView icon;
+	protected boolean loading;
+
+	public AccountRestrictionConfirmationSheet(@NonNull Context context, Account user, ConfirmCallback confirmCallback){
+		super(context);
+		View content=context.getSystemService(LayoutInflater.class).inflate(R.layout.sheet_restrict_account, null);
+		setContentView(content);
+		setNavigationBarBackground(new ColorDrawable(UiUtils.alphaBlendColors(UiUtils.getThemeColor(context, R.attr.colorM3Surface),
+				UiUtils.getThemeColor(context, R.attr.colorM3Primary), 0.05f)), !UiUtils.isDarkTheme());
+
+		contentWrap=findViewById(R.id.content_wrap);
+		titleView=findViewById(R.id.title);
+		subtitleView=findViewById(R.id.text);
+		cancelBtn=findViewById(R.id.btn_cancel);
+		confirmBtn=findViewById(R.id.btn_confirm);
+		secondaryBtn=findViewById(R.id.btn_secondary);
+		icon=findViewById(R.id.icon);
+
+		contentWrap.setDividerDrawable(new EmptyDrawable(1, V.dp(8)));
+		contentWrap.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE);
+		confirmBtn.setOnClickListener(v->{
+			if(loading)
+				return;
+			loading=true;
+			confirmBtn.setProgressBarVisible(true);
+			confirmCallback.onConfirmed(this::dismiss, ()->{
+				confirmBtn.setProgressBarVisible(false);
+				loading=false;
+			});
+		});
+		cancelBtn.setOnClickListener(v->{
+			if(!loading)
+				dismiss();
+		});
+	}
+
+	protected void addRow(@DrawableRes int icon, CharSequence text){
+		TextView tv=new TextView(getContext());
+		tv.setTextAppearance(R.style.m3_body_large);
+		tv.setTextColor(UiUtils.getThemeColor(getContext(), R.attr.colorM3OnSurfaceVariant));
+		tv.setCompoundDrawableTintList(ColorStateList.valueOf(UiUtils.getThemeColor(getContext(), R.attr.colorM3Primary)));
+		tv.setGravity(Gravity.START | Gravity.CENTER_VERTICAL);
+		tv.setText(text);
+		InsetDrawable drawable=new InsetDrawable(getContext().getResources().getDrawable(icon, getContext().getTheme()), V.dp(8));
+		drawable.setBounds(0, 0, V.dp(40), V.dp(40));
+		tv.setCompoundDrawablesRelative(drawable, null, null, null);
+		tv.setCompoundDrawablePadding(V.dp(16));
+		contentWrap.addView(tv, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+	}
+
+	protected void addRow(@DrawableRes int icon, @StringRes int text){
+		addRow(icon, getContext().getString(text));
+	}
+
+	public interface ConfirmCallback{
+		void onConfirmed(Runnable onSuccess, Runnable onError);
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java b/mastodon/src/main/java/org/joinmastodon/android/ui/sheets/AccountSwitcherSheet.java
similarity index 93%
rename from mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java
rename to mastodon/src/main/java/org/joinmastodon/android/ui/sheets/AccountSwitcherSheet.java
index ea8603757..460db1ec1 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/sheets/AccountSwitcherSheet.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.ui;
+package org.joinmastodon.android.ui.sheets;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -8,7 +8,6 @@ import android.graphics.drawable.Animatable;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.text.SpannableStringBuilder;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
@@ -27,8 +26,10 @@ import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.HomeFragment;
 import org.joinmastodon.android.fragments.SplashFragment;
 import org.joinmastodon.android.fragments.onboarding.CustomWelcomeFragment;
+import org.joinmastodon.android.ui.ClickableSingleViewRecyclerAdapter;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
+import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.text.HtmlParser;
-import org.joinmastodon.android.ui.utils.CustomEmojiHelper;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.CheckableRelativeLayout;
 
@@ -67,6 +68,7 @@ public class AccountSwitcherSheet extends BottomSheet{
 	private List<WrappedAccount> accounts;
 	private ListImageLoaderWrapper imgLoader;
 	private AccountsAdapter accountsAdapter;
+	private Runnable onLoggedOutCallback;
 
 	public AccountSwitcherSheet(@NonNull Activity activity, @Nullable HomeFragment fragment){
 		this(activity, fragment, false, false);
@@ -125,6 +127,11 @@ public class AccountSwitcherSheet extends BottomSheet{
 				UiUtils.getThemeColor(activity, R.attr.colorM3Primary), 0.05f)), !UiUtils.isDarkTheme());
 	}
 
+	public AccountSwitcherSheet setOnLoggedOutCallback(Runnable onLoggedOutCallback){
+		this.onLoggedOutCallback=onLoggedOutCallback;
+		return this;
+	}
+
 	public void setOnClick(BiConsumer<String, Boolean> onClick) {
 		this.onClick = onClick;
 	}
@@ -148,8 +155,12 @@ public class AccountSwitcherSheet extends BottomSheet{
 	}
 
 	private void logOut(String accountID){
+		String activeAccount=AccountSessionManager.getInstance().getLastActiveAccountID();
 		AccountSessionManager.get(accountID).logOut(activity, ()->{
-			((MainActivity)activity).restartActivity();
+			if(accountID.equals(activeAccount) && onLoggedOutCallback!=null)
+				onLoggedOutCallback.run();
+			dismiss();
+			((MainActivity)activity).restartHomeFragment();
 		});
 	}
 
@@ -167,6 +178,8 @@ public class AccountSwitcherSheet extends BottomSheet{
 							AccountSessionManager.getInstance().removeAccount(session.getID());
 							sessions.remove(session);
 							if(sessions.isEmpty()){
+								if(onLoggedOutCallback!=null)
+									onLoggedOutCallback.run();
 								progress.dismiss();
 								Nav.goClearingStack(activity, SplashFragment.class, null);
 								dismiss();
@@ -178,6 +191,8 @@ public class AccountSwitcherSheet extends BottomSheet{
 							AccountSessionManager.getInstance().removeAccount(session.getID());
 							sessions.remove(session);
 							if(sessions.isEmpty()){
+								if(onLoggedOutCallback!=null)
+									onLoggedOutCallback.run();
 								progress.dismiss();
 								Nav.goClearingStack(activity, SplashFragment.class, null);
 								dismiss();
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/sheets/BlockAccountConfirmationSheet.java b/mastodon/src/main/java/org/joinmastodon/android/ui/sheets/BlockAccountConfirmationSheet.java
new file mode 100644
index 000000000..3097cf3f5
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/sheets/BlockAccountConfirmationSheet.java
@@ -0,0 +1,24 @@
+package org.joinmastodon.android.ui.sheets;
+
+import android.content.Context;
+import android.view.View;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.model.Account;
+
+import androidx.annotation.NonNull;
+
+public class BlockAccountConfirmationSheet extends AccountRestrictionConfirmationSheet{
+	public BlockAccountConfirmationSheet(@NonNull Context context, Account user, ConfirmCallback confirmCallback){
+		super(context, user, confirmCallback);
+		titleView.setText(R.string.block_user_confirm_title);
+		confirmBtn.setText(R.string.do_block);
+		secondaryBtn.setVisibility(View.GONE);
+		icon.setImageResource(R.drawable.ic_fluent_shield_24_regular);
+		subtitleView.setText(user.getDisplayUsername());
+		addRow(R.drawable.ic_campaign_24px, R.string.user_can_see_blocked);
+		addRow(R.drawable.ic_fluent_eye_off_24_regular, R.string.user_cant_see_each_other_posts);
+		addRow(R.drawable.ic_fluent_mention_24_regular, R.string.you_wont_see_user_mentions);
+		addRow(R.drawable.ic_fluent_arrow_reply_24_regular, R.string.user_cant_mention_or_follow_you);
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/sheets/DecentralizationExplainerSheet.java b/mastodon/src/main/java/org/joinmastodon/android/ui/sheets/DecentralizationExplainerSheet.java
new file mode 100644
index 000000000..c15f201b1
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/sheets/DecentralizationExplainerSheet.java
@@ -0,0 +1,101 @@
+package org.joinmastodon.android.ui.sheets;
+
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.graphics.drawable.ColorDrawable;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
+import org.joinmastodon.android.ui.Snackbar;
+import org.joinmastodon.android.ui.text.LinkSpan;
+import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.ui.views.RippleAnimationTextView;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Element;
+import org.jsoup.nodes.Node;
+import org.jsoup.nodes.TextNode;
+import org.jsoup.select.NodeVisitor;
+
+import androidx.annotation.NonNull;
+import me.grishka.appkit.views.BottomSheet;
+
+public class DecentralizationExplainerSheet extends BottomSheet{
+	private final String handleStr;
+
+	public DecentralizationExplainerSheet(@NonNull Context context, String accountID, Account account){
+		super(context);
+		View content=context.getSystemService(LayoutInflater.class).inflate(R.layout.sheet_decentralization_info, null);
+		setContentView(content);
+		setNavigationBarBackground(new ColorDrawable(UiUtils.alphaBlendColors(UiUtils.getThemeColor(context, R.attr.colorM3Surface),
+				UiUtils.getThemeColor(context, R.attr.colorM3Primary), 0.05f)), !UiUtils.isDarkTheme());
+
+		TextView handleTitle=findViewById(R.id.handle_title);
+		RippleAnimationTextView handle=findViewById(R.id.handle);
+		TextView usernameExplanation=findViewById(R.id.username_text);
+		TextView serverExplanation=findViewById(R.id.server_text);
+		TextView handleExplanation=findViewById(R.id.handle_explanation);
+		findViewById(R.id.btn_cancel).setOnClickListener(v->dismiss());
+
+		String domain=account.getDomain();
+		if(TextUtils.isEmpty(domain))
+			domain=AccountSessionManager.get(accountID).domain;
+		handleStr="@"+account.username+"@"+domain;
+		boolean isSelf=AccountSessionManager.getInstance().isSelf(accountID, account);
+
+		handleTitle.setText(isSelf ? R.string.handle_title_own : R.string.handle_title);
+		handle.setText(handleStr);
+		usernameExplanation.setText(isSelf ? R.string.handle_username_explanation_own : R.string.handle_username_explanation);
+		serverExplanation.setText(isSelf ? R.string.handle_server_explanation_own : R.string.handle_server_explanation);
+
+		String explanation=context.getString(isSelf ? R.string.handle_explanation_own : R.string.handle_explanation);
+		SpannableStringBuilder ssb=new SpannableStringBuilder();
+		Jsoup.parseBodyFragment(explanation).body().traverse(new NodeVisitor(){
+			private int spanStart;
+			@Override
+			public void head(Node node, int depth){
+				if(node instanceof TextNode tn){
+					ssb.append(tn.text());
+				}else if(node instanceof Element){
+					spanStart=ssb.length();
+				}
+			}
+
+			@Override
+			public void tail(Node node, int depth){
+				if(node instanceof Element){
+					ssb.setSpan(new LinkSpan("", DecentralizationExplainerSheet.this::showActivityPubAlert, LinkSpan.Type.CUSTOM, null, null, null), spanStart, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+				}
+			}
+		});
+		handleExplanation.setText(ssb);
+
+		findViewById(R.id.handle_wrap).setOnClickListener(v->{
+			context.getSystemService(ClipboardManager.class).setPrimaryClip(ClipData.newPlainText(null, handleStr));
+			if(UiUtils.needShowClipboardToast()){
+				new Snackbar.Builder(context)
+						.setText(R.string.handle_copied)
+						.show();
+			}
+		});
+		String _domain=domain;
+		findViewById(R.id.username_row).setOnClickListener(v->handle.animate(1, account.username.length()+1));
+		findViewById(R.id.server_row).setOnClickListener(v->handle.animate(handleStr.length()-_domain.length(), handleStr.length()));
+	}
+
+	private void showActivityPubAlert(LinkSpan s){
+		new M3AlertDialogBuilder(getContext())
+				.setTitle(R.string.what_is_activitypub_title)
+				.setMessage(R.string.what_is_activitypub)
+				.setPositiveButton(R.string.ok, null)
+				.show();
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/sheets/MuteAccountConfirmationSheet.java b/mastodon/src/main/java/org/joinmastodon/android/ui/sheets/MuteAccountConfirmationSheet.java
new file mode 100644
index 000000000..87522e1bf
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/sheets/MuteAccountConfirmationSheet.java
@@ -0,0 +1,25 @@
+package org.joinmastodon.android.ui.sheets;
+
+import android.content.Context;
+import android.view.View;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.model.Account;
+
+import androidx.annotation.NonNull;
+
+public class MuteAccountConfirmationSheet extends AccountRestrictionConfirmationSheet{
+	public MuteAccountConfirmationSheet(@NonNull Context context, Account user, ConfirmCallback confirmCallback){
+		super(context, user, confirmCallback);
+		//TODO: readd the time option
+		titleView.setText(R.string.mute_user_confirm_title);
+		confirmBtn.setText(R.string.do_mute);
+		secondaryBtn.setVisibility(View.GONE);
+		icon.setImageResource(R.drawable.ic_fluent_speaker_off_24_regular);
+		subtitleView.setText(user.getDisplayUsername());
+		addRow(R.drawable.ic_campaign_24px, R.string.user_wont_know_muted);
+		addRow(R.drawable.ic_fluent_eye_off_24_regular, R.string.user_can_still_see_your_posts);
+		addRow(R.drawable.ic_fluent_mention_24_regular, R.string.you_wont_see_user_mentions);
+		addRow(R.drawable.ic_fluent_arrow_reply_24_regular, R.string.user_can_mention_and_follow_you);
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/sheets/NonMutualPreReplySheet.java b/mastodon/src/main/java/org/joinmastodon/android/ui/sheets/NonMutualPreReplySheet.java
new file mode 100644
index 000000000..9e358be17
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/sheets/NonMutualPreReplySheet.java
@@ -0,0 +1,131 @@
+package org.joinmastodon.android.ui.sheets;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.text.TextUtils;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.ui.OutlineProviders;
+import org.joinmastodon.android.ui.text.HtmlParser;
+import org.joinmastodon.android.ui.utils.UiUtils;
+
+import androidx.annotation.NonNull;
+import me.grishka.appkit.imageloader.ViewImageLoader;
+import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
+import me.grishka.appkit.utils.V;
+
+public class NonMutualPreReplySheet extends PreReplySheet{
+	private boolean fullBioShown=false;
+
+	@SuppressLint("DefaultLocale")
+	public NonMutualPreReplySheet(@NonNull Context context, ResultListener resultListener, Account account, String accountID){
+		super(context, resultListener);
+		icon.setImageResource(R.drawable.ic_waving_hand_24px);
+		title.setText(R.string.non_mutual_sheet_title);
+		text.setText(R.string.non_mutual_sheet_text);
+
+		LinearLayout userInfo=new LinearLayout(context);
+		userInfo.setOrientation(LinearLayout.HORIZONTAL);
+		userInfo.setBackgroundResource(R.drawable.bg_user_info);
+		UiUtils.setAllPaddings(userInfo, 12);
+
+		ImageView ava=new ImageView(context);
+		ava.setScaleType(ImageView.ScaleType.CENTER_CROP);
+		ava.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
+		ava.setOutlineProvider(OutlineProviders.roundedRect(12));
+		ava.setClipToOutline(true);
+		ava.setForeground(context.getResources().getDrawable(R.drawable.fg_user_info_ava, context.getTheme()));
+		userInfo.addView(ava, UiUtils.makeLayoutParams(56, 56, 0, 0, 12, 0));
+		ViewImageLoader.loadWithoutAnimation(ava, context.getResources().getDrawable(R.drawable.image_placeholder), new UrlImageLoaderRequest(account.avatarStatic, V.dp(56), V.dp(56)));
+
+		LinearLayout nameAndFields=new LinearLayout(context);
+		nameAndFields.setOrientation(LinearLayout.VERTICAL);
+		nameAndFields.setMinimumHeight(V.dp(56));
+		nameAndFields.setGravity(Gravity.CENTER_VERTICAL);
+		userInfo.addView(nameAndFields, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+		TextView name=new TextView(context);
+		name.setSingleLine();
+		name.setEllipsize(TextUtils.TruncateAt.END);
+		name.setTextAppearance(R.style.m3_title_medium);
+		name.setTextColor(UiUtils.getThemeColor(context, R.attr.colorM3OnSurface));
+		if(AccountSessionManager.get(accountID).getLocalPreferences().customEmojiInNames){
+			name.setText(HtmlParser.parseCustomEmoji(account.displayName, account.emojis));
+			UiUtils.loadCustomEmojiInTextView(name);
+		}else{
+			name.setText(account.displayName);
+		}
+		name.setGravity(Gravity.CENTER_VERTICAL | Gravity.START);
+		nameAndFields.addView(name, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, V.dp(24)));
+		if(!TextUtils.isEmpty(account.note)){
+			CharSequence strippedBio=HtmlParser.parseCustomEmoji(HtmlParser.stripAndRemoveInvisibleSpans(account.note), account.emojis);
+			TextView bioShort=new TextView(context);
+			bioShort.setTextAppearance(R.style.m3_body_medium);
+			bioShort.setTextColor(UiUtils.getThemeColor(context, R.attr.colorM3Secondary));
+			bioShort.setMaxLines(2);
+			bioShort.setEllipsize(TextUtils.TruncateAt.END);
+			bioShort.setText(strippedBio);
+			nameAndFields.addView(bioShort, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+
+			TextView bioFull=new TextView(context);
+			bioFull.setTextAppearance(R.style.m3_body_medium);
+			bioFull.setTextColor(UiUtils.getThemeColor(context, R.attr.colorM3Secondary));
+			bioFull.setText(strippedBio);
+			bioFull.setVisibility(View.GONE);
+			nameAndFields.addView(bioFull, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+			nameAndFields.setOnClickListener(v->{
+				UiUtils.beginLayoutTransition((ViewGroup) getWindow().getDecorView());
+				fullBioShown=!fullBioShown;
+				if(fullBioShown){
+					bioFull.setVisibility(View.VISIBLE);
+					bioShort.setVisibility(View.GONE);
+				}else{
+					bioFull.setVisibility(View.GONE);
+					bioShort.setVisibility(View.VISIBLE);
+				}
+			});
+			UiUtils.loadCustomEmojiInTextView(bioShort);
+			UiUtils.loadCustomEmojiInTextView(bioFull);
+		}else{
+			TextView username=new TextView(context);
+			username.setTextAppearance(R.style.m3_body_medium);
+			username.setTextColor(UiUtils.getThemeColor(context, R.attr.colorM3Secondary));
+			username.setSingleLine();
+			username.setEllipsize(TextUtils.TruncateAt.END);
+			username.setText(account.getDisplayUsername());
+			username.setGravity(Gravity.CENTER_VERTICAL | Gravity.START);
+			nameAndFields.addView(username, new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, V.dp(20)));
+		}
+
+		contentWrap.addView(userInfo, UiUtils.makeLayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT, 0, 0, 0, 8));
+
+		for(int i=0;i<3;i++){
+			View item=context.getSystemService(LayoutInflater.class).inflate(R.layout.item_other_numbered_rule, contentWrap, false);
+			TextView number=item.findViewById(R.id.number);
+			number.setText(String.format("%d", i+1));
+			TextView title=item.findViewById(R.id.title);
+			TextView text=item.findViewById(R.id.text);
+			title.setText(switch(i){
+				case 0 -> R.string.non_mutual_title1;
+				case 1 -> R.string.non_mutual_title2;
+				case 2 -> R.string.non_mutual_title3;
+				default -> throw new IllegalStateException("Unexpected value: "+i);
+			});
+			text.setText(switch(i){
+				case 0 -> R.string.non_mutual_text1;
+				case 1 -> R.string.non_mutual_text2;
+				case 2 -> R.string.non_mutual_text3;
+				default -> throw new IllegalStateException("Unexpected value: "+i);
+			});
+			contentWrap.addView(item);
+		}
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/sheets/OldPostPreReplySheet.java b/mastodon/src/main/java/org/joinmastodon/android/ui/sheets/OldPostPreReplySheet.java
new file mode 100644
index 000000000..644ae1865
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/sheets/OldPostPreReplySheet.java
@@ -0,0 +1,23 @@
+package org.joinmastodon.android.ui.sheets;
+
+import android.content.Context;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.model.Status;
+
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.temporal.ChronoUnit;
+
+import androidx.annotation.NonNull;
+
+public class OldPostPreReplySheet extends PreReplySheet{
+	public OldPostPreReplySheet(@NonNull Context context, ResultListener resultListener, Status status){
+		super(context, resultListener);
+		int months=(int)status.createdAt.atZone(ZoneId.systemDefault()).until(ZonedDateTime.now(), ChronoUnit.MONTHS);
+		String monthsStr=months>24 ? context.getString(R.string.more_than_two_years) : context.getResources().getQuantityString(R.plurals.x_months, months, months);
+		title.setText(context.getString(R.string.old_post_sheet_title, monthsStr));
+		text.setText(R.string.old_post_sheet_text);
+		icon.setImageResource(R.drawable.ic_fluent_history_24_regular);
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/sheets/PreReplySheet.java b/mastodon/src/main/java/org/joinmastodon/android/ui/sheets/PreReplySheet.java
new file mode 100644
index 000000000..cae173a5e
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/sheets/PreReplySheet.java
@@ -0,0 +1,54 @@
+package org.joinmastodon.android.ui.sheets;
+
+import android.content.Context;
+import android.graphics.drawable.ColorDrawable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.ui.utils.UiUtils;
+
+import androidx.annotation.NonNull;
+import me.grishka.appkit.views.BottomSheet;
+
+public abstract class PreReplySheet extends BottomSheet{
+	protected ImageView icon;
+	protected TextView title, text;
+	protected Button gotItButton, dontRemindButton;
+	protected LinearLayout contentWrap;
+
+	public PreReplySheet(@NonNull Context context, ResultListener resultListener){
+		super(context);
+
+		View content=context.getSystemService(LayoutInflater.class).inflate(R.layout.sheet_pre_reply, null);
+		setContentView(content);
+
+		setNavigationBarBackground(new ColorDrawable(UiUtils.alphaBlendColors(UiUtils.getThemeColor(context, R.attr.colorM3Surface),
+				UiUtils.getThemeColor(context, R.attr.colorM3Primary), 0.05f)), !UiUtils.isDarkTheme());
+
+		icon=findViewById(R.id.icon);
+		title=findViewById(R.id.title);
+		text=findViewById(R.id.text);
+		gotItButton=findViewById(R.id.btn_got_it);
+		dontRemindButton=findViewById(R.id.btn_dont_remind_again);
+		contentWrap=findViewById(R.id.content_wrap);
+
+		gotItButton.setOnClickListener(v->{
+			dismiss();
+			resultListener.onButtonClicked(false);
+		});
+		dontRemindButton.setOnClickListener(v->{
+			dismiss();
+			resultListener.onButtonClicked(true);
+		});
+	}
+
+	@FunctionalInterface
+	public interface ResultListener{
+		void onButtonClicked(boolean notAgain);
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java b/mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
index d47942054..832e8905c 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
@@ -66,12 +66,21 @@ public class HtmlParser{
 						")" +
 					")";
 	public static final Pattern URL_PATTERN=Pattern.compile(VALID_URL_PATTERN_STRING, Pattern.CASE_INSENSITIVE);
+	public static final Pattern INVITE_LINK_PATTERN=Pattern.compile("^https://"+Regex.URL_VALID_DOMAIN+"/invite/[a-z\\d]+$", Pattern.CASE_INSENSITIVE);
 	private static Pattern EMOJI_CODE_PATTERN=Pattern.compile(":([\\w]+):");
 
 	private HtmlParser(){}
 
 	public static SpannableStringBuilder parse(String source, List<Emoji> emojis, List<Mention> mentions, List<Hashtag> tags, String accountID){
-		return parse(source, emojis, mentions, tags, accountID, null);
+		return parse(source, emojis, mentions, tags, accountID, null, null);
+	}
+
+	public static SpannableStringBuilder parse(String source, List<Emoji> emojis, List<Mention> mentions, List<Hashtag> tags, String accountID, Context context){
+		return parse(source, emojis, mentions, tags, accountID, null, context);
+	}
+
+	public static SpannableStringBuilder parse(String source, List<Emoji> emojis, List<Mention> mentions, List<Hashtag> tags, String accountID, Object parentObject){
+		return parse(source, emojis, mentions, tags, accountID, parentObject, null);
 	}
 
 	/**
@@ -86,7 +95,7 @@ public class HtmlParser{
 	 * @param emojis Custom emojis that are present in source as <code>:code:</code>
 	 * @return a spanned string
 	 */
-	public static SpannableStringBuilder parse(String source, List<Emoji> emojis, List<Mention> mentions, List<Hashtag> tags, String accountID, Context context){
+	public static SpannableStringBuilder parse(String source, List<Emoji> emojis, List<Mention> mentions, List<Hashtag> tags, String accountID, Object parentObject, Context context){
 		class SpanInfo{
 			public Object span;
 			public int start;
@@ -105,7 +114,7 @@ public class HtmlParser{
 			}
 		}
 
-		Map<String, String> idsByUrl=mentions.stream().filter(mention -> mention.id != null).collect(Collectors.toMap(m->m.url, m->m.id));
+		Map<String, String> idsByUrl=mentions.stream().distinct().collect(Collectors.toMap(m->m.url, m->m.id));
 		// Hashtags in remote posts have remote URLs, these have local URLs so they don't match.
 //		Map<String, String> tagsByUrl=tags.stream().collect(Collectors.toMap(t->t.url, t->t.name));
 		Map<String, Hashtag> tagsByTag=tags.stream().distinct().collect(Collectors.toMap(t->t.name.toLowerCase(), Function.identity()));
@@ -120,15 +129,15 @@ public class HtmlParser{
 			@Override
 			public void head(@NonNull Node node, int depth){
 				if(node instanceof TextNode textNode){
-					ssb.append(textNode.getWholeText());
+					ssb.append(textNode.text());
 				}else if(node instanceof Element el){
 					switch(el.nodeName()){
 						case "a" -> {
 							Object linkObject=null;
 							String href=el.attr("href");
 							LinkSpan.Type linkType;
-							String text=el.text();
 							if(el.hasClass("hashtag")){
+								String text=el.text();
 								if(text.startsWith("#")){
 									linkType=LinkSpan.Type.HASHTAG;
 									href=text.substring(1);
@@ -147,7 +156,7 @@ public class HtmlParser{
 							}else{
 								linkType=LinkSpan.Type.URL;
 							}
-							openSpans.add(new SpanInfo(new LinkSpan(href, null, linkType, accountID, linkObject, text), ssb.length(), el));
+							openSpans.add(new SpanInfo(new LinkSpan(href, null, linkType, accountID, linkObject, parentObject), ssb.length(), el));
 						}
 						case "br" -> ssb.append('\n');
 						case "span" -> {
@@ -269,8 +278,28 @@ public class HtmlParser{
 	public static String stripAndRemoveInvisibleSpans(String html){
 		Document doc=Jsoup.parseBodyFragment(html);
 		doc.body().select("span.invisible").remove();
-		Cleaner cleaner=new Cleaner(Safelist.none());
-		return cleaner.clean(doc).body().html();
+		Cleaner cleaner=new Cleaner(Safelist.none().addTags("br", "p"));
+		StringBuilder sb=new StringBuilder();
+		cleaner.clean(doc).body().traverse(new NodeVisitor(){
+			@Override
+			public void head(Node node, int depth){
+				if(node instanceof TextNode tn){
+					sb.append(tn.text());
+				}else if(node instanceof Element el){
+					if("br".equals(el.tagName())){
+						sb.append('\n');
+					}
+				}
+			}
+
+			@Override
+			public void tail(Node node, int depth){
+				if(node instanceof Element el && "p".equals(el.tagName()) && el.nextSibling()!=null){
+					sb.append("\n\n");
+				}
+			}
+		});
+		return sb.toString();
 	}
 
 	public static String text(String html) {
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/text/LinkSpan.java b/mastodon/src/main/java/org/joinmastodon/android/ui/text/LinkSpan.java
index f654f6b34..b907a9f6d 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/text/LinkSpan.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/text/LinkSpan.java
@@ -17,15 +17,15 @@ public class LinkSpan extends CharacterStyle {
 	private Type type;
 	private String accountID;
 	private Object linkObject;
-	private String text;
+	private Object parentObject;
 
-	public LinkSpan(String link, OnLinkClickListener listener, Type type, String accountID, Object linkObject, String text){
+	public LinkSpan(String link, OnLinkClickListener listener, Type type, String accountID, Object linkObject, Object parentObject){
 		this.listener=listener;
 		this.link=link;
 		this.type=type;
 		this.accountID=accountID;
 		this.linkObject=linkObject;
-		this.text=text;
+		this.parentObject=parentObject;
 	}
 
 	public int getColor(){
@@ -40,7 +40,7 @@ public class LinkSpan extends CharacterStyle {
 	
 	public void onClick(Context context){
 		switch(getType()){
-			case URL -> UiUtils.openURL(context, accountID, link);
+			case URL -> UiUtils.openURL(context, accountID, link, parentObject);
 			case MENTION -> UiUtils.openProfileByID(context, accountID, link);
 			case HASHTAG -> {
 				if(linkObject instanceof Hashtag ht)
@@ -53,7 +53,10 @@ public class LinkSpan extends CharacterStyle {
 	}
 
 	public void onLongClick(View view) {
-		UiUtils.copyText(view, getType() == Type.URL ? link : text);
+		if(linkObject instanceof Hashtag ht)
+			UiUtils.copyText(view, ht.name);
+		else
+			UiUtils.copyText(view, link);
 	}
 
 	public String getLink(){
@@ -61,7 +64,7 @@ public class LinkSpan extends CharacterStyle {
 	}
 
 	public String getText() {
-		return text;
+		return parentObject.toString();
 	}
 
 	public Type getType(){
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/ActionModeHelper.java b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/ActionModeHelper.java
index 23f7fbf45..7e8bb310e 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/ActionModeHelper.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/ActionModeHelper.java
@@ -9,6 +9,7 @@ import android.view.ActionMode;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
 
 import org.joinmastodon.android.R;
 
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/DiscoverInfoBannerHelper.java b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/DiscoverInfoBannerHelper.java
index e69acc17f..c2330b5d9 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/DiscoverInfoBannerHelper.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/DiscoverInfoBannerHelper.java
@@ -23,6 +23,8 @@ public class DiscoverInfoBannerHelper{
 	private final BannerType type;
 	private final String accountID;
 	private static EnumSet<BannerType> bannerTypesToShow=EnumSet.noneOf(BannerType.class);
+	private SingleViewRecyclerAdapter bannerAdapter;
+	private boolean added;
 
 	static{
 		for(BannerType t:BannerType.values()){
@@ -41,6 +43,8 @@ public class DiscoverInfoBannerHelper{
 	}
 
 	public void maybeAddBanner(RecyclerView list, MergeRecyclerAdapter adapter){
+		if(added)
+			return;
 		if(bannerTypesToShow.contains(type)){
 			banner=((Activity)list.getContext()).getLayoutInflater().inflate(R.layout.discover_info_banner, list, false);
 			TextView text=banner.findViewById(R.id.banner_text);
@@ -63,7 +67,8 @@ public class DiscoverInfoBannerHelper{
 				case BUBBLE_TIMELINE -> TimelineDefinition.BUBBLE_TIMELINE.getDefaultIcon().iconRes;
 				case POST_NOTIFICATIONS -> TimelineDefinition.POSTS_TIMELINE.getDefaultIcon().iconRes;
 			});
-			adapter.addAdapter(new SingleViewRecyclerAdapter(banner));
+			adapter.addAdapter(0, bannerAdapter=new SingleViewRecyclerAdapter(banner));
+			added=true;
 		}
 	}
 
@@ -72,6 +77,13 @@ public class DiscoverInfoBannerHelper{
 		// bannerTypesToShow is not updated here on purpose so the banner keeps showing until the app is relaunched
 	}
 
+	public void removeBanner(MergeRecyclerAdapter adapter){
+		if(bannerAdapter!=null){
+			adapter.removeAdapter(bannerAdapter);
+			added=false;
+		}
+	}
+
 	public static void reset(){
 		SharedPreferences prefs=getPrefs();
 		SharedPreferences.Editor e=prefs.edit();
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
index a831c9c37..284371bb9 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
@@ -23,9 +23,11 @@ import android.content.res.TypedArray;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
+import android.graphics.drawable.Animatable;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.InsetDrawable;
+import android.graphics.drawable.LayerDrawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -38,6 +40,7 @@ import android.provider.OpenableColumns;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.TextUtils;
+import android.text.style.BulletSpan;
 import android.text.style.TypefaceSpan;
 import android.transition.ChangeBounds;
 import android.transition.ChangeScroll;
@@ -49,6 +52,8 @@ import android.util.Pair;
 import android.view.Gravity;
 import android.view.HapticFeedbackConstants;
 import android.view.LayoutInflater;
+import android.view.Gravity;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.SubMenu;
@@ -58,14 +63,17 @@ import android.view.ViewPropertyAnimator;
 import android.view.WindowInsets;
 import android.webkit.MimeTypeMap;
 import android.widget.Button;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.PopupMenu;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.GlobalUserPreferences;
+import org.joinmastodon.android.MainActivity;
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.CacheController;
@@ -76,6 +84,7 @@ import org.joinmastodon.android.api.requests.accounts.SetAccountBlocked;
 import org.joinmastodon.android.api.requests.accounts.SetAccountFollowed;
 import org.joinmastodon.android.api.requests.accounts.SetAccountMuted;
 import org.joinmastodon.android.api.requests.accounts.SetDomainBlocked;
+import org.joinmastodon.android.api.requests.search.GetSearchResults;
 import org.joinmastodon.android.api.requests.accounts.AuthorizeFollowRequest;
 import org.joinmastodon.android.api.requests.accounts.RejectFollowRequest;
 import org.joinmastodon.android.api.requests.instance.GetInstance;
@@ -110,11 +119,15 @@ import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.Relationship;
+import org.joinmastodon.android.model.SearchResults;
 import org.joinmastodon.android.model.ScheduledStatus;
 import org.joinmastodon.android.model.SearchResults;
 import org.joinmastodon.android.model.Searchable;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
+import org.joinmastodon.android.ui.Snackbar;
+import org.joinmastodon.android.ui.sheets.BlockAccountConfirmationSheet;
+import org.joinmastodon.android.ui.sheets.MuteAccountConfirmationSheet;
 import org.joinmastodon.android.ui.text.CustomEmojiSpan;
 import org.joinmastodon.android.ui.text.HtmlParser;
 import org.parceler.Parcels;
@@ -141,6 +154,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.BiConsumer;
@@ -488,30 +502,44 @@ public class UiUtils {
 	}
 
 	public static void confirmToggleBlockUser(Activity activity, String accountID, Account account, boolean currentlyBlocked, Consumer<Relationship> resultCallback) {
-		showConfirmationAlert(activity, activity.getString(currentlyBlocked ? R.string.confirm_unblock_title : R.string.confirm_block_title),
-				activity.getString(currentlyBlocked ? R.string.confirm_unblock : R.string.confirm_block, account.getDisplayName()),
-				activity.getString(currentlyBlocked ? R.string.do_unblock : R.string.do_block),
-				R.drawable.ic_fluent_person_prohibited_28_regular,
-				() -> {
-					new SetAccountBlocked(account.id, !currentlyBlocked)
-							.setCallback(new Callback<>() {
-								@Override
-								public void onSuccess(Relationship result) {
-									if (activity == null) return;
-									resultCallback.accept(result);
-									if (!currentlyBlocked) {
-										E.post(new RemoveAccountPostsEvent(accountID, account.id, false));
-									}
-								}
+		if(!currentlyBlocked){
+			new BlockAccountConfirmationSheet(activity, account, (onSuccess, onError)->{
+				new SetAccountBlocked(account.id, true)
+						.setCallback(new Callback<>(){
+							@Override
+							public void onSuccess(Relationship result){
+								resultCallback.accept(result);
+								onSuccess.run();
+								E.post(new RemoveAccountPostsEvent(accountID, account.id, false));
+							}
 
-								@Override
-								public void onError(ErrorResponse error) {
-									error.showToast(activity);
-								}
-							})
-							.wrapProgress(activity, R.string.loading, false)
-							.exec(accountID);
-				});
+							@Override
+							public void onError(ErrorResponse error){
+								error.showToast(activity);
+								onError.run();
+							}
+						})
+						.exec(accountID);
+			}).show();
+		}else{
+			new SetAccountBlocked(account.id, false)
+					.setCallback(new Callback<>(){
+						@Override
+						public void onSuccess(Relationship result){
+							resultCallback.accept(result);
+							new Snackbar.Builder(activity)
+									.setText(activity.getString(R.string.unblocked_user_x, account.getDisplayUsername()))
+									.show();
+						}
+
+						@Override
+						public void onError(ErrorResponse error){
+							error.showToast(activity);
+						}
+					})
+					.wrapProgress(activity, R.string.loading, false)
+					.exec(accountID);
+		}
 	}
 
 	public static void confirmSoftBlockUser(Activity activity, String accountID, Account account, Consumer<Relationship> resultCallback) {
@@ -570,69 +598,109 @@ public class UiUtils {
 				});
 	}
 	public static void confirmToggleMuteUser(Context context, String accountID, Account account, boolean currentlyMuted, Consumer<Relationship> resultCallback){
-		View durationView=LayoutInflater.from(context).inflate(R.layout.mute_user_dialog, null);
-		LinearLayout.LayoutParams params=new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-		params.setMargins(0, V.dp(-12), 0, 0);
-		durationView.setLayoutParams(params);
-		Button button=durationView.findViewById(R.id.button);
-		((TextView) durationView.findViewById(R.id.message)).setText(context.getString(R.string.confirm_mute, account.getDisplayName()));
+		if(!currentlyMuted){
+			new MuteAccountConfirmationSheet(context, account, (onSuccess, onError)->{
+				new SetAccountMuted(account.id, true, 0)
+						.setCallback(new Callback<>(){
+							@Override
+							public void onSuccess(Relationship result){
+								resultCallback.accept(result);
+								onSuccess.run();
+								E.post(new RemoveAccountPostsEvent(accountID, account.id, false));
+							}
 
-		AtomicReference<Duration> muteDuration=new AtomicReference<>(Duration.ZERO);
+							@Override
+							public void onError(ErrorResponse error){
+								error.showToast(context);
+								onError.run();
+							}
+						})
+						.exec(accountID);
+			}).show();
+		}else{
+			new SetAccountMuted(account.id, false, 0)
+					.setCallback(new Callback<>(){
+						@Override
+						public void onSuccess(Relationship result){
+							resultCallback.accept(result);
+							new Snackbar.Builder(context)
+									.setText(context.getString(R.string.unmuted_user_x, account.getDisplayUsername()))
+									.show();
+						}
 
-		PopupMenu popupMenu=new PopupMenu(context, button, Gravity.CENTER_HORIZONTAL);
-		popupMenu.inflate(R.menu.mute_duration);
-		popupMenu.setOnMenuItemClickListener(item->{
-			int id=item.getItemId();
-			if(id==R.id.duration_indefinite)
-				muteDuration.set(Duration.ZERO);
-			else if(id==R.id.duration_minutes_5){
-				muteDuration.set(Duration.ofMinutes(5));
-			}else if(id==R.id.duration_minutes_30){
-				muteDuration.set(Duration.ofMinutes(30));
-			}else if(id==R.id.duration_hours_1){
-				muteDuration.set(Duration.ofHours(1));
-			}else if(id==R.id.duration_hours_6){
-				muteDuration.set(Duration.ofHours(6));
-			}else if(id==R.id.duration_days_1){
-				muteDuration.set(Duration.ofDays(1));
-			}else if(id==R.id.duration_days_3){
-				muteDuration.set(Duration.ofDays(3));
-			}else if(id==R.id.duration_days_7){
-				muteDuration.set(Duration.ofDays(7));
-			}
-			button.setText(item.getTitle());
-			return true;
-		});
-		button.setOnTouchListener(popupMenu.getDragToOpenListener());
-		button.setOnClickListener(v->popupMenu.show());
-		button.setText(popupMenu.getMenu().getItem(0).getTitle());
+						@Override
+						public void onError(ErrorResponse error){
+							error.showToast(context);
+						}
+					})
+					.wrapProgress(context, R.string.loading, false)
+					.exec(accountID);
+		}
 
-		new M3AlertDialogBuilder(context)
-				.setTitle(context.getString(currentlyMuted ? R.string.confirm_unmute_title : R.string.confirm_mute_title))
-				.setMessage(currentlyMuted ? context.getString(R.string.confirm_unmute, account.getDisplayName()) : null)
-				.setView(currentlyMuted ? null : durationView)
-				.setPositiveButton(context.getString(currentlyMuted ? R.string.do_unmute : R.string.do_mute), (dlg, i)->{
-					new SetAccountMuted(account.id, !currentlyMuted, muteDuration.get().getSeconds())
-							.setCallback(new Callback<>(){
-								@Override
-								public void onSuccess(Relationship result){
-									resultCallback.accept(result);
-									if(!currentlyMuted){
-										E.post(new RemoveAccountPostsEvent(accountID, account.id, false));
-									}
-								}
-
-								@Override
-								public void onError(ErrorResponse error){
-									error.showToast(context);
-								}
-							})
-							.wrapProgress(context, R.string.loading, false)
-							.exec(accountID);
-				})
-				.setNegativeButton(R.string.cancel, null)
-				.setIcon(currentlyMuted ? R.drawable.ic_fluent_speaker_2_28_regular : R.drawable.ic_fluent_speaker_off_28_regular)
-				.show();
+		// I need to readd the mute thing, so this is gonna stay as a comment for now
+//		View durationView=LayoutInflater.from(context).inflate(R.layout.mute_user_dialog, null);
+//		LinearLayout.LayoutParams params=new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+//		params.setMargins(0, V.dp(-12), 0, 0);
+//		durationView.setLayoutParams(params);
+//		Button button=durationView.findViewById(R.id.button);
+//		((TextView) durationView.findViewById(R.id.message)).setText(context.getString(R.string.confirm_mute, account.getDisplayName()));
+//
+//		AtomicReference<Duration> muteDuration=new AtomicReference<>(Duration.ZERO);
+//
+//		PopupMenu popupMenu=new PopupMenu(context, button, Gravity.CENTER_HORIZONTAL);
+//		popupMenu.inflate(R.menu.mute_duration);
+//		popupMenu.setOnMenuItemClickListener(item->{
+//			int id=item.getItemId();
+//			if(id==R.id.duration_indefinite)
+//				muteDuration.set(Duration.ZERO);
+//			else if(id==R.id.duration_minutes_5){
+//				muteDuration.set(Duration.ofMinutes(5));
+//			}else if(id==R.id.duration_minutes_30){
+//				muteDuration.set(Duration.ofMinutes(30));
+//			}else if(id==R.id.duration_hours_1){
+//				muteDuration.set(Duration.ofHours(1));
+//			}else if(id==R.id.duration_hours_6){
+//				muteDuration.set(Duration.ofHours(6));
+//			}else if(id==R.id.duration_days_1){
+//				muteDuration.set(Duration.ofDays(1));
+//			}else if(id==R.id.duration_days_3){
+//				muteDuration.set(Duration.ofDays(3));
+//			}else if(id==R.id.duration_days_7){
+//				muteDuration.set(Duration.ofDays(7));
+//			}
+//			button.setText(item.getTitle());
+//			return true;
+//		});
+//		button.setOnTouchListener(popupMenu.getDragToOpenListener());
+//		button.setOnClickListener(v->popupMenu.show());
+//		button.setText(popupMenu.getMenu().getItem(0).getTitle());
+//
+//		new M3AlertDialogBuilder(context)
+//				.setTitle(context.getString(currentlyMuted ? R.string.confirm_unmute_title : R.string.confirm_mute_title))
+//				.setMessage(currentlyMuted ? context.getString(R.string.confirm_unmute, account.getDisplayName()) : null)
+//				.setView(currentlyMuted ? null : durationView)
+//				.setPositiveButton(context.getString(currentlyMuted ? R.string.do_unmute : R.string.do_mute), (dlg, i)->{
+//					new SetAccountMuted(account.id, !currentlyMuted, muteDuration.get().getSeconds())
+//							.setCallback(new Callback<>(){
+//								@Override
+//								public void onSuccess(Relationship result){
+//									resultCallback.accept(result);
+//									if(!currentlyMuted){
+//										E.post(new RemoveAccountPostsEvent(accountID, account.id, false));
+//									}
+//								}
+//
+//								@Override
+//								public void onError(ErrorResponse error){
+//									error.showToast(context);
+//								}
+//							})
+//							.wrapProgress(context, R.string.loading, false)
+//							.exec(accountID);
+//				})
+//				.setNegativeButton(R.string.cancel, null)
+//				.setIcon(currentlyMuted ? R.drawable.ic_fluent_speaker_2_28_regular : R.drawable.ic_fluent_speaker_off_28_regular)
+//				.show();
 	}
 
 	public static void confirmDeletePost(Activity activity, String accountID, Status status, Consumer<Status> resultCallback, boolean forRedraft) {
@@ -769,8 +837,9 @@ public class UiUtils {
 				activity.getString(R.string.delete),
 				R.drawable.ic_fluent_delete_28_regular,
 				() -> new DeleteList(listID).setCallback(new Callback<>() {
+
 							@Override
-							public void onSuccess(Object o) {
+							public void onSuccess(Void result){
 								callback.run();
 							}
 
@@ -1275,6 +1344,10 @@ public class UiUtils {
 		openURL(context, accountID, url, true);
 	}
 
+	public static void openURL(Context context, String accountID, String url, Object parentObject) {
+		openURL(context, accountID, url, !(parentObject instanceof Status || parentObject instanceof Account));
+	}
+
 	public static void openURL(Context context, String accountID, String url, boolean launchBrowser) {
 		lookupURL(context, accountID, url, (clazz, args) -> {
 			if (clazz == null) {
@@ -1644,6 +1717,17 @@ public class UiUtils {
 		return insets;
 	}
 
+	public static void applyBottomInsetToFAB(View fab, WindowInsets insets){
+		int inset;
+		if(Build.VERSION.SDK_INT>=29 && insets.getTappableElementInsets().bottom==0 /*&& wantsOverlaySystemNavigation()*/){
+			int bottomInset=insets.getSystemWindowInsetBottom();
+			inset=bottomInset>0 ? Math.max(V.dp(40), bottomInset) : 0;
+		}else{
+			inset=0;
+		}
+		((ViewGroup.MarginLayoutParams) fab.getLayoutParams()).bottomMargin=V.dp(16)+inset;
+	}
+
 	public static String formatDuration(Context context, int seconds){
 		if(seconds<3600){
 			int minutes=seconds/60;
@@ -1811,4 +1895,72 @@ public class UiUtils {
 	public static ViewPropertyAnimator opacityOut(View v, float alpha){
 		return v.animate().alpha(alpha).setDuration(300).setInterpolator(CubicBezierInterpolator.DEFAULT);
 	}
+
+	public static void maybeShowTextCopiedToast(Context context){
+		//show toast, android from S_V2 on has built-in popup, as documented in
+		//https://developer.android.com/develop/ui/views/touch-and-input/copy-paste#duplicate-notifications
+		if(Build.VERSION.SDK_INT<=Build.VERSION_CODES.S_V2){
+			Toast.makeText(context, R.string.text_copied, Toast.LENGTH_SHORT).show();
+		}
+	}
+
+	public static boolean needShowClipboardToast(){
+		return Build.VERSION.SDK_INT<=Build.VERSION_CODES.S_V2;
+	}
+
+	public static void setAllPaddings(View view, int paddingDp){
+		int pad=V.dp(paddingDp);
+		view.setPadding(pad, pad, pad, pad);
+	}
+
+	public static ViewGroup.MarginLayoutParams makeLayoutParams(int width, int height, int marginStart, int marginTop, int marginEnd, int marginBottom){
+		ViewGroup.MarginLayoutParams lp=new ViewGroup.MarginLayoutParams(width>0 ? V.dp(width) : width, height>0 ? V.dp(height) : height);
+		lp.topMargin=V.dp(marginTop);
+		lp.bottomMargin=V.dp(marginBottom);
+		lp.setMarginStart(V.dp(marginStart));
+		lp.setMarginEnd(V.dp(marginEnd));
+		return lp;
+	}
+
+	public static CharSequence fixBulletListInString(Context context, @StringRes int res){
+		SpannableStringBuilder msg=new SpannableStringBuilder(context.getText(res));
+		BulletSpan[] spans=msg.getSpans(0, msg.length(), BulletSpan.class);
+		for(BulletSpan span:spans){
+			BulletSpan betterSpan;
+			if(Build.VERSION.SDK_INT<Build.VERSION_CODES.Q)
+				betterSpan=new BulletSpan(V.dp(10), UiUtils.getThemeColor(context, R.attr.colorM3OnSurface));
+			else
+				betterSpan=new BulletSpan(V.dp(10), UiUtils.getThemeColor(context, R.attr.colorM3OnSurface), V.dp(1.5f));
+			msg.setSpan(betterSpan, msg.getSpanStart(span), msg.getSpanEnd(span), msg.getSpanFlags(span));
+			msg.removeSpan(span);
+		}
+		return msg;
+	}
+
+	public static void showProgressForAlertButton(Button button, boolean show){
+		boolean shown=button.getTag(R.id.button_progress_orig_color)!=null;
+		if(shown==show)
+			return;
+		button.setEnabled(!show);
+		if(show){
+			ColorStateList origColor=button.getTextColors();
+			button.setTag(R.id.button_progress_orig_color, origColor);
+			button.setTextColor(0);
+			ProgressBar progressBar=(ProgressBar) LayoutInflater.from(button.getContext()).inflate(R.layout.progress_bar, null);
+			Drawable progress=progressBar.getIndeterminateDrawable().mutate();
+			progress.setTint(getThemeColor(button.getContext(), R.attr.colorM3OnSurface) & 0x60ffffff);
+			if(progress instanceof Animatable a)
+				a.start();
+			LayerDrawable layerList=new LayerDrawable(new Drawable[]{progress});
+			layerList.setLayerGravity(0, Gravity.CENTER);
+			layerList.setLayerSize(0, V.dp(24), V.dp(24));
+			layerList.setBounds(0, 0, button.getWidth(), button.getHeight());
+			button.getOverlay().add(layerList);
+		}else{
+			button.getOverlay().clear();
+			ColorStateList origColor=(ColorStateList) button.getTag(R.id.button_progress_orig_color);
+			button.setTag(R.id.button_progress_orig_color, null);
+			button.setTextColor(origColor);
+		}
+	}
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeAutocompleteViewController.java b/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeAutocompleteViewController.java
index 95cc2ccfc..cfbc1cae2 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeAutocompleteViewController.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeAutocompleteViewController.java
@@ -278,7 +278,7 @@ public class ComposeAutocompleteViewController{
 					@Override
 					public void onSuccess(SearchResults result){
 						currentRequest=null;
-						if(result.hashtags.isEmpty() || (result.hashtags.size()==1 && result.hashtags.get(0).name.equals(lastText.substring(1))))
+						if(result.hashtags.isEmpty() || (result.hashtags.size()==1 && result.hashtags.get(0).name.equals(lastText.substring(1))) || mode!=Mode.HASHTAGS)
 							return;
 						List<Hashtag> oldList=hashtags;
 						hashtags=result.hashtags;
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeLanguageAlertViewController.java b/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeLanguageAlertViewController.java
index 53016ffa1..bd7073885 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeLanguageAlertViewController.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeLanguageAlertViewController.java
@@ -115,7 +115,7 @@ public class ComposeLanguageAlertViewController{
 				int i=0;
 				boolean found=false;
 				for(SpecialLocaleInfo li:specialLocales){
-					if(previouslySelected.language != null && previouslySelected.language.equals(li.language)){
+					if(null!=li.language&&li.language.equals(previouslySelected.language)){
 						selectedLocale=li.language;
 						selectedIndex=i;
 						found=true;
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeMediaViewController.java b/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeMediaViewController.java
index 75c157d9c..7aee0ea29 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeMediaViewController.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeMediaViewController.java
@@ -124,7 +124,7 @@ public class ComposeMediaViewController{
 			updateMediaAttachmentsLayout();
 		}
 	}
-	
+
 	public boolean addMediaAttachment(Uri uri, String description){
 		if(getMediaAttachmentsCount()==MAX_ATTACHMENTS){
 			showMediaAttachmentError(fragment.getResources().getQuantityString(R.plurals.cant_add_more_than_x_attachments, MAX_ATTACHMENTS, MAX_ATTACHMENTS));
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/DropdownSubmenuController.java b/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/DropdownSubmenuController.java
new file mode 100644
index 000000000..4cfe3abaf
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/DropdownSubmenuController.java
@@ -0,0 +1,190 @@
+package org.joinmastodon.android.ui.viewcontrollers;
+
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.accessibility.AccessibilityNodeInfo;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.ui.BetterItemAnimator;
+import org.joinmastodon.android.ui.utils.HideableSingleViewRecyclerAdapter;
+import org.joinmastodon.android.ui.utils.UiUtils;
+
+import java.util.List;
+import java.util.function.Consumer;
+
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import me.grishka.appkit.utils.BindableViewHolder;
+import me.grishka.appkit.utils.MergeRecyclerAdapter;
+import me.grishka.appkit.utils.V;
+import me.grishka.appkit.views.UsableRecyclerView;
+
+public abstract class DropdownSubmenuController{
+	protected List<Item<?>> items;
+	protected LinearLayout contentView;
+	protected UsableRecyclerView list;
+	protected TextView backItem;
+	protected final ToolbarDropdownMenuController dropdownController;
+	protected MergeRecyclerAdapter mergeAdapter;
+	protected ItemsAdapter itemsAdapter;
+
+	public DropdownSubmenuController(ToolbarDropdownMenuController dropdownController){
+		this.dropdownController=dropdownController;
+	}
+
+	protected abstract CharSequence getBackItemTitle();
+	public void onDismiss(){}
+
+	protected void createView(){
+		contentView=new LinearLayout(dropdownController.getActivity());
+		contentView.setOrientation(LinearLayout.VERTICAL);
+		CharSequence backTitle=getBackItemTitle();
+		if(!TextUtils.isEmpty(backTitle)){
+			backItem=(TextView) dropdownController.getActivity().getLayoutInflater().inflate(R.layout.item_dropdown_menu, contentView, false);
+			((LinearLayout.LayoutParams) backItem.getLayoutParams()).topMargin=V.dp(8);
+			backItem.setText(backTitle);
+			backItem.setCompoundDrawablesRelativeWithIntrinsicBounds(R.drawable.ic_fluent_arrow_left_24_regular, 0, 0, 0);
+			backItem.setBackground(UiUtils.getThemeDrawable(dropdownController.getActivity(), android.R.attr.selectableItemBackground));
+			backItem.setOnClickListener(v->dropdownController.popSubmenuController());
+			backItem.setAccessibilityDelegate(new View.AccessibilityDelegate(){
+				@Override
+				public void onInitializeAccessibilityNodeInfo(@NonNull View host, @NonNull AccessibilityNodeInfo info){
+					super.onInitializeAccessibilityNodeInfo(host, info);
+					info.setText(info.getText()+". "+host.getResources().getString(R.string.back));
+				}
+			});
+			contentView.addView(backItem);
+		}
+		list=new UsableRecyclerView(dropdownController.getActivity());
+		list.setLayoutManager(new LinearLayoutManager(dropdownController.getActivity()));
+		itemsAdapter=new ItemsAdapter();
+		mergeAdapter=new MergeRecyclerAdapter();
+		mergeAdapter.addAdapter(itemsAdapter);
+		list.setAdapter(mergeAdapter);
+		list.setPadding(0, backItem!=null ? 0 : V.dp(8), 0, V.dp(8));
+		list.setClipToPadding(false);
+		list.setItemAnimator(new BetterItemAnimator());
+		list.addItemDecoration(new RecyclerView.ItemDecoration(){
+			private final Paint paint=new Paint();
+			{
+				paint.setStyle(Paint.Style.STROKE);
+				paint.setStrokeWidth(V.dp(1));
+				paint.setColor(UiUtils.getThemeColor(dropdownController.getActivity(), R.attr.colorM3OutlineVariant));
+			}
+
+			@Override
+			public void onDraw(@NonNull Canvas c, @NonNull RecyclerView parent, @NonNull RecyclerView.State state){
+				for(int i=0;i<parent.getChildCount();i++){
+					View view=parent.getChildAt(i);
+					if(parent.getChildViewHolder(view) instanceof ItemHolder ih && ih.getItem().dividerBefore){
+						paint.setAlpha(Math.round(view.getAlpha()*255));
+						float y=view.getTop()-V.dp(8)-paint.getStrokeWidth()/2f;
+						c.drawLine(0, y, parent.getWidth(), y, paint);
+					}
+				}
+			}
+
+			@Override
+			public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state){
+				if(parent.getChildViewHolder(view) instanceof ItemHolder ih && ih.getItem().dividerBefore){
+					outRect.top=V.dp(17);
+				}
+			}
+		});
+		contentView.addView(list, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+	}
+
+	public View getView(){
+		if(contentView==null)
+			createView();
+		return contentView;
+	}
+
+	protected HideableSingleViewRecyclerAdapter createEmptyView(@DrawableRes int icon, @StringRes int title, @StringRes int subtitle){
+		View view=dropdownController.getActivity().getLayoutInflater().inflate(R.layout.popup_menu_empty, list, false);
+		ImageView iconView=view.findViewById(R.id.icon);
+		TextView titleView=view.findViewById(R.id.title);
+		TextView subtitleView=view.findViewById(R.id.subtitle);
+		iconView.setImageResource(icon);
+		titleView.setText(title);
+		subtitleView.setText(subtitle);
+		return new HideableSingleViewRecyclerAdapter(view);
+	}
+
+	protected final class Item<T>{
+		public final String title;
+		public final boolean hasSubmenu;
+		public final boolean dividerBefore;
+		public final T parentObject;
+		public final Consumer<Item<T>> onClick;
+
+		public Item(String title, boolean hasSubmenu, boolean dividerBefore, T parentObject, Consumer<Item<T>> onClick){
+			this.title=title;
+			this.hasSubmenu=hasSubmenu;
+			this.dividerBefore=dividerBefore;
+			this.parentObject=parentObject;
+			this.onClick=onClick;
+		}
+
+		public Item(String title, boolean hasSubmenu, boolean dividerBefore, Consumer<Item<T>> onClick){
+			this(title, hasSubmenu, dividerBefore, null, onClick);
+		}
+
+		public Item(@StringRes int titleRes, boolean hasSubmenu, boolean dividerBefore, Consumer<Item<T>> onClick){
+			this(dropdownController.getActivity().getString(titleRes), hasSubmenu, dividerBefore, null, onClick);
+		}
+
+		private void performClick(){
+			onClick.accept(this);
+		}
+	}
+
+	protected class ItemsAdapter extends RecyclerView.Adapter<ItemHolder>{
+
+		@NonNull
+		@Override
+		public ItemHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
+			return new ItemHolder();
+		}
+
+		@Override
+		public void onBindViewHolder(@NonNull ItemHolder holder, int position){
+			holder.bind(items.get(position));
+		}
+
+		@Override
+		public int getItemCount(){
+			return items.size();
+		}
+	}
+
+	private class ItemHolder extends BindableViewHolder<Item<?>> implements UsableRecyclerView.Clickable{
+		private final TextView text;
+
+		public ItemHolder(){
+			super(dropdownController.getActivity(), R.layout.item_dropdown_menu, list);
+			text=(TextView) itemView;
+		}
+
+		@Override
+		public void onBind(Item<?> item){
+			text.setText(item.title);
+			text.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, item.hasSubmenu ? R.drawable.ic_arrow_right_24px : 0, 0);
+		}
+
+		@Override
+		public void onClick(){
+			item.performClick();
+		}
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/HomeTimelineHashtagsMenuController.java b/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/HomeTimelineHashtagsMenuController.java
new file mode 100644
index 000000000..74f4698e5
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/HomeTimelineHashtagsMenuController.java
@@ -0,0 +1,111 @@
+package org.joinmastodon.android.ui.viewcontrollers;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.Gravity;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.ProgressBar;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.tags.GetFollowedTags;
+import org.joinmastodon.android.fragments.ManageFollowedHashtagsFragment;
+import org.joinmastodon.android.model.Hashtag;
+import org.joinmastodon.android.model.HeaderPaginationList;
+import org.joinmastodon.android.ui.utils.HideableSingleViewRecyclerAdapter;
+import org.joinmastodon.android.ui.utils.UiUtils;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+
+import androidx.recyclerview.widget.RecyclerView;
+import me.grishka.appkit.Nav;
+import me.grishka.appkit.api.APIRequest;
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
+import me.grishka.appkit.utils.V;
+
+public class HomeTimelineHashtagsMenuController extends DropdownSubmenuController{
+	private HideableSingleViewRecyclerAdapter largeProgressAdapter;
+	private HideableSingleViewRecyclerAdapter emptyAdapter;
+	private APIRequest<?> currentRequest;
+
+	public HomeTimelineHashtagsMenuController(ToolbarDropdownMenuController dropdownController){
+		super(dropdownController);
+		items=new ArrayList<>();
+		loadHashtags();
+	}
+
+	@Override
+	protected void createView(){
+		super.createView();
+		emptyAdapter=createEmptyView(R.drawable.ic_fluent_tag_24_regular, R.string.no_followed_hashtags_title, R.string.no_followed_hashtags_subtitle);
+		FrameLayout largeProgressView=new FrameLayout(dropdownController.getActivity());
+		int pad=V.dp(32);
+		largeProgressView.setPadding(0, pad, 0, pad);
+		largeProgressView.setLayoutParams(new RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+		ProgressBar progress=new ProgressBar(dropdownController.getActivity());
+		largeProgressView.addView(progress, new FrameLayout.LayoutParams(V.dp(48), V.dp(48), Gravity.CENTER));
+		largeProgressAdapter=new HideableSingleViewRecyclerAdapter(largeProgressView);
+		mergeAdapter.addAdapter(0, largeProgressAdapter);
+		emptyAdapter.setVisible(false);
+		mergeAdapter.addAdapter(0, emptyAdapter);
+	}
+
+	@Override
+	protected CharSequence getBackItemTitle(){
+		return dropdownController.getActivity().getString(R.string.followed_hashtags);
+	}
+
+	@Override
+	public void onDismiss(){
+		if(currentRequest!=null){
+			currentRequest.cancel();
+			currentRequest=null;
+		}
+	}
+
+	private void onTagClick(Item<Hashtag> item){
+		dropdownController.dismiss();
+		UiUtils.openHashtagTimeline(dropdownController.getActivity(), dropdownController.getAccountID(), item.parentObject);
+	}
+
+	private void onManageTagsClick(){
+		dropdownController.dismiss();
+		Bundle args=new Bundle();
+		args.putString("account", dropdownController.getAccountID());
+		Nav.go(dropdownController.getActivity(), ManageFollowedHashtagsFragment.class, args);
+	}
+
+	private void loadHashtags(){
+		currentRequest=new GetFollowedTags(null, 200)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(HeaderPaginationList<Hashtag> result){
+						currentRequest=null;
+						dropdownController.resizeOnNextFrame();
+						largeProgressAdapter.setVisible(false);
+						((List<Hashtag>) result).sort(Comparator.comparing(tag->tag.name));
+						int prevSize=items.size();
+						for(Hashtag tag:result){
+							items.add(new Item<>("#"+tag.name, false, false, tag, HomeTimelineHashtagsMenuController.this::onTagClick));
+						}
+						items.add(new Item<Void>(R.string.manage_hashtags, false, true, i->onManageTagsClick()));
+						itemsAdapter.notifyItemRangeInserted(prevSize, result.size()+1);
+						emptyAdapter.setVisible(result.isEmpty());
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						currentRequest=null;
+						Activity activity=dropdownController.getActivity();
+						if(activity!=null)
+							error.showToast(activity);
+						dropdownController.popSubmenuController();
+
+					}
+				})
+				.exec(dropdownController.getAccountID());
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/HomeTimelineListsMenuController.java b/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/HomeTimelineListsMenuController.java
new file mode 100644
index 000000000..22c78468a
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/HomeTimelineListsMenuController.java
@@ -0,0 +1,61 @@
+package org.joinmastodon.android.ui.viewcontrollers;
+
+import android.os.Bundle;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.fragments.CreateListFragment;
+import org.joinmastodon.android.fragments.ManageListsFragment;
+import org.joinmastodon.android.model.FollowList;
+import org.joinmastodon.android.ui.utils.HideableSingleViewRecyclerAdapter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import me.grishka.appkit.Nav;
+
+public class HomeTimelineListsMenuController extends DropdownSubmenuController{
+	private final List<FollowList> lists;
+	private final HomeTimelineMenuController.Callback callback;
+	private HideableSingleViewRecyclerAdapter emptyAdapter;
+
+	public HomeTimelineListsMenuController(ToolbarDropdownMenuController dropdownController, HomeTimelineMenuController.Callback callback){
+		super(dropdownController);
+		this.lists=new ArrayList<>(callback.getLists());
+		this.callback=callback;
+		items=new ArrayList<>();
+		for(FollowList l:lists){
+			items.add(new Item<>(l.title, false, false, l, this::onListSelected));
+		}
+		items.add(new Item<Void>(dropdownController.getActivity().getString(R.string.create_list), false, true, i->{
+			dropdownController.dismiss();
+			Bundle args=new Bundle();
+			args.putString("account", dropdownController.getAccountID());
+			Nav.go(dropdownController.getActivity(), CreateListFragment.class, args);
+		}));
+		items.add(new Item<Void>(dropdownController.getActivity().getString(R.string.manage_lists), false, false, i->{
+			dropdownController.dismiss();
+			Bundle args=new Bundle();
+			args.putString("account", dropdownController.getAccountID());
+			Nav.go(dropdownController.getActivity(), ManageListsFragment.class, args);
+		}));
+	}
+
+	@Override
+	protected CharSequence getBackItemTitle(){
+		return dropdownController.getActivity().getString(R.string.lists);
+	}
+
+	@Override
+	protected void createView(){
+		super.createView();
+		emptyAdapter=createEmptyView(R.drawable.ic_list_alt_24px, R.string.no_lists_title, R.string.no_lists_subtitle);
+		if(lists.isEmpty()){
+			mergeAdapter.addAdapter(0, emptyAdapter);
+		}
+	}
+
+	private void onListSelected(Item<FollowList> item){
+		callback.onListSelected(item.parentObject);
+		dropdownController.dismiss();
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/HomeTimelineMenuController.java b/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/HomeTimelineMenuController.java
new file mode 100644
index 000000000..2391d5b7b
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/HomeTimelineMenuController.java
@@ -0,0 +1,39 @@
+package org.joinmastodon.android.ui.viewcontrollers;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.model.FollowList;
+
+import java.util.List;
+
+public class HomeTimelineMenuController extends DropdownSubmenuController{
+	private Callback callback;
+
+	public HomeTimelineMenuController(ToolbarDropdownMenuController dropdownController, Callback callback){
+		super(dropdownController);
+		this.callback=callback;
+		items=List.of(
+				new Item<Void>(R.string.timeline_following, false, false, i->{
+					callback.onFollowingSelected();
+					dropdownController.dismiss();
+				}),
+				new Item<Void>(R.string.local_timeline, false, false, i->{
+					callback.onLocalSelected();
+					dropdownController.dismiss();
+				}),
+				new Item<Void>(R.string.lists, true, true, i->dropdownController.pushSubmenuController(new HomeTimelineListsMenuController(dropdownController, callback))),
+				new Item<Void>(R.string.followed_hashtags, true, false, i->dropdownController.pushSubmenuController(new HomeTimelineHashtagsMenuController(dropdownController)))
+		);
+	}
+
+	@Override
+	protected CharSequence getBackItemTitle(){
+		return null;
+	}
+
+	public interface Callback{
+		void onFollowingSelected();
+		void onLocalSelected();
+		List<FollowList> getLists();
+		void onListSelected(FollowList list);
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ToolbarDropdownMenuController.java b/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ToolbarDropdownMenuController.java
new file mode 100644
index 000000000..520ef51ef
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ToolbarDropdownMenuController.java
@@ -0,0 +1,270 @@
+package org.joinmastodon.android.ui.viewcontrollers;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
+import android.animation.ValueAnimator;
+import android.app.Activity;
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.PixelFormat;
+import android.graphics.Rect;
+import android.view.Gravity;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
+import android.view.WindowManager;
+import android.widget.FrameLayout;
+import android.widget.Toolbar;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.ui.OutlineProviders;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import androidx.annotation.NonNull;
+import me.grishka.appkit.utils.CubicBezierInterpolator;
+import me.grishka.appkit.utils.V;
+
+public class ToolbarDropdownMenuController{
+	private final HostFragment fragment;
+	private FrameLayout windowView;
+	private FrameLayout menuContainer;
+	private boolean dismissing;
+	private List<DropdownSubmenuController> controllerStack=new ArrayList<>();
+	private Animator currentTransition;
+
+	public ToolbarDropdownMenuController(HostFragment fragment){
+		this.fragment=fragment;
+	}
+
+	public void show(DropdownSubmenuController initialSubmenu){
+		if(windowView!=null)
+			return;
+
+		menuContainer=new FrameLayout(fragment.getActivity());
+		menuContainer.setBackgroundResource(R.drawable.bg_m3_surface2);
+		menuContainer.setOutlineProvider(OutlineProviders.roundedRect(4));
+		menuContainer.setClipToOutline(true);
+		menuContainer.setElevation(V.dp(6));
+		View menuView=initialSubmenu.getView();
+		menuView.setVisibility(View.VISIBLE);
+		menuContainer.addView(menuView, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+
+		windowView=new WindowView(fragment.getActivity());
+		int pad=V.dp(16);
+		windowView.setPadding(pad, fragment.getToolbar().getHeight(), pad, pad);
+		windowView.setClipToPadding(false);
+		windowView.addView(menuContainer, new FrameLayout.LayoutParams(V.dp(200), ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.TOP | Gravity.START));
+
+		WindowManager.LayoutParams wlp=new WindowManager.LayoutParams(WindowManager.LayoutParams.TYPE_APPLICATION_PANEL);
+		wlp.format=PixelFormat.TRANSLUCENT;
+		wlp.token=fragment.getActivity().getWindow().getDecorView().getWindowToken();
+		wlp.width=wlp.height=ViewGroup.LayoutParams.MATCH_PARENT;
+		wlp.flags=WindowManager.LayoutParams.FLAG_LAYOUT_ATTACHED_IN_DECOR;
+		wlp.setTitle(fragment.getActivity().getString(R.string.dropdown_menu));
+		fragment.getActivity().getWindowManager().addView(windowView, wlp);
+
+		menuContainer.setPivotX(V.dp(100));
+		menuContainer.setPivotY(0);
+		menuContainer.setScaleX(.8f);
+		menuContainer.setScaleY(.8f);
+		menuContainer.setAlpha(0f);
+		menuContainer.animate()
+				.scaleX(1f)
+				.scaleY(1f)
+				.alpha(1f)
+				.setInterpolator(CubicBezierInterpolator.DEFAULT)
+				.setDuration(150)
+				.withLayer()
+				.start();
+		controllerStack.add(initialSubmenu);
+	}
+
+	public void dismiss(){
+		if(windowView==null || dismissing)
+			return;
+		dismissing=true;
+		fragment.onDropdownWillDismiss();
+		menuContainer.animate()
+				.scaleX(.8f)
+				.scaleY(.8f)
+				.alpha(0f)
+				.setInterpolator(CubicBezierInterpolator.DEFAULT)
+				.setDuration(150)
+				.withLayer()
+				.withEndAction(()->{
+					controllerStack.clear();
+					fragment.getActivity().getWindowManager().removeView(windowView);
+					menuContainer.removeAllViews();
+					dismissing=false;
+					windowView=null;
+					menuContainer=null;
+					fragment.onDropdownDismissed();
+				})
+				.start();
+	}
+
+	public void pushSubmenuController(DropdownSubmenuController controller){
+		View prevView=menuContainer.getChildAt(menuContainer.getChildCount()-1);
+		View newView=controller.getView();
+		newView.setVisibility(View.VISIBLE);
+		menuContainer.addView(newView, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+		controllerStack.add(controller);
+		animateTransition(prevView, newView, true);
+	}
+
+	public void popSubmenuController(){
+		if(menuContainer.getChildCount()<=1)
+			throw new IllegalStateException();
+		DropdownSubmenuController controller=controllerStack.remove(controllerStack.size()-1);
+		controller.onDismiss();
+		View top=menuContainer.getChildAt(menuContainer.getChildCount()-1);
+		View prev=menuContainer.getChildAt(menuContainer.getChildCount()-2);
+		prev.setVisibility(View.VISIBLE);
+		animateTransition(prev, top, false);
+	}
+
+	private void animateTransition(View bottomView, View topView, boolean adding){
+		if(currentTransition!=null)
+			currentTransition.cancel();
+		int origBottom=menuContainer.getBottom();
+		menuContainer.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener(){
+			private final Rect tmpRect=new Rect();
+
+			@Override
+			public boolean onPreDraw(){
+				menuContainer.getViewTreeObserver().removeOnPreDrawListener(this);
+
+				AnimatorSet set=new AnimatorSet();
+				ObjectAnimator slideIn;
+				set.playTogether(
+						ObjectAnimator.ofInt(menuContainer, "bottom", origBottom, menuContainer.getTop()+(adding ? topView : bottomView).getHeight()),
+						slideIn=ObjectAnimator.ofFloat(topView, View.TRANSLATION_X, adding ? menuContainer.getWidth() : 0, adding ? 0 : menuContainer.getWidth()),
+						ObjectAnimator.ofFloat(bottomView, View.TRANSLATION_X, adding ? 0 : -menuContainer.getWidth()/4f, adding ? -menuContainer.getWidth()/4f : 0),
+						ObjectAnimator.ofFloat(bottomView, View.ALPHA, adding ? 1f : 0f, adding ? 0f : 1f)
+				);
+				set.setDuration(300);
+				set.setInterpolator(CubicBezierInterpolator.DEFAULT);
+				set.addListener(new AnimatorListenerAdapter(){
+					@Override
+					public void onAnimationEnd(Animator animation){
+						bottomView.setClipBounds(null);
+						bottomView.setTranslationX(0);
+						bottomView.setAlpha(1f);
+						topView.setTranslationX(0);
+						topView.setAlpha(1f);
+						if(adding){
+							bottomView.setVisibility(View.GONE);
+						}else{
+							menuContainer.removeView(topView);
+						}
+						currentTransition=null;
+					}
+				});
+				slideIn.addUpdateListener(animation->{
+					tmpRect.set(0, 0, Math.round(topView.getX()-bottomView.getX()), bottomView.getHeight());
+					bottomView.setClipBounds(tmpRect);
+				});
+				currentTransition=set;
+				set.start();
+
+				return true;
+			}
+		});
+	}
+
+	public void resizeOnNextFrame(){
+		if(currentTransition!=null)
+			currentTransition.cancel();
+		if(windowView==null)
+			return;
+		int origBottom=menuContainer.getBottom();
+		menuContainer.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener(){
+			@Override
+			public boolean onPreDraw(){
+				menuContainer.getViewTreeObserver().removeOnPreDrawListener(this);
+
+				ObjectAnimator anim=ObjectAnimator.ofInt(menuContainer, "bottom", origBottom, menuContainer.getBottom());
+				anim.setDuration(300);
+				anim.setInterpolator(CubicBezierInterpolator.DEFAULT);
+				anim.addListener(new AnimatorListenerAdapter(){
+					@Override
+					public void onAnimationEnd(Animator animation){
+						currentTransition=null;
+					}
+				});
+				currentTransition=anim;
+				anim.start();
+
+				return true;
+			}
+		});
+	}
+
+	Activity getActivity(){
+		return fragment.getActivity();
+	}
+
+	String getAccountID(){
+		return fragment.getAccountID();
+	}
+
+	private class WindowView extends FrameLayout{
+		private final Rect tmpRect=new Rect();
+		public WindowView(@NonNull Context context){
+			super(context);
+		}
+
+		@Override
+		public boolean onTouchEvent(MotionEvent ev){
+			for(int i=0;i<getChildCount();i++){
+				View child=getChildAt(i);
+				child.getHitRect(tmpRect);
+				if(tmpRect.contains(Math.round(ev.getX()), Math.round(ev.getY())))
+					return super.onTouchEvent(ev);
+			}
+			if(ev.getAction()==MotionEvent.ACTION_DOWN){
+				dismiss();
+			}
+			return true;
+		}
+
+		@Override
+		public boolean dispatchTouchEvent(MotionEvent ev){
+			if(currentTransition!=null)
+				return false;
+			return super.dispatchTouchEvent(ev);
+		}
+
+		@Override
+		public boolean dispatchKeyEvent(KeyEvent event){
+			if(event.getKeyCode()==KeyEvent.KEYCODE_BACK){
+				if(event.getAction()==KeyEvent.ACTION_DOWN){
+					if(controllerStack.size()>1)
+						popSubmenuController();
+					else
+						dismiss();
+				}
+				return true;
+			}
+			return super.dispatchKeyEvent(event);
+		}
+	}
+
+	public interface HostFragment{
+		// Fragment methods
+		Activity getActivity();
+		Resources getResources();
+		Toolbar getToolbar();
+		String getAccountID();
+
+		// Callbacks
+		void onDropdownWillDismiss();
+		void onDropdownDismissed();
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/viewholders/AccountViewHolder.java b/mastodon/src/main/java/org/joinmastodon/android/ui/viewholders/AccountViewHolder.java
index caa89f797..a431bf2c9 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/viewholders/AccountViewHolder.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/viewholders/AccountViewHolder.java
@@ -16,6 +16,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
 import android.widget.FrameLayout;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.PopupMenu;
 import android.widget.ProgressBar;
@@ -26,7 +27,7 @@ import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.SetAccountFollowed;
 import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.fragments.ListsFragment;
+import org.joinmastodon.android.fragments.AddAccountToListsFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.report.ReportReasonChoiceFragment;
 import org.joinmastodon.android.model.Account;
@@ -43,7 +44,9 @@ import java.util.HashMap;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Consumer;
+import java.util.function.Predicate;
 
+import androidx.annotation.LayoutRes;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
@@ -53,7 +56,7 @@ import me.grishka.appkit.views.UsableRecyclerView;
 
 public class AccountViewHolder extends BindableViewHolder<AccountViewModel> implements ImageLoaderViewHolder, UsableRecyclerView.Clickable, UsableRecyclerView.LongClickable{
 	private final TextView name, username, followers, pronouns, bio;
-	private final ImageView avatar;
+	public final ImageView avatar;
 	private final FrameLayout accessory;
 	private final ProgressBarButton button;
 	private final PopupMenu contextMenu;
@@ -62,18 +65,25 @@ public class AccountViewHolder extends BindableViewHolder<AccountViewModel> impl
 	private final CheckableRelativeLayout view;
 	private final View checkbox;
 	private final ProgressBar actionProgress;
+	private final ImageButton menuButton;
 
 	private final String accountID;
 	private final Fragment fragment;
 	private final HashMap<String, Relationship> relationships;
 
 	private Consumer<AccountViewHolder> onClick;
+	private Predicate<AccountViewHolder> onLongClick;
+	private Consumer<MenuItem> onCustomMenuItemSelected;
 	private AccessoryType accessoryType;
 	private boolean showBio;
 	private boolean checked;
 
 	public AccountViewHolder(Fragment fragment, ViewGroup list, HashMap<String, Relationship> relationships){
-		super(fragment.getActivity(), R.layout.item_account_list, list);
+		this(fragment, list, relationships, R.layout.item_account_list);
+	}
+
+	public AccountViewHolder(Fragment fragment, ViewGroup list, HashMap<String, Relationship> relationships, @LayoutRes int layout){
+		super(fragment.getActivity(), layout, list);
 		this.fragment=fragment;
 		this.accountID=Objects.requireNonNull(fragment.getArguments().getString("account"));
 		this.relationships=relationships;
@@ -90,6 +100,7 @@ public class AccountViewHolder extends BindableViewHolder<AccountViewModel> impl
 		bio=findViewById(R.id.bio);
 		checkbox=findViewById(R.id.checkbox);
 		actionProgress=findViewById(R.id.action_progress);
+		menuButton=findViewById(R.id.options_btn);
 
 		avatar.setOutlineProvider(OutlineProviders.roundedRect(10));
 		avatar.setClipToOutline(true);
@@ -100,6 +111,7 @@ public class AccountViewHolder extends BindableViewHolder<AccountViewModel> impl
 		contextMenu=new PopupMenu(fragment.getActivity(), menuAnchor);
 		contextMenu.inflate(R.menu.profile);
 		contextMenu.setOnMenuItemClickListener(this::onContextMenuItemSelected);
+		menuButton.setOnClickListener(v->showMenuFromButton());
 		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.P && !UiUtils.isEMUI())
 			contextMenu.getMenu().setGroupDividerEnabled(true);
 		UiUtils.enablePopupMenuIcons(fragment.getContext(), contextMenu);
@@ -209,6 +221,10 @@ public class AccountViewHolder extends BindableViewHolder<AccountViewModel> impl
 
 	@Override
 	public boolean onLongClick(float x, float y){
+		if(onLongClick!=null && onLongClick.test(this))
+			return true;
+		if(accessoryType==AccessoryType.MENU || !prepareMenu())
+			return false;
 		if(relationships==null)
 			return false;
 		Relationship relationship=relationships.get(item.account.id);
@@ -247,7 +263,6 @@ public class AccountViewHolder extends BindableViewHolder<AccountViewModel> impl
 		menuAnchor.setTranslationX(x);
 		menuAnchor.setTranslationY(y);
 		contextMenu.show();
-
 		return true;
 	}
 
@@ -262,7 +277,7 @@ public class AccountViewHolder extends BindableViewHolder<AccountViewModel> impl
 		});
 	}
 
-	private void setActionProgressVisible(boolean visible){
+	public void setActionProgressVisible(boolean visible){
 		if(visible)
 			actionProgress.setIndeterminateTintList(button.getTextColors());
 		button.setTextVisible(!visible);
@@ -318,11 +333,12 @@ public class AccountViewHolder extends BindableViewHolder<AccountViewModel> impl
 					.wrapProgress(fragment.getActivity(), R.string.loading, false)
 					.exec(accountID);
 		}else if(id==R.id.manage_user_lists){
-			final Bundle args=new Bundle();
+			Bundle args=new Bundle();
 			args.putString("account", accountID);
-			args.putString("profileAccount", account.id);
-			args.putString("profileDisplayUsername", account.getDisplayUsername());
-			Nav.go(fragment.getActivity(), ListsFragment.class, args);
+			args.putParcelable("targetAccount", Parcels.wrap(account));
+			Nav.go(fragment.getActivity(), AddAccountToListsFragment.class, args);
+		}else if(onCustomMenuItemSelected!=null){
+			onCustomMenuItemSelected.accept(item);
 		}
 		return true;
 	}
@@ -336,6 +352,14 @@ public class AccountViewHolder extends BindableViewHolder<AccountViewModel> impl
 		onClick=listener;
 	}
 
+	public void setOnLongClickListener(Predicate<AccountViewHolder> onLongClick){
+		this.onLongClick=onLongClick;
+	}
+
+	public void setOnCustomMenuItemSelectedListener(Consumer<MenuItem> onCustomMenuItemSelected){
+		this.onCustomMenuItemSelected=onCustomMenuItemSelected;
+	}
+
 	public void setStyle(AccessoryType accessoryType, boolean showBio){
 		if(accessoryType!=this.accessoryType){
 			this.accessoryType=accessoryType;
@@ -343,20 +367,29 @@ public class AccountViewHolder extends BindableViewHolder<AccountViewModel> impl
 				case NONE -> {
 					button.setVisibility(View.GONE);
 					checkbox.setVisibility(View.GONE);
+					menuButton.setVisibility(View.GONE);
 				}
 				case CHECKBOX -> {
 					button.setVisibility(View.GONE);
 					checkbox.setVisibility(View.VISIBLE);
+					menuButton.setVisibility(View.GONE);
 					checkbox.setBackground(new CheckBox(checkbox.getContext()).getButtonDrawable());
 				}
 				case RADIOBUTTON -> {
 					button.setVisibility(View.GONE);
 					checkbox.setVisibility(View.VISIBLE);
+					menuButton.setVisibility(View.GONE);
 					checkbox.setBackground(new RadioButton(checkbox.getContext()).getButtonDrawable());
 				}
-				case BUTTON -> {
+				case BUTTON, CUSTOM_BUTTON -> {
 					button.setVisibility(View.VISIBLE);
 					checkbox.setVisibility(View.GONE);
+					menuButton.setVisibility(View.GONE);
+				}
+				case MENU -> {
+					button.setVisibility(View.GONE);
+					checkbox.setVisibility(View.GONE);
+					menuButton.setVisibility(View.VISIBLE);
 				}
 			}
 			view.setCheckable(accessoryType==AccessoryType.CHECKBOX || accessoryType==AccessoryType.RADIOBUTTON);
@@ -365,15 +398,68 @@ public class AccountViewHolder extends BindableViewHolder<AccountViewModel> impl
 		bio.setVisibility(showBio ? View.VISIBLE : View.GONE);
 	}
 
+	private boolean prepareMenu(){
+		if(relationships==null)
+			return false;
+		Relationship relationship=relationships.get(item.account.id);
+		if(relationship==null)
+			return false;
+		Menu menu=contextMenu.getMenu();
+		Account account=item.account;
+
+		menu.findItem(R.id.share).setTitle(R.string.share_user);
+		menu.findItem(R.id.mute).setTitle(fragment.getString(relationship.muting ? R.string.unmute_user : R.string.mute_user, account.getDisplayUsername()));
+		menu.findItem(R.id.block).setTitle(fragment.getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getDisplayUsername()));
+		menu.findItem(R.id.report).setTitle(fragment.getString(R.string.report_user, account.getDisplayUsername()));
+		MenuItem hideBoosts=menu.findItem(R.id.hide_boosts);
+		if(relationship.following){
+			hideBoosts.setTitle(fragment.getString(relationship.showingReblogs ? R.string.hide_boosts_from_user : R.string.show_boosts_from_user, account.getDisplayUsername()));
+			hideBoosts.setVisible(true);
+		}else{
+			hideBoosts.setVisible(false);
+		}
+		MenuItem blockDomain=menu.findItem(R.id.block_domain);
+		if(!account.isLocal()){
+			blockDomain.setTitle(fragment.getString(relationship.domainBlocking ? R.string.unblock_domain : R.string.block_domain, account.getDomain()));
+			blockDomain.setVisible(true);
+		}else{
+			blockDomain.setVisible(false);
+		}
+		menu.findItem(R.id.manage_user_lists).setVisible(relationship.following);
+		return true;
+	}
+
+	private void showMenuFromButton(){
+		if(!prepareMenu())
+			return;
+		int[] xy={0, 0};
+		itemView.getLocationInWindow(xy);
+		int x=xy[0], y=xy[1];
+		menuButton.getLocationInWindow(xy);
+		menuAnchor.setTranslationX(xy[0]-x+menuButton.getWidth()/2f);
+		menuAnchor.setTranslationY(xy[1]-y+menuButton.getHeight());
+		contextMenu.show();
+	}
+
 	public void setChecked(boolean checked){
 		this.checked=checked;
 		view.setChecked(checked);
 	}
 
+	public PopupMenu getContextMenu(){
+		return contextMenu;
+	}
+
+	public ProgressBarButton getButton(){
+		return button;
+	}
+
 	public enum AccessoryType{
 		NONE,
 		BUTTON,
 		CHECKBOX,
-		RADIOBUTTON
+		RADIOBUTTON,
+		MENU,
+		CUSTOM_BUTTON
 	}
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/viewholders/AvatarPileListItemViewHolder.java b/mastodon/src/main/java/org/joinmastodon/android/ui/viewholders/AvatarPileListItemViewHolder.java
new file mode 100644
index 000000000..1590f7df4
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/viewholders/AvatarPileListItemViewHolder.java
@@ -0,0 +1,42 @@
+package org.joinmastodon.android.ui.viewholders;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.model.viewmodel.AvatarPileListItem;
+import org.joinmastodon.android.ui.views.AvatarPileView;
+
+import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
+import me.grishka.appkit.utils.V;
+
+public class AvatarPileListItemViewHolder extends ListItemViewHolder<AvatarPileListItem<?>> implements ImageLoaderViewHolder{
+	private final AvatarPileView pile;
+
+	public AvatarPileListItemViewHolder(Context context, ViewGroup parent){
+		super(context, R.layout.item_generic_list, parent);
+		pile=new AvatarPileView(context);
+		LinearLayout.LayoutParams lp=new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.MATCH_PARENT);
+		lp.topMargin=lp.bottomMargin=V.dp(-8);
+		view.addView(pile, lp);
+		view.setClipToPadding(false);
+	}
+
+	@Override
+	public void onBind(AvatarPileListItem<?> item){
+		super.onBind(item);
+		pile.setVisibleAvatarCount(item.avatars.size());
+	}
+
+	@Override
+	public void setImage(int index, Drawable image){
+		pile.avatars[index].setImageDrawable(image);
+	}
+
+	@Override
+	public void clearImage(int index){
+		pile.avatars[index].setImageResource(R.drawable.image_placeholder);
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/viewholders/OptionsListItemViewHolder.java b/mastodon/src/main/java/org/joinmastodon/android/ui/viewholders/OptionsListItemViewHolder.java
new file mode 100644
index 000000000..30a326142
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/viewholders/OptionsListItemViewHolder.java
@@ -0,0 +1,33 @@
+package org.joinmastodon.android.ui.viewholders;
+
+import android.content.Context;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageButton;
+import android.widget.PopupMenu;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.model.viewmodel.ListItemWithOptionsMenu;
+
+public class OptionsListItemViewHolder extends ListItemViewHolder<ListItemWithOptionsMenu<?>>{
+	private final PopupMenu menu;
+	private final ImageButton menuBtn;
+
+	public OptionsListItemViewHolder(Context context, ViewGroup parent){
+		super(context, R.layout.item_generic_list_options, parent);
+		menuBtn=findViewById(R.id.options_btn);
+		menu=new PopupMenu(context, menuBtn);
+		menuBtn.setOnClickListener(this::onMenuBtnClick);
+
+		menu.setOnMenuItemClickListener(menuItem->{
+			item.performItemSelected(menuItem);
+			return true;
+		});
+	}
+
+	private void onMenuBtnClick(View v){
+		menu.getMenu().clear();
+		item.performConfigureMenu(menu.getMenu());
+		menu.show();
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/viewholders/SwitchListItemViewHolder.java b/mastodon/src/main/java/org/joinmastodon/android/ui/viewholders/SwitchListItemViewHolder.java
index 85cefd009..6dd042a2e 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/viewholders/SwitchListItemViewHolder.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/viewholders/SwitchListItemViewHolder.java
@@ -2,10 +2,13 @@ package org.joinmastodon.android.ui.viewholders;
 
 import android.content.Context;
 import android.view.Gravity;
+import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 
+import org.joinmastodon.android.R;
 import org.joinmastodon.android.model.viewmodel.CheckableListItem;
+import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.M3Switch;
 
 import me.grishka.appkit.utils.V;
@@ -14,8 +17,17 @@ public class SwitchListItemViewHolder extends CheckableListItemViewHolder{
 	private final M3Switch sw;
 	private boolean ignoreListener;
 
-	public SwitchListItemViewHolder(Context context, ViewGroup parent){
+	public SwitchListItemViewHolder(Context context, ViewGroup parent, boolean separated){
 		super(context, parent);
+		if(separated){
+			View separator=new View(context);
+			separator.setBackgroundColor(UiUtils.getThemeColor(context, R.attr.colorM3OutlineVariant));
+			LinearLayout.LayoutParams lp=new LinearLayout.LayoutParams(V.dp(1), V.dp(32));
+			lp.gravity=Gravity.TOP;
+			lp.setMarginStart(V.dp(16));
+			lp.setMarginEnd(V.dp(-1));
+			checkableLayout.addView(separator, lp);
+		}
 		sw=new M3Switch(context);
 		LinearLayout.LayoutParams lp=new LinearLayout.LayoutParams(V.dp(52), V.dp(32));
 		lp.gravity=Gravity.TOP;
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/views/AvatarPileView.java b/mastodon/src/main/java/org/joinmastodon/android/ui/views/AvatarPileView.java
new file mode 100644
index 000000000..bdb050f0d
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/views/AvatarPileView.java
@@ -0,0 +1,81 @@
+package org.joinmastodon.android.ui.views;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffXfermode;
+import android.graphics.RectF;
+import android.util.AttributeSet;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.ui.OutlineProviders;
+
+import androidx.annotation.Nullable;
+import me.grishka.appkit.utils.CustomViewHelper;
+
+public class AvatarPileView extends LinearLayout implements CustomViewHelper{
+	public final ImageView[] avatars=new ImageView[3];
+	private final Paint borderPaint=new Paint(Paint.ANTI_ALIAS_FLAG);
+	private final RectF tmpRect=new RectF();
+
+	public AvatarPileView(Context context){
+		super(context);
+		init();
+	}
+
+	public AvatarPileView(Context context, @Nullable AttributeSet attrs){
+		super(context, attrs);
+		init();
+	}
+
+	public AvatarPileView(Context context, @Nullable AttributeSet attrs, int defStyleAttr){
+		super(context, attrs, defStyleAttr);
+		init();
+	}
+
+	private void init(){
+		setLayerType(LAYER_TYPE_HARDWARE, null);
+		setPaddingRelative(dp(16), 0, 0, 0);
+		setClipToPadding(false);
+		for(int i=0;i<avatars.length;i++){
+			ImageView ava=new ImageView(getContext());
+			ava.setScaleType(ImageView.ScaleType.CENTER_CROP);
+			ava.setOutlineProvider(OutlineProviders.roundedRect(6));
+			ava.setClipToOutline(true);
+			ava.setImageResource(R.drawable.image_placeholder);
+			ava.setPivotX(dp(16));
+			ava.setPivotY(dp(32));
+			ava.setRotation((avatars.length-1-i)*(-2f));
+			LayoutParams lp=new LayoutParams(dp(32), dp(32));
+			lp.gravity=Gravity.CENTER_VERTICAL;
+			if(i<avatars.length-1)
+				lp.setMarginEnd(dp(-16));
+			addView(ava, lp);
+			avatars[avatars.length-1-i]=ava;
+		}
+		borderPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.CLEAR));
+	}
+
+	public void setVisibleAvatarCount(int count){
+		for(int i=0;i<avatars.length;i++){
+			avatars[i].setVisibility(i<count ? VISIBLE : INVISIBLE);
+		}
+	}
+
+	@Override
+	protected boolean drawChild(Canvas canvas, View child, long drawingTime){
+		tmpRect.set(child.getLeft(), child.getTop(), child.getRight(), child.getBottom());
+		tmpRect.offset(child.getTranslationX(), child.getTranslationY());
+		tmpRect.inset(dp(-2), dp(-2));
+		canvas.save();
+		canvas.rotate(child.getRotation(), child.getLeft()+child.getPivotX(), child.getTop()+child.getPivotY());
+		canvas.drawRoundRect(tmpRect, dp(8), dp(8), borderPaint);
+		canvas.restore();
+		return super.drawChild(canvas, child, drawingTime);
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/views/CurlyArrowEmptyView.java b/mastodon/src/main/java/org/joinmastodon/android/ui/views/CurlyArrowEmptyView.java
new file mode 100644
index 000000000..6039cf208
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/views/CurlyArrowEmptyView.java
@@ -0,0 +1,146 @@
+package org.joinmastodon.android.ui.views;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Matrix;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.PathMeasure;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.util.AttributeSet;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.ui.utils.UiUtils;
+
+import me.grishka.appkit.utils.CustomViewHelper;
+
+public class CurlyArrowEmptyView extends LinearLayout implements CustomViewHelper{
+	private int pointGravity=Gravity.TOP | Gravity.END;
+	private int pointOffsetX, pointOffsetY;
+	private float startingPointX, startingPointY, endingPointX, endingPointY;
+	private Path path=new Path(), arrowhead=new Path();
+	private Paint paint=new Paint(Paint.ANTI_ALIAS_FLAG);
+	private Rect tmpRect1=new Rect(), tmpRect2=new Rect();
+	private Matrix matrix=new Matrix();
+
+	public CurlyArrowEmptyView(Context context){
+		this(context, null);
+	}
+
+	public CurlyArrowEmptyView(Context context, AttributeSet attrs){
+		this(context, attrs, 0);
+	}
+
+	public CurlyArrowEmptyView(Context context, AttributeSet attrs, int defStyle){
+		super(context, attrs, defStyle);
+		setWillNotDraw(false);
+
+		paint.setColor(UiUtils.getThemeColor(getContext(), R.attr.colorM3OutlineVariant));
+		paint.setStyle(Paint.Style.STROKE);
+		paint.setStrokeWidth(dp(3));
+		paint.setStrokeCap(Paint.Cap.ROUND);
+		paint.setStrokeJoin(Paint.Join.ROUND);
+
+		// 22x12
+		arrowhead.moveTo(dp(-11), dp(12));
+		arrowhead.lineTo(0, 0);
+		arrowhead.lineTo(dp(11), dp(12));
+	}
+
+	@Override
+	public void onViewAdded(View child){
+		if(getChildCount()==1 && child instanceof TextView tv){
+			tv.setShadowLayer(dp(5), 0, 0, UiUtils.getThemeColor(getContext(), R.attr.colorM3Surface));
+		}
+	}
+
+	@Override
+	protected void onLayout(boolean changed, int l, int t, int r, int b){
+		super.onLayout(changed, l, t, r, b);
+		updatePoints();
+	}
+
+	@Override
+	protected void onDraw(Canvas canvas){
+		super.onDraw(canvas);
+		canvas.drawPath(path, paint);
+	}
+
+	private void updatePoints(){
+		if(getChildCount()==0)
+			return;
+		View lastChild=getChildAt(getChildCount()-1);
+		if(isRTL()){
+			startingPointX=lastChild.getLeft()-dp(8);
+		}else{
+			startingPointX=lastChild.getRight()+dp(8);
+		}
+		startingPointY=lastChild.getTop()+lastChild.getHeight()/2f;
+
+		tmpRect1.set(0, 0, getWidth(), getHeight());
+		tmpRect1.inset(pointOffsetX, pointOffsetY);
+		Gravity.apply(pointGravity, 2, 2, tmpRect1, tmpRect2, getLayoutDirection());
+		endingPointX=tmpRect2.centerX();
+		endingPointY=tmpRect2.centerY();
+		updatePath();
+	}
+
+	public void setGravityAndOffsets(int gravity, int offsetX, int offsetY){
+		pointGravity=gravity;
+		pointOffsetX=dp(offsetX);
+		pointOffsetY=dp(offsetY);
+		updatePoints();
+	}
+
+	private boolean isRTL(){
+		return getLayoutDirection()==LAYOUT_DIRECTION_RTL;
+	}
+
+	private void updatePath(){
+		RectF src=new RectF(), dst=new RectF();
+		dst.set(Math.min(startingPointX, endingPointX), Math.min(startingPointY, endingPointY), Math.max(startingPointX, endingPointX), Math.max(startingPointY, endingPointY));
+		boolean isReversed=false;
+
+		path.rewind();
+		path.moveTo(0.92f,292.1f);
+		path.cubicTo(53.42f,283.6f,71.67f,171.4f,46.42f,148.09f);
+		path.cubicTo(33.42f,136.09f,16.92f,137.59f,16.92f,156.09f);
+		path.cubicTo(16.92f,175.59f,36.66f,193.48f,55.39f,186.59f);
+		path.cubicTo(100.7f,169.94f,104.24f,38.38f,93.92f,1.1f);
+		if(dst.width()>dst.height()){
+			path.computeBounds(src, false);
+			matrix.setRotate(90, src.centerX(), src.centerY());
+			matrix.postScale(-1f, 1f, src.centerX(), src.centerY());
+			path.transform(matrix);
+			isReversed=true;
+		}
+		PathMeasure pm=new PathMeasure(path, false);
+		float[] pos=new float[2], tan=new float[2];
+		pm.getPosTan(isReversed ? pm.getLength() : 0, pos, null);
+		src.left=pos[0];
+		src.bottom=pos[1];
+		pm.getPosTan(isReversed ? 0 : pm.getLength(), pos, null);
+		src.right=pos[0];
+		src.top=pos[1];
+
+		matrix.setRectToRect(src, dst, Matrix.ScaleToFit.FILL);
+		if(startingPointX>endingPointX)
+			matrix.postScale(-1f, 1f, dst.centerX(), dst.centerY());
+		if(startingPointY<endingPointY)
+			matrix.postScale(1f, -1f, dst.centerX(), dst.centerY());
+		path.transform(matrix);
+		pm.setPath(path, false);
+		pm.getPosTan(isReversed ? 0 : pm.getLength(), pos, tan);
+		matrix.setTranslate(pos[0], pos[1]);
+		float angle=(float)Math.toDegrees(Math.atan2(tan[1], tan[0]))+90f;
+		if(isReversed)
+			angle+=180f;
+		matrix.postRotate(angle%360f, pos[0], pos[1]);
+		path.addPath(arrowhead, matrix);
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/views/FixedAspectRatioImageView.java b/mastodon/src/main/java/org/joinmastodon/android/ui/views/FixedAspectRatioImageView.java
index c3529799b..fd88585a5 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/views/FixedAspectRatioImageView.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/views/FixedAspectRatioImageView.java
@@ -1,11 +1,15 @@
 package org.joinmastodon.android.ui.views;
 
 import android.content.Context;
+import android.content.res.TypedArray;
 import android.util.AttributeSet;
 import android.widget.ImageView;
 
+import org.joinmastodon.android.R;
+
 public class FixedAspectRatioImageView extends ImageView{
-	private float aspectRatio=1;
+	private float aspectRatio;
+	private boolean useHeight;
 
 	public FixedAspectRatioImageView(Context context){
 		this(context, null);
@@ -17,12 +21,21 @@ public class FixedAspectRatioImageView extends ImageView{
 
 	public FixedAspectRatioImageView(Context context, AttributeSet attrs, int defStyle){
 		super(context, attrs, defStyle);
+		TypedArray ta=context.obtainStyledAttributes(attrs, R.styleable.FixedAspectRatioImageView);
+		aspectRatio=ta.getFloat(R.styleable.FixedAspectRatioImageView_aspectRatio, 1);
+		useHeight=ta.getBoolean(R.styleable.FixedAspectRatioImageView_useHeight, false);
+		ta.recycle();
 	}
 
 	@Override
 	protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec){
-		int width=MeasureSpec.getSize(widthMeasureSpec);
-		heightMeasureSpec=Math.round(width/aspectRatio) | MeasureSpec.EXACTLY;
+		if(useHeight){
+			int height=MeasureSpec.getSize(heightMeasureSpec);
+			widthMeasureSpec=Math.round(height*aspectRatio) | MeasureSpec.EXACTLY;
+		}else{
+			int width=MeasureSpec.getSize(widthMeasureSpec);
+			heightMeasureSpec=Math.round(width/aspectRatio) | MeasureSpec.EXACTLY;
+		}
 		super.onMeasure(widthMeasureSpec, heightMeasureSpec);
 	}
 
@@ -33,4 +46,12 @@ public class FixedAspectRatioImageView extends ImageView{
 	public void setAspectRatio(float aspectRatio){
 		this.aspectRatio=aspectRatio;
 	}
+
+	public boolean isUseHeight(){
+		return useHeight;
+	}
+
+	public void setUseHeight(boolean useHeight){
+		this.useHeight=useHeight;
+	}
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/views/FloatingHintEditTextLayout.java b/mastodon/src/main/java/org/joinmastodon/android/ui/views/FloatingHintEditTextLayout.java
index 54746df14..cec3f1af1 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/views/FloatingHintEditTextLayout.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/views/FloatingHintEditTextLayout.java
@@ -34,11 +34,13 @@ import org.joinmastodon.android.ui.utils.UiUtils;
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 import me.grishka.appkit.utils.CubicBezierInterpolator;
 import me.grishka.appkit.utils.CustomViewHelper;
 
 public class FloatingHintEditTextLayout extends FrameLayout implements CustomViewHelper{
 	private EditText edit;
+	private View firstChild;
 	private TextView label;
 	private int labelTextSize;
 	private int offsetY;
@@ -71,30 +73,37 @@ public class FloatingHintEditTextLayout extends FrameLayout implements CustomVie
 	@Override
 	protected void onFinishInflate(){
 		super.onFinishInflate();
-		if(getChildCount()>0 && getChildAt(0) instanceof EditText et){
-			edit=et;
+		if(getChildCount()>0){
+			firstChild=getChildAt(0);
+			if(firstChild instanceof EditText et)
+				edit=et;
 		}else{
-			throw new IllegalStateException("First child must be an EditText");
+			throw new IllegalStateException("Must contain at least one child view");
 		}
 
 		label=new TextView(getContext());
 		label.setTextSize(TypedValue.COMPLEX_UNIT_PX, labelTextSize);
 //		label.setTextColor(labelColors==null ? edit.getHintTextColors() : labelColors);
-		origHintColors=edit.getHintTextColors();
-		label.setText(edit.getHint());
+		if(edit!=null){
+			origHintColors=edit.getHintTextColors();
+			label.setText(edit.getHint());
+		}
 		label.setSingleLine();
 		label.setPivotX(0f);
 		label.setPivotY(0f);
 		label.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);
 		LayoutParams lp=new LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.START | Gravity.TOP);
-		lp.setMarginStart(edit.getPaddingStart()+((LayoutParams)edit.getLayoutParams()).getMarginStart());
+		lp.setMarginStart(firstChild.getPaddingStart()+((LayoutParams)firstChild.getLayoutParams()).getMarginStart());
 		addView(label, lp);
 
-		hintVisible=edit.getText().length()==0;
+		hintVisible=edit!=null && edit.getText().length()==0;
 		if(hintVisible)
 			label.setAlpha(0f);
+		else
+			animProgress=1;
 
-		edit.addTextChangedListener(new SimpleTextWatcher(this::onTextChanged));
+		if(edit!=null)
+			edit.addTextChangedListener(new SimpleTextWatcher(this::onTextChanged));
 
 		errorView=new LinkedTextView(getContext());
 		errorView.setTextAppearance(R.style.m3_body_small);
@@ -110,6 +119,18 @@ public class FloatingHintEditTextLayout extends FrameLayout implements CustomVie
 		label.setText(edit.getHint());
 	}
 
+	public void setHint(CharSequence hint){
+		label.setText(hint);
+	}
+
+	public void setHint(@StringRes int hint){
+		label.setText(hint);
+	}
+
+	public TextView getLabel(){
+		return label;
+	}
+
 	private void onTextChanged(Editable text){
 		if(errorState){
 			errorView.setVisibility(View.GONE);
@@ -244,7 +265,7 @@ public class FloatingHintEditTextLayout extends FrameLayout implements CustomVie
 	protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec){
 		if(errorView.getVisibility()!=GONE){
 			int width=MeasureSpec.getSize(widthMeasureSpec)-getPaddingLeft()-getPaddingRight();
-			LayoutParams editLP=(LayoutParams) edit.getLayoutParams();
+			LayoutParams editLP=(LayoutParams) firstChild.getLayoutParams();
 			width-=editLP.leftMargin+editLP.rightMargin;
 			errorView.measure(width | MeasureSpec.EXACTLY, MeasureSpec.UNSPECIFIED);
 			LayoutParams lp=(LayoutParams) errorView.getLayoutParams();
@@ -254,7 +275,7 @@ public class FloatingHintEditTextLayout extends FrameLayout implements CustomVie
 			lp.leftMargin=editLP.leftMargin;
 			editLP.bottomMargin=errorView.getMeasuredHeight();
 		}else{
-			LayoutParams editLP=(LayoutParams) edit.getLayoutParams();
+			LayoutParams editLP=(LayoutParams) firstChild.getLayoutParams();
 			editLP.bottomMargin=0;
 		}
 		super.onMeasure(widthMeasureSpec, heightMeasureSpec);
@@ -355,7 +376,7 @@ public class FloatingHintEditTextLayout extends FrameLayout implements CustomVie
 		protected void onBoundsChange(@NonNull Rect bounds){
 			super.onBoundsChange(bounds);
 			int offset=dp(12);
-			wrapped.setBounds(edit.getLeft()-offset, edit.getTop()-offset, edit.getRight()+offset, edit.getBottom()+offset);
+			wrapped.setBounds(firstChild.getLeft()-offset, firstChild.getTop()-offset, firstChild.getRight()+offset, firstChild.getBottom()+offset);
 		}
 	}
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/views/ListEditor.java b/mastodon/src/main/java/org/joinmastodon/android/ui/views/ListEditor.java
index 1ebe466d2..de4454c36 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/views/ListEditor.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/views/ListEditor.java
@@ -15,10 +15,10 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.joinmastodon.android.R;
-import org.joinmastodon.android.model.ListTimeline;
+import org.joinmastodon.android.model.FollowList;
 
 public class ListEditor extends LinearLayout {
-    private ListTimeline.RepliesPolicy policy = null;
+    private FollowList.RepliesPolicy policy = null;
     private final TextInputFrameLayout input;
     private final Button button;
     private final Switch exclusiveSwitch;
@@ -42,10 +42,10 @@ public class ListEditor extends LinearLayout {
         findViewById(R.id.exclusive)
                 .setOnClickListener(v -> exclusiveSwitch.setChecked(!exclusiveSwitch.isChecked()));
 
-        setRepliesPolicy(ListTimeline.RepliesPolicy.LIST);
+        setRepliesPolicy(FollowList.RepliesPolicy.LIST);
     }
 
-    public void applyList(String title, boolean exclusive, @Nullable ListTimeline.RepliesPolicy policy) {
+    public void applyList(String title, boolean exclusive, @Nullable FollowList.RepliesPolicy policy) {
         input.getEditText().setText(title);
         exclusiveSwitch.setChecked(exclusive);
         if (policy != null) setRepliesPolicy(policy);
@@ -55,7 +55,7 @@ public class ListEditor extends LinearLayout {
         return input.getEditText().getText().toString();
     }
 
-    public ListTimeline.RepliesPolicy getRepliesPolicy() {
+    public FollowList.RepliesPolicy getRepliesPolicy() {
         return policy;
     }
 
@@ -63,7 +63,7 @@ public class ListEditor extends LinearLayout {
         return exclusiveSwitch.isChecked();
     }
 
-    public void setRepliesPolicy(@NonNull ListTimeline.RepliesPolicy policy) {
+    public void setRepliesPolicy(@NonNull FollowList.RepliesPolicy policy) {
         this.policy = policy;
         switch (policy) {
             case FOLLOWED -> button.setText(R.string.sk_list_replies_policy_followed);
@@ -74,11 +74,11 @@ public class ListEditor extends LinearLayout {
 
     private boolean onMenuItemClick(MenuItem i) {
         if (i.getItemId() == R.id.reply_policy_none) {
-            setRepliesPolicy(ListTimeline.RepliesPolicy.NONE);
+            setRepliesPolicy(FollowList.RepliesPolicy.NONE);
         } else if (i.getItemId() == R.id.reply_policy_followed) {
-            setRepliesPolicy(ListTimeline.RepliesPolicy.FOLLOWED);
+            setRepliesPolicy(FollowList.RepliesPolicy.FOLLOWED);
         } else if (i.getItemId() == R.id.reply_policy_list) {
-            setRepliesPolicy(ListTimeline.RepliesPolicy.LIST);
+            setRepliesPolicy(FollowList.RepliesPolicy.LIST);
         }
         return true;
     }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/views/ProgressBarButton.java b/mastodon/src/main/java/org/joinmastodon/android/ui/views/ProgressBarButton.java
index ac0e4c9da..ae9497bdc 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/views/ProgressBarButton.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/views/ProgressBarButton.java
@@ -1,23 +1,42 @@
 package org.joinmastodon.android.ui.views;
 
 import android.content.Context;
+import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.ProgressBar;
+
+import org.joinmastodon.android.R;
 
 public class ProgressBarButton extends Button{
 	private boolean textVisible=true;
+	private ProgressBar progressBar;
+	private int progressBarID;
 
 	public ProgressBarButton(Context context){
-		super(context);
+		this(context, null);
 	}
 
 	public ProgressBarButton(Context context, AttributeSet attrs){
-		super(context, attrs);
+		this(context, attrs, 0);
 	}
 
-	public ProgressBarButton(Context context, AttributeSet attrs, int defStyleAttr){
-		super(context, attrs, defStyleAttr);
+	public ProgressBarButton(Context context, AttributeSet attrs, int defStyle){
+		super(context, attrs, defStyle);
+		TypedArray ta=context.obtainStyledAttributes(attrs, R.styleable.ProgressBarButton);
+		progressBarID=ta.getResourceId(R.styleable.ProgressBarButton_progressBar, 0);
+		ta.recycle();
+	}
+
+	@Override
+	protected void onAttachedToWindow(){
+		super.onAttachedToWindow();
+		if(progressBarID!=0){
+			progressBar=((ViewGroup)getParent()).findViewById(progressBarID);
+		}
 	}
 
 	public void setTextVisible(boolean textVisible){
@@ -29,6 +48,19 @@ public class ProgressBarButton extends Button{
 		return textVisible;
 	}
 
+	public void setProgressBarVisible(boolean visible){
+		if(progressBar==null)
+			throw new IllegalStateException("progressBar is not set");
+		if(visible){
+			setTextVisible(false);
+			progressBar.setIndeterminateTintList(getTextColors());
+			progressBar.setVisibility(View.VISIBLE);
+		}else{
+			setTextVisible(true);
+			progressBar.setVisibility(View.GONE);
+		}
+	}
+
 	@Override
 	protected void onDraw(Canvas canvas){
 		if(textVisible){
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/views/ReorderableLinearLayout.java b/mastodon/src/main/java/org/joinmastodon/android/ui/views/ReorderableLinearLayout.java
index c49bf56b1..c8d880f5a 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/views/ReorderableLinearLayout.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/views/ReorderableLinearLayout.java
@@ -170,6 +170,7 @@ public class ReorderableLinearLayout extends LinearLayout implements CustomViewH
 		else
 			bottomSibling=null;
 		dragListener.onSwapItems(prevIndex, index);
+		final View draggedView=this.draggedView;
 		draggedView.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener(){
 			@Override
 			public boolean onPreDraw(){
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/views/RippleAnimationTextView.java b/mastodon/src/main/java/org/joinmastodon/android/ui/views/RippleAnimationTextView.java
new file mode 100644
index 000000000..b44db321a
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/views/RippleAnimationTextView.java
@@ -0,0 +1,170 @@
+package org.joinmastodon.android.ui.views;
+
+import android.animation.ArgbEvaluator;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.text.Layout;
+import android.util.AttributeSet;
+import android.widget.TextView;
+
+import androidx.dynamicanimation.animation.FloatValueHolder;
+import androidx.dynamicanimation.animation.SpringAnimation;
+import androidx.dynamicanimation.animation.SpringForce;
+import me.grishka.appkit.utils.CustomViewHelper;
+
+public class RippleAnimationTextView extends TextView implements CustomViewHelper{
+	private final Paint animationPaint=new Paint(Paint.ANTI_ALIAS_FLAG);
+	private CharacterAnimationState[] charStates;
+	private final ArgbEvaluator colorEvaluator=new ArgbEvaluator();
+	private int runningAnimCount=0;
+	private Runnable[] delayedAnimations1, delayedAnimations2;
+
+	public RippleAnimationTextView(Context context){
+		this(context, null);
+	}
+
+	public RippleAnimationTextView(Context context, AttributeSet attrs){
+		this(context, attrs, 0);
+	}
+
+	public RippleAnimationTextView(Context context, AttributeSet attrs, int defStyle){
+		super(context, attrs, defStyle);
+	}
+
+	@Override
+	protected void onTextChanged(CharSequence text, int start, int lengthBefore, int lengthAfter){
+		super.onTextChanged(text, start, lengthBefore, lengthAfter);
+		if(charStates!=null){
+			for(CharacterAnimationState state:charStates){
+				state.colorAnimation.cancel();
+				state.shadowAnimation.cancel();
+				state.scaleAnimation.cancel();
+			}
+			for(Runnable r:delayedAnimations1){
+				if(r!=null)
+					removeCallbacks(r);
+			}
+			for(Runnable r:delayedAnimations2){
+				if(r!=null)
+					removeCallbacks(r);
+			}
+		}
+		charStates=new CharacterAnimationState[lengthAfter];
+		delayedAnimations1=new Runnable[lengthAfter];
+		delayedAnimations2=new Runnable[lengthAfter];
+	}
+
+	@Override
+	protected void onDraw(Canvas canvas){
+		if(runningAnimCount==0 && !areThereDelayedAnimations()){
+			super.onDraw(canvas);
+			return;
+		}
+		Layout layout=getLayout();
+		animationPaint.set(getPaint());
+		CharSequence text=layout.getText();
+		for(int i=0;i<layout.getLineCount();i++){
+			int baseline=layout.getLineBaseline(i);
+			for(int offset=layout.getLineStart(i); offset<layout.getLineEnd(i); offset++){
+				float x=layout.getPrimaryHorizontal(offset);
+				CharacterAnimationState state=charStates[offset];
+				if(state==null || state.scaleAnimation==null){
+					animationPaint.setColor(getCurrentTextColor());
+					animationPaint.clearShadowLayer();
+					canvas.drawText(text, offset, offset+1, x, baseline, animationPaint);
+				}else{
+					animationPaint.setColor((int)colorEvaluator.evaluate(Math.max(0, Math.min(1, state.color.getValue())), getCurrentTextColor(), getLinkTextColors().getDefaultColor()));
+					float scale=state.scale.getValue();
+					int shadowAlpha=Math.round(255*Math.max(0, Math.min(1, state.shadowAlpha.getValue())));
+					animationPaint.setShadowLayer(dp(4), 0, dp(3), (getPaint().linkColor & 0xFFFFFF) | (shadowAlpha << 24));
+					canvas.save();
+					canvas.scale(scale, scale, x, baseline);
+					canvas.drawText(text, offset, offset+1, x, baseline, animationPaint);
+					canvas.restore();
+				}
+			}
+		}
+		invalidate();
+	}
+
+	public void animate(int startIndex, int endIndex){
+		for(int i=startIndex;i<endIndex;i++){
+			CharacterAnimationState _state=charStates[i];
+			if(_state==null){
+				_state=charStates[i]=new CharacterAnimationState();
+			}
+			CharacterAnimationState state=_state;
+			int finalI=i;
+			postOnAnimationDelayed(()->{
+				if(!state.colorAnimation.isRunning())
+					runningAnimCount++;
+				state.colorAnimation.animateToFinalPosition(1f);
+				if(!state.shadowAnimation.isRunning())
+					runningAnimCount++;
+				state.shadowAnimation.animateToFinalPosition(0.3f);
+				if(!state.scaleAnimation.isRunning())
+					runningAnimCount++;
+				state.scaleAnimation.animateToFinalPosition(1.2f);
+				invalidate();
+
+				if(delayedAnimations1[finalI]!=null)
+					removeCallbacks(delayedAnimations1[finalI]);
+				if(delayedAnimations2[finalI]!=null)
+					removeCallbacks(delayedAnimations2[finalI]);
+				Runnable delay1=()->{
+					if(!state.colorAnimation.isRunning())
+						runningAnimCount++;
+					state.colorAnimation.animateToFinalPosition(0f);
+					if(!state.shadowAnimation.isRunning())
+						runningAnimCount++;
+					state.shadowAnimation.animateToFinalPosition(0f);
+					invalidate();
+					delayedAnimations1[finalI]=null;
+				};
+				Runnable delay2=()->{
+					if(!state.scaleAnimation.isRunning())
+						runningAnimCount++;
+					state.scaleAnimation.animateToFinalPosition(1f);
+					delayedAnimations2[finalI]=null;
+				};
+				delayedAnimations1[finalI]=delay1;
+				delayedAnimations2[finalI]=delay2;
+				postOnAnimationDelayed(delay1, 2000);
+				postOnAnimationDelayed(delay2, 100);
+			}, 20L*(i-startIndex));
+		}
+	}
+
+	private boolean areThereDelayedAnimations(){
+		for(Runnable r:delayedAnimations1){
+			if(r!=null)
+				return true;
+		}
+		for(Runnable r:delayedAnimations2){
+			if(r!=null)
+				return true;
+		}
+		return false;
+	}
+
+	private class CharacterAnimationState extends FloatValueHolder{
+		private final SpringAnimation scaleAnimation, colorAnimation, shadowAnimation;
+		private final FloatValueHolder scale=new FloatValueHolder(1), color=new FloatValueHolder(), shadowAlpha=new FloatValueHolder();
+
+		public CharacterAnimationState(){
+			scaleAnimation=new SpringAnimation(scale);
+			colorAnimation=new SpringAnimation(color);
+			shadowAnimation=new SpringAnimation(shadowAlpha);
+			setupSpring(scaleAnimation);
+			setupSpring(colorAnimation);
+			setupSpring(shadowAnimation);
+		}
+
+		private void setupSpring(SpringAnimation anim){
+			anim.setMinimumVisibleChange(0.01f);
+			anim.setSpring(new SpringForce().setStiffness(500f).setDampingRatio(0.175f));
+			anim.addEndListener((animation, canceled, value, velocity)->runningAnimCount--);
+		}
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/views/WrappingLinearLayout.java b/mastodon/src/main/java/org/joinmastodon/android/ui/views/WrappingLinearLayout.java
new file mode 100644
index 000000000..2b8352082
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/views/WrappingLinearLayout.java
@@ -0,0 +1,128 @@
+package org.joinmastodon.android.ui.views;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.joinmastodon.android.R;
+
+import java.util.ArrayList;
+
+/**
+ * Something like a horizontal LinearLayout, but wraps child views onto a new line if they don't fit
+ */
+public class WrappingLinearLayout extends ViewGroup{
+	private int verticalGap, horizontalGap;
+	private ArrayList<Integer> rowHeights=new ArrayList<>();
+
+	public WrappingLinearLayout(Context context){
+		this(context, null);
+	}
+
+	public WrappingLinearLayout(Context context, AttributeSet attrs){
+		this(context, attrs, 0);
+	}
+
+	public WrappingLinearLayout(Context context, AttributeSet attrs, int defStyle){
+		super(context, attrs, defStyle);
+		TypedArray ta=context.obtainStyledAttributes(attrs, R.styleable.WrappingLinearLayout);
+		verticalGap=ta.getDimensionPixelOffset(R.styleable.WrappingLinearLayout_android_verticalGap, 0);
+		horizontalGap=ta.getDimensionPixelOffset(R.styleable.WrappingLinearLayout_android_horizontalGap, 0);
+		ta.recycle();
+	}
+
+	@Override
+	protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec){
+		int w=MeasureSpec.getSize(widthMeasureSpec)-getPaddingLeft()-getPaddingRight();
+		int heightUsed=0, widthRemain=w, currentRowHeight=0;
+		rowHeights.clear();
+		for(int i=0;i<getChildCount();i++){
+			View child=getChildAt(i);
+			if(child.getVisibility()==GONE)
+				continue;
+			LayoutParams lp=child.getLayoutParams();
+			int horizontalPadding=getPaddingLeft()+getPaddingRight();
+			int verticalPadding=getPaddingTop()+getPaddingBottom();
+			int horizontalMargins=0, verticalMargins=0;
+			if(lp instanceof MarginLayoutParams mlp){
+				horizontalPadding+=mlp.leftMargin+mlp.rightMargin;
+				verticalPadding+=mlp.topMargin+mlp.bottomMargin;
+				horizontalMargins=mlp.leftMargin+mlp.rightMargin;
+				verticalMargins=mlp.topMargin+mlp.bottomMargin;
+			}
+			child.measure(getChildMeasureSpec(widthMeasureSpec, horizontalPadding, lp.width), getChildMeasureSpec(heightMeasureSpec, verticalPadding, lp.height));
+			currentRowHeight=Math.max(child.getMeasuredHeight()+verticalMargins, currentRowHeight);
+			if(child.getMeasuredWidth()+(widthRemain<w ? horizontalGap : 0)+horizontalMargins>widthRemain){
+				// Doesn't fit into the current row. Start a new one.
+				heightUsed+=currentRowHeight+verticalGap;
+				rowHeights.add(currentRowHeight);
+				currentRowHeight=child.getMeasuredHeight()+verticalMargins;
+				widthRemain=w;
+			}else{
+				// Does fit. Advance horizontally.
+				if(widthRemain<w)
+					widthRemain-=horizontalGap;
+				widthRemain-=child.getMeasuredWidth()+horizontalMargins;
+			}
+		}
+		// Take last row into account
+		heightUsed+=currentRowHeight;
+		rowHeights.add(currentRowHeight);
+		setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec), heightUsed+getPaddingTop()+getPaddingBottom());
+	}
+
+	@Override
+	protected void onLayout(boolean changed, int l, int t, int r, int b){
+		if(rowHeights.isEmpty())
+			return;
+		boolean rtl=getLayoutDirection()==LAYOUT_DIRECTION_RTL;
+		int xOffset=rtl ? getPaddingRight() : getPaddingLeft();
+		int endPadding=rtl ? getPaddingLeft() : getPaddingRight();
+		int yOffset=getPaddingTop();
+		int w=getWidth()-getPaddingLeft()-getPaddingRight();
+		int currentRowIndex=0;
+		boolean firstInRow=true;
+		for(int i=0;i<getChildCount();i++){
+			View child=getChildAt(i);
+			if(child.getVisibility()==GONE)
+				continue;
+			int childW=child.getMeasuredWidth();
+			int childH=child.getMeasuredHeight();
+			int rowHeight=rowHeights.get(currentRowIndex);
+			int childY, childX=xOffset;
+			if(getWidth()-(xOffset+childW+(firstInRow ? 0 : horizontalGap))>=endPadding){
+				xOffset+=childW+horizontalGap;
+				if(child.getLayoutParams() instanceof MarginLayoutParams mlp){
+					xOffset+=mlp.leftMargin+mlp.rightMargin;
+				}
+				firstInRow=false;
+			}else if(currentRowIndex<rowHeights.size()-1){
+				xOffset=rtl ? getPaddingRight() : getPaddingLeft();
+				yOffset+=rowHeight+verticalGap;
+				currentRowIndex++;
+				childX=xOffset;
+				rowHeight=rowHeights.get(currentRowIndex);
+			}
+			if(childH<rowHeight){
+				childY=yOffset+rowHeight/2-childH/2;
+			}else{
+				childY=yOffset;
+			}
+			if(rtl){
+				childX=getWidth()-childX-childW;
+			}
+			if(child.getLayoutParams() instanceof MarginLayoutParams mlp){
+				childX+=rtl ? mlp.rightMargin : mlp.leftMargin;
+				childY+=mlp.topMargin;
+			}
+			child.layout(childX, childY, childX+childW, childY+childH);
+		}
+	}
+
+	@Override
+	public LayoutParams generateLayoutParams(AttributeSet attrs){
+		return new MarginLayoutParams(getContext(), attrs);
+	}
+}
diff --git a/mastodon/src/main/res/animator/squish.xml b/mastodon/src/main/res/animator/squish.xml
new file mode 100644
index 000000000..19f77360d
--- /dev/null
+++ b/mastodon/src/main/res/animator/squish.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:state_pressed="true">
+		<set>
+			<objectAnimator
+				android:duration="200"
+				android:interpolator="@interpolator/m3_sys_motion_easing_standard"
+				android:propertyName="scaleX"
+				android:valueTo="0.8"
+				android:valueType="floatType"/>
+			<objectAnimator
+				android:duration="200"
+				android:interpolator="@interpolator/m3_sys_motion_easing_standard"
+				android:propertyName="scaleY"
+				android:valueTo="0.8"
+				android:valueType="floatType"/>
+			<objectAnimator
+				android:duration="200"
+				android:interpolator="@interpolator/m3_sys_motion_easing_standard"
+				android:propertyName="alpha"
+				android:valueTo="0.5"
+				android:valueType="floatType"/>
+		</set>
+	</item>
+	<item>
+		<set>
+			<objectAnimator
+				android:duration="200"
+				android:interpolator="@interpolator/m3_sys_motion_easing_standard"
+				android:propertyName="scaleX"
+				android:valueTo="1"
+				android:valueType="floatType"/>
+			<objectAnimator
+				android:duration="200"
+				android:interpolator="@interpolator/m3_sys_motion_easing_standard"
+				android:propertyName="scaleY"
+				android:valueTo="1"
+				android:valueType="floatType"/>
+			<objectAnimator
+				android:duration="200"
+				android:interpolator="@interpolator/m3_sys_motion_easing_standard"
+				android:propertyName="alpha"
+				android:valueTo="1"
+				android:valueType="floatType"/>
+		</set>
+	</item>
+</selector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/bg_bottom_sheet.xml b/mastodon/src/main/res/drawable/bg_bottom_sheet.xml
index bf1a899ef..92ee0279c 100644
--- a/mastodon/src/main/res/drawable/bg_bottom_sheet.xml
+++ b/mastodon/src/main/res/drawable/bg_bottom_sheet.xml
@@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item>
-		<shape>
+	<item android:bottom="-28dp">
+		<shape android:tint="@color/m3_primary_alpha5" android:tintMode="src_over">
 			<solid android:color="?colorM3Surface"/>
-			<corners android:topLeftRadius="28dp" android:topRightRadius="28dp"/>
-		</shape>
-	</item>
-	<item>
-		<shape android:tint="?colorM3Primary">
-			<solid android:color="#0D000000"/>
-			<corners android:topLeftRadius="28dp" android:topRightRadius="28dp"/>
+			<corners android:radius="28dp"/>
 		</shape>
 	</item>
 </layer-list>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/bg_button_m3_elevated.xml b/mastodon/src/main/res/drawable/bg_button_m3_elevated.xml
new file mode 100644
index 000000000..9354428dc
--- /dev/null
+++ b/mastodon/src/main/res/drawable/bg_button_m3_elevated.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="@color/m3_primary_overlay" xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		 <shape android:tint="@color/m3_primary_alpha5" android:tintMode="src_over">
+			   <solid android:color="?colorM3Surface"/>
+			   <corners android:radius="20dp"/>
+		 </shape>
+	</item>
+</ripple>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/bg_button_m3_filled_icon.xml b/mastodon/src/main/res/drawable/bg_button_m3_filled_icon.xml
new file mode 100644
index 000000000..2c4ea8a12
--- /dev/null
+++ b/mastodon/src/main/res/drawable/bg_button_m3_filled_icon.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inset xmlns:android="http://schemas.android.com/apk/res/android" android:drawable="@drawable/bg_button_m3_filled" android:inset="4dp">
+</inset>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/bg_button_m3_icon_label.xml b/mastodon/src/main/res/drawable/bg_button_m3_icon_label.xml
new file mode 100644
index 000000000..73eec74d5
--- /dev/null
+++ b/mastodon/src/main/res/drawable/bg_button_m3_icon_label.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="@color/m3_primary_overlay" xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:id="@android:id/mask">
+		 <shape>
+			   <solid android:color="#000"/>
+			   <corners android:radius="8dp"/>
+		 </shape>
+	</item>
+</ripple>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/bg_button_m3_tonal_icon.xml b/mastodon/src/main/res/drawable/bg_button_m3_tonal_icon.xml
new file mode 100644
index 000000000..81a9482a9
--- /dev/null
+++ b/mastodon/src/main/res/drawable/bg_button_m3_tonal_icon.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inset xmlns:android="http://schemas.android.com/apk/res/android" android:drawable="@drawable/bg_button_m3_tonal" android:inset="4dp">
+</inset>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/bg_handle_help.xml b/mastodon/src/main/res/drawable/bg_handle_help.xml
new file mode 100644
index 000000000..ebfec2f2a
--- /dev/null
+++ b/mastodon/src/main/res/drawable/bg_handle_help.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<shape
+			android:tint="@color/m3_primary_alpha11"
+			android:tintMode="src_over">
+			<solid android:color="?colorM3Surface" />
+			<corners android:radius="8dp"/>
+		</shape>
+	</item>
+	<item>
+		<shape>
+			<stroke android:width="2dp" android:color="?colorM3OutlineVariant" android:dashWidth="5dp" android:dashGap="5dp"/>
+			<corners android:radius="8dp"/>
+		</shape>
+	</item>
+</layer-list>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/bg_m3_filled_text_field.xml b/mastodon/src/main/res/drawable/bg_m3_filled_text_field.xml
new file mode 100644
index 000000000..a2159e9af
--- /dev/null
+++ b/mastodon/src/main/res/drawable/bg_m3_filled_text_field.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<selector>
+			<item android:state_enabled="true">
+				<shape>
+					<corners android:topLeftRadius="4dp" android:topRightRadius="4dp"/>
+					<solid android:color="?colorM3SurfaceVariant"/>
+				</shape>
+			</item>
+			<item>
+				<shape android:tint="?colorM3OnSurface">
+					<corners android:topLeftRadius="4dp" android:topRightRadius="4dp"/>
+					<solid android:color="#0a000000"/>
+				</shape>
+			</item>
+		</selector>
+	</item>
+	<item android:left="-3dp" android:top="-3dp" android:right="-3dp">
+		<selector>
+			<item android:state_focused="true">
+				<shape>
+					<stroke android:color="?colorM3Primary" android:width="2dp"/>
+				</shape>
+			</item>
+			<item>
+				<shape>
+					 <stroke android:color="?colorM3OnSurfaceVariant" android:width="1dp"/>
+				</shape>
+			</item>
+		</selector>
+	</item>
+</layer-list>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/bg_m3_filled_text_field_error.xml b/mastodon/src/main/res/drawable/bg_m3_filled_text_field_error.xml
new file mode 100644
index 000000000..6c18cd7d2
--- /dev/null
+++ b/mastodon/src/main/res/drawable/bg_m3_filled_text_field_error.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<shape>
+			<corners android:topLeftRadius="4dp" android:topRightRadius="4dp" />
+			<solid android:color="?colorM3SurfaceVariant" />
+		</shape>
+	</item>
+	<item android:left="-3dp" android:right="-3dp" android:top="-3dp">
+		<shape>
+			<stroke
+				android:width="2dp"
+				android:color="?colorM3Error" />
+		</shape>
+	</item>
+</layer-list>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/bg_rect_ripple.xml b/mastodon/src/main/res/drawable/bg_rect_ripple.xml
new file mode 100644
index 000000000..a6322aabf
--- /dev/null
+++ b/mastodon/src/main/res/drawable/bg_rect_ripple.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/m3_on_surface_overlay">
+	<item android:id="@android:id/mask">
+		<shape>
+			<solid android:color="#000"/>
+		</shape>
+	</item>
+</ripple>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/bg_spinner.xml b/mastodon/src/main/res/drawable/bg_spinner.xml
new file mode 100644
index 000000000..0cfe96358
--- /dev/null
+++ b/mastodon/src/main/res/drawable/bg_spinner.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item
+		android:drawable="@drawable/ic_arrow_drop_down_24px"
+		android:gravity="end|center_vertical"
+		android:left="12dp"
+		android:right="12dp"/>
+</layer-list>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/bg_user_info.xml b/mastodon/src/main/res/drawable/bg_user_info.xml
new file mode 100644
index 000000000..c0fa41703
--- /dev/null
+++ b/mastodon/src/main/res/drawable/bg_user_info.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+	<corners android:radius="12dp"/>
+	<solid android:color="?colorM3SurfaceVariant"/>
+	<stroke android:color="?colorM3OutlineVariant" android:width="1dp"/>
+</shape>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/divider_inset_16dp.xml b/mastodon/src/main/res/drawable/divider_inset_16dp.xml
new file mode 100644
index 000000000..15394d995
--- /dev/null
+++ b/mastodon/src/main/res/drawable/divider_inset_16dp.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:left="16dp" android:right="16dp">
+		<shape>
+			<solid android:color="?colorM3OutlineVariant"/>
+			<size android:height="0.5dp"/>
+		</shape>
+	</item>
+</layer-list>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/fg_link_card.xml b/mastodon/src/main/res/drawable/fg_link_card.xml
new file mode 100644
index 000000000..5b4f100f8
--- /dev/null
+++ b/mastodon/src/main/res/drawable/fg_link_card.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/m3_on_surface_overlay">
+	<item android:id="@android:id/mask">
+		<shape>
+			<corners android:radius="11dp"/>
+			<solid android:color="#000"/>
+		</shape>
+	</item>
+	<item>
+		<shape>
+			<corners android:radius="11dp"/>
+			<stroke android:color="?colorM3OutlineVariant" android:width="1dp"/>
+		</shape>
+	</item>
+</ripple>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/fg_onboarding_ava.xml b/mastodon/src/main/res/drawable/fg_onboarding_ava.xml
new file mode 100644
index 000000000..c0dbe1234
--- /dev/null
+++ b/mastodon/src/main/res/drawable/fg_onboarding_ava.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+	<stroke android:width="1dp" android:color="?colorM3OutlineVariant"/>
+	<corners android:radius="7dp"/>
+</shape>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/fg_user_info_ava.xml b/mastodon/src/main/res/drawable/fg_user_info_ava.xml
new file mode 100644
index 000000000..e36ace291
--- /dev/null
+++ b/mastodon/src/main/res/drawable/fg_user_info_ava.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+	<stroke android:width="1dp" android:color="?colorM3OutlineVariant"/>
+	<corners android:radius="11dp"/>
+</shape>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/ic_arrow_drop_down_24px.xml b/mastodon/src/main/res/drawable/ic_arrow_drop_down_24px.xml
new file mode 100644
index 000000000..56d1b3b04
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_arrow_drop_down_24px.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,15 L7,10H17Z"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_arrow_right_24px.xml b/mastodon/src/main/res/drawable/ic_arrow_right_24px.xml
new file mode 100644
index 000000000..55e7c6463
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_arrow_right_24px.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+	android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M10,17V7L15,12Z"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_arrow_upward_24px.xml b/mastodon/src/main/res/drawable/ic_arrow_upward_24px.xml
new file mode 100644
index 000000000..15d81d9d6
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_arrow_upward_24px.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M11,20V7.825L5.4,13.425L4,12L12,4L20,12L18.6,13.425L13,7.825V20Z"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_badge_24px.xml b/mastodon/src/main/res/drawable/ic_badge_24px.xml
new file mode 100644
index 000000000..489eff0b5
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_badge_24px.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M4,22Q3.175,22 2.588,21.413Q2,20.825 2,20V9Q2,8.175 2.588,7.587Q3.175,7 4,7H9V4Q9,3.175 9.588,2.587Q10.175,2 11,2H13Q13.825,2 14.413,2.587Q15,3.175 15,4V7H20Q20.825,7 21.413,7.587Q22,8.175 22,9V20Q22,20.825 21.413,21.413Q20.825,22 20,22ZM4,20H20Q20,20 20,20Q20,20 20,20V9Q20,9 20,9Q20,9 20,9H15Q15,9.825 14.413,10.412Q13.825,11 13,11H11Q10.175,11 9.588,10.412Q9,9.825 9,9H4Q4,9 4,9Q4,9 4,9V20Q4,20 4,20Q4,20 4,20ZM6,18H12V17.55Q12,17.125 11.762,16.762Q11.525,16.4 11.1,16.2Q10.6,15.975 10.088,15.863Q9.575,15.75 9,15.75Q8.425,15.75 7.913,15.863Q7.4,15.975 6.9,16.2Q6.475,16.4 6.238,16.762Q6,17.125 6,17.55ZM14,16.5H18V15H14ZM9,15Q9.625,15 10.062,14.562Q10.5,14.125 10.5,13.5Q10.5,12.875 10.062,12.438Q9.625,12 9,12Q8.375,12 7.938,12.438Q7.5,12.875 7.5,13.5Q7.5,14.125 7.938,14.562Q8.375,15 9,15ZM14,13.5H18V12H14ZM11,9H13V4H11ZM12,14.5Q12,14.5 12,14.5Q12,14.5 12,14.5Q12,14.5 12,14.5Q12,14.5 12,14.5Q12,14.5 12,14.5Q12,14.5 12,14.5Q12,14.5 12,14.5Q12,14.5 12,14.5Q12,14.5 12,14.5Q12,14.5 12,14.5Q12,14.5 12,14.5Q12,14.5 12,14.5Z"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_bookmark_fill1_24px.xml b/mastodon/src/main/res/drawable/ic_bookmark_fill1_24px.xml
new file mode 100644
index 000000000..2b286bbc1
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_bookmark_fill1_24px.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M5,21V5Q5,4.175 5.588,3.587Q6.175,3 7,3H17Q17.825,3 18.413,3.587Q19,4.175 19,5V21L12,18Z"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_boost_24px.xml b/mastodon/src/main/res/drawable/ic_boost_24px.xml
new file mode 100644
index 000000000..40373a17d
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_boost_24px.xml
@@ -0,0 +1,9 @@
+<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,22L3,18L7,14L8.4,15.45L6.85,17H17V13H19V19H6.85L8.4,20.55L7,22ZM5,11V5H17.15L15.6,3.45L17,2L21,6L17,10L15.6,8.55L17.15,7H7V11H5Z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_boost_disabled_24px.xml b/mastodon/src/main/res/drawable/ic_boost_disabled_24px.xml
new file mode 100644
index 000000000..859b454e8
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_boost_disabled_24px.xml
@@ -0,0 +1,15 @@
+<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,13V17.879L17,15.879V13H19Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M2.414,2.707L1,4.121L5,8.121V11H7V10.121L13.879,17H6.85L8.4,15.45L7,14L3,18L7,22L8.4,20.55L6.85,19H15.879L19.385,22.506L20.799,21.092L2.414,2.707Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M17.15,7H8.121L6.121,5H17.15L15.6,3.45L17,2L21,6L17,10L15.6,8.55L17.15,7Z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_boost_fill_alt_24px.xml b/mastodon/src/main/res/drawable/ic_boost_fill_alt_24px.xml
new file mode 100644
index 000000000..259725654
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_boost_fill_alt_24px.xml
@@ -0,0 +1,9 @@
+<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.775,22.875L2.15,18.25L6.775,13.625L8.8,15.7L7.675,16.8H16.95V12.8H19.85V19.7H7.675L8.8,20.8L6.775,22.875ZM4.15,11.45V4.55H16.35L15.225,3.45L17.25,1.375L21.875,6L17.25,10.625L15.225,8.55L16.35,7.45H7.05V11.45H4.15Z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_boost_private.xml b/mastodon/src/main/res/drawable/ic_boost_private.xml
new file mode 100644
index 000000000..6a2187dc9
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_boost_private.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:state_selected="true" android:drawable="@drawable/ic_private_boost_fill_alt_24px"/>
+	<item android:drawable="@drawable/ic_private_boost_24px"/>
+</selector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/ic_campaign_24px.xml b/mastodon/src/main/res/drawable/ic_campaign_24px.xml
new file mode 100644
index 000000000..0f34633b9
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_campaign_24px.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M18,13V11H22V13ZM19.2,20 L16,17.6 17.2,16 20.4,18.4ZM17.2,8 L16,6.4 19.2,4 20.4,5.6ZM5,19V15H4Q3.175,15 2.588,14.412Q2,13.825 2,13V11Q2,10.175 2.588,9.587Q3.175,9 4,9H8L13,6V18L8,15H7V19ZM14,15.35V8.65Q14.675,9.25 15.088,10.113Q15.5,10.975 15.5,12Q15.5,13.025 15.088,13.887Q14.675,14.75 14,15.35ZM4,11Q4,11 4,11Q4,11 4,11V13Q4,13 4,13Q4,13 4,13H8.55L11,14.45V9.55L8.55,11ZM7.5,12Q7.5,12 7.5,12Q7.5,12 7.5,12Q7.5,12 7.5,12Q7.5,12 7.5,12Z"/>
+</vector>
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/ic_confirmation_number_24px.xml b/mastodon/src/main/res/drawable/ic_confirmation_number_24px.xml
new file mode 100644
index 000000000..d5c4b03f3
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_confirmation_number_24px.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M4,20Q3.175,20 2.588,19.413Q2,18.825 2,18V14Q2.825,14 3.413,13.412Q4,12.825 4,12Q4,11.175 3.413,10.587Q2.825,10 2,10V6Q2,5.175 2.588,4.588Q3.175,4 4,4H20Q20.825,4 21.413,4.588Q22,5.175 22,6V10Q21.175,10 20.587,10.587Q20,11.175 20,12Q20,12.825 20.587,13.412Q21.175,14 22,14V18Q22,18.825 21.413,19.413Q20.825,20 20,20ZM4,18H20V15.45Q19.075,14.9 18.538,13.988Q18,13.075 18,12Q18,10.925 18.538,10.012Q19.075,9.1 20,8.55V6H4V8.55Q4.925,9.1 5.463,10.012Q6,10.925 6,12Q6,13.075 5.463,13.988Q4.925,14.9 4,15.45ZM12,17Q12.425,17 12.713,16.712Q13,16.425 13,16Q13,15.575 12.713,15.287Q12.425,15 12,15Q11.575,15 11.288,15.287Q11,15.575 11,16Q11,16.425 11.288,16.712Q11.575,17 12,17ZM12,13Q12.425,13 12.713,12.712Q13,12.425 13,12Q13,11.575 12.713,11.287Q12.425,11 12,11Q11.575,11 11.288,11.287Q11,11.575 11,12Q11,12.425 11.288,12.712Q11.575,13 12,13ZM12,9Q12.425,9 12.713,8.712Q13,8.425 13,8Q13,7.575 12.713,7.287Q12.425,7 12,7Q11.575,7 11.288,7.287Q11,7.575 11,8Q11,8.425 11.288,8.712Q11.575,9 12,9ZM12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Z"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_feed_48px.xml b/mastodon/src/main/res/drawable/ic_feed_48px.xml
new file mode 100644
index 000000000..72fc5dc66
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_feed_48px.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M9,42Q7.8,42 6.9,41.1Q6,40.2 6,39V9Q6,7.8 6.9,6.9Q7.8,6 9,6H32.1L42,15.9V39Q42,40.2 41.1,41.1Q40.2,42 39,42ZM9,39H39Q39,39 39,39Q39,39 39,39V17.55H30.45V9H9Q9,9 9,9Q9,9 9,9V39Q9,39 9,39Q9,39 9,39ZM13.95,33.45H34.05V30.45H13.95ZM13.95,17.55H24V14.55H13.95ZM13.95,25.5H34.05V22.5H13.95ZM9,9V17.55V9V17.55V39Q9,39 9,39Q9,39 9,39Q9,39 9,39Q9,39 9,39V9Q9,9 9,9Q9,9 9,9Z"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_arrow_up_16_filled.xml b/mastodon/src/main/res/drawable/ic_fluent_arrow_up_16_filled.xml
deleted file mode 100644
index 39a248513..000000000
--- a/mastodon/src/main/res/drawable/ic_fluent_arrow_up_16_filled.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="16dp" android:height="16dp" android:viewportWidth="16" android:viewportHeight="16">
-    <path android:pathData="M8 14c-0.414 0-0.75-0.336-0.75-0.75V4.463L4.309 7.75c-0.276 0.31-0.75 0.335-1.06 0.06-0.308-0.276-0.334-0.75-0.058-1.06L7.441 2C7.583 1.842 7.787 1.75 8 1.75c0.213 0 0.417 0.09 0.559 0.25l4.25 4.75c0.276 0.309 0.25 0.783-0.059 1.059-0.309 0.276-0.783 0.25-1.059-0.059L8.75 4.463v8.787C8.75 13.664 8.414 14 8 14z" android:fillColor="#fff"/>
-</vector>
diff --git a/mastodon/src/main/res/drawable/ic_help_24px.xml b/mastodon/src/main/res/drawable/ic_help_24px.xml
new file mode 100644
index 000000000..b19cb3450
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_help_24px.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="24dp"
+	android:height="24dp"
+	android:viewportWidth="24"
+	android:viewportHeight="24">
+	<path
+		android:fillColor="@android:color/white"
+		android:pathData="M11.95,18Q12.475,18 12.838,17.637Q13.2,17.275 13.2,16.75Q13.2,16.225 12.838,15.863Q12.475,15.5 11.95,15.5Q11.425,15.5 11.062,15.863Q10.7,16.225 10.7,16.75Q10.7,17.275 11.062,17.637Q11.425,18 11.95,18ZM11.05,14.15H12.9Q12.9,13.325 13.088,12.85Q13.275,12.375 14.15,11.55Q14.8,10.9 15.175,10.312Q15.55,9.725 15.55,8.9Q15.55,7.5 14.525,6.75Q13.5,6 12.1,6Q10.675,6 9.788,6.75Q8.9,7.5 8.55,8.55L10.2,9.2Q10.325,8.75 10.763,8.225Q11.2,7.7 12.1,7.7Q12.9,7.7 13.3,8.137Q13.7,8.575 13.7,9.1Q13.7,9.6 13.4,10.037Q13.1,10.475 12.65,10.85Q11.55,11.825 11.3,12.325Q11.05,12.825 11.05,14.15ZM12,22Q9.925,22 8.1,21.212Q6.275,20.425 4.925,19.075Q3.575,17.725 2.788,15.9Q2,14.075 2,12Q2,9.925 2.788,8.1Q3.575,6.275 4.925,4.925Q6.275,3.575 8.1,2.787Q9.925,2 12,2Q14.075,2 15.9,2.787Q17.725,3.575 19.075,4.925Q20.425,6.275 21.212,8.1Q22,9.925 22,12Q22,14.075 21.212,15.9Q20.425,17.725 19.075,19.075Q17.725,20.425 15.9,21.212Q14.075,22 12,22ZM12,20Q15.35,20 17.675,17.675Q20,15.35 20,12Q20,8.65 17.675,6.325Q15.35,4 12,4Q8.65,4 6.325,6.325Q4,8.65 4,12Q4,15.35 6.325,17.675Q8.65,20 12,20ZM12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Z"/>
+</vector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/ic_info_fill1_24px.xml b/mastodon/src/main/res/drawable/ic_info_fill1_24px.xml
new file mode 100644
index 000000000..077f39342
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_info_fill1_24px.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M11,17H13V11H11ZM12,9Q12.425,9 12.713,8.712Q13,8.425 13,8Q13,7.575 12.713,7.287Q12.425,7 12,7Q11.575,7 11.288,7.287Q11,7.575 11,8Q11,8.425 11.288,8.712Q11.575,9 12,9ZM12,22Q9.925,22 8.1,21.212Q6.275,20.425 4.925,19.075Q3.575,17.725 2.788,15.9Q2,14.075 2,12Q2,9.925 2.788,8.1Q3.575,6.275 4.925,4.925Q6.275,3.575 8.1,2.787Q9.925,2 12,2Q14.075,2 15.9,2.787Q17.725,3.575 19.075,4.925Q20.425,6.275 21.212,8.1Q22,9.925 22,12Q22,14.075 21.212,15.9Q20.425,17.725 19.075,19.075Q17.725,20.425 15.9,21.212Q14.075,22 12,22Z"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_list_alt_24px.xml b/mastodon/src/main/res/drawable/ic_list_alt_24px.xml
new file mode 100644
index 000000000..5341250ce
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_list_alt_24px.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M8,17Q8.425,17 8.713,16.712Q9,16.425 9,16Q9,15.575 8.713,15.287Q8.425,15 8,15Q7.575,15 7.287,15.287Q7,15.575 7,16Q7,16.425 7.287,16.712Q7.575,17 8,17ZM8,13Q8.425,13 8.713,12.712Q9,12.425 9,12Q9,11.575 8.713,11.287Q8.425,11 8,11Q7.575,11 7.287,11.287Q7,11.575 7,12Q7,12.425 7.287,12.712Q7.575,13 8,13ZM8,9Q8.425,9 8.713,8.712Q9,8.425 9,8Q9,7.575 8.713,7.287Q8.425,7 8,7Q7.575,7 7.287,7.287Q7,7.575 7,8Q7,8.425 7.287,8.712Q7.575,9 8,9ZM11,17H17V15H11ZM11,13H17V11H11ZM11,9H17V7H11ZM5,21Q4.175,21 3.587,20.413Q3,19.825 3,19V5Q3,4.175 3.587,3.587Q4.175,3 5,3H19Q19.825,3 20.413,3.587Q21,4.175 21,5V19Q21,19.825 20.413,20.413Q19.825,21 19,21ZM5,19H19Q19,19 19,19Q19,19 19,19V5Q19,5 19,5Q19,5 19,5H5Q5,5 5,5Q5,5 5,5V19Q5,19 5,19Q5,19 5,19ZM5,5Q5,5 5,5Q5,5 5,5V19Q5,19 5,19Q5,19 5,19Q5,19 5,19Q5,19 5,19V5Q5,5 5,5Q5,5 5,5Z"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_m3_cancel.xml b/mastodon/src/main/res/drawable/ic_m3_cancel.xml
new file mode 100644
index 000000000..d11a326a2
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_m3_cancel.xml
@@ -0,0 +1,9 @@
+<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,2C6.47,2 2,6.47 2,12C2,17.53 6.47,22 12,22C17.53,22 22,17.53 22,12C22,6.47 17.53,2 12,2ZM12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20ZM12,10.59L15.59,7L17,8.41L13.41,12L17,15.59L15.59,17L12,13.41L8.41,17L7,15.59L10.59,12L7,8.41L8.41,7L12,10.59Z"
+		android:fillColor="#49454F"/>
+</vector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/ic_more_vert_24px.xml b/mastodon/src/main/res/drawable/ic_more_vert_24px.xml
new file mode 100644
index 000000000..bb501448f
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_more_vert_24px.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,20Q11.175,20 10.588,19.413Q10,18.825 10,18Q10,17.175 10.588,16.587Q11.175,16 12,16Q12.825,16 13.413,16.587Q14,17.175 14,18Q14,18.825 13.413,19.413Q12.825,20 12,20ZM12,14Q11.175,14 10.588,13.412Q10,12.825 10,12Q10,11.175 10.588,10.587Q11.175,10 12,10Q12.825,10 13.413,10.587Q14,11.175 14,12Q14,12.825 13.413,13.412Q12.825,14 12,14ZM12,8Q11.175,8 10.588,7.412Q10,6.825 10,6Q10,5.175 10.588,4.588Q11.175,4 12,4Q12.825,4 13.413,4.588Q14,5.175 14,6Q14,6.825 13.413,7.412Q12.825,8 12,8Z"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_private_boost_24px.xml b/mastodon/src/main/res/drawable/ic_private_boost_24px.xml
new file mode 100644
index 000000000..3c6670a9f
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_private_boost_24px.xml
@@ -0,0 +1,15 @@
+<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.4,15.45L7,14L3,18L7,22L8.4,20.55L6.85,19H13.5V18C13.5,17.657 13.564,17.317 13.699,17H6.85L8.4,15.45Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M5,5V11H7V7H17.15L15.6,8.55L17,10L21,6L17,2L15.6,3.45L17.15,5H5Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M16,22C15.717,22 15.475,21.908 15.275,21.725C15.092,21.525 15,21.283 15,21V18C15,17.717 15.092,17.483 15.275,17.3C15.475,17.1 15.717,17 16,17V16C16,15.45 16.192,14.983 16.575,14.6C16.975,14.2 17.45,14 18,14C18.55,14 19.017,14.2 19.4,14.6C19.8,14.983 20,15.45 20,16V17C20.283,17 20.517,17.1 20.7,17.3C20.9,17.483 21,17.717 21,18V21C21,21.283 20.9,21.525 20.7,21.725C20.517,21.908 20.283,22 20,22H16ZM17,17H19V16C19,15.717 18.9,15.483 18.7,15.3C18.517,15.1 18.283,15 18,15C17.717,15 17.475,15.1 17.275,15.3C17.092,15.483 17,15.717 17,16V17Z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_private_boost_fill_alt_24px.xml b/mastodon/src/main/res/drawable/ic_private_boost_fill_alt_24px.xml
new file mode 100644
index 000000000..6929d74aa
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_private_boost_fill_alt_24px.xml
@@ -0,0 +1,15 @@
+<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.15,18.25L6.775,22.875L8.8,20.8L7.675,19.7H13.5V18C13.5,17.583 13.594,17.172 13.795,16.8H7.675L8.8,15.7L6.775,13.625L2.15,18.25Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M4.15,4.55V11.45H7.05V7.45H16.35L15.225,8.55L17.25,10.625L21.875,6L17.25,1.375L15.225,3.45L16.35,4.55H4.15Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M16,22C15.717,22 15.475,21.908 15.275,21.725C15.092,21.525 15,21.283 15,21V18C15,17.717 15.092,17.483 15.275,17.3C15.475,17.1 15.717,17 16,17V16C16,15.45 16.192,14.983 16.575,14.6C16.975,14.2 17.45,14 18,14C18.55,14 19.017,14.2 19.4,14.6C19.8,14.983 20,15.45 20,16V17C20.283,17 20.517,17.1 20.7,17.3C20.9,17.483 21,17.717 21,18V21C21,21.283 20.9,21.525 20.7,21.725C20.517,21.908 20.283,22 20,22H16ZM17,17H19V16C19,15.717 18.9,15.483 18.7,15.3C18.517,15.1 18.283,15 18,15C17.717,15 17.475,15.1 17.275,15.3C17.092,15.483 17,15.717 17,16V17Z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_switch_account_24px.xml b/mastodon/src/main/res/drawable/ic_switch_account_24px.xml
new file mode 100644
index 000000000..f496736ba
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_switch_account_24px.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M14,11Q15.25,11 16.125,10.125Q17,9.25 17,8Q17,6.75 16.125,5.875Q15.25,5 14,5Q12.75,5 11.875,5.875Q11,6.75 11,8Q11,9.25 11.875,10.125Q12.75,11 14,11ZM8,15.75Q9.1,14.475 10.65,13.738Q12.2,13 14,13Q15.8,13 17.35,13.738Q18.9,14.475 20,15.75Q20,15.75 20,15.75Q20,15.75 20,15.75V4Q20,4 20,4Q20,4 20,4H8Q8,4 8,4Q8,4 8,4V15.75Q8,15.75 8,15.75Q8,15.75 8,15.75ZM8,18Q7.175,18 6.588,17.413Q6,16.825 6,16V4Q6,3.175 6.588,2.587Q7.175,2 8,2H20Q20.825,2 21.413,2.587Q22,3.175 22,4V16Q22,16.825 21.413,17.413Q20.825,18 20,18ZM4,22Q3.175,22 2.588,21.413Q2,20.825 2,20V6H4V20Q4,20 4,20Q4,20 4,20H18V22ZM14,9Q13.575,9 13.288,8.712Q13,8.425 13,8Q13,7.575 13.288,7.287Q13.575,7 14,7Q14.425,7 14.713,7.287Q15,7.575 15,8Q15,8.425 14.713,8.712Q14.425,9 14,9ZM10.7,16H17.3Q16.575,15.5 15.738,15.25Q14.9,15 14,15Q13.1,15 12.263,15.25Q11.425,15.5 10.7,16ZM14,9.875Q14,9.875 14,9.875Q14,9.875 14,9.875Q14,9.875 14,9.875Q14,9.875 14,9.875Q14,9.875 14,9.875Q14,9.875 14,9.875Q14,9.875 14,9.875Q14,9.875 14,9.875Q14,9.875 14,9.875Q14,9.875 14,9.875Q14,9.875 14,9.875Q14,9.875 14,9.875Z"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_waving_hand_24px.xml b/mastodon/src/main/res/drawable/ic_waving_hand_24px.xml
new file mode 100644
index 000000000..b43de6812
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_waving_hand_24px.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M17,23Q19.5,23 21.25,21.25Q23,19.5 23,17H21.5Q21.5,18.875 20.188,20.188Q18.875,21.5 17,21.5ZM1,7H2.5Q2.5,5.125 3.812,3.812Q5.125,2.5 7,2.5V1Q4.5,1 2.75,2.75Q1,4.5 1,7ZM3.525,20.475Q1.025,17.975 1.025,14.475Q1.025,10.975 3.525,8.475L7.05,4.925Q7.775,4.2 8.812,4.2Q9.85,4.2 10.575,4.925Q10.675,5.025 10.763,5.125Q10.85,5.225 10.9,5.325L13.425,2.8Q14.15,2.075 15.188,2.075Q16.225,2.075 16.95,2.8Q17.075,2.925 17.15,3.025Q17.225,3.125 17.3,3.225Q18.025,2.725 18.925,2.8Q19.825,2.875 20.475,3.525Q21.05,4.1 21.175,4.837Q21.3,5.575 21,6.3Q21.15,6.375 21.288,6.475Q21.425,6.575 21.55,6.7Q22.275,7.425 22.275,8.463Q22.275,9.5 21.55,10.225L21.15,10.625Q21.25,10.675 21.35,10.762Q21.45,10.85 21.55,10.95Q22.275,11.675 22.275,12.712Q22.275,13.75 21.55,14.475L15.525,20.475Q13.025,22.975 9.525,22.975Q6.025,22.975 3.525,20.475ZM4.925,19.075Q5.875,20.025 7.075,20.5Q8.275,20.975 9.525,20.975Q10.775,20.975 11.975,20.5Q13.175,20.025 14.125,19.075L20.125,13.05Q20.275,12.9 20.275,12.7Q20.275,12.5 20.125,12.35Q19.975,12.2 19.775,12.2Q19.575,12.2 19.425,12.35L15.9,15.9L14.475,14.475L20.125,8.825Q20.275,8.675 20.275,8.462Q20.275,8.25 20.125,8.1Q19.975,7.975 19.775,7.962Q19.575,7.95 19.425,8.1L14.475,13.05L13.05,11.65L19.075,5.625Q19.225,5.475 19.225,5.275Q19.225,5.075 19.075,4.925Q18.925,4.775 18.725,4.775Q18.525,4.775 18.375,4.925L12.35,10.95L10.95,9.525L15.525,4.925Q15.675,4.775 15.675,4.575Q15.675,4.375 15.525,4.225Q15.4,4.075 15.188,4.075Q14.975,4.075 14.825,4.225L8.525,10.525Q9.05,11.875 8.775,13.337Q8.5,14.8 7.4,15.9L6,14.475Q6.875,13.6 6.875,12.35Q6.875,11.1 6,10.225L9.175,7.05Q9.325,6.9 9.325,6.7Q9.325,6.5 9.175,6.35Q9.025,6.2 8.825,6.212Q8.625,6.225 8.475,6.35L4.925,9.875Q3.975,10.825 3.5,12.025Q3.025,13.225 3.025,14.475Q3.025,15.725 3.5,16.925Q3.975,18.125 4.925,19.075Z"/>
+</vector>
diff --git a/mastodon/src/main/res/interpolator-v21/m3_sys_motion_easing_emphasized_accelerate.xml b/mastodon/src/main/res/interpolator-v21/m3_sys_motion_easing_emphasized_accelerate.xml
new file mode 100644
index 000000000..2527b6607
--- /dev/null
+++ b/mastodon/src/main/res/interpolator-v21/m3_sys_motion_easing_emphasized_accelerate.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2022 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<pathInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:controlX1="@dimen/m3_sys_motion_easing_emphasized_accelerate_control_x1"
+    android:controlY1="@dimen/m3_sys_motion_easing_emphasized_accelerate_control_y1"
+    android:controlX2="@dimen/m3_sys_motion_easing_emphasized_accelerate_control_x2"
+    android:controlY2="@dimen/m3_sys_motion_easing_emphasized_accelerate_control_y2"/>
diff --git a/mastodon/src/main/res/interpolator-v21/m3_sys_motion_easing_standard_accelerate.xml b/mastodon/src/main/res/interpolator-v21/m3_sys_motion_easing_standard_accelerate.xml
new file mode 100644
index 000000000..513147958
--- /dev/null
+++ b/mastodon/src/main/res/interpolator-v21/m3_sys_motion_easing_standard_accelerate.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2022 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<pathInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:controlX1="@dimen/m3_sys_motion_easing_standard_accelerate_control_x1"
+    android:controlY1="@dimen/m3_sys_motion_easing_standard_accelerate_control_y1"
+    android:controlX2="@dimen/m3_sys_motion_easing_standard_accelerate_control_x2"
+    android:controlY2="@dimen/m3_sys_motion_easing_standard_accelerate_control_y2"/>
diff --git a/mastodon/src/main/res/layout/alert_invite_link.xml b/mastodon/src/main/res/layout/alert_invite_link.xml
new file mode 100644
index 000000000..a188985b6
--- /dev/null
+++ b/mastodon/src/main/res/layout/alert_invite_link.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:paddingHorizontal="24dp"
+	android:paddingTop="24dp">
+
+	<TextView
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:textAppearance="@style/m3_headline_small"
+		android:textColor="?colorM3OnSurface"
+		android:drawableTop="@drawable/ic_confirmation_number_24px"
+		android:drawableTint="?colorM3Secondary"
+		android:drawablePadding="16dp"
+		android:text="@string/enter_invite_link"/>
+
+	<TextView
+		android:id="@+id/subtitle"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="16dp"
+		android:textAppearance="@style/m3_body_medium"
+		android:textColor="?colorM3OnSurfaceVariant"
+		tools:text="@string/need_invite_to_join_server"/>
+
+	<FrameLayout
+		android:layout_width="match_parent"
+		android:layout_height="76dp"
+		android:layout_marginTop="16dp">
+
+		<EditText
+			android:id="@+id/edit"
+			android:layout_width="match_parent"
+			android:layout_height="56dp"
+			android:background="@drawable/bg_m3_filled_text_field"
+			android:paddingHorizontal="16dp"
+			android:textColorHint="?colorM3OnSurfaceVariant"
+			android:textColor="?colorM3OnSurface"
+			android:gravity="start|bottom"
+			android:paddingBottom="8dp"
+			android:singleLine="true"
+			android:inputType="textUri"
+			android:textAppearance="@style/m3_body_large"
+			android:hint="example.social/invite/AbC123"/>
+
+		<TextView
+			android:id="@+id/label"
+			android:layout_width="match_parent"
+			android:layout_height="16dp"
+			android:layout_marginHorizontal="16dp"
+			android:layout_marginTop="8dp"
+			android:layout_gravity="top"
+			android:paddingEnd="23dp"
+			android:textAppearance="@style/m3_body_small"
+			android:textColor="?colorM3OnSurfaceVariant"
+			android:singleLine="true"
+			android:ellipsize="end"
+			android:text="@string/server_url"/>
+
+		<TextView
+			android:id="@+id/supporting_text"
+			android:layout_width="match_parent"
+			android:layout_height="16dp"
+			android:layout_marginHorizontal="16dp"
+			android:layout_gravity="bottom"
+			android:textAppearance="@style/m3_body_small"
+			android:textColor="?colorM3OnSurfaceVariant"
+			android:singleLine="true"
+			android:ellipsize="end"
+			android:text=""/>
+		
+		<ImageButton
+			android:id="@+id/clear"
+			android:layout_width="48dp"
+			android:layout_height="48dp"
+			android:layout_marginTop="4dp"
+			android:layout_gravity="end|top"
+			android:src="@drawable/ic_m3_cancel"
+			android:background="?android:actionBarItemBackground"
+			android:contentDescription="@string/clear"/>
+	</FrameLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/display_item_extended_footer.xml b/mastodon/src/main/res/layout/display_item_extended_footer.xml
index 6ee095c9a..783ad2dd9 100644
--- a/mastodon/src/main/res/layout/display_item_extended_footer.xml
+++ b/mastodon/src/main/res/layout/display_item_extended_footer.xml
@@ -2,79 +2,20 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:orientation="vertical"
-	android:padding="8dp"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:background="@drawable/bg_m3_surface3">
+	android:paddingBottom="8dp"
+	android:divider="@drawable/divider_inset_16dp"
+	android:showDividers="middle">
 
-	<org.joinmastodon.android.ui.views.AutoOrientationLinearLayout
-		android:id="@+id/button_bar"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
-
-		<LinearLayout
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content">
-
-			<Button
-				android:id="@+id/reblogs"
-				style="@style/Widget.Mastodon.M3.Button.Text.Icon"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:gravity="center"
-				android:paddingStart="8dp"
-				android:paddingEnd="12dp"
-				android:minHeight="48dp"
-				android:textColor="?colorM3OnSurfaceVariant"
-				android:fontFamily="sans-serif"
-				android:drawableStart="@drawable/ic_fluent_arrow_repeat_all_20_regular"
-				android:drawablePadding="8dp"
-				android:drawableTint="?colorM3OnSurfaceVariant"
-				tools:text="4 reblogs"/>
-
-			<Button
-				android:id="@+id/favorites"
-				style="@style/Widget.Mastodon.M3.Button.Text.Icon"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:gravity="center"
-				android:paddingStart="8dp"
-				android:paddingEnd="12dp"
-				android:minHeight="48dp"
-				android:textColor="?colorM3OnSurfaceVariant"
-				android:fontFamily="sans-serif"
-				android:drawableStart="@drawable/ic_fluent_star_20_regular"
-				android:drawablePadding="8dp"
-				android:drawableTint="?colorM3OnSurfaceVariant"
-				tools:text="12 favorites"/>
-
-		</LinearLayout>
-
-		<Button
-			android:id="@+id/edit_history"
-			style="@style/Widget.Mastodon.M3.Button.Text.Icon"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:gravity="center"
-			android:paddingStart="8dp"
-			android:paddingEnd="12dp"
-			android:minHeight="48dp"
-			android:textColor="?colorM3OnSurfaceVariant"
-			android:fontFamily="sans-serif"
-			android:drawableStart="@drawable/ic_fluent_history_20_regular"
-			android:drawablePadding="8dp"
-			android:drawableTint="?colorM3OnSurfaceVariant"
-			tools:text="Dec 12, 2021, 12:42 PM"/>
-
-	</org.joinmastodon.android.ui.views.AutoOrientationLinearLayout>
-
-	<LinearLayout
-		android:orientation="horizontal"
-		android:gravity="start|center"
+	<org.joinmastodon.android.ui.views.WrappingLinearLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginHorizontal="8dp"
-		android:minHeight="48dp">
+		android:paddingHorizontal="16dp"
+		android:paddingVertical="8dp"
+		android:horizontalGap="8dp"
+		android:verticalGap="8dp"
+		android:clipToPadding="false">
 
 		<ImageView
 			android:id="@+id/visibility"
@@ -84,34 +25,131 @@
 			android:tint="?colorM3OnSurfaceVariant" />
 
 		<TextView
-			android:id="@+id/timestamp"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_marginLeft="8dp"
-			android:minHeight="20dp"
-			android:gravity="center_vertical"
-			android:textSize="14sp"
-			android:textColor="?android:textColorSecondary"
-			tools:text="Dec 12, 2021, 12:42 PM via "/>
-
-		<Button
-			android:id="@+id/application_name"
-			style="@style/Widget.Mastodon.M3.Button.Text"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:gravity="center"
-			android:layout_marginStart="-12dp"
-			android:paddingStart="12dp"
-			android:paddingEnd="12dp"
-			android:padding="0dp"
-			android:minWidth="0dp"
-			android:minHeight="48dp"
+			android:textAppearance="@style/m3_label_large"
 			android:textColor="?colorM3OnSurfaceVariant"
-			android:fontFamily="sans-serif"
+			android:importantForAccessibility="no"
+			android:text="·"/>
+
+		<TextView
+			android:id="@+id/time"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textAppearance="@style/m3_label_large"
+			android:textColor="?colorM3OnSurfaceVariant"
+			android:background="@drawable/bg_button_borderless_rounded"
+			android:backgroundTint="?colorM3OnSurfaceVariant"
 			android:singleLine="true"
 			android:ellipsize="end"
-			tools:text="Megalodon"/>
+			android:paddingVertical="4dp"
+			android:paddingHorizontal="8dp"
+			android:layout_marginVertical="-4dp"
+			android:layout_marginHorizontal="-8dp"
+			android:gravity="center_vertical"
+			tools:text="8:24 AM"/>
 
-	</LinearLayout>
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textAppearance="@style/m3_label_large"
+			android:textColor="?colorM3OnSurfaceVariant"
+			android:importantForAccessibility="no"
+			android:text="·"/>
+
+		<TextView
+			android:id="@+id/date"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textAppearance="@style/m3_label_large"
+			android:textColor="?colorM3OnSurfaceVariant"
+			android:singleLine="true"
+			android:ellipsize="end"
+			tools:text="2023-11-08"/>
+
+		<TextView
+			android:id="@+id/date_app_separator"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textAppearance="@style/m3_label_large"
+			android:textColor="?colorM3OnSurfaceVariant"
+			android:importantForAccessibility="no"
+			android:text="·"/>
+
+		<TextView
+			android:id="@+id/app_name"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textAppearance="@style/m3_label_large"
+			android:textColor="?colorM3OnSurfaceVariant"
+			android:singleLine="true"
+			android:ellipsize="end"
+			android:paddingVertical="4dp"
+			android:paddingHorizontal="8dp"
+			android:layout_marginVertical="-4dp"
+			android:layout_marginHorizontal="-8dp"
+			android:background="@drawable/bg_button_borderless_rounded"
+			android:backgroundTint="?colorM3Secondary"
+			android:gravity="center_vertical"
+			tools:text="Moshidon dfjklafjdsalkfjdslakfjdsaklfjdslak"/>
+
+	</org.joinmastodon.android.ui.views.WrappingLinearLayout>
+
+	<TextView
+		android:id="@+id/edit_history"
+		android:layout_width="match_parent"
+		android:layout_height="36dp"
+		android:paddingStart="16dp"
+		android:paddingEnd="24dp"
+		android:background="?android:selectableItemBackground"
+		android:textAppearance="@style/m3_label_large"
+		android:textColor="?colorM3OnSurfaceVariant"
+		android:gravity="center_vertical"
+		tools:text="Last edit bla bla"/>
+
+	<org.joinmastodon.android.ui.views.WrappingLinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:paddingHorizontal="16dp"
+		android:paddingVertical="8dp"
+		android:horizontalGap="8dp"
+		android:verticalGap="8dp"
+		android:clipToPadding="false">
+
+		<TextView
+			android:id="@+id/reblogs"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textAppearance="@style/m3_label_large"
+			android:textColor="?colorM3OnSurfaceVariant"
+			android:background="@drawable/bg_button_borderless_rounded"
+			android:backgroundTint="?colorM3OnSurfaceVariant"
+			android:singleLine="true"
+			android:ellipsize="end"
+			android:paddingVertical="4dp"
+			android:paddingHorizontal="8dp"
+			android:layout_marginVertical="-4dp"
+			android:layout_marginHorizontal="-8dp"
+			android:gravity="center_vertical"
+			tools:text="123 boosts"/>
+
+		<TextView
+			android:id="@+id/favorites"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textAppearance="@style/m3_label_large"
+			android:textColor="?colorM3OnSurfaceVariant"
+			android:background="@drawable/bg_button_borderless_rounded"
+			android:backgroundTint="?colorM3OnSurfaceVariant"
+			android:singleLine="true"
+			android:ellipsize="end"
+			android:paddingVertical="4dp"
+			android:paddingHorizontal="8dp"
+			android:layout_marginVertical="-4dp"
+			android:layout_marginHorizontal="-8dp"
+			android:gravity="center_vertical"
+			tools:text="123 favorites"/>
+
+	</org.joinmastodon.android.ui.views.WrappingLinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/display_item_link_card.xml b/mastodon/src/main/res/layout/display_item_link_card.xml
index 31ac96418..7a12aa523 100644
--- a/mastodon/src/main/res/layout/display_item_link_card.xml
+++ b/mastodon/src/main/res/layout/display_item_link_card.xml
@@ -3,54 +3,76 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
-	android:layout_height="wrap_content">
+	android:layout_height="wrap_content"
+	android:paddingHorizontal="16dp"
+	android:paddingBottom="8dp">
 
-	<org.joinmastodon.android.ui.views.MaxWidthFrameLayout
+	<LinearLayout
 		android:id="@+id/inner"
 		android:layout_width="match_parent"
-		android:layout_height="match_parent"
+		android:layout_height="wrap_content"
 		android:layout_gravity="center_horizontal"
-		android:foreground="?android:selectableItemBackground"
-		android:maxWidth="@dimen/layout_max_width">
-		<ImageView
+		android:orientation="vertical"
+		android:foreground="@drawable/fg_link_card"
+		android:padding="1dp"
+		android:maxWidth="400dp">
+<!--		TODO figure out how to make blank space disappear when image is gone-->
+		<org.joinmastodon.android.ui.views.FixedAspectRatioImageView
 			android:id="@+id/photo"
 			android:layout_width="match_parent"
-			android:layout_height="250dp"
+			android:layout_height="wrap_content"
 			android:scaleType="centerCrop"
+			android:importantForAccessibility="no"
+			app:aspectRatio="1.7777777778"
 			tools:src="#0f0"/>
-		<LinearLayout
+		<TextView
+			android:id="@+id/title"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_gravity="bottom"
-			android:padding="8dp"
-			android:orientation="vertical"
-			android:background="@drawable/window_bg_alpha95">
-			<TextView
-				android:id="@+id/title"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:textAppearance="@style/m3_body_large"
-				android:singleLine="true"
-				android:ellipsize="end"
-				android:textColor="?colorM3OnSurface"
-				tools:text="Link title"/>
-			<TextView
-				android:id="@+id/description"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:maxLines="2"
-				android:ellipsize="end"
-				android:textAppearance="@style/m3_body_medium"
-				android:textColor="?colorM3OnSurface"
-				tools:text="Link description"/>
+			android:layout_marginHorizontal="16dp"
+			android:layout_marginTop="16dp"
+			android:textAppearance="@style/m3_title_medium"
+			android:maxLines="3"
+			android:ellipsize="end"
+			android:textColor="?colorM3OnSurface"
+			tools:text="Link title"/>
+		<TextView
+			android:id="@+id/description"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginHorizontal="16dp"
+			android:maxLines="2"
+			android:ellipsize="end"
+			android:textAppearance="@style/m3_body_medium"
+			android:textColor="?colorM3OnSurface"
+			tools:text="Link description"/>
+		<org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="20dp"
+			android:layout_marginHorizontal="16dp"
+			android:layout_marginTop="8dp"
+			android:layout_marginBottom="16dp">
 			<TextView
 				android:id="@+id/domain"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
+				android:layout_width="wrap_content"
+				android:layout_height="20dp"
 				android:textAppearance="@style/m3_body_medium"
 				android:textColor="?colorM3OnSurfaceVariant"
+				android:singleLine="true"
+				android:ellipsize="end"
+				android:gravity="center_vertical"
 				tools:text="example.com"/>
-		</LinearLayout>
-	</org.joinmastodon.android.ui.views.MaxWidthFrameLayout>
+			<TextView
+				android:id="@+id/timestamp"
+				android:layout_width="wrap_content"
+				android:layout_height="20dp"
+				android:textAppearance="@style/m3_body_medium"
+				android:textColor="?colorM3OnSurfaceVariant"
+				android:singleLine="true"
+				android:ellipsize="end"
+				android:gravity="center_vertical"
+				tools:text="example.com"/>
+		</org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout>
+	</LinearLayout>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/display_item_link_card_compact.xml b/mastodon/src/main/res/layout/display_item_link_card_compact.xml
new file mode 100644
index 000000000..3cc79302b
--- /dev/null
+++ b/mastodon/src/main/res/layout/display_item_link_card_compact.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:paddingHorizontal="16dp"
+	android:paddingBottom="8dp">
+
+	<RelativeLayout
+		android:id="@+id/inner"
+		android:layout_width="match_parent"
+		android:layout_height="128dp"
+		android:layout_gravity="center_horizontal"
+		android:orientation="vertical"
+		android:foreground="@drawable/fg_link_card"
+		android:padding="1dp"
+		android:maxWidth="400dp">
+		<ImageView
+			android:id="@+id/photo"
+			android:layout_width="128dp"
+			android:layout_height="128dp"
+			android:layout_alignParentEnd="true"
+			android:scaleType="centerCrop"
+			android:importantForAccessibility="no"
+			tools:src="#0f0"/>
+		<TextView
+			android:id="@+id/title"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_alignParentTop="true"
+			android:layout_alignParentStart="true"
+			android:layout_toStartOf="@id/photo"
+			android:layout_marginHorizontal="16dp"
+			android:layout_marginTop="16dp"
+			android:textAppearance="@style/m3_title_medium"
+			android:maxLines="3"
+			android:ellipsize="end"
+			android:textColor="?colorM3OnSurface"
+			tools:text="Link title"/>
+		<org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="20dp"
+			android:layout_alignParentStart="true"
+			android:layout_alignParentBottom="true"
+			android:layout_toStartOf="@id/photo"
+			android:layout_marginHorizontal="16dp"
+			android:layout_marginTop="8dp"
+			android:layout_marginBottom="16dp">
+			<TextView
+				android:id="@+id/domain"
+				android:layout_width="wrap_content"
+				android:layout_height="20dp"
+				android:textAppearance="@style/m3_body_medium"
+				android:textColor="?colorM3OnSurfaceVariant"
+				android:singleLine="true"
+				android:ellipsize="end"
+				android:gravity="center_vertical"
+				tools:text="example.com"/>
+			<TextView
+				android:id="@+id/timestamp"
+				android:layout_width="wrap_content"
+				android:layout_height="20dp"
+				android:textAppearance="@style/m3_body_medium"
+				android:textColor="?colorM3OnSurfaceVariant"
+				android:singleLine="true"
+				android:ellipsize="end"
+				android:gravity="center_vertical"
+				tools:text="example.com"/>
+		</org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout>
+	</RelativeLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/display_item_section_header.xml b/mastodon/src/main/res/layout/display_item_section_header.xml
index 71d97135c..06f6642aa 100644
--- a/mastodon/src/main/res/layout/display_item_section_header.xml
+++ b/mastodon/src/main/res/layout/display_item_section_header.xml
@@ -15,7 +15,8 @@
 		android:layout_width="0dp"
 		android:layout_height="24dp"
 		android:layout_weight="1"
-		android:gravity="center_vertical"
+		android:gravity="center_vertical|start"
+		android:textAlignment="viewStart"
 		android:textAppearance="@style/m3_title_medium"
 		android:textColor="?colorM3OnSurface"
 		android:singleLine="true"
diff --git a/mastodon/src/main/res/layout/empty_with_arrow.xml b/mastodon/src/main/res/layout/empty_with_arrow.xml
new file mode 100644
index 000000000..2d33e666a
--- /dev/null
+++ b/mastodon/src/main/res/layout/empty_with_arrow.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.joinmastodon.android.ui.views.CurlyArrowEmptyView xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:orientation="vertical"
+	android:gravity="center"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:padding="16dp">
+
+	<TextView
+		android:id="@+id/empty_text"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:textAppearance="@style/m3_title_large"
+		android:fontFamily="sans-serif"
+		android:textColor="?colorM3Outline"
+		tools:text="@string/empty_list"/>
+
+	<TextView
+		android:id="@+id/empty_text_secondary"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="4dp"
+		android:textAppearance="@style/m3_title_small"
+		android:gravity="center_horizontal"
+		android:textColor="?colorM3Outline"
+		tools:text="Because there's nothing in it"/>
+
+</org.joinmastodon.android.ui.views.CurlyArrowEmptyView>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/floating_hint_spinner.xml b/mastodon/src/main/res/layout/floating_hint_spinner.xml
new file mode 100644
index 000000000..44b158182
--- /dev/null
+++ b/mastodon/src/main/res/layout/floating_hint_spinner.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.joinmastodon.android.ui.views.FloatingHintEditTextLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:paddingTop="4dp"
+	android:paddingBottom="12dp"
+	app:labelTextColor="@color/m3_outlined_text_field_label"
+	android:foreground="@drawable/bg_m3_outlined_text_field">
+
+	<Spinner
+		android:id="@+id/spinner"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="16dp"
+		android:layout_marginEnd="16dp"
+		android:layout_marginTop="8dp"
+		android:elevation="0dp"/>
+
+</org.joinmastodon.android.ui.views.FloatingHintEditTextLayout>
diff --git a/mastodon/src/main/res/layout/fragment_discover.xml b/mastodon/src/main/res/layout/fragment_discover.xml
index 2b4d7c31c..f39392c58 100644
--- a/mastodon/src/main/res/layout/fragment_discover.xml
+++ b/mastodon/src/main/res/layout/fragment_discover.xml
@@ -31,7 +31,8 @@
 				android:id="@+id/search_text"
 				android:layout_width="match_parent"
 				android:layout_height="match_parent"
-				android:gravity="center_vertical"
+				android:gravity="center_vertical|start"
+				android:textAlignment="viewStart"
 				android:singleLine="true"
 				android:textColor="?colorM3OnSurfaceVariant"
 				android:textAppearance="@style/m3_body_large"
diff --git a/mastodon/src/main/res/layout/fragment_login.xml b/mastodon/src/main/res/layout/fragment_login.xml
index 0abb69439..7e949b49d 100644
--- a/mastodon/src/main/res/layout/fragment_login.xml
+++ b/mastodon/src/main/res/layout/fragment_login.xml
@@ -43,7 +43,7 @@
 			android:layout_marginLeft="16dp"
 			android:layout_marginRight="16dp"
 			android:layout_marginTop="8dp"
-			android:layout_marginBottom="16dp"
+			android:layout_marginBottom="8dp"
 			android:minWidth="145dp"
 			style="@style/Widget.Mastodon.M3.Button.Filled"
 			android:text="@string/next" />
diff --git a/mastodon/src/main/res/layout/fragment_onboarding_common.xml b/mastodon/src/main/res/layout/fragment_onboarding_common.xml
index e70080edd..e717fdc56 100644
--- a/mastodon/src/main/res/layout/fragment_onboarding_common.xml
+++ b/mastodon/src/main/res/layout/fragment_onboarding_common.xml
@@ -125,25 +125,15 @@
 		android:orientation="vertical"
 		android:background="@drawable/bg_onboarding_panel">
 
-		<TextView
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:layout_marginLeft="16dp"
-			android:layout_marginRight="16dp"
-			android:layout_marginTop="8dp"
-			android:textAppearance="@style/m3_body_small"
-			android:textColor="?colorM3OnSurfaceVariant"
-			android:text="@string/signup_random_server_explain"/>
-
 		<Button
-			android:id="@+id/btn_random_instance"
+			android:id="@+id/btn_use_invite"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="16dp"
 			android:layout_marginRight="16dp"
 			android:layout_marginTop="8dp"
 			style="@style/Widget.Mastodon.M3.Button.Text"
-			android:text="@string/pick_server_for_me"/>
+			android:text="@string/use_invite_link"/>
 
 		<Button
 			android:id="@+id/btn_next"
diff --git a/mastodon/src/main/res/layout/fragment_onboarding_follow_suggestions.xml b/mastodon/src/main/res/layout/fragment_onboarding_follow_suggestions.xml
index 321b56f66..1f2c092ed 100644
--- a/mastodon/src/main/res/layout/fragment_onboarding_follow_suggestions.xml
+++ b/mastodon/src/main/res/layout/fragment_onboarding_follow_suggestions.xml
@@ -36,7 +36,7 @@
 		android:id="@+id/button_bar"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:background="?colorM3SurfaceVariant"
+		android:background="@drawable/bg_tabbar"
 		android:outlineProvider="bounds"
 		android:orientation="horizontal"
 		android:elevation="0dp">
diff --git a/mastodon/src/main/res/layout/fragment_onboarding_profile_setup.xml b/mastodon/src/main/res/layout/fragment_onboarding_profile_setup.xml
index 592487632..e1e24fffe 100644
--- a/mastodon/src/main/res/layout/fragment_onboarding_profile_setup.xml
+++ b/mastodon/src/main/res/layout/fragment_onboarding_profile_setup.xml
@@ -11,6 +11,7 @@
 		android:layout_height="0dp"
 		android:layout_weight="1">
 		<LinearLayout
+			android:id="@+id/scrollable_content"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:paddingBottom="16dp"
@@ -30,10 +31,10 @@
 				android:id="@+id/header"
 				android:layout_width="match_parent"
 				android:layout_height="144dp"
-				android:foreground="@drawable/ic_fluent_image_add_24_regular"
 				android:foregroundGravity="center"
 				android:foregroundTint="?colorM3OnSecondaryContainer"
 				android:scaleType="centerCrop"
+				android:contentDescription="@string/profile_header"
 				android:background="?colorM3SecondaryContainer"/>
 
 			<FrameLayout
@@ -47,10 +48,10 @@
 					android:layout_width="96dp"
 					android:layout_height="96dp"
 					android:layout_gravity="center"
-					android:foreground="@drawable/ic_fluent_image_add_24_regular"
 					android:foregroundGravity="center"
 					android:foregroundTint="?colorM3OnSecondaryContainer"
 					android:scaleType="centerCrop"
+					android:contentDescription="@string/profile_picture"
 					android:background="?colorM3SecondaryContainer"/>
 			</FrameLayout>
 
@@ -104,39 +105,6 @@
 					android:hint="@string/profile_bio"/>
 
 			</org.joinmastodon.android.ui.views.FloatingHintEditTextLayout>
-			
-			<org.joinmastodon.android.ui.views.ReorderableLinearLayout
-				android:id="@+id/profile_fields"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:orientation="vertical"/>
-			
-			<Button
-				android:id="@+id/add_row"
-				android:layout_width="match_parent"
-				android:layout_height="56dp"
-				android:gravity="center_vertical"
-				android:paddingStart="16dp"
-				android:paddingEnd="24dp"
-				android:textAppearance="@style/m3_body_large"
-				android:textColor="?colorM3OnSurface"
-				android:drawableEnd="@drawable/ic_fluent_add_24_regular"
-				android:drawableTint="?colorM3OnSurface"
-				android:drawablePadding="16dp"
-				android:singleLine="true"
-				android:ellipsize="end"
-				android:background="?android:attr/selectableItemBackground"
-				android:stateListAnimator="@null"
-				android:text="@string/profile_add_row"/>
-
-			<TextView
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginLeft="16dp"
-				android:layout_marginRight="16dp"
-				android:textAppearance="@style/m3_body_small"
-				android:textColor="?colorM3OnSurfaceVariant"
-				android:text="@string/profile_setup_explanation"/>
 
 		</LinearLayout>
 	</ScrollView>
diff --git a/mastodon/src/main/res/layout/fragment_thread.xml b/mastodon/src/main/res/layout/fragment_thread.xml
new file mode 100644
index 000000000..0d817d825
--- /dev/null
+++ b/mastodon/src/main/res/layout/fragment_thread.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<me.grishka.appkit.views.FragmentRootLinearLayout android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:orientation="vertical"
+	android:id="@+id/appkit_loader_root"
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:background="?colorM3Surface">
+
+	<include layout="@layout/appkit_toolbar"/>
+
+	<FrameLayout
+		android:id="@+id/appkit_loader_content"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1">
+
+		<include layout="@layout/loading"
+				 android:id="@+id/loading"/>
+
+		<ViewStub android:layout="?errorViewLayout"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+				 android:id="@+id/error"
+				 android:visibility="gone"/>
+
+		<View
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:id="@+id/content_stub"/>
+
+	</FrameLayout>
+
+	<View
+		android:layout_width="match_parent"
+		android:layout_height="0.5dp"
+		android:background="?colorM3OutlineVariant"/>
+
+	<FrameLayout
+		android:id="@+id/reply_button_wrapper"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="@drawable/bg_m3_surface2">
+		
+		<LinearLayout
+			android:id="@+id/reply_button"
+			android:layout_width="match_parent"
+			android:layout_height="40dp"
+			android:layout_marginHorizontal="16dp"
+			android:layout_marginVertical="8dp"
+			android:orientation="horizontal"
+			android:background="?colorM3SurfaceVariant"
+			android:foreground="@drawable/bg_rect_4dp_ripple"
+			android:foregroundTint="?colorM3OnSurfaceVariant"
+			android:padding="8dp">
+			
+			<ImageView
+				android:id="@+id/avatar"
+				android:layout_width="24dp"
+				android:layout_height="24dp"
+				android:layout_marginEnd="8dp"
+				android:importantForAccessibility="no"
+				android:scaleType="centerCrop"/>
+
+			<TextView
+				android:id="@+id/reply_btn_text"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center"
+				android:textAppearance="@style/m3_body_medium"
+				android:textColor="?colorM3OnSurfaceVariant"
+				android:singleLine="true"
+				android:ellipsize="end"
+				tools:text="Reply to ..."/>
+			
+		</LinearLayout>
+		
+	</FrameLayout>
+
+</me.grishka.appkit.views.FragmentRootLinearLayout>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/fragment_timeline.xml b/mastodon/src/main/res/layout/fragment_timeline.xml
new file mode 100644
index 000000000..32b2fb594
--- /dev/null
+++ b/mastodon/src/main/res/layout/fragment_timeline.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<me.grishka.appkit.views.RecursiveSwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/refresh_layout"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<FrameLayout
+		android:id="@+id/content_wrap"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent">
+		<me.grishka.appkit.views.UsableRecyclerView
+			android:id="@+id/list"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:scrollbars="vertical"
+			android:clipToPadding="false"/>
+
+		<ViewStub android:layout="?emptyViewLayout"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:id="@+id/empty"/>
+
+		<ImageButton
+			android:id="@+id/fab"
+			android:layout_width="56dp"
+			android:layout_height="56dp"
+			android:layout_gravity="end|bottom"
+			android:layout_marginEnd="16dp"
+			android:layout_marginBottom="16dp"
+			android:background="@drawable/bg_fab"
+			android:tint="?colorM3Primary"
+			android:scaleType="center"
+			android:stateListAnimator="@animator/fab_shadow"
+			android:contentDescription="@string/new_post"
+			android:src="@drawable/ic_fluent_compose_24_filled"/>
+
+		<FrameLayout
+			android:id="@+id/new_posts_btn_wrap"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_horizontal|top">
+			<Button
+				android:id="@+id/new_posts_btn"
+				android:layout_width="wrap_content"
+				android:layout_height="40dp"
+				android:layout_margin="16dp"
+				android:background="@drawable/round_rect"
+				android:backgroundTint="?colorM3Primary"
+				android:paddingHorizontal="16dp"
+				android:paddingVertical="0dp"
+				android:textAppearance="@style/m3_label_large"
+				android:textColor="?colorM3OnPrimary"
+				android:drawableStart="@drawable/ic_arrow_upward_24px"
+				android:drawableTint="?colorM3OnPrimary"
+				android:drawablePadding="8dp"
+				android:elevation="@dimen/m3_sys_elevation_level4"
+				android:stateListAnimator="@animator/squish"
+				android:text="@string/see_new_posts"/>
+		</FrameLayout>
+
+	</FrameLayout>
+</me.grishka.appkit.views.RecursiveSwipeRefreshLayout>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/home_toolbar.xml b/mastodon/src/main/res/layout/home_toolbar.xml
index c677bffa5..1a992b002 100644
--- a/mastodon/src/main/res/layout/home_toolbar.xml
+++ b/mastodon/src/main/res/layout/home_toolbar.xml
@@ -51,7 +51,7 @@
 			android:layout_width="wrap_content"
 			android:layout_height="match_parent"
 			android:text="@string/see_new_posts"
-			android:drawableStart="@drawable/ic_fluent_arrow_up_16_filled"
+			android:drawableStart="@drawable/ic_fluent_arrow_up_24_regular"
 			android:layout_gravity="center"/>
 	</FrameLayout>
 </FrameLayout>
diff --git a/mastodon/src/main/res/layout/item_account_list.xml b/mastodon/src/main/res/layout/item_account_list.xml
index bbd15f376..0d9053299 100644
--- a/mastodon/src/main/res/layout/item_account_list.xml
+++ b/mastodon/src/main/res/layout/item_account_list.xml
@@ -44,9 +44,10 @@
 			android:layout_marginStart="4dp"
 			android:singleLine="true"
 			android:ellipsize="end"
-			android:gravity="center_vertical"
+			android:gravity="center_vertical|start"
 			android:textAppearance="@style/m3_body_medium"
 			android:textColor="?colorM3Secondary"
+			android:textAlignment="viewStart"
 			tools:text="\@user@server"/>
 
 	</LinearLayout>
@@ -124,6 +125,17 @@
 			android:layout_marginTop="2dp"
 			android:duplicateParentState="true"
 			android:visibility="gone"/>
+		
+		<ImageButton
+			android:id="@+id/options_btn"
+			android:layout_width="40dp"
+			android:layout_height="36dp"
+			android:layout_gravity="top"
+			android:background="?android:actionBarItemBackground"
+			android:tint="?colorM3OnSurfaceVariant"
+			android:contentDescription="@string/more_options"
+			android:src="@drawable/ic_more_vert_24px"
+			android:visibility="gone"/>
 
 	</FrameLayout>
 
diff --git a/mastodon/src/main/res/layout/item_account_list_onboarding.xml b/mastodon/src/main/res/layout/item_account_list_onboarding.xml
new file mode 100644
index 000000000..0e2d38794
--- /dev/null
+++ b/mastodon/src/main/res/layout/item_account_list_onboarding.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.joinmastodon.android.ui.views.CheckableRelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:paddingHorizontal="12dp"
+	android:paddingVertical="8dp"
+	android:clipToPadding="false">
+
+	<ImageView
+		android:id="@+id/avatar"
+		android:layout_width="38dp"
+		android:layout_height="38dp"
+		android:layout_marginEnd="8dp"
+		android:importantForAccessibility="no"
+		android:foreground="@drawable/fg_onboarding_ava"
+		android:padding="1dp"
+		tools:src="#0f0"/>
+
+	<TextView
+		android:id="@+id/name"
+		android:layout_width="match_parent"
+		android:layout_height="20dp"
+		android:layout_toEndOf="@id/avatar"
+		android:layout_toStartOf="@id/accessory"
+		android:singleLine="true"
+		android:ellipsize="end"
+		android:gravity="center_vertical"
+		android:textAppearance="@style/m3_title_small"
+		android:textColor="?colorM3OnSurface"
+		tools:text="User"/>
+
+	<TextView
+		android:id="@+id/username"
+		android:layout_width="match_parent"
+		android:layout_height="20dp"
+		android:layout_below="@id/name"
+		android:layout_toEndOf="@id/avatar"
+		android:layout_toStartOf="@id/accessory"
+		android:layout_marginTop="-2dp"
+		android:singleLine="true"
+		android:ellipsize="end"
+		android:gravity="center_vertical|start"
+		android:textAppearance="@style/m3_body_medium"
+		android:textColor="?colorM3Secondary"
+		android:textAlignment="viewStart"
+		tools:text="\@user@server"/>
+
+	<FrameLayout
+		android:id="@+id/accessory"
+		android:layout_width="wrap_content"
+		android:layout_height="38dp"
+		android:layout_alignParentEnd="true"
+		android:layout_alignParentTop="true"
+		android:layout_marginStart="8dp"
+		android:duplicateParentState="true">
+
+		<org.joinmastodon.android.ui.views.ProgressBarButton
+			android:id="@+id/button"
+			android:layout_width="wrap_content"
+			android:layout_height="32dp"
+			android:layout_gravity="center_vertical"
+			android:paddingHorizontal="10dp"
+			android:minWidth="96dp"
+			android:maxWidth="150dp"
+			style="@style/Widget.Mastodon.M3.Button.Filled"
+			tools:text="Follow back"/>
+		<ProgressBar
+			android:id="@+id/action_progress"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center"
+			android:indeterminate="true"
+			style="?android:progressBarStyleSmall"
+			android:elevation="10dp"
+			android:outlineProvider="none"
+			android:indeterminateTint="?colorM3OnPrimary"
+			android:visibility="gone"/>
+
+		<View
+			android:id="@+id/checkbox"
+			android:layout_width="32dp"
+			android:layout_height="32dp"
+			android:layout_marginHorizontal="4dp"
+			android:layout_marginTop="2dp"
+			android:duplicateParentState="true"
+			android:visibility="gone"/>
+
+		<ImageButton
+			android:id="@+id/options_btn"
+			android:layout_width="40dp"
+			android:layout_height="36dp"
+			android:layout_gravity="top"
+			android:background="?android:actionBarItemBackground"
+			android:tint="?colorM3OnSurfaceVariant"
+			android:contentDescription="@string/more_options"
+			android:src="@drawable/ic_more_vert_24px"
+			android:visibility="gone"/>
+
+	</FrameLayout>
+
+	<TextView
+		android:id="@+id/bio"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_toEndOf="@id/avatar"
+		android:layout_below="@id/username"
+		android:layout_marginTop="2dp"
+		android:textAppearance="@style/m3_body_medium"
+		android:textColor="?colorM3OnSurface"
+		android:maxLines="2"
+		android:paddingVertical="2dp"
+		tools:text="bla bla bla bla bla bla"/>
+
+	<View
+		android:id="@+id/menu_anchor"
+		android:layout_width="1px"
+		android:layout_height="1px"
+		android:layout_alignParentTop="true"
+		android:layout_alignParentLeft="true"
+		android:layout_marginLeft="-16dp"/>
+
+</org.joinmastodon.android.ui.views.CheckableRelativeLayout>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/item_discover_account.xml b/mastodon/src/main/res/layout/item_discover_account.xml
index 371491fb6..8b6753976 100644
--- a/mastodon/src/main/res/layout/item_discover_account.xml
+++ b/mastodon/src/main/res/layout/item_discover_account.xml
@@ -329,10 +329,12 @@
 				android:id="@+id/action_btn"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:minHeight="48dp"
-				android:minWidth="56dp"
-				android:singleLine="true"
-				tools:text="@string/follow_back"/>
+				android:layout_gravity="center_vertical"
+				android:paddingHorizontal="10dp"
+				android:minWidth="96dp"
+				android:maxWidth="150dp"
+				style="@style/Widget.Mastodon.M3.Button.Filled"
+				tools:text="Follow back"/>
 
 			<ProgressBar
 				android:id="@+id/action_progress"
diff --git a/mastodon/src/main/res/layout/item_dropdown_menu.xml b/mastodon/src/main/res/layout/item_dropdown_menu.xml
new file mode 100644
index 000000000..8f217b590
--- /dev/null
+++ b/mastodon/src/main/res/layout/item_dropdown_menu.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="56dp"
+	android:paddingStart="16dp"
+	android:paddingEnd="24dp"
+	android:drawablePadding="16dp"
+	android:maxLines="2"
+	android:gravity="center_vertical|start"
+	android:textAppearance="@style/m3_body_large"
+	android:textColor="?colorM3OnSurface"
+	android:drawableTint="?colorM3OnSurface"
+	android:ellipsize="end"
+	android:textAlignment="viewStart"
+	tools:text="Menu item">
+
+</TextView>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/item_generic_list_content.xml b/mastodon/src/main/res/layout/item_generic_list_content.xml
index 9d0e45e08..590e6ac84 100644
--- a/mastodon/src/main/res/layout/item_generic_list_content.xml
+++ b/mastodon/src/main/res/layout/item_generic_list_content.xml
@@ -23,9 +23,11 @@
 			android:layout_height="wrap_content"
 			android:minHeight="24dp"
 			android:ellipsize="end"
-			android:gravity="center_vertical"
+			android:gravity="center_vertical|start"
 			android:textAppearance="@style/m3_body_large"
+			android:textSize="16sp"
 			android:textColor="?colorM3OnSurface"
+			android:textAlignment="viewStart"
 			tools:text="Title"/>
 
 		<TextView
@@ -33,9 +35,11 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:minHeight="20dp"
-			android:gravity="center_vertical"
+			android:gravity="center_vertical|start"
 			android:textAppearance="@style/m3_body_medium"
+			android:textSize="14sp"
 			android:textColor="?colorM3OnSurfaceVariant"
+			android:textAlignment="viewStart"
 			tools:text="Subtitle"/>
 
 	</LinearLayout>
diff --git a/mastodon/src/main/res/layout/item_generic_list_options.xml b/mastodon/src/main/res/layout/item_generic_list_options.xml
new file mode 100644
index 000000000..4ca3c0e93
--- /dev/null
+++ b/mastodon/src/main/res/layout/item_generic_list_options.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:orientation="horizontal"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:minHeight="56dp"
+	android:paddingHorizontal="16dp"
+	android:paddingVertical="12dp"
+	android:gravity="center_vertical">
+
+	<include layout="@layout/item_generic_list_content"/>
+
+	<ImageButton
+		android:id="@+id/options_btn"
+		android:layout_width="32dp"
+		android:layout_height="32dp"
+		android:layout_marginStart="8dp"
+		android:layout_gravity="top"
+		android:contentDescription="@string/more_options"
+		android:src="@drawable/ic_more_vert_24px"
+		android:tint="?colorM3OnSurface"
+		android:background="?android:actionBarItemBackground"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/item_list_header.xml b/mastodon/src/main/res/layout/item_list_header.xml
index 6837e06bd..91c272959 100644
--- a/mastodon/src/main/res/layout/item_list_header.xml
+++ b/mastodon/src/main/res/layout/item_list_header.xml
@@ -15,7 +15,8 @@
 		android:layout_marginBottom="8dp"
 		android:textAppearance="@style/m3_headline_medium"
 		android:minHeight="36dp"
-		android:gravity="center_vertical"
+		android:gravity="center_vertical|start"
+		android:textAlignment="viewStart"
 		android:textColor="?colorM3OnSurface"
 		tools:text="Title"/>
 
@@ -26,7 +27,8 @@
 		android:textAppearance="@style/m3_title_medium"
 		android:textColor="?colorM3OnSurfaceVariant"
 		android:minHeight="24dp"
-		android:gravity="center_vertical"
+		android:gravity="center_vertical|start"
+		android:textAlignment="viewStart"
 		tools:text="Subtitle"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/item_other_numbered_rule.xml b/mastodon/src/main/res/layout/item_other_numbered_rule.xml
new file mode 100644
index 000000000..d36c32705
--- /dev/null
+++ b/mastodon/src/main/res/layout/item_other_numbered_rule.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:paddingVertical="8dp"
+	android:baselineAligned="false">
+	
+	<TextView
+		android:id="@+id/number"
+		android:layout_width="40dp"
+		android:layout_height="40dp"
+		android:layout_alignParentTop="true"
+		android:layout_alignParentStart="true"
+		android:layout_marginEnd="16dp"
+		android:textColor="?colorM3Primary"
+		android:fontFamily="sans-serif-condensed"
+		android:textStyle="bold"
+		android:textSize="22dp"
+		android:gravity="center"
+		android:includeFontPadding="false"
+		tools:text="1"/>
+
+	<TextView
+		android:id="@+id/title"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_toEndOf="@id/number"
+		android:textAppearance="@style/m3_body_large"
+		android:textSize="16sp"
+		android:textColor="?colorM3OnSurface"
+		android:minHeight="20sp"
+		android:gravity="center_vertical|start"
+		tools:text="No discrimination, including (but not limited to) racism, sexism, homophobia or transphobia."/>
+
+	<TextView
+		android:id="@+id/text"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_toEndOf="@id/number"
+		android:layout_below="@id/title"
+		android:textAppearance="@style/m3_body_medium"
+		android:textSize="14sp"
+		android:textColor="?colorM3OnSurfaceVariant"
+		android:paddingVertical="2sp"
+		android:lineSpacingExtra="4sp"
+		android:gravity="start"
+		tools:text="No discrimination, including (but not limited to) racism, sexism, homophobia or transphobia."/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/item_server_rule.xml b/mastodon/src/main/res/layout/item_server_rule.xml
index efd7e3a82..2f97bc8b0 100644
--- a/mastodon/src/main/res/layout/item_server_rule.xml
+++ b/mastodon/src/main/res/layout/item_server_rule.xml
@@ -29,6 +29,7 @@
 		android:layout_height="wrap_content"
 		android:layout_gravity="top"
 		android:textAppearance="@style/m3_body_large"
+		android:textSize="16sp"
 		android:textColor="?colorM3OnSurface"
 		tools:text="No discrimination, including (but not limited to) racism, sexism, homophobia or transphobia."/>
 
diff --git a/mastodon/src/main/res/layout/item_spinner.xml b/mastodon/src/main/res/layout/item_spinner.xml
new file mode 100644
index 000000000..fcf964b91
--- /dev/null
+++ b/mastodon/src/main/res/layout/item_spinner.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@android:id/text1"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:padding="16dp"
+	android:textAppearance="@style/m3_body_large"
+	android:textColor="?colorM3OnSurface"
+	android:singleLine="true"/>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/item_text_with_icon.xml b/mastodon/src/main/res/layout/item_text_with_icon.xml
index 4a1df3a6e..91fc10903 100644
--- a/mastodon/src/main/res/layout/item_text_with_icon.xml
+++ b/mastodon/src/main/res/layout/item_text_with_icon.xml
@@ -2,10 +2,14 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
-	android:layout_height="56dp"
-	android:gravity="center_vertical"
+	android:layout_height="wrap_content"
+	android:minHeight="56dp"
+	android:gravity="center_vertical|start"
+	android:textAlignment="viewStart"
 	android:textColor="?colorM3OnSurface"
 	android:textAppearance="@style/m3_body_large"
+	android:textSize="16sp"
+	android:paddingVertical="14dp"
 	android:singleLine="true"
 	android:ellipsize="end"
 	android:paddingLeft="24dp"
diff --git a/mastodon/src/main/res/layout/popup_menu_empty.xml b/mastodon/src/main/res/layout/popup_menu_empty.xml
new file mode 100644
index 000000000..4c61c5c17
--- /dev/null
+++ b/mastodon/src/main/res/layout/popup_menu_empty.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:paddingTop="8dp"
+	android:paddingBottom="12dp"
+	android:paddingHorizontal="12dp"
+	android:gravity="center_horizontal">
+
+	<ImageView
+		android:id="@+id/icon"
+		android:layout_width="40dp"
+		android:layout_height="40dp"
+		android:layout_marginBottom="12dp"
+		android:background="@drawable/white_circle"
+		android:backgroundTint="?colorM3SecondaryContainer"
+		android:tint="?colorM3OnSecondaryContainer"
+		android:scaleType="center"
+		android:importantForAccessibility="no"
+		tools:src="@drawable/ic_list_alt_24px"/>
+
+	<TextView
+		android:id="@+id/title"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:textColor="?colorM3Outline"
+		android:textAppearance="@style/m3_body_large"
+		android:gravity="center"
+		android:alpha="0.7"
+		tools:text="Title"/>
+
+	<TextView
+		android:id="@+id/subtitle"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:textColor="?colorM3Outline"
+		android:textAppearance="@style/m3_body_small"
+		android:gravity="center"
+		android:alpha="0.7"
+		tools:text="Subtitle"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/progress_bar.xml b/mastodon/src/main/res/layout/progress_bar.xml
new file mode 100644
index 000000000..d1c5c3939
--- /dev/null
+++ b/mastodon/src/main/res/layout/progress_bar.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ProgressBar xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+</ProgressBar>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/sheet_alt_text.xml b/mastodon/src/main/res/layout/sheet_alt_text.xml
new file mode 100644
index 000000000..4c6837fd0
--- /dev/null
+++ b/mastodon/src/main/res/layout/sheet_alt_text.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.joinmastodon.android.ui.views.CustomScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="@drawable/bg_bottom_sheet"
+	android:outlineProvider="background"
+	android:elevation="1dp">
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical"
+		android:paddingBottom="16dp">
+
+		<View
+			android:id="@+id/handle"
+			android:layout_width="match_parent"
+			android:layout_height="36dp"
+			android:background="@drawable/bg_bottom_sheet_handle"/>
+
+		<LinearLayout
+			android:id="@+id/alt_text_title"
+			android:layout_width="match_parent"
+			android:layout_height="48dp"
+			android:orientation="horizontal"
+			android:layout_marginHorizontal="16dp">
+
+			<TextView
+				android:layout_width="0dp"
+				android:layout_height="match_parent"
+				android:layout_weight="1"
+				android:layout_marginEnd="8dp"
+				android:singleLine="true"
+				android:ellipsize="end"
+				android:textSize="22dp"
+				android:textColor="?colorM3OnSurfaceVariant"
+				android:gravity="center_vertical|start"
+				android:text="@string/alt_text"/>
+
+			<ImageButton
+				android:id="@+id/alt_text_help"
+				android:layout_width="48dp"
+				android:layout_height="48dp"
+				android:background="?android:actionBarItemBackground"
+				android:tint="?colorM3OnSurfaceVariant"
+				android:contentDescription="@string/help"
+				android:src="@drawable/ic_help_24px"/>
+
+		</LinearLayout>
+
+		<TextView
+			android:id="@+id/alt_text"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginHorizontal="16dp"
+			android:textAppearance="@style/m3_body_large"
+			android:textColor="?colorM3OnSurface"
+			tools:text="A cute black cat"/>
+
+	</LinearLayout>
+
+</org.joinmastodon.android.ui.views.CustomScrollView>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/sheet_decentralization_info.xml b/mastodon/src/main/res/layout/sheet_decentralization_info.xml
new file mode 100644
index 000000000..9460b1a9e
--- /dev/null
+++ b/mastodon/src/main/res/layout/sheet_decentralization_info.xml
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.joinmastodon.android.ui.views.CustomScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:background="@drawable/bg_bottom_sheet"
+	android:outlineProvider="background"
+	android:elevation="1dp">
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical">
+
+		<View
+			android:id="@+id/sheet_handle"
+			android:layout_width="match_parent"
+			android:layout_height="36dp"
+			android:background="@drawable/bg_bottom_sheet_handle"/>
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginHorizontal="16dp"
+			android:orientation="horizontal"
+			android:gravity="center_vertical">
+			<ImageView
+				android:id="@+id/icon"
+				android:layout_width="40dp"
+				android:layout_height="40dp"
+				android:layout_marginEnd="16dp"
+				android:background="@drawable/white_circle"
+				android:backgroundTint="?colorM3SecondaryContainer"
+				android:scaleType="center"
+				android:tint="?colorM3OnSecondaryContainer"
+				android:src="@drawable/ic_badge_24px"
+				android:importantForAccessibility="no"/>
+
+			<TextView
+				android:id="@+id/title"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:textAppearance="@style/m3_title_large"
+				android:fontFamily="sans-serif"
+				android:textColor="?colorM3OnSurface"
+				android:text="@string/handle_help_title"/>
+		</LinearLayout>
+
+		<LinearLayout
+			android:id="@+id/handle_wrap"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="16dp"
+			android:layout_marginBottom="8dp"
+			android:layout_marginHorizontal="16dp"
+			android:orientation="vertical"
+			android:background="@drawable/bg_handle_help"
+			android:clipChildren="false"
+			android:clipToPadding="false"
+			android:padding="12dp">
+
+			<TextView
+				android:id="@+id/handle_title"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:textAppearance="@style/m3_label_small"
+				android:textColor="?colorM3OnSurfaceVariant"
+				android:alpha="0.6"
+				tools:text="@string/handle_title"/>
+
+			<org.joinmastodon.android.ui.views.RippleAnimationTextView
+				android:id="@+id/handle"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="2dp"
+				android:textAppearance="@style/m3_body_large"
+				android:textColor="?colorM3OnSurface"
+				tools:text="\@Gargron@mastodon.social"/>
+
+		</LinearLayout>
+
+		<RelativeLayout
+			android:id="@+id/username_row"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:paddingHorizontal="16dp"
+			android:layout_marginBottom="16dp">
+			
+			<ImageView
+				android:id="@+id/icon"
+				android:layout_width="40dp"
+				android:layout_height="40dp"
+				android:layout_marginEnd="16dp"
+				android:importantForAccessibility="no"
+				android:scaleType="center"
+				android:tint="?colorM3Primary"
+				android:src="@drawable/ic_fluent_mention_24_regular"/>
+
+			<TextView
+				android:id="@+id/username_title"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_toEndOf="@id/icon"
+				android:textAppearance="@style/m3_title_medium"
+				android:textColor="?colorM3OnSurface"
+				android:text="@string/username"/>
+
+			<TextView
+				android:id="@+id/username_text"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_toEndOf="@id/icon"
+				android:layout_below="@id/username_title"
+				android:textAppearance="@style/m3_body_small"
+				android:textColor="?colorM3OnSurfaceVariant"
+				tools:text="@string/handle_username_explanation"/>
+			
+		</RelativeLayout>
+
+		<RelativeLayout
+			android:id="@+id/server_row"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:paddingHorizontal="16dp"
+			android:layout_marginBottom="16dp">
+
+			<ImageView
+				android:id="@+id/icon"
+				android:layout_width="40dp"
+				android:layout_height="40dp"
+				android:layout_marginEnd="16dp"
+				android:importantForAccessibility="no"
+				android:scaleType="center"
+				android:tint="?colorM3Primary"
+				android:src="@drawable/ic_fluent_earth_24_regular"/>
+
+			<TextView
+				android:id="@+id/server_title"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_toEndOf="@id/icon"
+				android:textAppearance="@style/m3_title_medium"
+				android:textColor="?colorM3OnSurface"
+				android:text="@string/server"/>
+
+			<TextView
+				android:id="@+id/server_text"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_toEndOf="@id/icon"
+				android:layout_below="@id/server_title"
+				android:textAppearance="@style/m3_body_small"
+				android:textColor="?colorM3OnSurfaceVariant"
+				tools:text="@string/handle_server_explanation"/>
+
+		</RelativeLayout>
+
+		<org.joinmastodon.android.ui.views.LinkedTextView
+			android:id="@+id/handle_explanation"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginHorizontal="16dp"
+			android:layout_marginBottom="16dp"
+			android:textAppearance="@style/m3_body_medium"
+			android:textColor="?colorM3OnSurfaceVariant"
+			tools:text="@string/handle_explanation"/>
+
+		<Button
+			android:id="@+id/btn_cancel"
+			android:layout_width="match_parent"
+			android:layout_height="40dp"
+			android:layout_marginBottom="8dp"
+			android:layout_marginHorizontal="16dp"
+			style="@style/Widget.Mastodon.M3.Button.Filled"
+			android:text="@string/got_it"/>
+
+	</LinearLayout>
+</org.joinmastodon.android.ui.views.CustomScrollView>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/sheet_photo_viewer_info.xml b/mastodon/src/main/res/layout/sheet_photo_viewer_info.xml
new file mode 100644
index 000000000..9ce319fb6
--- /dev/null
+++ b/mastodon/src/main/res/layout/sheet_photo_viewer_info.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.joinmastodon.android.ui.views.CustomScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="@drawable/bg_bottom_sheet"
+	android:outlineProvider="background"
+	android:elevation="1dp">
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical"
+		android:paddingBottom="16dp">
+
+		<View
+			android:id="@+id/handle"
+			android:layout_width="match_parent"
+			android:layout_height="36dp"
+			android:background="@drawable/bg_bottom_sheet_handle"/>
+
+		<HorizontalScrollView
+			android:id="@+id/buttons_container"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:fillViewport="true">
+
+			<LinearLayout
+				android:layout_width="wrap_content"
+				android:layout_height="64dp"
+				android:orientation="horizontal"
+				android:paddingHorizontal="16dp"
+				android:baselineAligned="false">
+
+				<Button
+					android:id="@+id/btn_boost"
+					android:layout_width="64dp"
+					android:layout_height="64dp"
+					android:text="@string/button_reblog"
+					android:drawableTop="@drawable/ic_boost"
+					style="@style/Widget.Mastodon.M3.Button.IconWithLabel"/>
+
+				<Space
+					android:layout_width="0dp"
+					android:layout_height="1dp"
+					android:layout_weight="1"/>
+
+				<Button
+					android:id="@+id/btn_favorite"
+					android:layout_width="64dp"
+					android:layout_height="64dp"
+					android:text="@string/button_favorite"
+					android:drawableTop="@drawable/ic_fluent_star_24_selector"
+					style="@style/Widget.Mastodon.M3.Button.IconWithLabel"/>
+
+				<Space
+					android:layout_width="0dp"
+					android:layout_height="1dp"
+					android:layout_weight="1"/>
+
+				<Button
+					android:id="@+id/btn_share"
+					android:layout_width="64dp"
+					android:layout_height="64dp"
+					android:text="@string/button_share"
+					android:drawableTop="@drawable/ic_fluent_share_24_regular"
+					style="@style/Widget.Mastodon.M3.Button.IconWithLabel"/>
+
+				<Space
+					android:layout_width="0dp"
+					android:layout_height="1dp"
+					android:layout_weight="1"/>
+
+				<Button
+					android:id="@+id/btn_bookmark"
+					android:layout_width="64dp"
+					android:layout_height="64dp"
+					android:text="@string/add_bookmark"
+					android:drawableTop="@drawable/ic_fluent_bookmark_24_selector"
+					style="@style/Widget.Mastodon.M3.Button.IconWithLabel"/>
+
+				<Space
+					android:layout_width="0dp"
+					android:layout_height="1dp"
+					android:layout_weight="1"/>
+
+				<Button
+					android:id="@+id/btn_download"
+					android:layout_width="64dp"
+					android:layout_height="64dp"
+					android:text="@string/download"
+					android:drawableTop="@drawable/ic_fluent_arrow_download_24_regular"
+					style="@style/Widget.Mastodon.M3.Button.IconWithLabel"/>
+
+			</LinearLayout>
+
+		</HorizontalScrollView>
+		
+		<View
+			android:id="@+id/divider"
+			android:layout_width="match_parent"
+			android:layout_height="1dp"
+			android:layout_marginVertical="4dp"
+			android:layout_marginHorizontal="16dp"
+			android:background="?colorM3OutlineVariant"/>
+
+		<LinearLayout
+			android:id="@+id/alt_text_title"
+			android:layout_width="match_parent"
+			android:layout_height="48dp"
+			android:orientation="horizontal"
+			android:layout_marginHorizontal="16dp">
+
+			<TextView
+				android:layout_width="0dp"
+				android:layout_height="match_parent"
+				android:layout_weight="1"
+				android:layout_marginEnd="8dp"
+				android:singleLine="true"
+				android:ellipsize="end"
+				android:textSize="22dp"
+				android:textColor="?colorM3OnSurfaceVariant"
+				android:gravity="center_vertical|start"
+				android:text="@string/alt_text"/>
+
+			<ImageButton
+				android:id="@+id/alt_text_help"
+				android:layout_width="48dp"
+				android:layout_height="48dp"
+				android:background="?android:actionBarItemBackground"
+				android:tint="?colorM3OnSurfaceVariant"
+				android:contentDescription="@string/help"
+				android:src="@drawable/ic_help_24px"/>
+
+		</LinearLayout>
+
+		<TextView
+			android:id="@+id/alt_text"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginHorizontal="16dp"
+			android:textAppearance="@style/m3_body_large"
+			android:textColor="?colorM3OnSurface"
+			tools:text="A cute black cat"/>
+
+	</LinearLayout>
+
+</org.joinmastodon.android.ui.views.CustomScrollView>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/sheet_pre_reply.xml b/mastodon/src/main/res/layout/sheet_pre_reply.xml
new file mode 100644
index 000000000..5bb35a436
--- /dev/null
+++ b/mastodon/src/main/res/layout/sheet_pre_reply.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.joinmastodon.android.ui.views.CustomScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="@drawable/bg_bottom_sheet"
+	android:outlineProvider="background"
+	android:elevation="1dp">
+	<RelativeLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:paddingHorizontal="16dp">
+
+		<View
+			android:id="@+id/handle"
+			android:layout_width="match_parent"
+			android:layout_height="36dp"
+			android:background="@drawable/bg_bottom_sheet_handle"/>
+
+		<ImageView
+			android:id="@+id/icon"
+			android:layout_width="40dp"
+			android:layout_height="40dp"
+			android:layout_below="@id/handle"
+			android:layout_alignParentStart="true"
+			android:layout_marginEnd="16dp"
+			android:background="@drawable/white_circle"
+			android:backgroundTint="?colorM3PrimaryContainer"
+			android:scaleType="center"
+			android:tint="?colorM3OnPrimaryContainer"
+			tools:src="@drawable/ic_waving_hand_24px"
+			android:importantForAccessibility="no"/>
+
+		<TextView
+			android:id="@+id/title"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_toEndOf="@id/icon"
+			android:layout_below="@id/handle"
+			android:layout_marginBottom="4dp"
+			android:textAppearance="@style/m3_title_large"
+			android:fontFamily="sans-serif"
+			android:textColor="?colorM3OnSurface"
+			tools:text="@string/non_mutual_sheet_title"/>
+
+		<TextView
+			android:id="@+id/text"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_below="@id/title"
+			android:layout_toEndOf="@id/icon"
+			android:textAppearance="@style/m3_body_medium"
+			android:textColor="?colorM3OnSurfaceVariant"
+			tools:text="@string/non_mutual_sheet_text"/>
+
+		<LinearLayout
+			android:id="@+id/content_wrap"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_below="@id/text"
+			android:layout_marginTop="16dp"
+			android:layout_marginBottom="8dp"
+			android:minHeight="8dp"
+			android:orientation="vertical"/>
+
+		<Button
+			android:id="@+id/btn_got_it"
+			android:layout_width="match_parent"
+			android:layout_height="40dp"
+			android:layout_below="@id/content_wrap"
+			android:layout_marginBottom="8dp"
+			style="@style/Widget.Mastodon.M3.Button.Tonal"
+			android:text="@string/got_it"/>
+
+		<Button
+			android:id="@+id/btn_dont_remind_again"
+			android:layout_width="match_parent"
+			android:layout_height="40dp"
+			android:layout_below="@id/btn_got_it"
+			android:layout_marginBottom="8dp"
+			style="@style/Widget.Mastodon.M3.Button.Text"
+			android:text="@string/dont_remind_again"/>
+
+	</RelativeLayout>
+</org.joinmastodon.android.ui.views.CustomScrollView>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/sheet_restrict_account.xml b/mastodon/src/main/res/layout/sheet_restrict_account.xml
new file mode 100644
index 000000000..fbaa91d5d
--- /dev/null
+++ b/mastodon/src/main/res/layout/sheet_restrict_account.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.joinmastodon.android.ui.views.CustomScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:background="@drawable/bg_bottom_sheet"
+	android:outlineProvider="background"
+	android:elevation="1dp">
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical"
+		android:paddingHorizontal="16dp">
+
+		<View
+			android:id="@+id/handle"
+			android:layout_width="match_parent"
+			android:layout_height="36dp"
+			android:background="@drawable/bg_bottom_sheet_handle"/>
+
+		<RelativeLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content">
+			<ImageView
+				android:id="@+id/icon"
+				android:layout_width="40dp"
+				android:layout_height="40dp"
+				android:layout_marginEnd="16dp"
+				android:layout_centerVertical="true"
+				android:background="@drawable/white_circle"
+				android:backgroundTint="?colorM3SecondaryContainer"
+				android:scaleType="center"
+				android:tint="?colorM3OnSecondaryContainer"
+				tools:src="@drawable/ic_waving_hand_24px"
+				android:importantForAccessibility="no"/>
+
+			<TextView
+				android:id="@+id/title"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_toEndOf="@id/icon"
+				android:textAppearance="@style/m3_title_large"
+				android:fontFamily="sans-serif"
+				android:textColor="?colorM3OnSurface"
+				tools:text="@string/mute_user_confirm_title"/>
+
+			<TextView
+				android:id="@+id/text"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_toEndOf="@id/icon"
+				android:layout_below="@id/title"
+				android:textAppearance="@style/m3_body_medium"
+				android:textColor="?colorM3OnSurfaceVariant"
+				tools:text="\@username"/>
+		</RelativeLayout>
+
+		<LinearLayout
+			android:id="@+id/content_wrap"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="8dp"
+			android:layout_marginBottom="32dp"
+			android:orientation="vertical"/>
+
+		<FrameLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginBottom="8dp">
+			<org.joinmastodon.android.ui.views.ProgressBarButton
+				android:id="@+id/btn_confirm"
+				android:layout_width="match_parent"
+				android:layout_height="40dp"
+				style="@style/Widget.Mastodon.M3.Button.Filled"
+				app:progressBar="@id/confirm_progress"
+				tools:text="@string/got_it"/>
+			<ProgressBar
+				android:id="@+id/confirm_progress"
+				style="?android:progressBarStyleSmall"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center"
+				android:elevation="10dp"
+				android:indeterminate="true"
+				android:outlineProvider="none"
+				android:visibility="gone"
+				tools:visibility="visible"/>
+		</FrameLayout>
+
+		<FrameLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginBottom="8dp">
+			<org.joinmastodon.android.ui.views.ProgressBarButton
+				android:id="@+id/btn_secondary"
+				android:layout_width="match_parent"
+				android:layout_height="40dp"
+				style="@style/Widget.Mastodon.M3.Button.Tonal"
+				app:progressBar="@id/secondary_progress"
+				tools:text="@string/got_it"/>
+			<ProgressBar
+				android:id="@+id/secondary_progress"
+				style="?android:progressBarStyleSmall"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center"
+				android:elevation="10dp"
+				android:indeterminate="true"
+				android:outlineProvider="none"
+				android:visibility="gone"
+				tools:visibility="visible"/>
+		</FrameLayout>
+
+		<Button
+			android:id="@+id/btn_cancel"
+			android:layout_width="match_parent"
+			android:layout_height="40dp"
+			android:layout_marginBottom="8dp"
+			style="@style/Widget.Mastodon.M3.Button.Text"
+			android:text="@string/cancel"/>
+
+	</LinearLayout>
+</org.joinmastodon.android.ui.views.CustomScrollView>
\ No newline at end of file
diff --git a/mastodon/src/main/res/menu/post.xml b/mastodon/src/main/res/menu/post.xml
index 74265ccb8..ed9c25300 100644
--- a/mastodon/src/main/res/menu/post.xml
+++ b/mastodon/src/main/res/menu/post.xml
@@ -8,7 +8,7 @@
 		<item android:id="@+id/unpin" android:title="@string/sk_unpin_post" android:icon="@drawable/ic_fluent_pin_off_24_regular"/>
 	</group>
 	<group android:id="@+id/menu_group2">
-		<item android:id="@+id/manage_user_lists" android:title="@string/sk_lists_with_user" android:icon="@drawable/ic_fluent_people_24_regular"/>
+		<item android:id="@+id/manage_user_lists" android:title="@string/add_user_to_list" android:icon="@drawable/ic_fluent_people_24_regular"/>
 		<item android:id="@+id/follow" android:title="@string/follow_user" android:icon="@drawable/ic_fluent_person_add_24_regular"/>
 		<item android:id="@+id/mute" android:title="@string/mute_user" android:icon="@drawable/ic_fluent_speaker_off_24_regular"/>
 		<item android:id="@+id/block" android:title="@string/block_user" android:icon="@drawable/ic_fluent_person_prohibited_24_regular"/>
diff --git a/mastodon/src/main/res/menu/profile.xml b/mastodon/src/main/res/menu/profile.xml
index e7d46f959..7a5083d2a 100644
--- a/mastodon/src/main/res/menu/profile.xml
+++ b/mastodon/src/main/res/menu/profile.xml
@@ -4,7 +4,7 @@
 		<item android:id="@+id/edit_note" android:title="@string/sk_add_note" android:icon="@drawable/ic_fluent_notepad_24_regular" android:showAsAction="ifRoom" />
 	</group>
 	<group android:id="@+id/menu_group2">
-		<item android:id="@+id/manage_user_lists" android:title="@string/sk_lists_with_user" android:icon="@drawable/ic_fluent_people_24_regular"/>
+		<item android:id="@+id/manage_user_lists" android:title="@string/add_user_to_list" android:icon="@drawable/ic_fluent_people_24_regular"/>
 		<item android:id="@+id/mute" android:title="@string/mute_user" android:icon="@drawable/ic_fluent_speaker_off_24_regular"/>
 		<item android:id="@+id/hide_boosts" android:title="@string/hide_boosts_from_user" android:icon="@drawable/ic_fluent_arrow_repeat_all_off_24_regular"/>
 		<item android:id="@+id/block" android:title="@string/block_user" android:icon="@drawable/ic_fluent_person_prohibited_24_regular"/>
diff --git a/mastodon/src/main/res/menu/standalone_list_timeline.xml b/mastodon/src/main/res/menu/standalone_list_timeline.xml
new file mode 100644
index 000000000..c1b6bccb3
--- /dev/null
+++ b/mastodon/src/main/res/menu/standalone_list_timeline.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+	<item
+		android:id="@+id/members"
+		android:icon="@drawable/ic_fluent_people_24_regular"
+		android:title="@string/list_members"
+		android:showAsAction="always"/>
+	<item
+		android:id="@+id/edit_list"
+		android:icon="@drawable/ic_fluent_edit_24_regular"
+		android:showAsAction="always"
+		android:title="@string/edit_list"/>
+</menu>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values-ar-rSA/strings.xml b/mastodon/src/main/res/values-ar-rSA/strings.xml
index 94eb58203..403758d48 100644
--- a/mastodon/src/main/res/values-ar-rSA/strings.xml
+++ b/mastodon/src/main/res/values-ar-rSA/strings.xml
@@ -18,9 +18,9 @@
 	<string name="poll_ended">الاطلاع على نتائج استطلاع الرأي الذي صوّت فيه</string>
 	<string name="share_toot_title">شارك</string>
 	<string name="settings">الإعدادات</string>
-	<string name="publish">انشر</string>
-	<string name="discard_draft">أتريد التخلص من المسودة؟</string>
-	<string name="discard">تخلص</string>
+	<string name="publish">نَشر</string>
+	<string name="discard_draft">أتريد إلغاء المسودة؟</string>
+	<string name="discard">إلغاء</string>
 	<string name="cancel">إلغاء</string>
 	<plurals name="followers">
 		<item quantity="zero">لا متابِعين</item>
@@ -211,19 +211,7 @@
 	<string name="password">كلمة المرور</string>
 	<string name="confirm_password">تأكيد كلمة المرور</string>
 	<string name="password_note">ضمّن الأحرف الكبيرة والأحرف الخاصة والأرقام لزيادة قوة كلمة المرور.</string>
-	<string name="category_academia">أكاديمي</string>
-	<string name="category_activism">النشطاء</string>
-	<string name="category_all">الكل</string>
-	<string name="category_art">فنون</string>
-	<string name="category_food">طعام</string>
-	<string name="category_furry">حيوان ذو فرو</string>
-	<string name="category_games">ألعاب</string>
 	<string name="category_general">عام</string>
-	<string name="category_journalism">صحافة</string>
-	<string name="category_lgbt">مجتمع الميم</string>
-	<string name="category_music">موسيقى</string>
-	<string name="category_regional">إقليمي</string>
-	<string name="category_tech">تقني</string>
 	<string name="confirm_email_title">تحقق من صندوق الوارد الخاص بك</string>
 	<!-- %s is the email address -->
 	<string name="confirm_email_subtitle">اضغط على الرابط الذي أرسلناه إليك للتحقق من %s. سننتظر هنا.</string>
@@ -314,6 +302,7 @@
 	<!-- %s is the server domain -->
 	<string name="local_timeline_info_banner">هذه هي جميع المشاركات من جميع المستخدمين في الخادم الخاص بك (%s).</string>
 	<string name="recommended_accounts_info_banner">قد تعجبك هذه الحسابات استنادا إلى حسابات أخرى تتابعها.</string>
+	<string name="see_new_posts">المنشورات الجديدة</string>
 	<string name="load_missing_posts">حمّل المَنشورات المَفقودَة</string>
 	<string name="follow_back">رُدّ المتابعة</string>
 	<string name="button_follow_pending">معلق</string>
@@ -352,7 +341,6 @@
 		<item quantity="many">أعيد نشره %,d مرات</item>
 		<item quantity="other">أعيد نشره %,d مرات</item>
 	</plurals>
-	<string name="timestamp_via_app">%1$s عبر %2$s</string>
 	<string name="time_now">الآن</string>
 	<string name="edit_history">تاريخ التعديل</string>
 	<string name="last_edit_at_x">آخر تعديل %s</string>
@@ -432,7 +420,6 @@
 	<string name="profile_add_row">إضافة صف</string>
 	<string name="profile_setup">إعداد الملف الشخصي</string>
 	<string name="profile_setup_subtitle">يمكنك دائماً إكمال هذا في وقت لاحق في علامة التبويب الملف الشخصي.</string>
-	<string name="profile_setup_explanation">يمكنك إضافة ما يصل إلى أربعة حقول شخصية لأي شيء تريده. الموقع، الروابط، الضمائر - السماء هي الحد الأقصى.</string>
 	<string name="popular_on_mastodon">مشهور على ماستدون</string>
 	<string name="follow_all">اتبع الكل</string>
 	<string name="server_rules_disagree">لا أوافق</string>
@@ -703,6 +690,9 @@
 	<string name="post_translated">مُترجَم مِن %1$s باستخدام %2$s</string>
 	<string name="translation_show_original">إظهار الأصل</string>
 	<string name="translation_failed">فشِلَت الترجَمة. قد لم يتمكّن مدير الخادم من تفعيل الترجمات على هذا الخادم أو أنّ هذا الخادم يُشغِّل نسخة قديمة من ماستدون حيث الترجمات غير مدعومة بعد.</string>
+	<string name="settings_privacy">الخصوصية و الوصول</string>
+	<string name="settings_discoverable">ميزة الملف الشخصي والمشاركات في خوارزميات الاكتشاف</string>
+	<string name="settings_indexable">تضمين المشاركات العامة في نتائج البحث</string>
 	<plurals name="x_participants">
 		<item quantity="zero">لا مُشارِك</item>
 		<item quantity="one">مشارِك واحد</item>
@@ -711,8 +701,44 @@
 		<item quantity="many">مُشارِكًا</item>
 		<item quantity="other">مُشارك</item>
 	</plurals>
+	<string name="error_playing_video">خطأ في تشغيل الفيديو</string>
+	<string name="timeline_following">الصفحة الرئيسية</string>
+	<string name="lists">القوائم</string>
+	<string name="followed_hashtags">الوسوم المتابَعة</string>
+	<string name="manage_lists">إدارة القوائم</string>
+	<string name="manage_hashtags">إدارة الوسوم</string>
 	<!-- Screen reader description for the menu on the home timeline screen -->
+	<string name="dropdown_menu">القائمة المنسدلة</string>
+	<string name="edit_list">تعديل القائمة</string>
+	<string name="list_members">قائمة الاعضاء</string>
+	<string name="delete_list">حذف القائمة</string>
 	<!-- %s is the name of the list -->
+	<string name="delete_list_confirm">حذف \"%s\"؟</string>
+	<string name="list_exclusive">إخفاء الأعضاء في المتابعة</string>
+	<string name="list_exclusive_subtitle">إذا كان هناك شخص ما في هذه القائمة، فقم بإخفائه في مخططك الزمني لتجنب رؤية مشاركاته مرتين.</string>
+	<string name="list_name">اسم القائمة</string>
+	<string name="list_show_replies_to">إظهار الردود على</string>
+	<string name="list_replies_no_one">لا أحد</string>
+	<string name="list_replies_members">أعضاء القائمة</string>
+	<string name="list_replies_anyone">أي شخص أتابعه</string>
+	<string name="confirm_remove_list_members">إزالة أعضاء؟</string>
+	<string name="remove">إزالة</string>
+	<string name="add_list_member">إضافة عضو</string>
+	<string name="search_among_people_you_follow">البحث بين الأشخاص الذين تتابعهم</string>
+	<string name="add_user_to_list">إضافة القائمة…</string>
+	<string name="add_user_to_list_title">إضافة إلى القائمة</string>
 	<!-- %s is a username -->
-	<string name="see_new_posts">استعرض المنشورات الجديدة</string>
+	<string name="remove_from_list">إزالة من القائمة</string>
+	<string name="confirm_remove_list_member">إزالة عضو؟</string>
+	<string name="no_followed_hashtags_title">مواكبة الاهتمامات من خلال متابعة الوسوم</string>
+	<string name="no_followed_hashtags_subtitle">سوف تظهر المتابعات هنا</string>
+	<string name="no_lists_title">تنظيم موجزك باستخدام القوائم</string>
+	<string name="manage_accounts">إضافة أو تبديل الحسابات</string>
+	<string name="create_list">إنشاء قائمة</string>
+	<string name="step_x_of_y">الخطوة %1$d من %2$d</string>
+	<string name="create">إنشاء</string>
+	<string name="manage_list_members">إدارة قائمة الأعضاء</string>
+	<string name="list_no_members">لا أعضاء حتى الآن</string>
+	<string name="list_find_users">البحث عن مستخدمين للإضافة</string>
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-be-rBY/strings.xml b/mastodon/src/main/res/values-be-rBY/strings.xml
index d10c578d4..b3acce23a 100644
--- a/mastodon/src/main/res/values-be-rBY/strings.xml
+++ b/mastodon/src/main/res/values-be-rBY/strings.xml
@@ -15,6 +15,7 @@
 	<string name="user_sent_follow_request">%s адправіў вам запыт на падпіску</string>
 	<string name="user_favorited">%s упадабаў ваш допіс</string>
 	<string name="notification_boosted">%s пашырыў ваш допіс</string>
+	<string name="poll_ended">Прагляд вынікаў апытання, у якім вы прынялі ўдзел</string>
 	<string name="share_toot_title">Абагуліць</string>
 	<string name="settings">Налады</string>
 	<string name="publish">Апублікаваць</string>
@@ -186,19 +187,7 @@
 	<string name="password">Пароль</string>
 	<string name="confirm_password">Пацвердзіць пароль</string>
 	<string name="password_note">Выкарыстоўвайце вялікія літары, спецыяльныя сімвалы і лічбы, каб павялічыць надзейнасць пароля.</string>
-	<string name="category_academia">Акадэмія</string>
-	<string name="category_activism">Актывізм</string>
-	<string name="category_all">Усе</string>
-	<string name="category_art">Мастацтва</string>
-	<string name="category_food">Ежа</string>
-	<string name="category_furry">Furry</string>
-	<string name="category_games">Гульні</string>
 	<string name="category_general">Асноўныя</string>
-	<string name="category_journalism">Журналістыка</string>
-	<string name="category_lgbt">ЛГБТ</string>
-	<string name="category_music">Музыка</string>
-	<string name="category_regional">Рэгіянальныя</string>
-	<string name="category_tech">Тэхналогіі</string>
 	<string name="confirm_email_title">Праверце паштовую скрыню</string>
 	<!-- %s is the email address -->
 	<string name="confirm_email_subtitle">Націсніце на спасылку, якую мы адправілі, каб спраўдзіць %s. Мы вас пачакаем тут.</string>
@@ -222,9 +211,16 @@
 	<string name="notification_type_poll">Апытанні</string>
 	<string name="choose_account">Выберыце ўліковы запіс</string>
 	<string name="err_not_logged_in">Спачатку ўвайдзіце ў Mastodon</string>
+	<plurals name="cant_add_more_than_x_attachments">
+		<item quantity="one">Вы не можаце дадаць больш за %d далучэнне</item>
+		<item quantity="few">Вы не можаце дадаць больш за %d далучэнняў</item>
+		<item quantity="many">Вы не можаце дадаць больш за %d далучэнняў</item>
+		<item quantity="other">Вы не можаце дадаць больш за %d далучэнняў</item>
+	</plurals>
 	<string name="media_attachment_unsupported_type">Тып файла %s не падтрымліваецца</string>
 	<string name="media_attachment_too_big">Памер файла %1$s перавышае абмежаванне ў %2$s МБ</string>
 	<string name="settings_theme">Знешні выгляд</string>
+	<string name="theme_auto">Выкарыстоўваць сістэмную тэму</string>
 	<string name="theme_light">Светлая</string>
 	<string name="theme_dark">Цёмная</string>
 	<string name="settings_behavior">Паводзіны</string>
@@ -237,6 +233,8 @@
 	<string name="settings_clear_cache">Ачысціць кэш медыя</string>
 	<string name="settings_app_version">Mastodon для Android v%1$s (%2$d)</string>
 	<string name="media_cache_cleared">Кэш медыя ачышчаны</string>
+	<string name="confirm_log_out">Выйсці з %s?</string>
+	<string name="sensitive_content_explain">Аўтар пазначыў гэтае медыя як адчувальнае.</string>
 	<string name="avatar_description">Перайсці да профілю %s</string>
 	<string name="more_options">Больш опцый</string>
 	<string name="new_post">Новы допіс</string>
@@ -271,8 +269,14 @@
 	<string name="error_saving_file">Памылка пры захаванні файла</string>
 	<string name="file_saved">Файл захаваны</string>
 	<string name="downloading">Спампоўванне…</string>
+	<string name="no_app_to_handle_action">Няма патрэбнай праграмы для гэтага дзеяння</string>
 	<string name="local_timeline">Лакальнае</string>
+	<string name="trending_posts_info_banner">Гэтыя допісы набіраюць папулярнасць у Mastodon.</string>
+	<string name="trending_links_info_banner">Гэта навіны, аб якіх кажуць на Mastodon.</string>
 	<!-- %s is the server domain -->
+	<string name="local_timeline_info_banner">Гэта ўсе допісы ад усіх карыстальнікаў на вашым серверы (%s).</string>
+	<string name="recommended_accounts_info_banner">Вам могуць спадабацца гэтыя ўліковыя запісы на аснове вашых падпісак.</string>
+	<string name="see_new_posts">Новыя допісы</string>
 	<string name="load_missing_posts">Загрузіць адсутныя допісы</string>
 	<string name="follow_back">Падпісацца ў адказ</string>
 	<string name="button_follow_pending">Чакаюць</string>
@@ -303,7 +307,6 @@
 		<item quantity="many">%,d пашырэнняў</item>
 		<item quantity="other">%,d пашырэння</item>
 	</plurals>
-	<string name="timestamp_via_app">%1$s праз %2$s</string>
 	<string name="time_now">толькі што</string>
 	<string name="edit_history">Гісторыя рэдагавання</string>
 	<string name="last_edit_at_x">Апошняе рэдагаванне %s</string>
@@ -361,6 +364,7 @@
 	<string name="login_title">З вяртаннем</string>
 	<string name="login_subtitle">Увайдзіце з дапамогай сервера, на якім вы стварылі свой уліковы запіс.</string>
 	<string name="server_url">URL-адрас сервера</string>
+	<string name="signup_random_server_explain">Мы абярэм сервер на аснове вашай мовы, калі вы працягнеце без выбару.</string>
 	<string name="server_filter_any_language">Любая мова</string>
 	<string name="server_filter_instant_signup">Імгненная рэгістрацыя</string>
 	<string name="server_filter_manual_review">Ручная праверка</string>
@@ -378,7 +382,6 @@
 	<string name="profile_add_row">Дадаць радок</string>
 	<string name="profile_setup">Налады профілю</string>
 	<string name="profile_setup_subtitle">Вы можаце завяршыць гэта пазней на ўкладцы Профіль.</string>
-	<string name="profile_setup_explanation">Вы можаце дадаць да чатырох палёў профіля для ўсяго, што хочаце. Месцазнаходжанне, спасылкі, займеннікі - няма мяжы магчымасцям.</string>
 	<string name="popular_on_mastodon">Папулярна на Mastodon</string>
 	<string name="follow_all">Падпісацца на ўсіх</string>
 	<string name="server_rules_disagree">Не згодны</string>
@@ -389,11 +392,16 @@
 	<!-- Shown in a progress dialog when you tap "follow all" -->
 	<string name="sending_follows">Падпісваемся…</string>
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
+	<string name="signup_email_domain_blocked">%1$s не дазваляе зарэгістравацца ад %2$s. Паспрабуйце іншы ці &lt;a&gt;выберыце іншы сервер&lt;/a&gt;.</string>
 	<string name="spoiler_show">Усё адно паказаць</string>
+	<string name="spoiler_hide">Схаваць зноў</string>
+	<string name="poll_multiple_choice">Абярыце адзін або некалькі</string>
 	<string name="save_changes">Захаваць змены</string>
 	<string name="profile_featured">Рэкамендаванае</string>
+	<string name="profile_timeline">Стужка</string>
 	<string name="view_all">Праглядзець усё</string>
 	<string name="profile_endorsed_accounts">Уліковыя запісы</string>
+	<string name="verified_link">Правераная спасылка</string>
 	<string name="show">Паказаць</string>
 	<string name="hide">Схаваць</string>
 	<string name="join_default_server">Далучыцца да %s</string>
@@ -403,30 +411,75 @@
 	<string name="welcome_to_mastodon">Вітаем у Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon - гэта дэцэнтралізаваная сацыяльная сетка, што азначае, што ні адна кампанія не кантралюе яе. Яна складаецца з мноства незалежна працуючых сервераў, злучаных разам.</string>
 	<string name="what_are_servers">Што такое серверы?</string>
+	<string name="welcome_paragraph2">Кожны ўліковы запіс Mastodon размяшчаецца на серверы - кожны са сваімі каштоўнасцямі, правіламі, &amp; адміністратарамі. Незалежна ад таго, які сервер вы вылучыце, вы можаце сачыць і ўзаемадзейнічаць з людзьмі на любым серверы.</string>
+	<string name="opening_link">Адкрыццё спасылкі…</string>
+	<string name="link_not_supported">Гэтая спасылка не падтрымліваецца ў праграме</string>
+	<string name="log_out_all_accounts">Выйсці з усіх уліковых запісаў</string>
+	<string name="confirm_log_out_all_accounts">Выйсці з усіх уліковых запісаў?</string>
 	<string name="retry">Паўтарыць</string>
+	<string name="post_failed">Не ўдалося адправіць допіс</string>
 	<!-- %s is formatted file size ("467 KB image") -->
+	<string name="attachment_description_image">%s выява</string>
+	<string name="attachment_description_video">%s відэа</string>
+	<string name="attachment_description_audio">%s аўдыё</string>
+	<string name="attachment_description_unknown">%s файл</string>
+	<string name="attachment_type_image">Выява</string>
 	<string name="attachment_type_video">Відэа</string>
+	<string name="attachment_type_audio">Аўдыё</string>
 	<string name="attachment_type_gif">GIF</string>
 	<string name="attachment_type_unknown">Файл</string>
+	<string name="attachment_x_percent_uploaded">%d%% загружана</string>
+	<string name="add_poll_option">Дадаць варыянт адказу</string>
+	<string name="poll_length">Тэрмін апытання</string>
 	<string name="poll_style">Стыль</string>
+	<string name="compose_poll_single_choice">Адзін варыянт</string>
+	<string name="compose_poll_multiple_choice">Некалькі варыянтаў</string>
+	<string name="delete_poll_option">Выдаліць варыянт адказу</string>
+	<string name="poll_style_title">Стыль апытання</string>
+	<string name="alt_text">Альтэрнатыўны тэкст</string>
 	<string name="help">Даведка</string>
+	<string name="what_is_alt_text">Што такое альтэрнатыўны тэкст?</string>
+	<string name="alt_text_help">Альтэрнатыўны тэкст змяшчае апісанні выяў для людзей з парушэннямі зроку, нізкахуткаснымі злучэннямі або тых, хто шукае дадатковы кантэкст.\n\nВы можаце палепшыць даступнасць і разуменне для ўсіх, напісаўшы ясны і кароткі альтэрнатыўны тэкст.\n\n<ul><li>Адзначце важныя элементы</li>\n<li>Ахоплівайце тэкст выявам</li>\n<li>Выкарыстоўвайце звычайную структуру прапаноў</li>\n<li>Пазбягайце лішняй інфармацыі</li>\n<li>Засяродзьцеся на тэндэнцыях і ключавых высновах у складаных візуальных формах (напрыклад, дыяграмах або картах)</li></ul></string>
 	<string name="edit_post">Рэдагаваць допіс</string>
 	<string name="no_verified_link">Няма спраўджанай спасылкі</string>
+	<string name="compose_autocomplete_emoji_empty">Агляд emoji</string>
+	<string name="compose_autocomplete_users_empty">Знайдзіце тых, каго шукаеце</string>
+	<string name="no_search_results">Нічога не знойдзена па гэтым запыце</string>
 	<string name="language">Мова</string>
 	<string name="language_default">Перадвызначана</string>
 	<string name="language_system">Сістэма</string>
+	<string name="language_detecting">Вызначэнне мовы</string>
+	<string name="language_cant_detect">Не ўдалося вызначыць мову</string>
+	<string name="language_detected">Выяўлена</string>
 	<string name="media_hidden">Медыя схавана</string>
 	<string name="post_hidden">Допіс схаваны</string>
 	<string name="report_title_post">Паскардзіцца на допіс</string>
+	<string name="forward_report_explanation">Уліковы запіс належыць іншаму серверу. Адправіць туды ананімную копію гэтай справаздачы?</string>
 	<!-- %s is the server domain -->
+	<string name="forward_report_to_server">Пераслаць на %s</string>
 	<!-- Shown on the "stamp" on the screen that appears after you report a post/user. Please keep the translation short, preferably a single word -->
+	<string name="reported">Паведамлена</string>
+	<string name="report_unfollow_explanation">Каб больш не бачыць іх допісы ў вашай стужцы, адмяніце падпіску на іх.</string>
+	<string name="muted_user">Ігнараваць %s</string>
+	<string name="report_sent_already_blocked">Вы ўжо заблакіравалі гэтага карыстальніка, таму вам больш нічога не трэба рабіць, пакуль мы разглядаем ваша данясенне.</string>
+	<string name="report_personal_already_blocked">Вы ўжо заблакіравалі гэтага карыстальніка, таму больш нічога рабіць не трэба.\n\nДзякуй, што дапамагаеце захаваць Mastodon бяспечным месцам для ўсіх!</string>
+	<string name="blocked_user">Заблакіраваць %s</string>
+	<string name="mark_all_notifications_read">Адзначыць усё як прачытанае</string>
 	<string name="settings_display">Адлюстраванне</string>
 	<string name="settings_filters">Фільтры</string>
+	<string name="settings_server_explanation">Агульныя звесткі, правілы, мадэратары</string>
 	<!-- %s is the app name (Mastodon, key app_name). I made it a placeholder so everything Just Works™ with forks -->
 	<string name="about_app">Аб %s</string>
+	<string name="default_post_language">Мова допісаў па змаўчанні</string>
+	<string name="settings_alt_text_reminders">Даданне напамінаў пра тэкст alt</string>
+	<string name="settings_confirm_unfollow">Спытайце, перш чым адпісацца ад каго-небудзь</string>
 	<string name="settings_confirm_boost">Пытаць перад пашырэннем</string>
+	<string name="settings_confirm_delete_post">Спытаць перад выдаленнем допісаў</string>
 	<string name="pause_all_notifications">Прыпыніць усе</string>
+	<string name="pause_notifications_off">Выкл.</string>
 	<string name="notifications_policy_anyone">Кожны</string>
+	<string name="notifications_policy_followed">Людзі, якія падпісаны на вас</string>
+	<string name="notifications_policy_follower">Людзі, на якіх вы падпісаны</string>
 	<string name="notifications_policy_no_one">Ніхто</string>
 	<string name="settings_notifications_policy">Атрымліваць апавяшчэнні ад</string>
 	<string name="notification_type_mentions_and_replies">Згадванні і адказы</string>
@@ -445,9 +498,19 @@
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
 	<string name="pause_notifications_ends">Скончыцца %s</string>
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
+	<string name="pause_notifications_banner">Апавяшчэнні адновяцца %s.</string>
+	<string name="resume_notifications_now">Аднавіць зараз</string>
+	<string name="open_system_notification_settings">Перайсці ў налады апавяшчэнняў</string>
 	<string name="about_server">Пра сервер</string>
 	<string name="server_rules">Правілы</string>
 	<string name="server_administrator">Адміністратар</string>
+	<string name="send_email_to_server_admin">Напісаць адміністратару</string>
+	<string name="notifications_disabled_in_system">Уключыце апавяшчэння ў наладах прылады, каб бачыць абнаўлення адкуль згодна.</string>
+	<string name="settings_even_more">Яшчэ больш налад</string>
+	<string name="settings_show_cws">Паказваць папярэджанні аб змесце</string>
+	<string name="settings_hide_sensitive_media">Хаваць медыя пазначаныя як далікатныя</string>
+	<string name="settings_show_interaction_counts">Паказваць колькасць узаемадзеянняў пад допісамі</string>
+	<string name="settings_show_emoji_in_names">Карыстальніцкія emoji у імёнах</string>
 	<plurals name="in_x_seconds">
 		<item quantity="one">праз %d секунду</item>
 		<item quantity="few">праз %d секунды</item>
@@ -472,41 +535,78 @@
 		<item quantity="many">%d гадзін таму</item>
 		<item quantity="other">%d гадзіны таму</item>
 	</plurals>
+	<string name="alt_text_reminder_title">У медыя адсутнічае альтэрнатыўны тэкст</string>
+	<plurals name="alt_text_reminder_x_images">
+		<item quantity="one">%s выявы не маюць альтэрнатыўны тэкст. Усё роўна апублікаваць?</item>
+		<item quantity="few">%s выявы не маюць альтэрнатыўны тэкст. Усё роўна апублікаваць?</item>
+		<item quantity="many">%s выявы не маюць альтэрнатыўны тэкст. Усё роўна апублікаваць?</item>
+		<item quantity="other">%s выявы не маюць альтэрнатыўны тэкст. Усё роўна апублікаваць?</item>
+	</plurals>
+	<plurals name="alt_text_reminder_x_attachments">
+		<item quantity="one">%s медыя далучэнні не маюць альтэрнатыўны тэкст. Усё роўна апублікаваць?</item>
+		<item quantity="few">%s медыя далучэнні не маюць альтэрнатыўны тэкст. Усё роўна апублікаваць?</item>
+		<item quantity="many">%s медыя далучэнні не маюць альтэрнатыўны тэкст. Усё роўна апублікаваць?</item>
+		<item quantity="other">%s медыя далучэнні не маюць альтэрнатыўны тэкст. Усё роўна апублікаваць?</item>
+	</plurals>
 	<string name="count_one">Адзін</string>
 	<string name="count_two">Два</string>
 	<string name="count_three">Тры</string>
 	<string name="count_four">Чатыры</string>
 	<string name="alt_text_reminder_post_anyway">Допіс</string>
 	<!-- %s is the username -->
+	<string name="unfollow_confirmation">Адпісацца ад %s?</string>
 	<string name="filter_active">Актыўны</string>
 	<string name="filter_inactive">Неактыўны</string>
 	<string name="settings_add_filter">Дадаць фільтр</string>
 	<string name="settings_edit_filter">Рэдагаваць фільтр</string>
 	<string name="settings_filter_duration">Працягласць</string>
 	<string name="settings_filter_muted_words">Ігнараваныя словы</string>
+	<string name="settings_filter_context">Ігнараваць</string>
+	<string name="settings_filter_show_cw">Паказаць з папярэджаннем аб змесце</string>
+	<string name="settings_filter_show_cw_explanation">Па-ранейшаму паказваць допісы, якія адпавядаюць гэтаму фільтру, але з папярэджаннем аб змесце</string>
 	<string name="settings_delete_filter">Выдаліць фільтр</string>
 	<string name="filter_duration_forever">Назаўсёды</string>
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
 	<string name="settings_filter_ends">Скончыцца %s</string>
+	<plurals name="settings_x_muted_words">
+		<item quantity="one">%d заглушанае слова ці фраза</item>
+		<item quantity="few">%d заглушаных слоў ці фраз</item>
+		<item quantity="many">%d заглушаных слоў ці фраз</item>
+		<item quantity="other">%d заглушаных слоў ці фраз</item>
+	</plurals>
 	<string name="selection_2_options">%1$s і %2$s</string>
 	<string name="selection_3_options">%1$s, %2$s і %3$s</string>
+	<string name="selection_4_or_more">%1$s, %2$s і %3$d больш</string>
+	<string name="filter_context_home_lists">Галоўная &amp; спісы</string>
 	<string name="filter_context_notifications">Апавяшчэнні</string>
 	<string name="filter_context_public_timelines">Публічныя стужкі</string>
+	<string name="filter_context_threads_replies">Ланцугі &amp; адказы</string>
 	<string name="filter_context_profiles">Профілі</string>
 	<string name="settings_filter_title">Загаловак</string>
 	<string name="settings_delete_filter_title">Выдаліць фільтр \"%s\"?</string>
+	<string name="settings_delete_filter_confirmation">Гэты фільтр будзе выдалены з уліковага запісу на ўсіх вашых прыладах.</string>
+	<string name="add_muted_word">Дадаць слова да ігнаруемых</string>
+	<string name="edit_muted_word">Рэдагаваць ігнараванае слова</string>
 	<string name="add">Дадаць</string>
 	<string name="filter_word_or_phrase">Слова або фраза</string>
+	<string name="filter_add_word_help">Словы адчувальныя да рэгістра і павінны супадаць з поўным словам.\n\nКалі адфільтраваць слова «яблык», будуць схаваны паведамленні са словам «яблык» або «ЯбЛыК», але не, напрыклад, «яблычны».</string>
 	<string name="settings_delete_filter_word">Выдаліць слова \"%s\"?</string>
 	<string name="enter_selection_mode">Выбраць</string>
 	<string name="select_all">Выбраць усё</string>
 	<string name="settings_filter_duration_title">Працягласць фільтра</string>
+	<string name="filter_duration_custom">Уласнае</string>
 	<plurals name="settings_delete_x_filter_words">
 		<item quantity="one">Выдаліць %d слова?</item>
 		<item quantity="few">Выдаліць %d словы?</item>
 		<item quantity="many">Выдаліць %d словаў?</item>
 		<item quantity="other">Выдаліць %d слова?</item>
 	</plurals>
+	<plurals name="x_items_selected">
+		<item quantity="one">%d выбрана</item>
+		<item quantity="few">%d выбрана</item>
+		<item quantity="many">%d выбрана</item>
+		<item quantity="other">%d выбрана</item>
+	</plurals>
 	<string name="required_form_field_blank">Не можа быць пустым</string>
 	<string name="filter_word_already_in_list">Ужо ў спісе</string>
 	<string name="app_update_ready">Абнаўленне праграмы гатова</string>
@@ -527,9 +627,73 @@
 	<string name="time_hours_ago_short">%d г таму</string>
 	<string name="time_days_ago_short">%d дз таму</string>
 	<!-- %s is the name of the post language -->
+	<string name="translate_post">Перакласці з %s</string>
 	<!-- %1$s is the language, %2$s is the name of the translation service -->
+	<string name="post_translated">Перакладзена з %1$s з дапамогай %2$s</string>
+	<string name="translation_show_original">Паказаць арыгінал</string>
+	<string name="translation_failed">Збой перакладу. Магчыма, адміністратар не ўключыў пераклады на гэтым серверы або гэты сервер працуе са старой версіяй Mastodon, дзе пераклады яшчэ не падтрымліваюцца.</string>
+	<string name="settings_privacy">Прыватнасць і дасяжнасць</string>
+	<string name="settings_discoverable">Уключыць профіль і допісы ў алгарытмы рэкамендацый</string>
+	<string name="settings_indexable">Індэксаваць публічныя допісы ў пошукавых сістэмах</string>
+	<plurals name="x_participants">
+		<item quantity="one">%,d удзельнік</item>
+		<item quantity="few">%,d удзельнікаў</item>
+		<item quantity="many">%,d удзельнікаў</item>
+		<item quantity="other">%,d удзельнікі</item>
+	</plurals>
+	<plurals name="x_posts_today">
+		<item quantity="one">%,d допіс сёння</item>
+		<item quantity="few">%,d допісаў сёння</item>
+		<item quantity="many">%,d допісаў сёння</item>
+		<item quantity="other">%,d допісы сёння</item>
+	</plurals>
+	<string name="error_playing_video">Памылка прайгравання відэа</string>
+	<string name="timeline_following">Галоўная</string>
+	<string name="lists">Спісы</string>
+	<string name="followed_hashtags">Адсочваныя хэштэгі</string>
+	<string name="manage_lists">Кіраванне спісамі</string>
+	<string name="manage_hashtags">Кіраванне хэштэгамі</string>
 	<!-- Screen reader description for the menu on the home timeline screen -->
+	<string name="dropdown_menu">Раскрываючаеся меню</string>
+	<string name="edit_list">Рэдагаваць спіс</string>
+	<string name="list_members">Спіс удзельнікаў</string>
+	<string name="delete_list">Выдаліць спіс</string>
 	<!-- %s is the name of the list -->
+	<string name="delete_list_confirm">Выдаліць “%s”?</string>
+	<string name="list_exclusive">Схаваць удзельнікаў у падпісках</string>
+	<string name="list_exclusive_subtitle">Калі нехта ёсць у гэтым спісе, схавайце яго ў стужцы падпісак, каб яго допісы не з\'яўляліся двойчы.</string>
+	<string name="list_name">Назва спіса</string>
+	<string name="list_show_replies_to">Паказаць адказы да</string>
+	<string name="list_replies_no_one">Ніводны</string>
+	<string name="list_replies_members">Удзельнікі гэтага спісу</string>
+	<string name="list_replies_anyone">Нехта, на каго я падпісаны</string>
+	<string name="confirm_remove_list_members">Выдаліць удзельнікаў?</string>
+	<string name="remove">Выдаліць</string>
+	<string name="add_list_member">Дадаць удзельніка</string>
+	<string name="search_among_people_you_follow">Шукайце сярод людзей, на якіх Вы падпісаны</string>
+	<string name="add_user_to_list">Дадаць да спісу…</string>
+	<string name="add_user_to_list_title">Дадаць да спісу</string>
 	<!-- %s is a username -->
-	<string name="see_new_posts">Паказаць новыя допісы</string>
+	<string name="manage_user_lists">Кіраваць спісамі з %s</string>
+	<string name="remove_from_list">Выдаліць са спісу</string>
+	<string name="confirm_remove_list_member">Выдаліць удзельніка?</string>
+	<string name="no_followed_hashtags_title">Сачыце за інтарэсамі па хэштэгах</string>
+	<string name="no_followed_hashtags_subtitle">Тут з\'явяцца хэштэгі</string>
+	<string name="no_lists_title">Арганізуйце сваю стужку з дапамогай спісаў</string>
+	<string name="no_lists_subtitle">Ваш з\'явіцца тут</string>
+	<string name="manage_accounts">Дадаць або пераключыць уліковыя запісы</string>
+	<plurals name="x_posts_recently">
+		<item quantity="one">%,d нядаўні допіс</item>
+		<item quantity="few">%,d нядаўніх допісаў</item>
+		<item quantity="many">%,d нядаўніх допісаў</item>
+		<item quantity="other">%,d нядаўнія допісы</item>
+	</plurals>
+	<string name="create_list">Ствараць спiс</string>
+	<string name="step_x_of_y">Крок %1$d з %2$d</string>
+	<string name="create">Стварыць</string>
+	<string name="manage_list_members">Кіраванне ўдзельнікамі спісу</string>
+	<string name="list_no_members">Пакуль няма ўдзельнікаў</string>
+	<string name="list_find_users">Знайдзіце карыстальнікаў для дадання</string>
+	<string name="reply_to_user">Адказаць %s</string>
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-bn-rBD/strings.xml b/mastodon/src/main/res/values-bn-rBD/strings.xml
index 9c725c36d..a1a027745 100644
--- a/mastodon/src/main/res/values-bn-rBD/strings.xml
+++ b/mastodon/src/main/res/values-bn-rBD/strings.xml
@@ -122,10 +122,6 @@
 	<string name="email">ই-মেইল</string>
 	<string name="password">পাসওয়ার্ড</string>
 	<string name="confirm_password">পাসওয়ার্ড নিশ্চিত করুন</string>
-	<string name="category_lgbt">LGBT</string>
-	<string name="category_music">সঙ্গীত</string>
-	<string name="category_regional">আঞ্চলিক</string>
-	<string name="category_tech">তথ্য-প্রযুক্তি</string>
 	<string name="confirm_email_title">আপনার ইনবক্স দেখুন</string>
 	<!-- %s is the email address -->
 	<string name="open_email_app">ই-মেইল অ্যাপ খুলুন</string>
@@ -204,4 +200,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-bs-rBA/strings.xml b/mastodon/src/main/res/values-bs-rBA/strings.xml
index 1a9393de7..47845df8b 100644
--- a/mastodon/src/main/res/values-bs-rBA/strings.xml
+++ b/mastodon/src/main/res/values-bs-rBA/strings.xml
@@ -93,19 +93,7 @@
 	<string name="unfollow">Prestani pratiti</string>
 	<string name="back">Nazad</string>
 	<string name="password_note">Koristite velika slova, brojeve i oznake da bi osigurali lozinku.</string>
-	<string name="category_academia">Akademija</string>
-	<string name="category_activism">Aktivizam</string>
-	<string name="category_all">Sve</string>
-	<string name="category_art">Umjetnost</string>
-	<string name="category_food">Hrana</string>
-	<string name="category_furry">Ljubimci</string>
-	<string name="category_games">Igre</string>
 	<string name="category_general">Generalno</string>
-	<string name="category_journalism">Novinarstvo</string>
-	<string name="category_lgbt">LGBT</string>
-	<string name="category_music">Muzika</string>
-	<string name="category_regional">Regionalno</string>
-	<string name="category_tech">Tehnika</string>
 	<!-- %s is the email address -->
 	<string name="resend">Ponovo poslato</string>
 	<string name="open_email_app">Otvori email</string>
@@ -187,4 +175,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-ca-rES/strings.xml b/mastodon/src/main/res/values-ca-rES/strings.xml
index ca8d615d6..934c4ccc9 100644
--- a/mastodon/src/main/res/values-ca-rES/strings.xml
+++ b/mastodon/src/main/res/values-ca-rES/strings.xml
@@ -136,19 +136,7 @@
 	<string name="password">Contrasenya</string>
 	<string name="confirm_password">Confirmar contrasenya</string>
 	<string name="password_note">Inclou lletres majúscules, caràcters especials i números per augmentar la seguretat de la teva contrasenya.</string>
-	<string name="category_academia">Acadèmic</string>
-	<string name="category_activism">Activisme</string>
-	<string name="category_all">Totes</string>
-	<string name="category_art">Art</string>
-	<string name="category_food">Menjar</string>
-	<string name="category_furry">Furry</string>
-	<string name="category_games">Jocs</string>
 	<string name="category_general">General</string>
-	<string name="category_journalism">Periodisme</string>
-	<string name="category_lgbt">LGBT</string>
-	<string name="category_music">Música</string>
-	<string name="category_regional">Regional</string>
-	<string name="category_tech">Tecnologia</string>
 	<string name="confirm_email_title">Comprova la teva safata d\'entrada</string>
 	<!-- %s is the email address -->
 	<string name="resend">Reenvia</string>
@@ -226,7 +214,6 @@
 		<item quantity="one">%,d favorit</item>
 		<item quantity="other">%,d favorits</item>
 	</plurals>
-	<string name="timestamp_via_app">%1$s través de %2$s</string>
 	<string name="time_now">ara</string>
 	<string name="edit_history">Editar l’historial</string>
 	<string name="last_edit_at_x">Darrera edició: %s</string>
@@ -297,5 +284,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
-	<string name="see_new_posts">Publicacions noves</string>
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-cs-rCZ/strings.xml b/mastodon/src/main/res/values-cs-rCZ/strings.xml
index 0b39122c2..a2e816057 100644
--- a/mastodon/src/main/res/values-cs-rCZ/strings.xml
+++ b/mastodon/src/main/res/values-cs-rCZ/strings.xml
@@ -187,19 +187,7 @@
 	<string name="password">Heslo</string>
 	<string name="confirm_password">Potvrdit heslo</string>
 	<string name="password_note">Použijte velká písmena, speciální znaky a čísla, abyste zvýšili sílu hesla.</string>
-	<string name="category_academia">Akademická sféra</string>
-	<string name="category_activism">Aktivismus</string>
-	<string name="category_all">Vše</string>
-	<string name="category_art">Umění</string>
-	<string name="category_food">Jídlo</string>
-	<string name="category_furry">Furry</string>
-	<string name="category_games">Hry</string>
 	<string name="category_general">Obecné</string>
-	<string name="category_journalism">Žurnalistika</string>
-	<string name="category_lgbt">LGBT</string>
-	<string name="category_music">Hudba</string>
-	<string name="category_regional">Regionální</string>
-	<string name="category_tech">Technologie</string>
 	<string name="confirm_email_title">Zkontrolujte si příchozí poštu</string>
 	<!-- %s is the email address -->
 	<string name="confirm_email_subtitle">Klepněte na odkaz, který jsme vám poslali, abyste ověřili %s. Budeme tu na vás čekat.</string>
@@ -318,7 +306,6 @@
 		<item quantity="many">%,d boostů</item>
 		<item quantity="other">%,d boostů</item>
 	</plurals>
-	<string name="timestamp_via_app">%1$s přes %2$s</string>
 	<string name="time_now">teď</string>
 	<string name="edit_history">Historie úprav</string>
 	<string name="last_edit_at_x">Poslední úprava %s</string>
@@ -394,7 +381,6 @@
 	<string name="profile_add_row">Přidat řádek</string>
 	<string name="profile_setup">Nastavení profilu</string>
 	<string name="profile_setup_subtitle">Toto můžete vždy dokončit později v záložce Profil.</string>
-	<string name="profile_setup_explanation">Můžete přidat až čtyři pole profilu pro cokoliv, co chcete. Umístění, odkazy, oslovení — limitem je obloha.</string>
 	<string name="popular_on_mastodon">Populární na Mastodonu</string>
 	<string name="follow_all">Sledovat všechny</string>
 	<string name="server_rules_disagree">Nesouhlasit</string>
@@ -643,5 +629,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
-	<string name="see_new_posts">Zobrazit nové příspěvky</string>
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-da-rDK/strings.xml b/mastodon/src/main/res/values-da-rDK/strings.xml
index d0bce2124..76fef432a 100644
--- a/mastodon/src/main/res/values-da-rDK/strings.xml
+++ b/mastodon/src/main/res/values-da-rDK/strings.xml
@@ -163,19 +163,7 @@
 	<string name="password">Adgangskode</string>
 	<string name="confirm_password">Bekræft adgangskode</string>
 	<string name="password_note">Benyt majuskler, specialtegn og tal for at øge adgangskodens styrke.</string>
-	<string name="category_academia">Forskning og højere uddannelser</string>
-	<string name="category_activism">Aktivisme</string>
-	<string name="category_all">Alt</string>
-	<string name="category_art">Kunst</string>
-	<string name="category_food">Mad</string>
-	<string name="category_furry">Pelsdyr</string>
-	<string name="category_games">Spil</string>
 	<string name="category_general">Generelt</string>
-	<string name="category_journalism">Journalistik</string>
-	<string name="category_lgbt">LGBT</string>
-	<string name="category_music">Musik</string>
-	<string name="category_regional">Regionalt</string>
-	<string name="category_tech">Teknologi</string>
 	<string name="confirm_email_title">Tjek din indbakke</string>
 	<!-- %s is the email address -->
 	<string name="confirm_email_subtitle">Tryk på det modtage link for at bekræfte %s. Vi venter her så længe.</string>
@@ -284,7 +272,6 @@
 		<item quantity="one">%,d fremhævning</item>
 		<item quantity="other">%,d fremhævninger</item>
 	</plurals>
-	<string name="timestamp_via_app">%1$s via %2$s</string>
 	<string name="time_now">nu</string>
 	<string name="edit_history">Rediger historik</string>
 	<string name="last_edit_at_x">Senest ændret: %s</string>
@@ -356,7 +343,6 @@
 	<string name="profile_add_row">Tilføj række</string>
 	<string name="profile_setup">Profilopsætning</string>
 	<string name="profile_setup_subtitle">Du kan altid afslutte dette senere i fanen Profil.</string>
-	<string name="profile_setup_explanation">Du kan tilføje op til fire profilfelter til lige, hvad du ønsker. Placering, links, pronomener — du bestemmer.</string>
 	<string name="popular_on_mastodon">Populært på Mastodon</string>
 	<string name="follow_all">Følg alle</string>
 	<string name="server_rules_disagree">Ikke enig</string>
@@ -507,5 +493,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
-	<string name="see_new_posts">Se nye indlæg</string>
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-de-rDE/strings.xml b/mastodon/src/main/res/values-de-rDE/strings.xml
index d4545413c..0f7fa8b94 100644
--- a/mastodon/src/main/res/values-de-rDE/strings.xml
+++ b/mastodon/src/main/res/values-de-rDE/strings.xml
@@ -163,19 +163,7 @@
 	<string name="password">Passwort</string>
 	<string name="confirm_password">Passwort bestätigen</string>
 	<string name="password_note">Verwende Großbuchstaben, Sonderzeichen und Zahlen, um deine Passwortstärke zu erhöhen.</string>
-	<string name="category_academia">Bildung</string>
-	<string name="category_activism">Bürgerbeteiligung</string>
-	<string name="category_all">Alle</string>
-	<string name="category_art">Kunst</string>
-	<string name="category_food">Essen</string>
-	<string name="category_furry">Furry</string>
-	<string name="category_games">Spiele</string>
 	<string name="category_general">Allgemein</string>
-	<string name="category_journalism">Journalismus</string>
-	<string name="category_lgbt">LGBT</string>
-	<string name="category_music">Musik</string>
-	<string name="category_regional">Regional</string>
-	<string name="category_tech">Technik</string>
 	<string name="confirm_email_title">Überprüfe deinen Posteingang</string>
 	<!-- %s is the email address -->
 	<string name="confirm_email_subtitle">Bitte klicke auf den Link, den wir an %s geschickt haben, um dich zu verifizieren. Wir warten bis dahin einfach hier.</string>
@@ -285,7 +273,6 @@
 		<item quantity="one">%,d geteilter Beitrag</item>
 		<item quantity="other">%,d geteilte Beiträge</item>
 	</plurals>
-	<string name="timestamp_via_app">%1$s via %2$s</string>
 	<string name="time_now">jetzt</string>
 	<string name="edit_history">Verlauf bearbeiten</string>
 	<string name="last_edit_at_x">Zuletzt bearbeitet: %s</string>
@@ -357,7 +344,6 @@
 	<string name="profile_add_row">Zeile hinzufügen</string>
 	<string name="profile_setup">Profil einrichten</string>
 	<string name="profile_setup_subtitle">Du kannst dies jederzeit später auf dem Profil-Reiter vervollständigen.</string>
-	<string name="profile_setup_explanation">Du kannst bis zu vier Profilfelder für alles, was du möchtest, hinzufügen. Standort, Links, Pronomen - deiner Fantasie sind hier keine Grenzen gesetzt.</string>
 	<string name="popular_on_mastodon">Beliebt auf Mastodon</string>
 	<string name="follow_all">Allen folgen</string>
 	<string name="server_rules_disagree">Ablehnen</string>
@@ -594,8 +580,6 @@
 	<string name="error_playing_video">Fehler bei Videowiedergabe</string>
 	<string name="lists">Listen</string>
 	<string name="followed_hashtags">Gefolgte Hashtags</string>
-	<string name="no_lists">Du hast noch keine Listen.</string>
-	<string name="no_followed_hashtags">Du folgst keinen Hashtags.</string>
 	<string name="manage_lists">Listen verwalten</string>
 	<string name="manage_hashtags">Hashtags verwalten</string>
 	<!-- Screen reader description for the menu on the home timeline screen -->
@@ -627,4 +611,11 @@
 	<string name="no_lists_title">Startseite mit Listen organisieren</string>
 	<string name="no_lists_subtitle">Deine werden hier erscheinen</string>
 	<string name="manage_accounts">Konten hinzufügen oder wechseln</string>
+	<string name="create_list">Liste erstellen</string>
+	<string name="step_x_of_y">Schritt %1$d von %2$d</string>
+	<string name="manage_list_members">Listenmitglieder verwalten</string>
+	<string name="list_no_members">Noch keine Mitglieder</string>
+	<string name="dont_remind_again">Nicht erneut erinnern</string>
+	<!-- %s is a time interval ("5 months") -->
+	<string name="old_post_sheet_title">Dieser Beitrag ist %s alt</string>
 </resources>
diff --git a/mastodon/src/main/res/values-el-rGR/strings.xml b/mastodon/src/main/res/values-el-rGR/strings.xml
index b86702e09..13d8c0b5a 100644
--- a/mastodon/src/main/res/values-el-rGR/strings.xml
+++ b/mastodon/src/main/res/values-el-rGR/strings.xml
@@ -163,19 +163,7 @@
 	<string name="password">Κωδικός πρόσβασης</string>
 	<string name="confirm_password">Επιβεβαίωση κωδικού πρόσβασης</string>
 	<string name="password_note">Να συμπεριλάβεις κεφαλαία γράμματα, ειδικούς χαρακτήρες και αριθμούς για να αυξήσεις την ισχύ του κωδικού πρόσβασης.</string>
-	<string name="category_academia">Ακαδημία</string>
-	<string name="category_activism">Ακτιβισμός</string>
-	<string name="category_all">Όλα</string>
-	<string name="category_art">Τέχνη</string>
-	<string name="category_food">Φαγητό</string>
-	<string name="category_furry">Γούνινη</string>
-	<string name="category_games">Παιχνίδια</string>
 	<string name="category_general">Γενικά</string>
-	<string name="category_journalism">Δημοσιογραφία</string>
-	<string name="category_lgbt">LGBT</string>
-	<string name="category_music">Μουσική</string>
-	<string name="category_regional">Τοπικό</string>
-	<string name="category_tech">Τεχνολογία</string>
 	<string name="confirm_email_title">Έλεγξε τα Εισερχόμενα σου</string>
 	<!-- %s is the email address -->
 	<string name="confirm_email_subtitle">Πάτησε το σύνδεσμο που σού στείλαμε για να επαληθεύσεις το %s. Θα σε περιμένουμε εδώ.</string>
@@ -285,7 +273,6 @@
 		<item quantity="one">%,d ενίσχυση</item>
 		<item quantity="other">%,d ενισχύσεις</item>
 	</plurals>
-	<string name="timestamp_via_app">%1$s μέσω %2$s</string>
 	<string name="time_now">τώρα</string>
 	<string name="edit_history">Επεξεργασία ιστορικού</string>
 	<string name="last_edit_at_x">Τελευταία επεξεργασία %s</string>
@@ -357,7 +344,6 @@
 	<string name="profile_add_row">Προσθήκη γραμμής</string>
 	<string name="profile_setup">Ρύθμιση προφίλ</string>
 	<string name="profile_setup_subtitle">Μπορείς πάντα να το ολοκληρώσεις αργότερα στην καρτέλα Προφίλ.</string>
-	<string name="profile_setup_explanation">Μπορείς να προσθέσεις έως και τέσσερα πεδία προφίλ για οτιδήποτε θες. Τοποθεσία, συνδέσμους, αντωνυμίες - δεν υπάρχουν όρια.</string>
 	<string name="popular_on_mastodon">Δημοφιλή στο Mastodon</string>
 	<string name="follow_all">Ακολούθησε όλους</string>
 	<string name="server_rules_disagree">Διαφωνώ</string>
@@ -603,8 +589,6 @@
 	<string name="timeline_following">Αρχική</string>
 	<string name="lists">Λίστες</string>
 	<string name="followed_hashtags">Ετικέτες που ακολουθούνται</string>
-	<string name="no_lists">Δεν έχεις καμία λίστα ακόμα.</string>
-	<string name="no_followed_hashtags">Δεν ακολουθείς καμία ετικέτα.</string>
 	<string name="manage_lists">Διαχείριση λιστών</string>
 	<string name="manage_hashtags">Διαχείριση ετικετών</string>
 	<!-- Screen reader description for the menu on the home timeline screen -->
@@ -628,4 +612,5 @@
 	<string name="add_user_to_list">Προσθήκη στη λίστα…</string>
 	<string name="add_user_to_list_title">Προσθήκη στη λίστα</string>
 	<!-- %s is a username -->
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-es-rES/strings.xml b/mastodon/src/main/res/values-es-rES/strings.xml
index 295788718..13ba95c7c 100644
--- a/mastodon/src/main/res/values-es-rES/strings.xml
+++ b/mastodon/src/main/res/values-es-rES/strings.xml
@@ -163,19 +163,7 @@
 	<string name="password">Contraseña</string>
 	<string name="confirm_password">Confirmar contraseña</string>
 	<string name="password_note">Incluye letras mayúsculas, caracteres especiales y números para aumentar la fuerza de tu contraseña.</string>
-	<string name="category_academia">Académico</string>
-	<string name="category_activism">Activismo</string>
-	<string name="category_all">Todas</string>
-	<string name="category_art">Arte</string>
-	<string name="category_food">Comida</string>
-	<string name="category_furry">Furry</string>
-	<string name="category_games">Juegos</string>
 	<string name="category_general">General</string>
-	<string name="category_journalism">Periodismo</string>
-	<string name="category_lgbt">LGBT</string>
-	<string name="category_music">Música</string>
-	<string name="category_regional">Regional</string>
-	<string name="category_tech">Tecnología</string>
 	<string name="confirm_email_title">Revisa tu bandeja de entrada</string>
 	<!-- %s is the email address -->
 	<string name="confirm_email_subtitle">Pulsa el enlace que te hemos enviado para verificar %s. Esperaremos aquí mismo.</string>
@@ -285,7 +273,6 @@
 		<item quantity="one">%,d retooteo</item>
 		<item quantity="other">%,d retooteos</item>
 	</plurals>
-	<string name="timestamp_via_app">%1$s a través de %2$s</string>
 	<string name="time_now">ahora</string>
 	<string name="edit_history">Editar historial</string>
 	<string name="last_edit_at_x">Última edición: %s</string>
@@ -357,7 +344,6 @@
 	<string name="profile_add_row">Añadir fila</string>
 	<string name="profile_setup">Configuración del perfil</string>
 	<string name="profile_setup_subtitle">Siempre puedes completar esto más tarde en la pestaña Perfil.</string>
-	<string name="profile_setup_explanation">Puedes añadir hasta cuatro campos de perfil para todo lo que quieras. Ubicación, enlaces, pronombres — el cielo es el límite.</string>
 	<string name="popular_on_mastodon">Popular en Mastodon</string>
 	<string name="follow_all">Seguir a todos</string>
 	<string name="server_rules_disagree">En desacuerdo</string>
@@ -594,8 +580,6 @@
 	<string name="error_playing_video">Error al reproducir el video</string>
 	<string name="lists">Listas</string>
 	<string name="followed_hashtags">Etiquetas seguidas</string>
-	<string name="no_lists">Aún no tienes ninguna lista.</string>
-	<string name="no_followed_hashtags">Aún no sigues ninguna etiqueta.</string>
 	<string name="manage_lists">Administrar listas</string>
 	<string name="manage_hashtags">Administrar etiquetas</string>
 	<!-- Screen reader description for the menu on the home timeline screen -->
@@ -624,4 +608,5 @@
 	<string name="confirm_remove_list_member">¿Eliminar miembro?</string>
 	<string name="no_followed_hashtags_title">Manténgase al día con los intereses siguiendo las etiquetas</string>
 	<string name="no_followed_hashtags_subtitle">Los seguidores aparecerán aquí</string>
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-eu-rES/strings.xml b/mastodon/src/main/res/values-eu-rES/strings.xml
index b6ea979f2..382994af8 100644
--- a/mastodon/src/main/res/values-eu-rES/strings.xml
+++ b/mastodon/src/main/res/values-eu-rES/strings.xml
@@ -162,19 +162,7 @@
 	<string name="password">Pasahitza</string>
 	<string name="confirm_password">Berretsi pasahitza</string>
 	<string name="password_note">Sartu letra larriak, karaktere bereziak eta zenbakiak zure pasahitzaren segurtasuna areagotzeko.</string>
-	<string name="category_academia">Akademia</string>
-	<string name="category_activism">Aktibismoa</string>
-	<string name="category_all">Denak</string>
-	<string name="category_art">Artea</string>
-	<string name="category_food">Janaria</string>
-	<string name="category_furry">Furry</string>
-	<string name="category_games">Jokoak</string>
 	<string name="category_general">Orokorra</string>
-	<string name="category_journalism">Kazetaritza</string>
-	<string name="category_lgbt">LGBT</string>
-	<string name="category_music">Musika</string>
-	<string name="category_regional">Herrialdekoa</string>
-	<string name="category_tech">Teknologia</string>
 	<string name="confirm_email_title">Egiaztatu zure sarrerako ontzia</string>
 	<!-- %s is the email address -->
 	<string name="confirm_email_didnt_get">Ez duzu estekarik jaso?</string>
@@ -275,7 +263,6 @@
 		<item quantity="one">Gogoko bat</item>
 		<item quantity="other">%,d gogoko</item>
 	</plurals>
-	<string name="timestamp_via_app">%1$s %2$s -en bidez</string>
 	<string name="time_now">orain</string>
 	<string name="edit_history">Editatu historia</string>
 	<string name="last_edit_at_x">Azken edizioa %s</string>
@@ -352,6 +339,7 @@
 	<!-- Shown in a progress dialog when you tap "follow all" -->
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
 	<string name="spoiler_show">Erakutsi hala ere</string>
+	<string name="spoiler_hide">Berrezkutatu</string>
 	<string name="poll_multiple_choice">Aukeratu bat edo gehiago</string>
 	<string name="save_changes">Gorde aldaketak</string>
 	<string name="profile_featured">Nabarmenak</string>
@@ -418,6 +406,10 @@
 	<string name="notifications_policy_follower">Zuk jarraitzen dituzun pertsonak</string>
 	<string name="notifications_policy_no_one">Bat ere ez</string>
 	<string name="pause_all_notifications_title">Pausatu jakinarazpen guztiak</string>
+	<plurals name="x_weeks">
+		<item quantity="one">aste %d</item>
+		<item quantity="other">%d aste</item>
+	</plurals>
 	<!-- %1$s is the date (may be relative, e.g. "today" or "yesterday"), %2$s is the time. You can reorder these placeholders if that works better for your language -->
 	<string name="date_at_time">%1$s %2$s-etan</string>
 	<string name="today">gaur</string>
@@ -428,11 +420,24 @@
 	<string name="about_server">Honi buruz</string>
 	<string name="server_rules">Arauak</string>
 	<string name="server_administrator">Administratzailea</string>
+	<string name="send_email_to_server_admin">Administratzaileari mezua</string>
 	<string name="settings_show_cws">Erakutsi eduki abisuak</string>
+	<plurals name="in_x_seconds">
+		<item quantity="one">segundo %d barru</item>
+		<item quantity="other">%d segundo barru</item>
+	</plurals>
+	<plurals name="in_x_minutes">
+		<item quantity="one">minutu %d barru</item>
+		<item quantity="other">%d minutu barru</item>
+	</plurals>
 	<plurals name="in_x_hours">
 		<item quantity="one">Ordu %d barru</item>
 		<item quantity="other">%d ordu barru</item>
 	</plurals>
+	<plurals name="x_hours_ago">
+		<item quantity="one">Duela ordu %d</item>
+		<item quantity="other">Duela %d ordu</item>
+	</plurals>
 	<string name="count_one">Bat</string>
 	<string name="count_two">Bi</string>
 	<string name="count_three">Hiru</string>
@@ -469,6 +474,7 @@
 	<string name="search_mastodon">Bilatu Mastodonen</string>
 	<string name="clear_all">Garbitu dena</string>
 	<string name="search_open_url">Ireki URLa Mastodonen</string>
+	<string name="search_go_to_account">Joan hona %s</string>
 	<!-- Shown in the post header. Please keep it short -->
 	<string name="time_seconds_ago_short">Duela %d segundo</string>
 	<string name="time_minutes_ago_short">Duela %d minutu</string>
@@ -480,10 +486,13 @@
 	<string name="settings_privacy">Pribatutasuna eta irismena</string>
 	<string name="settings_discoverable">Ezagutarazi profila eta bidalketak bilaketa algoritmoetan</string>
 	<string name="settings_indexable">Gehitu argitalpen publikoak bilaketa-emaitzetan</string>
+	<plurals name="x_participants">
+		<item quantity="one">partaide %,d</item>
+		<item quantity="other">%d partaide</item>
+	</plurals>
 	<string name="timeline_following">Hasiera</string>
 	<string name="lists">Zerrendak</string>
 	<string name="followed_hashtags">Jarraitutako traolak</string>
-	<string name="no_lists">Ez duzu zerrendarik oraindik.</string>
 	<string name="manage_lists">Kudeatu zerrendak</string>
 	<string name="manage_hashtags">Kudeatu traolak</string>
 	<!-- Screen reader description for the menu on the home timeline screen -->
@@ -507,8 +516,11 @@
 	<!-- %s is a username -->
 	<string name="remove_from_list">Kendu zerrendatik</string>
 	<string name="confirm_remove_list_member">Kendu kideak?</string>
+	<string name="no_lists_subtitle">Zurea hemen agertuko da</string>
 	<string name="create_list">Sortu zerrenda</string>
 	<string name="step_x_of_y">%1$d pausua %2$d -(e)tik</string>
 	<string name="create">Sortu</string>
+	<string name="manage_list_members">Kudeatu partaide zerrrenda</string>
 	<string name="list_no_members">Oraindik ez dago kiderik</string>
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-fa-rIR/strings.xml b/mastodon/src/main/res/values-fa-rIR/strings.xml
index a4ccd25e6..b853b509f 100644
--- a/mastodon/src/main/res/values-fa-rIR/strings.xml
+++ b/mastodon/src/main/res/values-fa-rIR/strings.xml
@@ -163,19 +163,7 @@
 	<string name="password">گذرواژه</string>
 	<string name="confirm_password">تأیید گذرواژه</string>
 	<string name="password_note">برای افزایش قدرت گذرواژه خود، حروف بزرگ، کاراکترهای خاص و اعداد را اضافه کنید.</string>
-	<string name="category_academia">دانشگاه</string>
-	<string name="category_activism">فعالیت</string>
-	<string name="category_all">همه</string>
-	<string name="category_art">هنر</string>
-	<string name="category_food">غذا</string>
-	<string name="category_furry">خزدار</string>
-	<string name="category_games">بازی‌ها</string>
 	<string name="category_general">عمومی</string>
-	<string name="category_journalism">روزنامه نگاری</string>
-	<string name="category_lgbt">LGBT</string>
-	<string name="category_music">موسیقی</string>
-	<string name="category_regional">منطقه‌ای</string>
-	<string name="category_tech">فناوری</string>
 	<string name="confirm_email_title">صندوق ورودیتان را بررسی کنید</string>
 	<!-- %s is the email address -->
 	<string name="confirm_email_subtitle">برای تأیید %s، روی پیوندی که برای شما ارسال کردیم ضربه بزنید. همین جا منتظر می‌مانیم.</string>
@@ -285,7 +273,6 @@
 		<item quantity="one">%,d تقویت</item>
 		<item quantity="other">%,d تقویت‌ها</item>
 	</plurals>
-	<string name="timestamp_via_app">%1$s از طریق %2$s</string>
 	<string name="time_now">اکنون</string>
 	<string name="edit_history">ویرایش تاریخچه</string>
 	<string name="last_edit_at_x">آخرین ویرایش %s</string>
@@ -357,7 +344,6 @@
 	<string name="profile_add_row">افزودن سطر</string>
 	<string name="profile_setup">تنظیم نمایه</string>
 	<string name="profile_setup_subtitle">همیشه می‌توانید این را بعداً در برگه نمایه تکمیل کنید.</string>
-	<string name="profile_setup_explanation">شما می توانید تا چهار قسمت نمایه برای هر چیزی که می خواهید اضافه کنید. مکان، پیوندها، ضمایر - آسمان حد است.</string>
 	<string name="popular_on_mastodon">محبوب در ماستودون</string>
 	<string name="follow_all">پی‌گیری همه</string>
 	<string name="server_rules_disagree">مخالفم</string>
@@ -600,10 +586,9 @@
 		<item quantity="other">%,d فرسته امروز</item>
 	</plurals>
 	<string name="error_playing_video">خطا در پخش ویدئو</string>
+	<string name="timeline_following">خانه</string>
 	<string name="lists">سیاهه‌ها</string>
 	<string name="followed_hashtags">برچسب‌های پی‌گرفته</string>
-	<string name="no_lists">شما هنوز هیچ سیاهه‌ای ندارید.</string>
-	<string name="no_followed_hashtags">شما هیچ برچسبی را پی نمی‌گیرید.</string>
 	<string name="manage_lists">مدیریت سیاهه‌ها</string>
 	<string name="manage_hashtags">مدیریت برچسب‌ها</string>
 	<!-- Screen reader description for the menu on the home timeline screen -->
@@ -618,17 +603,30 @@
 	<string name="list_show_replies_to">نمایش پاسخ‌ها به</string>
 	<string name="list_replies_no_one">هیچ‌کس</string>
 	<string name="list_replies_members">اعضای سیاهه</string>
+	<string name="list_replies_anyone">هرکسی را که پیگیری کنم</string>
 	<string name="confirm_remove_list_members">حذف اعضا؟</string>
 	<string name="remove">برداشتن</string>
 	<string name="add_list_member">افزودن عضو</string>
+	<string name="search_among_people_you_follow">جست‌وجو بین کسانی که پی‌گرفته‌اید</string>
 	<string name="add_user_to_list">افزودن به سیاهه…</string>
 	<string name="add_user_to_list_title">افزودن به سیاهه</string>
 	<!-- %s is a username -->
 	<string name="remove_from_list">برداشتن از سیاهه</string>
 	<string name="confirm_remove_list_member">حذف عضو؟</string>
+	<string name="no_followed_hashtags_title">با پیگیری برچسب‌ها با علاقه‌مندی‌ها همراه باشید</string>
+	<string name="no_followed_hashtags_subtitle">پیگیرهای شما اینجا ظاهر می‌شود</string>
+	<string name="no_lists_title">سازماندهی کردن خوراک خانه خود با سیاهه‌ها</string>
+	<string name="no_lists_subtitle">مال شما اینجا ظاهر می‌شود</string>
 	<string name="manage_accounts">افزودن یا جابجا شدن بین حساب‌ها</string>
 	<plurals name="x_posts_recently">
 		<item quantity="one">%,d فرسته اخیرا ارسال کرده</item>
 		<item quantity="other">%,d فرسته اخیرا ارسال کرده</item>
 	</plurals>
+	<string name="create_list">ایجاد سیاهه</string>
+	<string name="step_x_of_y">گام %1$d از %2$d</string>
+	<string name="create">ساختن</string>
+	<string name="manage_list_members">مدیریت اعضای سیاهه</string>
+	<string name="list_no_members">هنوز هیچ عضوی نیست</string>
+	<string name="list_find_users">پیدا کردن کاربرانی برای افزودن</string>
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-fi-rFI/strings.xml b/mastodon/src/main/res/values-fi-rFI/strings.xml
index e8a77bc5b..9f895f315 100644
--- a/mastodon/src/main/res/values-fi-rFI/strings.xml
+++ b/mastodon/src/main/res/values-fi-rFI/strings.xml
@@ -163,19 +163,7 @@
 	<string name="password">Salasana</string>
 	<string name="confirm_password">Vahvista salasana</string>
 	<string name="password_note">Sisällytä suuraakkoset, erikoismerkit, ja numerot, jotta voit lisätä salasanan voimaa.</string>
-	<string name="category_academia">Akateeminen</string>
-	<string name="category_activism">Aktivismi</string>
-	<string name="category_all">Kaikki</string>
-	<string name="category_art">Taide</string>
-	<string name="category_food">Ruoka</string>
-	<string name="category_furry">Turri</string>
-	<string name="category_games">Pelit</string>
 	<string name="category_general">Yleinen</string>
-	<string name="category_journalism">Journalismi</string>
-	<string name="category_lgbt">HLBT</string>
-	<string name="category_music">Musiikki</string>
-	<string name="category_regional">Alueellinen</string>
-	<string name="category_tech">Teknologia</string>
 	<string name="confirm_email_title">Tarkista sähköpostisi</string>
 	<!-- %s is the email address -->
 	<string name="confirm_email_subtitle">Napauta lähettämäämme linkkiä vahvistaaksesi tunnuksen %s. Odotamme täällä.</string>
@@ -285,7 +273,6 @@
 		<item quantity="one">%,d tehostus</item>
 		<item quantity="other">%,d tehostusta</item>
 	</plurals>
-	<string name="timestamp_via_app">%1$s sovelluksella %2$s</string>
 	<string name="time_now">nyt</string>
 	<string name="edit_history">Muokkaushistoria</string>
 	<string name="last_edit_at_x">Muokattiin viimeksi %s</string>
@@ -357,7 +344,6 @@
 	<string name="profile_add_row">Lisää rivi</string>
 	<string name="profile_setup">Profiilin asetukset</string>
 	<string name="profile_setup_subtitle">Voit myös täyttää tämän myöhemmin Profiili-välilehdellä.</string>
-	<string name="profile_setup_explanation">Voit lisätä enintään neljä profiilikenttää joissa on mitä haluat. Sijainti, linkit, pronominit — taivas on rajana.</string>
 	<string name="popular_on_mastodon">Suosittua Mastodonissa</string>
 	<string name="follow_all">Seuraa kaikkia</string>
 	<string name="server_rules_disagree">Eri mieltä</string>
@@ -603,8 +589,6 @@
 	<string name="timeline_following">Koti</string>
 	<string name="lists">Listat</string>
 	<string name="followed_hashtags">Seuratut aihetunnisteet</string>
-	<string name="no_lists">Sinulla ei ole vielä yhtään listaa.</string>
-	<string name="no_followed_hashtags">Et seuraa yhtään aihetunnistetta.</string>
 	<string name="manage_lists">Hallitse listoja</string>
 	<string name="manage_hashtags">Hallitse aihetunnisteita</string>
 	<!-- Screen reader description for the menu on the home timeline screen -->
@@ -646,4 +630,5 @@
 	<string name="manage_list_members">Hallitse listan jäseniä</string>
 	<string name="list_no_members">Ei vielä jäseniä</string>
 	<string name="list_find_users">Etsi lisättäviä käyttäjiä</string>
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-fil-rPH/strings.xml b/mastodon/src/main/res/values-fil-rPH/strings.xml
index a01971a1b..d534b2187 100644
--- a/mastodon/src/main/res/values-fil-rPH/strings.xml
+++ b/mastodon/src/main/res/values-fil-rPH/strings.xml
@@ -128,19 +128,7 @@
 	<string name="unfollow">I-unfollow</string>
 	<string name="back">Bumalik</string>
 	<string name="password_note">Isama ang mga malalaking titik, mga espesyal na character, at mga numero para madagdagan ang lakas ng iyong password.</string>
-	<string name="category_academia">Academia</string>
-	<string name="category_activism">Activism</string>
-	<string name="category_all">Lahat</string>
-	<string name="category_art">Sining</string>
-	<string name="category_food">Pagkain</string>
-	<string name="category_furry">Furry</string>
-	<string name="category_games">Mga Laro</string>
 	<string name="category_general">Pangkalahatan</string>
-	<string name="category_journalism">Pamamahayag</string>
-	<string name="category_lgbt">LGBT</string>
-	<string name="category_music">Musika</string>
-	<string name="category_regional">Rehiyon</string>
-	<string name="category_tech">Tech</string>
 	<!-- %s is the email address -->
 	<string name="resend">Muling ipadala</string>
 	<string name="open_email_app">Buksan ang email app</string>
@@ -217,7 +205,6 @@
 		<item quantity="one">%,d Paborito</item>
 		<item quantity="other">%,d paborito</item>
 	</plurals>
-	<string name="timestamp_via_app">%1$s sa pamamagitan ng %2$s</string>
 	<string name="time_now">ngayon</string>
 	<string name="edit_history">I-Edit ang kasaysayan</string>
 	<string name="last_edit_at_x">Huling edit %s</string>
@@ -288,5 +275,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
-	<string name="see_new_posts">Tingnan ang mga bagong post</string>
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-fr-rFR/strings.xml b/mastodon/src/main/res/values-fr-rFR/strings.xml
index 113e0ea91..32f4e9916 100644
--- a/mastodon/src/main/res/values-fr-rFR/strings.xml
+++ b/mastodon/src/main/res/values-fr-rFR/strings.xml
@@ -163,19 +163,7 @@
 	<string name="password">Mot de passe</string>
 	<string name="confirm_password">Confirmez le mot de passe</string>
 	<string name="password_note">Inclure les lettres majuscules, les caractères spéciaux et les chiffres pour augmenter la force de votre mot de passe.</string>
-	<string name="category_academia">Universitaire</string>
-	<string name="category_activism">Activisme</string>
-	<string name="category_all">Tout</string>
-	<string name="category_art">Art</string>
-	<string name="category_food">Nourriture</string>
-	<string name="category_furry">Fourrure</string>
-	<string name="category_games">Jeux</string>
 	<string name="category_general">Général</string>
-	<string name="category_journalism">Journalisme</string>
-	<string name="category_lgbt">LGBT</string>
-	<string name="category_music">Musique</string>
-	<string name="category_regional">Régional</string>
-	<string name="category_tech">Technologie</string>
 	<string name="confirm_email_title">Consultez votre boîte de réception</string>
 	<!-- %s is the email address -->
 	<string name="confirm_email_subtitle">Cliquez sur le lien que nous avons envoyé à %s pour confirmer votre email. Nous vous attendons ici.</string>
@@ -285,7 +273,6 @@
 		<item quantity="one">%,d partage</item>
 		<item quantity="other">%,d partages</item>
 	</plurals>
-	<string name="timestamp_via_app">%1$s via %2$s</string>
 	<string name="time_now">à l’instant</string>
 	<string name="edit_history">Historique des modifications</string>
 	<string name="last_edit_at_x">Dernière modification %s</string>
@@ -333,7 +320,7 @@
 	<string name="instance_signup_closed">Ce serveur n\'accepte pas les nouvelles inscriptions.</string>
 	<string name="text_copied">Copié dans le presse-papier</string>
 	<string name="add_bookmark">Ajouter aux marque-pages</string>
-	<string name="remove_bookmark">Retirer des favoris</string>
+	<string name="remove_bookmark">Retirer des marque-pages</string>
 	<string name="bookmarks">Marque-pages</string>
 	<string name="your_favorites">Vos favoris</string>
 	<string name="login_title">Content de vous revoir</string>
@@ -357,7 +344,6 @@
 	<string name="profile_add_row">Ajouter une ligne</string>
 	<string name="profile_setup">Configuration du profil</string>
 	<string name="profile_setup_subtitle">Vous pourrez toujours compléter cela plus tard dans l\'onglet Profil.</string>
-	<string name="profile_setup_explanation">Vous pouvez ajouter jusqu\'à quatre champs de profil pour tout ce que vous souhaitez. Localisation, liens, surnoms — le ciel est la limite.</string>
 	<string name="popular_on_mastodon">Populaire sur Mastodon</string>
 	<string name="follow_all">Tout suivre</string>
 	<string name="server_rules_disagree">Refuser</string>
@@ -603,8 +589,6 @@
 	<string name="timeline_following">Accueil</string>
 	<string name="lists">Listes</string>
 	<string name="followed_hashtags">Hashtags suivis</string>
-	<string name="no_lists">Vous n’avez pas encore de listes.</string>
-	<string name="no_followed_hashtags">Vous ne suivez aucun hashtag.</string>
 	<string name="manage_lists">Gérer les listes</string>
 	<string name="manage_hashtags">Gérer les hashtags</string>
 	<!-- Screen reader description for the menu on the home timeline screen -->
@@ -646,4 +630,5 @@
 	<string name="manage_list_members">Gérer les membres de la liste</string>
 	<string name="list_no_members">Aucun membre pour l\'instant</string>
 	<string name="list_find_users">Trouver des utilisateurs à ajouter</string>
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-ga-rIE/strings.xml b/mastodon/src/main/res/values-ga-rIE/strings.xml
index d610a4e07..e428c80dc 100644
--- a/mastodon/src/main/res/values-ga-rIE/strings.xml
+++ b/mastodon/src/main/res/values-ga-rIE/strings.xml
@@ -25,4 +25,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-gd-rGB/strings.xml b/mastodon/src/main/res/values-gd-rGB/strings.xml
index bea727ea7..5cf20bb5b 100644
--- a/mastodon/src/main/res/values-gd-rGB/strings.xml
+++ b/mastodon/src/main/res/values-gd-rGB/strings.xml
@@ -187,19 +187,7 @@
 	<string name="password">Facal-faire</string>
 	<string name="confirm_password">Dearbh am facal-faire</string>
 	<string name="password_note">Gabh a-steach litrichean mòra, caractaran sònraichte agus àireamhan airson am facal-faire agad a dhèanamh nas treasa.</string>
-	<string name="category_academia">Sgoilearachd</string>
-	<string name="category_activism">Iomairteachd</string>
-	<string name="category_all">Na h-uile</string>
-	<string name="category_art">Na h-ealain</string>
-	<string name="category_food">Biadh</string>
-	<string name="category_furry">Furry</string>
-	<string name="category_games">Geamannan</string>
 	<string name="category_general">Coitcheann</string>
-	<string name="category_journalism">Naidheachdas</string>
-	<string name="category_lgbt">LGBT</string>
-	<string name="category_music">Ceòl</string>
-	<string name="category_regional">Sgìreil</string>
-	<string name="category_tech">Teicneolas</string>
 	<string name="confirm_email_title">Thoir sùil air a’ bhogsa a-steach agad</string>
 	<!-- %s is the email address -->
 	<string name="confirm_email_subtitle">Thoir gnogag air a’ cheangal a chuir sinn thugad a dhearbhadh %s. Fuirichidh sinn ort an-seo.</string>
@@ -319,7 +307,6 @@
 		<item quantity="few">%,d brosnachaidhean</item>
 		<item quantity="other">%,d brosnachadh</item>
 	</plurals>
-	<string name="timestamp_via_app">%1$s slighe %2$s</string>
 	<string name="time_now">an-dràsta</string>
 	<string name="edit_history">Eachdraidh nan deasachaidhean</string>
 	<string name="last_edit_at_x">An deasachadh mu dheireadh %s</string>
@@ -395,7 +382,6 @@
 	<string name="profile_add_row">Cuir ràgh ris</string>
 	<string name="profile_setup">Suidheachadh na pròifile</string>
 	<string name="profile_setup_subtitle">’S urrainn dhut seo a choileanadh air taba na Pròifile uair sam bith.</string>
-	<string name="profile_setup_explanation">’S urrainn dhut suas ri ceithir raointean a chur ris a’ phròifil agad airson rud sam bith a thogras tu. Ionad, ceanglaichean, roimhearan no ge b’ e dè eile.</string>
 	<string name="popular_on_mastodon">Fèillmhor air Mastodon</string>
 	<string name="follow_all">Lean na h-uile</string>
 	<string name="server_rules_disagree">Diùlt</string>
@@ -665,8 +651,6 @@
 	<string name="timeline_following">Dachaigh</string>
 	<string name="lists">Liostaichean</string>
 	<string name="followed_hashtags">Tagaichean hais ’gan leantainn</string>
-	<string name="no_lists">Chan eil liosta agad fhathast.</string>
-	<string name="no_followed_hashtags">Chan eil thu a’ leantainn taga hais fhathast.</string>
 	<string name="manage_lists">Stiùirich na liostaichean</string>
 	<string name="manage_hashtags">Stiùirich na tagaichean hais</string>
 	<!-- Screen reader description for the menu on the home timeline screen -->
@@ -677,4 +661,5 @@
 	<!-- %s is the name of the list -->
 	<string name="delete_list_confirm">A bheil thu airson “%s” a sguabadh às?</string>
 	<!-- %s is a username -->
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-gl-rES/strings.xml b/mastodon/src/main/res/values-gl-rES/strings.xml
index b77928fb4..89c25929b 100644
--- a/mastodon/src/main/res/values-gl-rES/strings.xml
+++ b/mastodon/src/main/res/values-gl-rES/strings.xml
@@ -163,19 +163,7 @@
 	<string name="password">Contrasinal</string>
 	<string name="confirm_password">Confirmar contrasinal</string>
 	<string name="password_note">Inclúe letras maiúsculas, caracteres especiais e números para aumentar a calidade do contrasinal.</string>
-	<string name="category_academia">Academia</string>
-	<string name="category_activism">Activismo</string>
-	<string name="category_all">Todo</string>
-	<string name="category_art">Arte</string>
-	<string name="category_food">Comida</string>
-	<string name="category_furry">Peluxos</string>
-	<string name="category_games">Xogos</string>
 	<string name="category_general">Xeral</string>
-	<string name="category_journalism">Xornalismo</string>
-	<string name="category_lgbt">LGBT</string>
-	<string name="category_music">Música</string>
-	<string name="category_regional">Rexional</string>
-	<string name="category_tech">Tecnoloxía</string>
 	<string name="confirm_email_title">Mira na caixa de correo</string>
 	<!-- %s is the email address -->
 	<string name="confirm_email_subtitle">Preme na ligazón que che enviamos para verificar a %s. Agardamos por ti.</string>
@@ -285,7 +273,6 @@
 		<item quantity="one">%,d promoción</item>
 		<item quantity="other">%,d promocións</item>
 	</plurals>
-	<string name="timestamp_via_app">%1$s vía %2$s</string>
 	<string name="time_now">agora</string>
 	<string name="edit_history">Editar historial</string>
 	<string name="last_edit_at_x">Última edición %s</string>
@@ -357,7 +344,6 @@
 	<string name="profile_add_row">Engadir fila</string>
 	<string name="profile_setup">Configuración do perfil</string>
 	<string name="profile_setup_subtitle">Sempre podes completar isto máis tarde na lapela de Perfil.</string>
-	<string name="profile_setup_explanation">Podes engadir ata catro campos de perfil para calquera cousa que queras. Ubicación, ligazóns, pronomes — o límite é a túa imaxinación.</string>
 	<string name="popular_on_mastodon">Popular en Mastodon</string>
 	<string name="follow_all">Seguir a todas</string>
 	<string name="server_rules_disagree">Non aceptar</string>
@@ -600,10 +586,9 @@
 		<item quantity="other">%,d publicacións hoxe</item>
 	</plurals>
 	<string name="error_playing_video">Erro ao reproducir o vídeo</string>
+	<string name="timeline_following">Inicio</string>
 	<string name="lists">Listas</string>
 	<string name="followed_hashtags">Cancelos seguidos</string>
-	<string name="no_lists">Aínda non tes ningunha lista.</string>
-	<string name="no_followed_hashtags">Non segues ningún cancelo.</string>
 	<string name="manage_lists">Xestionar listas</string>
 	<string name="manage_hashtags">Xestionar cancelos</string>
 	<!-- Screen reader description for the menu on the home timeline screen -->
@@ -639,4 +624,11 @@
 		<item quantity="one">%,d publicación recente</item>
 		<item quantity="other">%,d publicacións recentes</item>
 	</plurals>
+	<string name="create_list">Crear lista</string>
+	<string name="step_x_of_y">Paso %1$d de %2$d</string>
+	<string name="create">Crear</string>
+	<string name="manage_list_members">Xestionar membros da lista</string>
+	<string name="list_no_members">Aínda non tes ninguén</string>
+	<string name="list_find_users">Buscar persoas que engadir</string>
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-hi-rIN/strings.xml b/mastodon/src/main/res/values-hi-rIN/strings.xml
index 4895b6a96..b27729f1c 100644
--- a/mastodon/src/main/res/values-hi-rIN/strings.xml
+++ b/mastodon/src/main/res/values-hi-rIN/strings.xml
@@ -52,4 +52,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-hr-rHR/strings.xml b/mastodon/src/main/res/values-hr-rHR/strings.xml
index 7cdc3c934..21811ef36 100644
--- a/mastodon/src/main/res/values-hr-rHR/strings.xml
+++ b/mastodon/src/main/res/values-hr-rHR/strings.xml
@@ -138,19 +138,7 @@
 	<string name="unfollow">Prestani pratiti</string>
 	<string name="back">Natrag</string>
 	<string name="password_note">Upotrijebi velika slova, posebne znakove i brojeve kako bi podigao jačinu tvoje lozinke.</string>
-	<string name="category_academia">Akademija</string>
-	<string name="category_activism">Aktivizam</string>
-	<string name="category_all">Sve</string>
-	<string name="category_art">Umjetnost</string>
-	<string name="category_food">Hrana</string>
-	<string name="category_furry">Krzneni</string>
-	<string name="category_games">Igre</string>
 	<string name="category_general">Općenito</string>
-	<string name="category_journalism">Novinarstvo</string>
-	<string name="category_lgbt">LGBT</string>
-	<string name="category_music">Glazba</string>
-	<string name="category_regional">Lokalno</string>
-	<string name="category_tech">Tehnologija</string>
 	<!-- %s is the email address -->
 	<string name="resend">Ponovno pošalji</string>
 	<string name="open_email_app">Otvori aplikaciju za e-poštu</string>
@@ -232,4 +220,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-hu-rHU/strings.xml b/mastodon/src/main/res/values-hu-rHU/strings.xml
index d017b66d6..555558d92 100644
--- a/mastodon/src/main/res/values-hu-rHU/strings.xml
+++ b/mastodon/src/main/res/values-hu-rHU/strings.xml
@@ -9,7 +9,7 @@
 	<string name="preparing_auth">Felkészülés a hitelesítésre…</string>
 	<string name="finishing_auth">Hitelesítés befejezése…</string>
 	<string name="user_boosted">%s megtolta</string>
-	<string name="in_reply_to">Válaszolva %s számára</string>
+	<string name="in_reply_to">Válasz neki: %s</string>
 	<string name="notifications">Értesítések</string>
 	<string name="user_followed_you">%s bekövetett téged</string>
 	<string name="user_sent_follow_request">%s követési kérelmet küldött neked</string>
@@ -85,6 +85,10 @@
 		<item quantity="one">%d nap van hátra</item>
 		<item quantity="other">%d nap van hátra</item>
 	</plurals>
+	<plurals name="x_votes">
+		<item quantity="one">%,d szavazat</item>
+		<item quantity="other">%,d szavazat</item>
+	</plurals>
 	<string name="poll_closed">Lezárva</string>
 	<string name="confirm_mute_title">Fiók némítása</string>
 	<string name="confirm_mute">Valóban némítani szeretnéd őt: %s?</string>
@@ -112,11 +116,11 @@
 	<string name="log_out">Kijelentkezés</string>
 	<string name="add_account">Fiók hozzáadása</string>
 	<string name="search_hint">Keresés</string>
-	<string name="hashtags">Hashtagek</string>
+	<string name="hashtags">Címkék</string>
 	<string name="news">Hírek</string>
 	<string name="for_you">Neked</string>
-	<string name="all_notifications">Minden</string>
-	<string name="mentions">Megemlítések</string>
+	<string name="all_notifications">Összes</string>
+	<string name="mentions">Említések</string>
 	<plurals name="x_people_talking">
 		<item quantity="one">%d ember beszél róla</item>
 		<item quantity="other">%d ember beszél róla</item>
@@ -159,19 +163,7 @@
 	<string name="password">Jelszó</string>
 	<string name="confirm_password">Jelszó megerősítése</string>
 	<string name="password_note">A jelszó erősségének növelése érdekében használjon nagybetűket, speciális karaktereket és számokat.</string>
-	<string name="category_academia">Egyetem/Felsőoktatás</string>
-	<string name="category_activism">Aktivizmus</string>
-	<string name="category_all">Összes</string>
-	<string name="category_art">Művészet</string>
-	<string name="category_food">Étel</string>
-	<string name="category_furry">Furry</string>
-	<string name="category_games">Játékok</string>
 	<string name="category_general">Általános</string>
-	<string name="category_journalism">Újságírás</string>
-	<string name="category_lgbt">LGBT</string>
-	<string name="category_music">Zene</string>
-	<string name="category_regional">Regionális</string>
-	<string name="category_tech">Tech</string>
 	<string name="confirm_email_title">Nézd meg a bejővő emailfiókodat</string>
 	<!-- %s is the email address -->
 	<string name="confirm_email_subtitle">Kattints a hivatkozásra, melyet a %s ellenőrzése céljából küldtünk neked. Mi addig itt várunk.</string>
@@ -185,7 +177,7 @@
 	<string name="add_alt_text">Helyettesítő szöveg hozzáadása</string>
 	<string name="visibility_public">Nyilvános</string>
 	<string name="visibility_followers_only">Csak követőknek</string>
-	<string name="visibility_private">Csak a megemlítettek</string>
+	<string name="visibility_private">Csak az említetteknek</string>
 	<string name="recent_searches">Legutóbbiak</string>
 	<string name="skip">Átugrás</string>
 	<string name="notification_type_follow">Új követők</string>
@@ -213,7 +205,7 @@
 	<string name="settings_tos">Felhasználási feltételek</string>
 	<string name="settings_privacy_policy">Adatvédelmi szabályzat</string>
 	<string name="settings_clear_cache">Gyorsítótár törlése</string>
-	<string name="settings_app_version">Mastodon Androidra v%1$s (%2$d)</string>
+	<string name="settings_app_version">Mastodon Android v%1$s (%2$d)</string>
 	<string name="media_cache_cleared">Gyorsítótár törölve</string>
 	<string name="confirm_log_out">Kijelentkezel a %s felhasználói fiókból?</string>
 	<string name="sensitive_content_explain">A szerző ezt a médiát érzékenynek jelölte meg.</string>
@@ -228,7 +220,7 @@
 	<string name="add_media">Média hozzáadása</string>
 	<string name="add_poll">Szavazás hozzáadása</string>
 	<string name="emoji">Hangulatjel</string>
-	<string name="home_timeline">Kezdőlap</string>
+	<string name="home_timeline">Kezdőoldal idővonala</string>
 	<string name="my_profile">Profilom</string>
 	<string name="media_viewer">Média nézegető</string>
 	<string name="follow_user">%s követése</string>
@@ -258,6 +250,7 @@
 	<!-- %s is the server domain -->
 	<string name="local_timeline_info_banner">Itt található az összes bejegyzés az összes felhasznólótól a példányodon (%s).</string>
 	<string name="recommended_accounts_info_banner">Ezek a fiókok tetszhetnek neked azok alapján, akiket követsz.</string>
+	<string name="see_new_posts">Új posztok</string>
 	<string name="load_missing_posts">Hiányzó bejegyzések betöltése</string>
 	<string name="follow_back">Visszakövetés</string>
 	<string name="button_follow_pending">Függőben</string>
@@ -276,7 +269,10 @@
 		<item quantity="one">%,d kedvenc</item>
 		<item quantity="other">%,d kedvenc</item>
 	</plurals>
-	<string name="timestamp_via_app">%1$s %2$s használatával</string>
+	<plurals name="x_reblogs">
+		<item quantity="one">%,d megtolás</item>
+		<item quantity="other">%,d megtolás</item>
+	</plurals>
 	<string name="time_now">most</string>
 	<string name="edit_history">Szerkesztési előzmények</string>
 	<string name="last_edit_at_x">Utoljára szerkesztve: %s</string>
@@ -348,7 +344,6 @@
 	<string name="profile_add_row">Sor hozzáadása</string>
 	<string name="profile_setup">Profilbeállítás</string>
 	<string name="profile_setup_subtitle">Ezt később is bármikor kitöltheted a Profil fülön.</string>
-	<string name="profile_setup_explanation">Legfeljebb négy profilmezőt adhatsz hozzá bármiről, amiről csak akarsz. Helyadatok, hivatkozások, szólítások/névmások — határ a csillagos ég.</string>
 	<string name="popular_on_mastodon">Népszerű Mastodonon</string>
 	<string name="follow_all">Összes követése</string>
 	<string name="server_rules_disagree">Elutasítás</string>
@@ -359,22 +354,205 @@
 	<!-- Shown in a progress dialog when you tap "follow all" -->
 	<string name="sending_follows">Felhasználók bekövetése…</string>
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
+	<string name="spoiler_show">Megjelenítés mindenképp</string>
+	<string name="poll_multiple_choice">Válasszon egyet vagy többet</string>
+	<string name="save_changes">Módosítások mentése</string>
+	<string name="profile_featured">Ajánlott</string>
+	<string name="profile_timeline">Idővonal</string>
+	<string name="profile_endorsed_accounts">Fiókok</string>
+	<string name="verified_link">Ellenőrzött link</string>
+	<string name="show">Megjelenítés</string>
+	<string name="hide">Elrejtés</string>
+	<string name="join_default_server">Csatlakozol ide? %s</string>
+	<string name="signup_or_login">vagy</string>
+	<string name="learn_more">További információ</string>
+	<string name="welcome_to_mastodon">Üdvözöl a Mastodon</string>
+	<string name="welcome_paragraph1">A Mastodon egy decentralizált közösségi hálózat, ami azt jelenti, hogy nem egyetlen vállalat irányítja. Sok, egymástól függetlenül működtetett szerverből áll, amelyek össze vannak egymással kötve.</string>
+	<string name="what_are_servers">Mik azok a szerverek?</string>
+	<string name="welcome_paragraph2">Minden Mastodon-fiók egy szerveren van elhelyezve - mindegyiknek saját értékei, szabályai, &amp; adminjai vannak. Nem számít, melyiket választod, bármelyik szerveren lévő embereket követheted és kapcsolatba léphetsz velük.</string>
+	<string name="link_not_supported">Ez a link nem támogatott az alkalmazásban</string>
+	<string name="log_out_all_accounts">Kilépés mindegyik fiókból</string>
+	<string name="confirm_log_out_all_accounts">Kilépés mindegyik fiókból?</string>
+	<string name="retry">Újra</string>
+	<string name="post_failed">Hiba poszt elküldése közben</string>
 	<!-- %s is formatted file size ("467 KB image") -->
+	<string name="attachment_description_image">%s kép</string>
+	<string name="attachment_description_video">%s videó</string>
+	<string name="attachment_description_audio">%s audio</string>
+	<string name="attachment_description_unknown">%s fájl</string>
+	<string name="attachment_type_image">Kép</string>
+	<string name="attachment_type_video">Videó</string>
+	<string name="attachment_type_audio">Audio</string>
+	<string name="attachment_type_gif">GIF</string>
+	<string name="attachment_type_unknown">Fájl</string>
+	<string name="attachment_x_percent_uploaded">%d%% feltöltve</string>
+	<string name="add_poll_option">Szavazási opció hozzáadása</string>
+	<string name="poll_length">Szavazás hossza</string>
+	<string name="poll_style">Stílus</string>
+	<string name="compose_poll_single_choice">Egy válasz</string>
+	<string name="compose_poll_multiple_choice">Többválasztós</string>
+	<string name="delete_poll_option">Szavazási opció eltávolítása</string>
+	<string name="poll_style_title">Szavazás stílusa</string>
+	<string name="alt_text">Alt szöveg</string>
+	<string name="help">Súgó</string>
+	<string name="what_is_alt_text">Mi az az alt szöveg?</string>
+	<string name="alt_text_help">Az Alt szöveg képleírást biztosít a látássérültek, az alacsony sávszélességű kapcsolatokkal rendelkezők, illetve az extra kontextust keresők számára.\n\nAz egyértelmű, tömör és objektív alt szöveg megírásával mindenki számára javíthatja a hozzáférhetőséget és a megértést.\n\n<ul><li>Fontos elemek rögzítése</li>\n<li>Szöveg összefoglalása képekben</li>\n<li>Használjon szabályos mondatszerkezetet</li>\n<li>Kerülje a felesleges információkat</li>\n<li>Összetett vizuális ábrákon (például diagramokon vagy térképeken) a trendekre és a legfontosabb megállapításokra összpontosíthat.</li></ul></string>
+	<string name="edit_post">Poszt szerkesztése</string>
+	<string name="no_verified_link">Nem ellenőrzött link</string>
+	<string name="compose_autocomplete_emoji_empty">Emoji böngésző</string>
 	<string name="compose_autocomplete_users_empty">Találd meg akiket keresel</string>
+	<string name="language">Nyelv</string>
+	<string name="language_default">Alapértelmezés</string>
+	<string name="language_system">Rendszer</string>
+	<string name="language_detecting">Nyelv felismerése</string>
+	<string name="language_cant_detect">A nyelv nem ismerhető fel</string>
+	<string name="language_detected">Észlelt</string>
+	<string name="media_hidden">Rejtett média</string>
+	<string name="post_hidden">Rejtett poszt</string>
+	<string name="report_title_post">Poszt jelentése</string>
+	<string name="forward_report_explanation">A fiók egy másik szerverről származik. Elküldi a jelentés anonimizált másolatát oda is?</string>
 	<!-- %s is the server domain -->
 	<!-- Shown on the "stamp" on the screen that appears after you report a post/user. Please keep the translation short, preferably a single word -->
+	<string name="reported">Jelentve</string>
+	<string name="muted_user">Némítva %s</string>
+	<string name="mark_all_notifications_read">Összes megjelölése olvasottként</string>
+	<string name="settings_display">Kijelző</string>
+	<string name="settings_filters">Szűrők</string>
 	<!-- %s is the app name (Mastodon, key app_name). I made it a placeholder so everything Just Works™ with forks -->
+	<string name="about_app">%s névjegy</string>
+	<string name="default_post_language">Alapértelmezett poszt nyelv</string>
+	<string name="settings_confirm_unfollow">Kikövetés előtt rákérdezés</string>
+	<string name="settings_confirm_boost">Megtolás előtt rákérdezés</string>
+	<string name="settings_confirm_delete_post">Törlés előtt rákérdezés</string>
+	<string name="pause_all_notifications">Minden szüneteltetése</string>
+	<string name="pause_notifications_off">Ki</string>
+	<string name="notifications_policy_anyone">Bárkitől</string>
+	<string name="notifications_policy_followed">A követőktől</string>
+	<string name="notifications_policy_follower">A követettektől</string>
+	<string name="notifications_policy_no_one">Senkitől</string>
+	<string name="settings_notifications_policy">Értesítés fogadása</string>
+	<string name="notification_type_mentions_and_replies">Említések és válaszok</string>
+	<string name="pause_all_notifications_title">Minden értesítés szüneteltetése</string>
+	<plurals name="x_weeks">
+		<item quantity="one">1 hét</item>
+		<item quantity="other">%d hét</item>
+	</plurals>
 	<!-- %1$s is the date (may be relative, e.g. "today" or "yesterday"), %2$s is the time. You can reorder these placeholders if that works better for your language -->
+	<string name="today">ma</string>
+	<string name="yesterday">tegnap</string>
+	<string name="tomorrow">holnap</string>
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
+	<string name="open_system_notification_settings">Értesítések beállításai</string>
+	<string name="about_server">Névjegy</string>
+	<string name="server_rules">Szabályok</string>
+	<string name="server_administrator">Adminisztrátor</string>
+	<string name="settings_even_more">További beállítások</string>
+	<string name="settings_show_cws">Tartalmi figyelmeztetések megjelenítése</string>
+	<string name="settings_show_interaction_counts">Poszt interakció számláló</string>
+	<plurals name="x_hours_ago">
+		<item quantity="one">%d órája</item>
+		<item quantity="other">%d hónapja</item>
+	</plurals>
+	<string name="count_one">Egy</string>
+	<string name="count_two">Kettő</string>
+	<string name="count_three">Három</string>
+	<string name="count_four">Négy</string>
+	<string name="alt_text_reminder_post_anyway">Poszt</string>
 	<!-- %s is the username -->
+	<string name="unfollow_confirmation">%s kikövetése?</string>
+	<string name="filter_active">Aktív</string>
+	<string name="filter_inactive">Inaktív</string>
+	<string name="settings_add_filter">Szűrő hozzáadása</string>
+	<string name="settings_edit_filter">Szűrő szerkesztése</string>
+	<string name="settings_filter_duration">Időtartam</string>
+	<string name="settings_filter_muted_words">Némított szavak</string>
+	<string name="settings_filter_show_cw">Megjelenítés tartalmi figyelmeztetésekkel</string>
+	<string name="settings_delete_filter">Szűrő törlése</string>
+	<string name="filter_duration_forever">Állandó</string>
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
+	<plurals name="settings_x_muted_words">
+		<item quantity="one">%d néma szó vagy kifejezés</item>
+		<item quantity="other">%d néma szó vagy kifejezés</item>
+	</plurals>
+	<string name="filter_context_home_lists">Kezdőoldal &amp; listák</string>
+	<string name="filter_context_notifications">Értesítések</string>
+	<string name="filter_context_public_timelines">Nyilvános idővonalak</string>
+	<string name="filter_context_threads_replies">Témák &amp; válaszok</string>
+	<string name="filter_context_profiles">Profilok</string>
+	<string name="settings_filter_title">Cím</string>
+	<string name="settings_delete_filter_title">Szűrő törlése \"%s\"?</string>
+	<string name="settings_delete_filter_confirmation">Ez a szűrő minden eszközén törlődik a fiókjából.</string>
+	<string name="add_muted_word">Némított szó hozzáadása</string>
+	<string name="edit_muted_word">Némított szó szerkesztése</string>
+	<string name="add">Hozzáadás</string>
+	<string name="filter_word_or_phrase">Szó vagy kifejezés</string>
+	<string name="settings_delete_filter_word">Szó törlése \"%s\"?</string>
+	<string name="enter_selection_mode">Kijelölés</string>
+	<string name="select_all">Összes kijelölése</string>
+	<string name="settings_filter_duration_title">Szűrés időtartama</string>
+	<string name="filter_duration_custom">Egyéni</string>
+	<plurals name="settings_delete_x_filter_words">
+		<item quantity="one">%d szó törlése?</item>
+		<item quantity="other">%d szó törlése?</item>
+	</plurals>
+	<plurals name="x_items_selected">
+		<item quantity="one">%d kiválasztva</item>
+		<item quantity="other">%d kiválasztva</item>
+	</plurals>
+	<string name="required_form_field_blank">Nem lehet üres</string>
+	<string name="filter_word_already_in_list">Már szerepel a listán</string>
+	<string name="app_update_ready">App frissítés kész</string>
+	<string name="app_update_version">Verzió %s</string>
+	<string name="downloading_update">Letöltés (%d%%)</string>
 	<!-- Shown like a content warning, %s is the name of the filter -->
+	<string name="search_mastodon">Keresés a Mastodon-on</string>
+	<string name="search_open_url">URL megnyitása a Mastodonon</string>
 	<!-- Shown in the post header. Please keep it short -->
+	<string name="time_seconds_ago_short">%d mp-e</string>
+	<string name="time_minutes_ago_short">%d perce</string>
+	<string name="time_hours_ago_short">%d órája</string>
+	<string name="time_days_ago_short">%d napja</string>
 	<!-- %s is the name of the post language -->
+	<string name="translate_post">Fordítás erre: %s</string>
 	<!-- %1$s is the language, %2$s is the name of the translation service -->
+	<string name="translation_show_original">Eredeti megjelenítése</string>
+	<string name="translation_failed">A fordítás nem sikerült. Lehet, hogy a rendszergazda nem engedélyezte a fordításokat ezen a szerveren, vagy a szerveren a Mastodon egy régebbi verziója fut, ahol a fordítások még nem támogatottak.</string>
+	<string name="settings_privacy">Adatvédelem és elérhetőség</string>
+	<string name="settings_indexable">Nyilvános bejegyzések a keresési eredményekben</string>
+	<plurals name="x_participants">
+		<item quantity="one">%,d résztvevő</item>
+		<item quantity="other">%,d résztvevő</item>
+	</plurals>
+	<plurals name="x_posts_today">
+		<item quantity="one">%,d mai bejegyzés</item>
+		<item quantity="other">%,d mai bejegyzés</item>
+	</plurals>
+	<string name="error_playing_video">Hiba a videó lejátszásakor</string>
+	<string name="timeline_following">Kezdőoldal</string>
+	<string name="lists">Listák</string>
+	<string name="followed_hashtags">Követett címkék (hashtag)</string>
+	<string name="manage_lists">Listák kezelése</string>
+	<string name="manage_hashtags">Címkék kezelése</string>
 	<!-- Screen reader description for the menu on the home timeline screen -->
+	<string name="dropdown_menu">Legördülő menü</string>
+	<string name="edit_list">Lista szerkesztése</string>
+	<string name="list_members">Lista tagok</string>
+	<string name="delete_list">Lista törlése</string>
 	<!-- %s is the name of the list -->
+	<string name="list_name">Lista neve</string>
+	<string name="list_replies_members">A lista tagjai</string>
+	<string name="confirm_remove_list_members">Tagok eltávolítása?</string>
+	<string name="remove">Eltávolítás</string>
+	<string name="add_list_member">Tag hozzáadása</string>
+	<string name="add_user_to_list">Hozzáadás listához…</string>
+	<string name="add_user_to_list_title">Hozzáadás listához</string>
 	<!-- %s is a username -->
-	<string name="see_new_posts">Új bejegyzések megtekintése</string>
+	<string name="remove_from_list">Eltávolítás a listából</string>
+	<string name="confirm_remove_list_member">Tag eltávolítása?</string>
+	<string name="manage_accounts">Fiókok hozzáadása vagy váltása</string>
+	<string name="create_list">Lista létrehozása</string>
+	<string name="create">Létrehozás</string>
+	<string name="manage_list_members">Lista tagok kezelése</string>
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-hy-rAM/strings.xml b/mastodon/src/main/res/values-hy-rAM/strings.xml
index d5e4578c9..c2fefc2c3 100644
--- a/mastodon/src/main/res/values-hy-rAM/strings.xml
+++ b/mastodon/src/main/res/values-hy-rAM/strings.xml
@@ -93,10 +93,16 @@
 	<string name="confirm_mute_title">Լռեցնել հաշիվը</string>
 	<string name="confirm_mute">Հաստատեք %s-ի լռեցումը</string>
 	<string name="do_mute">Լռեցնել</string>
+	<string name="confirm_unmute_title">Հանել արգելափակումից</string>
+	<string name="confirm_unmute">Հաստատեք %s-ի` լռեցումից հեռացումը</string>
+	<string name="do_unmute">Ապախլացնել</string>
 	<string name="confirm_block_title">Արգելափակել հաշիվը</string>
 	<string name="confirm_block_domain_title">Արգելափակել տիրույթը</string>
 	<string name="confirm_block">Հաստատեք %s-ի արգելափակումը</string>
 	<string name="do_block">Արգելափակել</string>
+	<string name="confirm_unblock_title">Հանել արգելափակումից</string>
+	<string name="confirm_unblock_domain_title">Հանել տիրույթը արգելափակումից</string>
+	<string name="confirm_unblock">Հաստատեք %s-ի` արգելափակումից հանելը</string>
 	<string name="do_unblock">Արգելաբացել</string>
 	<string name="button_blocked">Արգելափակված</string>
 	<string name="action_vote">Քվեարկել</string>
@@ -146,18 +152,7 @@
 	<string name="password">Գաղտնաբառ</string>
 	<string name="confirm_password">Գաղտնաբառի հաստատում</string>
 	<string name="password_note">Գաղտնաբառի ապահովությունը բարձրացնելու համար ավելացրեք մեծատառեր, հատուկ նշաններ և թվեր։</string>
-	<string name="category_academia">Ակադեմիական</string>
-	<string name="category_activism">Ակտիվիզմ</string>
-	<string name="category_all">Բոլորը</string>
-	<string name="category_art">Արվեստ</string>
-	<string name="category_food">Ուտեստներ</string>
-	<string name="category_games">Խաղեր</string>
 	<string name="category_general">Ընդհանուր</string>
-	<string name="category_journalism">Լրագրություն</string>
-	<string name="category_lgbt">ԼԳԲՏ</string>
-	<string name="category_music">Երաժշտություն</string>
-	<string name="category_regional">Տարածաշրջանային</string>
-	<string name="category_tech">Տեխնոլոգիա</string>
 	<string name="confirm_email_title">Ստուգեք Ձեր էլ․ փոստը</string>
 	<!-- %s is the email address -->
 	<string name="confirm_email_subtitle">Սեղմեք %s-ին ուղարկված հղման վրա։ Մենք կսպասենք։</string>
@@ -172,6 +167,7 @@
 	<string name="visibility_public">Հրապարակային</string>
 	<string name="visibility_followers_only">Միայն հետեւողներին</string>
 	<string name="visibility_private">Միայն նշած մարդկանց</string>
+	<string name="recent_searches">Վերջին</string>
 	<string name="skip">Բաց թողնել</string>
 	<string name="notification_type_follow">Նոր հետևորդներ</string>
 	<string name="notification_type_favorite">Հավանումներ</string>
@@ -180,6 +176,9 @@
 	<string name="notification_type_poll">Հարցումներ</string>
 	<string name="choose_account">Ընտրել հաշիվը</string>
 	<string name="err_not_logged_in">Սկզբից մուտք գործեք Մաստոդոն</string>
+	<string name="media_attachment_unsupported_type">%s ֆայլը անհամատեղելի տեսակի է</string>
+	<string name="media_attachment_too_big">%1$s ֆայլի չափսը գերազանցում է %2$s ՄԲ առավելագույն շեմը</string>
+	<string name="settings_theme">Տեսք</string>
 	<string name="theme_light">Բաց</string>
 	<string name="theme_dark">Մուգ</string>
 	<string name="settings_behavior">Պահվածքը</string>
@@ -189,6 +188,9 @@
 	<string name="settings_tos">Ծառայության պայմանները</string>
 	<string name="settings_privacy_policy">Գաղտնիության քաղաքականություն</string>
 	<string name="settings_app_version">Մաստոդոն Android-ի համար, տարբերակ %1$s (%2$d)</string>
+	<string name="confirm_log_out">Դուրս գա՞լ %s-ից։</string>
+	<string name="sensitive_content_explain">Հեղինակը սա նշել է՝ որպես զգայուն բովանդակություն։</string>
+	<string name="avatar_description">Գնալ %s-ի հաշիվ</string>
 	<string name="more_options">Ավելին</string>
 	<string name="new_post">Նոր գրառում</string>
 	<string name="button_reply">Պատասխանել</string>
@@ -208,6 +210,7 @@
 	<string name="signup_reason">Ինչո՞ւ եք ցանկանում միանալ։</string>
 	<string name="signup_reason_note">Սա կօգնի մեզ ստուգել ձեր հայտը։</string>
 	<string name="clear">Մաքրել</string>
+	<string name="profile_header">Շապիկ</string>
 	<string name="profile_picture">Պրոֆիլի նկար</string>
 	<string name="reorder">Վերադասավորել</string>
 	<string name="download">Ներբեռնել</string>
@@ -227,6 +230,10 @@
 		<item quantity="one">%,d հետեւորդ</item>
 		<item quantity="other">%,d հետեւորդ</item>
 	</plurals>
+	<plurals name="x_following">
+		<item quantity="one">%,d հետեւում</item>
+		<item quantity="other">%,d հետեւում</item>
+	</plurals>
 	<plurals name="x_favorites">
 		<item quantity="one">%,d նախընտրելի</item>
 		<item quantity="other">%,d նախընտրելի</item>
@@ -235,7 +242,6 @@
 		<item quantity="one">%,d տարածում</item>
 		<item quantity="other">%,d տարածում</item>
 	</plurals>
-	<string name="timestamp_via_app">%1$s %2$s-ի միջոցով</string>
 	<string name="time_now">նոր</string>
 	<string name="edit_history">Խմբագրել պատմությունը</string>
 	<string name="last_edit_at_x">Վերջին խմբագրում՝ %s</string>
@@ -252,6 +258,7 @@
 	<string name="edit_original_post">Սկզբնական գրառում</string>
 	<string name="edit_text_edited">Տեքստը փոփոխվել է</string>
 	<string name="edit_spoiler_added">Ավելացվել է նախազգուշացում</string>
+	<string name="edit_spoiler_edited">Նախազգուշացումը խմբագրվել է</string>
 	<string name="edit_spoiler_removed">Նախազգուշացումը հեռացվել է</string>
 	<string name="edit_poll_added">Հարցումն ավելացել է</string>
 	<string name="edit_poll_edited">Հարցումը խմբագրվել է</string>
@@ -284,6 +291,7 @@
 	<string name="your_favorites">Հավանածներ</string>
 	<string name="login_title">Բարի վերադարձ</string>
 	<string name="server_url">Սերվերի հասցե</string>
+	<string name="signup_random_server_explain">Եթե շարունակեք՝ առանց ընտրելու, մենք կընտրենք սերվեր՝ ըստ ձեր լեզվի։</string>
 	<string name="server_filter_any_language">Որևե լեզու</string>
 	<string name="server_filter_instant_signup">Գրանցում միանգամից</string>
 	<string name="server_filter_manual_review">Հայտերի ստուգում</string>
@@ -301,7 +309,6 @@
 	<string name="profile_add_row">Ավելացնել տող</string>
 	<string name="profile_setup">Հաշվի կարգավորում</string>
 	<string name="profile_setup_subtitle">Դուք կարող եք սա կատարել ավելի ուշ` Հաշիվ բաժնում։</string>
-	<string name="profile_setup_explanation">Դուք կարող եք ավելացնել ոչ ավել, քան չորս դաշտ։ Ավելացրեք այն, ինչ ուզում եք` դիրք, հղումներ, դերանուններ և այլն։</string>
 	<string name="popular_on_mastodon">Տարածված Մաստոդոնում</string>
 	<string name="follow_all">Հետևել բոլորին</string>
 	<string name="server_rules_disagree">Համաձայն չեմ</string>
@@ -368,6 +375,7 @@
 	<!-- %s is the server domain -->
 	<string name="forward_report_to_server">Ուղարկել %s</string>
 	<!-- Shown on the "stamp" on the screen that appears after you report a post/user. Please keep the translation short, preferably a single word -->
+	<string name="reported">Բողոքարկված</string>
 	<string name="muted_user">%s-ը լռեցվել է</string>
 	<string name="settings_display">Տեսք</string>
 	<!-- %s is the app name (Mastodon, key app_name). I made it a placeholder so everything Just Works™ with forks -->
@@ -447,5 +455,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
-	<string name="see_new_posts">Նոր գրառումներ</string>
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-ig-rNG/strings.xml b/mastodon/src/main/res/values-ig-rNG/strings.xml
index d610a4e07..e428c80dc 100644
--- a/mastodon/src/main/res/values-ig-rNG/strings.xml
+++ b/mastodon/src/main/res/values-ig-rNG/strings.xml
@@ -25,4 +25,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-in-rID/strings.xml b/mastodon/src/main/res/values-in-rID/strings.xml
index aad346d82..6caeccfae 100644
--- a/mastodon/src/main/res/values-in-rID/strings.xml
+++ b/mastodon/src/main/res/values-in-rID/strings.xml
@@ -151,19 +151,7 @@
 	<string name="password">Kata sandi</string>
 	<string name="confirm_password">Konfirmasi kata sandi</string>
 	<string name="password_note">Tambahkan huruf besar, karakter spesial, dan nomor untuk meningkatkan kekuatan kata sandi Anda.</string>
-	<string name="category_academia">Akademisi</string>
-	<string name="category_activism">Aktivisme</string>
-	<string name="category_all">Semua</string>
-	<string name="category_art">Seni</string>
-	<string name="category_food">Makanan</string>
-	<string name="category_furry">Furry</string>
-	<string name="category_games">Permainan</string>
 	<string name="category_general">Umum</string>
-	<string name="category_journalism">Jurnalisme</string>
-	<string name="category_lgbt">LGBT</string>
-	<string name="category_music">Musik</string>
-	<string name="category_regional">Regional</string>
-	<string name="category_tech">Teknologi</string>
 	<string name="confirm_email_title">Periksa Kotak Masuk Anda</string>
 	<!-- %s is the email address -->
 	<string name="confirm_email_subtitle">Ketuk tautan yang kami kirim kepada Anda untuk memverifikasi %s. Kami akan tunggu di sini.</string>
@@ -267,7 +255,6 @@
 	<plurals name="x_reblogs">
 		<item quantity="other">%,d boost</item>
 	</plurals>
-	<string name="timestamp_via_app">%1$s melalui %2$s</string>
 	<string name="time_now">sekarang</string>
 	<string name="edit_history">Riwayat penyuntingan</string>
 	<string name="last_edit_at_x">Terakhir disunting %s</string>
@@ -337,7 +324,6 @@
 	<string name="profile_add_row">Tambahkan baris</string>
 	<string name="profile_setup">Pengaturan profil</string>
 	<string name="profile_setup_subtitle">Anda dapat selalu menyelesaikan ini nanti di tab Profil.</string>
-	<string name="profile_setup_explanation">Anda dapat menambahkan hingga empat kolom baris untuk apa saja yang Anda inginkan. Lokasi, tautan, kata ganti — langit adalah batasnya.</string>
 	<string name="popular_on_mastodon">Populer di Mastodon</string>
 	<string name="follow_all">Ikuti semua</string>
 	<string name="server_rules_disagree">Tolak</string>
@@ -570,5 +556,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
-	<string name="see_new_posts">Lihat kiriman baru</string>
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-is-rIS/strings.xml b/mastodon/src/main/res/values-is-rIS/strings.xml
index b833ab538..c1235a63b 100644
--- a/mastodon/src/main/res/values-is-rIS/strings.xml
+++ b/mastodon/src/main/res/values-is-rIS/strings.xml
@@ -163,19 +163,7 @@
 	<string name="password">Lykilorð</string>
 	<string name="confirm_password">Staðfestu lykilorðið</string>
 	<string name="password_note">Settu hástafi, sértákn og tölustafi til að auka styrk lykilorðins þíns.</string>
-	<string name="category_academia">Akademískt</string>
-	<string name="category_activism">Aðgerðasinnar</string>
-	<string name="category_all">Allt</string>
-	<string name="category_art">Listir</string>
-	<string name="category_food">Matur</string>
-	<string name="category_furry">Loðið</string>
-	<string name="category_games">Leikir</string>
 	<string name="category_general">Almennt</string>
-	<string name="category_journalism">Blaðamennska</string>
-	<string name="category_lgbt">LGBT</string>
-	<string name="category_music">Tónlist</string>
-	<string name="category_regional">Svæðisbundið</string>
-	<string name="category_tech">Tækni</string>
 	<string name="confirm_email_title">Athugaðu innhólfið þitt</string>
 	<!-- %s is the email address -->
 	<string name="confirm_email_subtitle">Ýttu á tengilinn sem við sendum þér til að staðfesta %s. Við bíðum á meðan.</string>
@@ -285,7 +273,6 @@
 		<item quantity="one">%,d endurbirting</item>
 		<item quantity="other">%,d endurbirtingar</item>
 	</plurals>
-	<string name="timestamp_via_app">%1$s með %2$s</string>
 	<string name="time_now">núna</string>
 	<string name="edit_history">Breytingaferill</string>
 	<string name="last_edit_at_x">Síðasta breyting %s</string>
@@ -357,7 +344,6 @@
 	<string name="profile_add_row">Bæta við röð</string>
 	<string name="profile_setup">Uppsetning notandasniðs</string>
 	<string name="profile_setup_subtitle">Þú getur alltaf klárað þetta síðar á notendasniðaflipanum.</string>
-	<string name="profile_setup_explanation">Þú getur bætt við allt að fjórum gagnasviðum að eigin vali. Staðsetning, tenglar, fornöfn - ímyndunaraflið er einu takmörkin.</string>
 	<string name="popular_on_mastodon">Vinsælt á Mastodon</string>
 	<string name="follow_all">Fylgjast með öllum</string>
 	<string name="server_rules_disagree">Ósammála</string>
@@ -603,8 +589,6 @@
 	<string name="timeline_following">Heim</string>
 	<string name="lists">Listar</string>
 	<string name="followed_hashtags">Myllumerki sem fylgst er með</string>
-	<string name="no_lists">Þú ert ekki ennþá með neina lista.</string>
-	<string name="no_followed_hashtags">Þú fylgist ekki með neinum myllumerkjum.</string>
 	<string name="manage_lists">Sýsla með lista</string>
 	<string name="manage_hashtags">Sýsla með myllumerki</string>
 	<!-- Screen reader description for the menu on the home timeline screen -->
@@ -646,4 +630,5 @@
 	<string name="manage_list_members">Sýsla með meðlimi listans</string>
 	<string name="list_no_members">Engir meðlimir ennþá</string>
 	<string name="list_find_users">Finndu notendur til að bæta við</string>
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-it-rIT/strings.xml b/mastodon/src/main/res/values-it-rIT/strings.xml
index 51470d41b..9fe8cd486 100644
--- a/mastodon/src/main/res/values-it-rIT/strings.xml
+++ b/mastodon/src/main/res/values-it-rIT/strings.xml
@@ -163,19 +163,7 @@
 	<string name="password">Password</string>
 	<string name="confirm_password">Conferma la password</string>
 	<string name="password_note">Includi lettere maiuscole, caratteri speciali e numeri per aumentare la forza della tua password.</string>
-	<string name="category_academia">Accademia</string>
-	<string name="category_activism">Attivismo</string>
-	<string name="category_all">Tutto</string>
-	<string name="category_art">Arte</string>
-	<string name="category_food">Alimenti</string>
-	<string name="category_furry">Peloso</string>
-	<string name="category_games">Giochi</string>
 	<string name="category_general">Generale</string>
-	<string name="category_journalism">Giornalismo</string>
-	<string name="category_lgbt">LGBT</string>
-	<string name="category_music">Musica</string>
-	<string name="category_regional">Regionale</string>
-	<string name="category_tech">Tecnologia</string>
 	<string name="confirm_email_title">Controlla la tua casella di posta</string>
 	<!-- %s is the email address -->
 	<string name="confirm_email_subtitle">Tocca il collegamento che ti abbiamo inviato per verificare %s. Aspetteremo proprio qui.</string>
@@ -285,7 +273,6 @@
 		<item quantity="one">%,d condivisione</item>
 		<item quantity="other">%,d condivisioni</item>
 	</plurals>
-	<string name="timestamp_via_app">%1$s tramite %2$s</string>
 	<string name="time_now">ora</string>
 	<string name="edit_history">Cronologia delle modifiche</string>
 	<string name="last_edit_at_x">Ultima modifica: %s</string>
@@ -357,7 +344,6 @@
 	<string name="profile_add_row">Aggiungi riga</string>
 	<string name="profile_setup">Configurazione del profilo</string>
 	<string name="profile_setup_subtitle">Puoi sempre completarlo più tardi nella scheda Profilo.</string>
-	<string name="profile_setup_explanation">Puoi aggiungere fino a quattro campi del profilo per tutto ciò che desideri. Posizione, collegamenti, pronomi — il limite è il cielo.</string>
 	<string name="popular_on_mastodon">Popolare su Mastodon</string>
 	<string name="follow_all">Segui tutto</string>
 	<string name="server_rules_disagree">Non sono d\'accordo</string>
@@ -603,8 +589,6 @@
 	<string name="timeline_following">Inizio</string>
 	<string name="lists">Liste</string>
 	<string name="followed_hashtags">Hashtag seguiti</string>
-	<string name="no_lists">Non hai ancora nessuna lista.</string>
-	<string name="no_followed_hashtags">Non segui alcun hashtag.</string>
 	<string name="manage_lists">Gestisci le liste</string>
 	<string name="manage_hashtags">Gestisci gli hashtag</string>
 	<!-- Screen reader description for the menu on the home timeline screen -->
@@ -646,4 +630,28 @@
 	<string name="manage_list_members">Gestisci i membri della lista</string>
 	<string name="list_no_members">Ancora nessun membro</string>
 	<string name="list_find_users">Trova gli utenti da aggiungere</string>
+	<string name="reply_to_user">Risposta a %s</string>
+	<string name="posted_at">Postato: %s</string>
+	<string name="non_mutual_sheet_title">Ciao, nuova connessione!</string>
+	<string name="non_mutual_sheet_text">Sembra che tu stia per rispondere a qualcuno che non ha ancora una connessione reciproca. Facciamo un\'ottima prima impressione.</string>
+	<string name="got_it">Ho capito</string>
+	<string name="dont_remind_again">Non ricordarmelo di nuovo</string>
+	<!-- %s is a time interval ("5 months") -->
+	<string name="old_post_sheet_title">Questo post è vecchio di %s</string>
+	<string name="old_post_sheet_text">Puoi ancora rispondere, ma potrebbe non essere più rilevante.</string>
+	<plurals name="x_months">
+		<item quantity="one">%,d mese</item>
+		<item quantity="other">%,d mesi</item>
+	</plurals>
+	<string name="more_than_two_years">più di 2 anni</string>
+	<string name="non_mutual_title1">Rimani rispettoso &amp; pertinente</string>
+	<string name="non_mutual_text1">Assicurati che la tua risposta sia cortese e in tema.</string>
+	<string name="non_mutual_title2">Abbraccia la gentilezza</string>
+	<string name="non_mutual_text2">Un tono positivo è sempre apprezzato.</string>
+	<string name="non_mutual_title3">Sii aperto</string>
+	<string name="non_mutual_text3">Lo stile di conversazione di ognuno è unico. Sii pronto ad adattarti.</string>
+	<string name="make_profile_discoverable">Rendi il mio profilo rilevabile</string>
+	<string name="discoverability">Rilevabilità</string>
+	<string name="discoverability_help">Quando attivi la rilevabilità su Mastodon, i tuoi post potrebbero apparire nei risultati di ricerca e nelle tendenze.\n\nIl tuo profilo potrebbe essere suggerito a persone con interessi simili ai tuoi.\n\nLa disattivazione non nasconde il tuo profilo se qualcuno ti cerca per nome.</string>
+	<string name="app_version_copied">Numero di versione copiato negli appunti</string>
 </resources>
diff --git a/mastodon/src/main/res/values-iw-rIL/strings.xml b/mastodon/src/main/res/values-iw-rIL/strings.xml
index f2654784d..4c298b67f 100644
--- a/mastodon/src/main/res/values-iw-rIL/strings.xml
+++ b/mastodon/src/main/res/values-iw-rIL/strings.xml
@@ -58,16 +58,7 @@
 	<string name="report_reason_other_subtitle">הבעיה לא מתאימה לקטגוריות האחרות</string>
 	<string name="report_choose_rule">אילו חוקים נשברים כאן?</string>
 	<string name="report_choose_rule_subtitle">בחרו את כל מה שרלוונטי</string>
-	<string name="category_academia">אקדמיה</string>
-	<string name="category_activism">אקטיביזם</string>
-	<string name="category_all">הכל</string>
-	<string name="category_art">אומנות</string>
-	<string name="category_food">אוכל</string>
-	<string name="category_furry">פרוותי</string>
-	<string name="category_games">משחקים</string>
 	<string name="category_general">כללי</string>
-	<string name="category_journalism">עיתונאות</string>
-	<string name="category_lgbt">להט״ב</string>
 	<!-- %s is the email address -->
 	<!-- %s is the server domain -->
 	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
@@ -93,4 +84,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-ja-rJP/strings.xml b/mastodon/src/main/res/values-ja-rJP/strings.xml
index c403c3b1a..b33f8aaf7 100644
--- a/mastodon/src/main/res/values-ja-rJP/strings.xml
+++ b/mastodon/src/main/res/values-ja-rJP/strings.xml
@@ -151,19 +151,7 @@
 	<string name="password">パスワード</string>
 	<string name="confirm_password">パスワードの確認</string>
 	<string name="password_note">パスワードの強度を高めるため、英大文字・数字・特殊文字を含めてください。</string>
-	<string name="category_academia">学問</string>
-	<string name="category_activism">社会運動</string>
-	<string name="category_all">すべて</string>
-	<string name="category_art">芸術</string>
-	<string name="category_food">食べ物</string>
-	<string name="category_furry">動物</string>
-	<string name="category_games">ゲーム</string>
 	<string name="category_general">一般</string>
-	<string name="category_journalism">ジャーナリズム</string>
-	<string name="category_lgbt">LGBT</string>
-	<string name="category_music">音楽</string>
-	<string name="category_regional">地域</string>
-	<string name="category_tech">技術</string>
 	<string name="confirm_email_title">確認のメールを送信しました</string>
 	<!-- %s is the email address -->
 	<string name="confirm_email_subtitle">%s を認証するためのリンクをメールで送信しました。リンクをタップしてメールアドレスを認証し、この画面に戻ってきてください。</string>
@@ -268,7 +256,6 @@
 	<plurals name="x_reblogs">
 		<item quantity="other">ブースト %,d 件</item>
 	</plurals>
-	<string name="timestamp_via_app">%1$s に %2$s から投稿</string>
 	<string name="time_now">今</string>
 	<string name="edit_history">編集履歴</string>
 	<string name="last_edit_at_x">最終更新 %s</string>
@@ -338,7 +325,6 @@
 	<string name="profile_add_row">フィールドを追加</string>
 	<string name="profile_setup">プロフィールの設定</string>
 	<string name="profile_setup_subtitle">プロフィール画面であとから設定することもできます。</string>
-	<string name="profile_setup_explanation">プロフィールには 4 つまでフィールドを追加できます。現在地やウェブサイト、座右の銘など、なんでも自由に書いてみましょう。</string>
 	<string name="popular_on_mastodon">人気のアカウント</string>
 	<string name="follow_all">すべてフォロー</string>
 	<string name="server_rules_disagree">同意しない</string>
@@ -572,8 +558,6 @@
 	<string name="timeline_following">ホーム</string>
 	<string name="lists">リスト</string>
 	<string name="followed_hashtags">フォロー中のハッシュタグ</string>
-	<string name="no_lists">まだリストがありません。</string>
-	<string name="no_followed_hashtags">ハッシュタグをフォローしていません。</string>
 	<string name="manage_lists">リストを管理</string>
 	<string name="manage_hashtags">ハッシュタグを管理</string>
 	<!-- Screen reader description for the menu on the home timeline screen -->
@@ -614,4 +598,27 @@
 	<string name="manage_list_members">リストのメンバーを管理</string>
 	<string name="list_no_members">まだメンバーがいません</string>
 	<string name="list_find_users">追加したいユーザーを探す</string>
+	<string name="reply_to_user">%s に返信</string>
+	<string name="posted_at">%s に投稿しました</string>
+	<string name="non_mutual_sheet_title">新しい関係を始めよう！</string>
+	<string name="non_mutual_sheet_text">相互フォローでない誰かに返信しようとしているようです。素晴らしい第一印象を与えましょう。</string>
+	<string name="got_it">了解</string>
+	<string name="dont_remind_again">次回からリマインドしない</string>
+	<!-- %s is a time interval ("5 months") -->
+	<string name="old_post_sheet_title">この投稿から %s 経過しています</string>
+	<string name="old_post_sheet_text">まだ返信することはできますが、関連性がなくなっているかもしれません。</string>
+	<plurals name="x_months">
+		<item quantity="other">%,d か月</item>
+	</plurals>
+	<string name="more_than_two_years">2 年以上</string>
+	<string name="non_mutual_title1">尊重し合う姿勢と関連性を意識しましょう</string>
+	<string name="non_mutual_text1">返信が失礼でないか、話題から逸れていないかを確認してください。</string>
+	<string name="non_mutual_title2">優しさを持ちましょう</string>
+	<string name="non_mutual_text2">ポジティブなトーンは常に好まれます。</string>
+	<string name="non_mutual_title3">オープンでいましょう</string>
+	<string name="non_mutual_text3">会話スタイルは十人十色です。適応する準備をしておきましょう。</string>
+	<string name="make_profile_discoverable">プロフィールを見つけられるようにする</string>
+	<string name="discoverability">見つけられやすさ</string>
+	<string name="discoverability_help">Mastodon で見つけられやすさをオプトインにすると、投稿を検索結果やトレンドに表示することがあります。\n\nあなたと似た興味を持つ人にプロフィールが候補表示されることもあります。\n\nオプトアウトしても、名前で検索された場合はプロフィールが表示されます。</string>
+	<string name="app_version_copied">バージョン番号をクリップボードにコピーしました</string>
 </resources>
diff --git a/mastodon/src/main/res/values-kab/strings.xml b/mastodon/src/main/res/values-kab/strings.xml
index ade09fa5a..f126726e5 100644
--- a/mastodon/src/main/res/values-kab/strings.xml
+++ b/mastodon/src/main/res/values-kab/strings.xml
@@ -132,19 +132,7 @@
 	<string name="password">Awal uffir</string>
 	<string name="confirm_password">Sentem awal uffir</string>
 	<string name="password_note">Seddu isekkilen imeqqranen, isekkilen imaẓlayen d wuṭṭunen i useǧhed ugar n wawal-ik•im uffir.</string>
-	<string name="category_academia">Akadimi</string>
-	<string name="category_activism">Tinuɣmest</string>
-	<string name="category_all">Akk</string>
-	<string name="category_art">Taẓuri</string>
-	<string name="category_food">Učči</string>
-	<string name="category_furry">S taḍut</string>
-	<string name="category_games">Uraren</string>
 	<string name="category_general">Amatu</string>
-	<string name="category_journalism">Taɣamsa</string>
-	<string name="category_lgbt">LGBT</string>
-	<string name="category_music">Aẓawan</string>
-	<string name="category_regional">Amnaḍan</string>
-	<string name="category_tech">Atiknikan</string>
 	<!-- %s is the email address -->
 	<string name="resend">Ales tuzna</string>
 	<string name="open_email_app">Ldi asnas n yimayl</string>
@@ -208,7 +196,6 @@
 	<string name="button_follow_pending">Yettraǧu</string>
 	<string name="follows_you">Yeṭṭafaṛ-ik·em-id</string>
 	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
-	<string name="timestamp_via_app">%1$s s %2$s</string>
 	<string name="time_now">tura</string>
 	<string name="time_just_now">tura kan</string>
 	<string name="edit">Ẓreg</string>
@@ -246,5 +233,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
-	<string name="see_new_posts">Ẓer tissufaɣ timaynutin</string>
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-ko-rKR/strings.xml b/mastodon/src/main/res/values-ko-rKR/strings.xml
index a65c3b040..0c2371953 100644
--- a/mastodon/src/main/res/values-ko-rKR/strings.xml
+++ b/mastodon/src/main/res/values-ko-rKR/strings.xml
@@ -126,19 +126,7 @@
 	<string name="password">암호</string>
 	<string name="confirm_password">암호 확인</string>
 	<string name="password_note">대문자, 특수문자, 숫자를 포함해서 암호의 강도를 높이세요.</string>
-	<string name="category_academia">학술</string>
-	<string name="category_activism">사회운동</string>
-	<string name="category_all">모두</string>
-	<string name="category_art">예술</string>
-	<string name="category_food">음식</string>
-	<string name="category_furry">수인</string>
-	<string name="category_games">게임</string>
 	<string name="category_general">일반</string>
-	<string name="category_journalism">언론</string>
-	<string name="category_lgbt">LGBT</string>
-	<string name="category_music">음악</string>
-	<string name="category_regional">지역</string>
-	<string name="category_tech">기술</string>
 	<string name="confirm_email_title">받은 편지함을 확인하세요</string>
 	<!-- %s is the email address -->
 	<string name="resend">재전송</string>
@@ -214,7 +202,6 @@
 	<plurals name="x_favorites">
 		<item quantity="other">%,d개의 좋아요</item>
 	</plurals>
-	<string name="timestamp_via_app">%1$s에 %2$s에서</string>
 	<string name="time_now">방금</string>
 	<string name="edit_history">수정 내역</string>
 	<string name="last_edit_at_x">마지막 수정: %s</string>
@@ -304,5 +291,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
-	<string name="see_new_posts">새 게시물 보기</string>
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-my-rMM/strings.xml b/mastodon/src/main/res/values-my-rMM/strings.xml
index 82722f2b0..169d2f43c 100644
--- a/mastodon/src/main/res/values-my-rMM/strings.xml
+++ b/mastodon/src/main/res/values-my-rMM/strings.xml
@@ -113,18 +113,7 @@
 	<string name="password">စကားဝှက်</string>
 	<string name="confirm_password">စကားဝှက်ကို အတည်ပြုပါ</string>
 	<string name="password_note">သင့်စကားဝှက်ခိုင်မာမှုကို မြှင့်တင်ရန် စာလုံးအကြီးများ၊ special character များနှင့် နံပါတ်များထည့်သွင်းပါ။</string>
-	<string name="category_academia">ပညာရေး</string>
-	<string name="category_activism">တက်ကြွလှုပ်ရှားမှု</string>
-	<string name="category_all">အားလုံး</string>
-	<string name="category_art">အနုပညာ</string>
-	<string name="category_food">အစားအသောက်</string>
-	<string name="category_games">ဂိမ်း</string>
 	<string name="category_general">အထွေထွေ</string>
-	<string name="category_journalism">သတင်းစာပညာ</string>
-	<string name="category_lgbt">LGBT</string>
-	<string name="category_music">ဂီတ</string>
-	<string name="category_regional">ဒေသဆိုင်ရာ</string>
-	<string name="category_tech">နည်းပညာ</string>
 	<string name="confirm_email_title">သင့်အီးမေးလ် စာဝင်ပုံးကို စစ်ဆေးပါ</string>
 	<!-- %s is the email address -->
 	<string name="media_attachment_unsupported_type">ဖိုင် %s သည် ထောက်ပံ့မပေးထားသည့်အမျိုးအစားဖြစ်သည်</string>
@@ -185,4 +174,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-nl-rNL/strings.xml b/mastodon/src/main/res/values-nl-rNL/strings.xml
index 50cc264e7..7d2071039 100644
--- a/mastodon/src/main/res/values-nl-rNL/strings.xml
+++ b/mastodon/src/main/res/values-nl-rNL/strings.xml
@@ -163,19 +163,7 @@
 	<string name="password">Wachtwoord</string>
 	<string name="confirm_password">Wachtwoord bevestigen</string>
 	<string name="password_note">Voeg hoofdletters, speciale tekens en cijfers toe om je wachtwoord veiliger te maken.</string>
-	<string name="category_academia">Academisch</string>
-	<string name="category_activism">Activisme</string>
-	<string name="category_all">Alle</string>
-	<string name="category_art">Kunst</string>
-	<string name="category_food">Voedsel</string>
-	<string name="category_furry">Furry</string>
-	<string name="category_games">Games</string>
 	<string name="category_general">Algemeen</string>
-	<string name="category_journalism">Journalistiek</string>
-	<string name="category_lgbt">LHBTQIA+</string>
-	<string name="category_music">Muziek</string>
-	<string name="category_regional">Regionaal</string>
-	<string name="category_tech">Tech</string>
 	<string name="confirm_email_title">Controleer je Postvak In</string>
 	<!-- %s is the email address -->
 	<string name="confirm_email_subtitle">Klik op de koppeling die we je hebben gestuurd om %s te verifiëren. We wachten op je.</string>
@@ -284,7 +272,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">nu</string>
 	<string name="edit_history">Bewerkingsgeschiedenis</string>
 	<string name="last_edit_at_x">Laatste bewerking op %s</string>
@@ -356,7 +343,6 @@
 	<string name="profile_add_row">Rij toevoegen</string>
 	<string name="profile_setup">Profiel instellen</string>
 	<string name="profile_setup_subtitle">Je kunt dit later altijd aanvullen op het tabblad Profiel.</string>
-	<string name="profile_setup_explanation">Je kunt tot vier profielvelden toevoegen voor alles wat je wilt. Locatie, links, voornaamwoorden – de mogelijkheden zijn eindeloos.</string>
 	<string name="popular_on_mastodon">Populair op Mastodon</string>
 	<string name="follow_all">Volg iedereen</string>
 	<string name="server_rules_disagree">Ik ga niet akkoord</string>
@@ -598,5 +584,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
-	<string name="see_new_posts">Nieuwe berichten</string>
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-no-rNO/strings.xml b/mastodon/src/main/res/values-no-rNO/strings.xml
index 565f0dfab..5d42256d0 100644
--- a/mastodon/src/main/res/values-no-rNO/strings.xml
+++ b/mastodon/src/main/res/values-no-rNO/strings.xml
@@ -163,19 +163,7 @@
 	<string name="password">Passord</string>
 	<string name="confirm_password">Bekreft passord</string>
 	<string name="password_note">Inkluder store bokstaver, spesialtegn og tall for å øke passordstyrken.</string>
-	<string name="category_academia">Akademi</string>
-	<string name="category_activism">Aktivisme</string>
-	<string name="category_all">Alle</string>
-	<string name="category_art">Kunst</string>
-	<string name="category_food">Mat</string>
-	<string name="category_furry">Pelskledde</string>
-	<string name="category_games">Spill</string>
 	<string name="category_general">Generelt</string>
-	<string name="category_journalism">Journalisme</string>
-	<string name="category_lgbt">LHBT</string>
-	<string name="category_music">Musikk</string>
-	<string name="category_regional">Region</string>
-	<string name="category_tech">Teknologi</string>
 	<string name="confirm_email_title">Sjekk innboksen din</string>
 	<!-- %s is the email address -->
 	<string name="confirm_email_subtitle">Trykk på linken vi sendte deg for å verifisere %s. Vi venter her.</string>
@@ -262,6 +250,7 @@
 	<!-- %s is the server domain -->
 	<string name="local_timeline_info_banner">Dette er alle innlegg fra alle brukere på din server (%s).</string>
 	<string name="recommended_accounts_info_banner">Du liker kanskje disse kontoene basert på de andre du følger.</string>
+	<string name="see_new_posts">Nye innlegg</string>
 	<string name="load_missing_posts">Last inn manglende innlegg</string>
 	<string name="follow_back">Følg tilbake</string>
 	<string name="button_follow_pending">Ventende</string>
@@ -284,7 +273,6 @@
 		<item quantity="one">%,d fremhev</item>
 		<item quantity="other">%,d fremheve</item>
 	</plurals>
-	<string name="timestamp_via_app">%1$s via %2$s</string>
 	<string name="time_now">nå</string>
 	<string name="edit_history">Rediger historikk</string>
 	<string name="last_edit_at_x">Sist redigert %s</string>
@@ -356,7 +344,6 @@
 	<string name="profile_add_row">Legg til rad</string>
 	<string name="profile_setup">Konfigurering av profil</string>
 	<string name="profile_setup_subtitle">Du kan alltid fullføre dette senere i profilfanen.</string>
-	<string name="profile_setup_explanation">Du kan legge opp til fire profilfelter for det du vil. Plassering, lenker, uttalelser – himmelen er grensen.</string>
 	<string name="popular_on_mastodon">Populært på Mastodon</string>
 	<string name="follow_all">Følg alle</string>
 	<string name="server_rules_disagree">Uenig</string>
@@ -386,6 +373,7 @@
 	<string name="welcome_to_mastodon">Velkommen til Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon er et desentralisert sosialt nettverk, som betyr at ingen selskaper kontrollerer det. Det består av mange uavhengige servere som er koblet sammen.</string>
 	<string name="what_are_servers">Hva er en server?</string>
+	<string name="welcome_paragraph2">Hver Mastodon konto ligger på en server - hver med sine egne verdier, regler, &amp; administratorer. Uansett hvilken du velger, kan du følge og samhandle med folk på hvilken som helst server.</string>
 	<string name="opening_link">Åpner link…</string>
 	<string name="link_not_supported">Denne linken støttes ikke av appen</string>
 	<string name="log_out_all_accounts">Logg ut av alle kontoer</string>
@@ -581,8 +569,89 @@
 	<string name="time_hours_ago_short">%dt siden</string>
 	<string name="time_days_ago_short">%dd siden</string>
 	<!-- %s is the name of the post language -->
+	<string name="translate_post">Oversett fra %s</string>
 	<!-- %1$s is the language, %2$s is the name of the translation service -->
+	<string name="post_translated">Oversatt fra %1$s ved å bruke %2$s</string>
+	<string name="translation_show_original">Vi original</string>
+	<string name="translation_failed">Oversettelsen mislyktes. Kanskje administratoren ikke har aktivert oversettelser på denne serveren, eller denne serveren kjører en eldre versjon av Mastodon der oversettelser ennå ikke støttes.</string>
+	<string name="settings_privacy">Personvern og rekkevidde</string>
+	<string name="settings_discoverable">Fremhevet profiler og innlegg i oppdagelsesalgoritmer</string>
+	<string name="settings_indexable">Inkluder offentlige innlegg i søkeresultatene</string>
+	<plurals name="x_participants">
+		<item quantity="one">%,d deltaker</item>
+		<item quantity="other">%,d deltakere</item>
+	</plurals>
+	<plurals name="x_posts_today">
+		<item quantity="one">%,d innlegg idag</item>
+		<item quantity="other">%,d innlegg i dag</item>
+	</plurals>
+	<string name="error_playing_video">Feil ved avspilling av video</string>
+	<string name="timeline_following">Hjem</string>
+	<string name="lists">Lister</string>
+	<string name="followed_hashtags">Fulgte emneknagger</string>
+	<string name="manage_lists">Behandle lister</string>
+	<string name="manage_hashtags">Behandle emneknagger</string>
 	<!-- Screen reader description for the menu on the home timeline screen -->
+	<string name="dropdown_menu">Nedtrekksmeny</string>
+	<string name="edit_list">Rediger liste</string>
+	<string name="list_members">Vis medlemmer</string>
+	<string name="delete_list">Slett liste</string>
 	<!-- %s is the name of the list -->
+	<string name="delete_list_confirm">Slette \"%s\"?</string>
+	<string name="list_exclusive">Gjem medlemmer i følger</string>
+	<string name="list_exclusive_subtitle">Hvis noen er på denne listen, skjul dem på tidslinjen på din neste side for å unngå å se innleggene deres to ganger.</string>
+	<string name="list_name">Navn på liste</string>
+	<string name="list_show_replies_to">Vis svar til</string>
+	<string name="list_replies_no_one">Ingen</string>
+	<string name="list_replies_members">Medlemmer i listen</string>
+	<string name="list_replies_anyone">Alle jeg følger</string>
+	<string name="confirm_remove_list_members">Fjern medlemmer?</string>
+	<string name="remove">Fjern</string>
+	<string name="add_list_member">Legg til medlem</string>
+	<string name="search_among_people_you_follow">Søk blant personer du følger</string>
+	<string name="add_user_to_list">Legg til i liste…</string>
+	<string name="add_user_to_list_title">Legg til i liste</string>
 	<!-- %s is a username -->
+	<string name="manage_user_lists">Behandle liste %s vises på</string>
+	<string name="remove_from_list">Fjern fra liste</string>
+	<string name="confirm_remove_list_member">Fjern medlem?</string>
+	<string name="no_followed_hashtags_title">Holde deg oppdatert ved å følge emneknagger</string>
+	<string name="no_followed_hashtags_subtitle">Følgere vises her</string>
+	<string name="no_lists_title">Organiser tidslinjen din med lister</string>
+	<string name="no_lists_subtitle">Din vil vises her</string>
+	<string name="manage_accounts">Legg til eller bytt konto</string>
+	<plurals name="x_posts_recently">
+		<item quantity="one">%,d nylig innlegg</item>
+		<item quantity="other">%,d nylig innlegg</item>
+	</plurals>
+	<string name="create_list">Lag liste</string>
+	<string name="step_x_of_y">Steg %1$d av %2$d</string>
+	<string name="create">Opprett</string>
+	<string name="manage_list_members">Administrere listemedlemmer</string>
+	<string name="list_no_members">Ingen medlemmer ennå</string>
+	<string name="list_find_users">Finn brukere å legge til</string>
+	<string name="reply_to_user">Svar til %s</string>
+	<string name="posted_at">Postet på %s</string>
+	<string name="non_mutual_sheet_title">Hei, ny tilkobling!</string>
+	<string name="non_mutual_sheet_text">Ser ut som du er i ferd med å svare til noen som ikke er i en gjensidig forbindelse ennå. La oss gjøre et godt førsteinntrykk.</string>
+	<string name="got_it">Forstått</string>
+	<string name="dont_remind_again">Ikke spør meg igjen</string>
+	<!-- %s is a time interval ("5 months") -->
+	<string name="old_post_sheet_title">Dette innlegget er %s gammelt</string>
+	<string name="old_post_sheet_text">Du kan fortsatt svare, men det er ikke lenger relevant.</string>
+	<plurals name="x_months">
+		<item quantity="one">%,d måned</item>
+		<item quantity="other">%,d måneder</item>
+	</plurals>
+	<string name="more_than_two_years">mer enn 2 år</string>
+	<string name="non_mutual_title1">Vær respektfull &amp; relevant</string>
+	<string name="non_mutual_text1">Sikre at svaret ditt er høflig og har samme emne.</string>
+	<string name="non_mutual_title2">Omfavn vennlighet</string>
+	<string name="non_mutual_text2">En positiv tone blir alltid verdsatt.</string>
+	<string name="non_mutual_title3">Vær åpen</string>
+	<string name="non_mutual_text3">Alles samtalestil er unik. Vær klar til å tilpasse deg.</string>
+	<string name="make_profile_discoverable">Gjør min profil synlig</string>
+	<string name="discoverability">Synlighet</string>
+	<string name="discoverability_help">Når du aktivere oppdagbarhet på Mastodon, kan innleggene dine vises i søkeresultater og trender.\n\nDin profil kan bli foreslått for personer med lignende interesser som deg.\n\nDeaktivere oppdagbarhet vil ikke skjule profilen din hvis noen søker etter deg med navn.</string>
+	<string name="app_version_copied">Versjonsnummer kopiert til utklippstavlen</string>
 </resources>
diff --git a/mastodon/src/main/res/values-oc-rFR/strings.xml b/mastodon/src/main/res/values-oc-rFR/strings.xml
index 718b52fc9..56e4b63b2 100644
--- a/mastodon/src/main/res/values-oc-rFR/strings.xml
+++ b/mastodon/src/main/res/values-oc-rFR/strings.xml
@@ -33,8 +33,6 @@
 	<string name="news">Novèls</string>
 	<string name="mentions">Mencions</string>
 	<string name="back">Tornar</string>
-	<string name="category_music">Musica</string>
-	<string name="category_tech">Tecnologia</string>
 	<!-- %s is the email address -->
 	<string name="resend">Tornar enviar</string>
 	<string name="content_warning">Avís de contengut</string>
@@ -84,4 +82,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-pl-rPL/strings.xml b/mastodon/src/main/res/values-pl-rPL/strings.xml
index 9831a4014..f271eb032 100644
--- a/mastodon/src/main/res/values-pl-rPL/strings.xml
+++ b/mastodon/src/main/res/values-pl-rPL/strings.xml
@@ -187,19 +187,7 @@
 	<string name="password">Hasło</string>
 	<string name="confirm_password">Potwierdź hasło</string>
 	<string name="password_note">Użyj wielkich liter, znaków specjalnych i liczb, aby zwiększyć siłę swojego hasła.</string>
-	<string name="category_academia">Środowiska akademickie</string>
-	<string name="category_activism">Aktywizm</string>
-	<string name="category_all">Wszystkie</string>
-	<string name="category_art">Sztuka</string>
-	<string name="category_food">Jedzenie</string>
-	<string name="category_furry">„Futrzaki”</string>
-	<string name="category_games">Gry</string>
 	<string name="category_general">Ogólne</string>
-	<string name="category_journalism">Dziennikarstwo</string>
-	<string name="category_lgbt">LGBT</string>
-	<string name="category_music">Muzyka</string>
-	<string name="category_regional">Regionalne</string>
-	<string name="category_tech">Technologia</string>
 	<string name="confirm_email_title">Sprawdź skrzynkę E-mail</string>
 	<!-- %s is the email address -->
 	<string name="confirm_email_subtitle">Kliknij w link, który wysłaliśmy, żeby zweryfikować %s. Poczekamy na Ciebie.</string>
@@ -318,7 +306,6 @@
 		<item quantity="many">%,d podbić</item>
 		<item quantity="other">%,d podbić</item>
 	</plurals>
-	<string name="timestamp_via_app">%1$s przez %2$s</string>
 	<string name="time_now">przed chwilą</string>
 	<string name="edit_history">Historia edycji</string>
 	<string name="last_edit_at_x">Ostatnia zmiana: %s</string>
@@ -394,7 +381,6 @@
 	<string name="profile_add_row">Dodaj wiersz</string>
 	<string name="profile_setup">Ustawienia profilu</string>
 	<string name="profile_setup_subtitle">Zawsze możesz to uzupełnić później w zakładce Profil.</string>
-	<string name="profile_setup_explanation">Możesz dodać do czterech pól profilowych dla czegokolwiek: Lokalizacja, linki, zaimki itp.</string>
 	<string name="popular_on_mastodon">Popularne na Mastodonie</string>
 	<string name="follow_all">Obserwuj każdego</string>
 	<string name="server_rules_disagree">Nie zgadzam się</string>
@@ -461,5 +447,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
-	<string name="see_new_posts">Zobacz nowe wpisy</string>
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-pt-rBR/strings.xml b/mastodon/src/main/res/values-pt-rBR/strings.xml
index 7cc2a2eb2..193d81297 100644
--- a/mastodon/src/main/res/values-pt-rBR/strings.xml
+++ b/mastodon/src/main/res/values-pt-rBR/strings.xml
@@ -163,19 +163,7 @@
 	<string name="password">Senha</string>
 	<string name="confirm_password">Confirmar senha</string>
 	<string name="password_note">Inclua letras maiúsculas, caracteres especiais e números para deixar sua senha mais forte e segura.</string>
-	<string name="category_academia">Acadêmico</string>
-	<string name="category_activism">Ativismo</string>
-	<string name="category_all">Todas</string>
-	<string name="category_art">Arte</string>
-	<string name="category_food">Comida</string>
-	<string name="category_furry">Furry</string>
-	<string name="category_games">Jogos</string>
 	<string name="category_general">Geral</string>
-	<string name="category_journalism">Jornalismo</string>
-	<string name="category_lgbt">LGBT</string>
-	<string name="category_music">Música</string>
-	<string name="category_regional">Regional</string>
-	<string name="category_tech">Tecnologia</string>
 	<string name="confirm_email_title">Verifique sua caixa de entrada</string>
 	<!-- %s is the email address -->
 	<string name="confirm_email_subtitle">Toque no link que te enviamos para verificar %s. Esperaremos por aqui.</string>
@@ -194,6 +182,7 @@
 	<string name="skip">Pular</string>
 	<string name="notification_type_follow">Novos seguidores</string>
 	<string name="notification_type_favorite">Favoritos</string>
+	<string name="notification_type_reblog">Impulsos</string>
 	<string name="notification_type_mention">Menções</string>
 	<string name="notification_type_poll">Enquetes</string>
 	<string name="choose_account">Escolher conta</string>
@@ -277,7 +266,6 @@
 		<item quantity="one">%,d favorito</item>
 		<item quantity="other">%,d favoritos</item>
 	</plurals>
-	<string name="timestamp_via_app">%1$s via %2$s</string>
 	<string name="time_now">agora</string>
 	<string name="edit_history">Histórico de edição</string>
 	<string name="last_edit_at_x">Última edição %s</string>
@@ -349,7 +337,6 @@
 	<string name="profile_add_row">Adicionar linha</string>
 	<string name="profile_setup">Configuração do perfil</string>
 	<string name="profile_setup_subtitle">Você sempre pode concluir isso mais tarde na guia de Perfil.</string>
-	<string name="profile_setup_explanation">Você pode adicionar até quatro campos no seu perfil para o que quiser. Local, links, pronomes — o céu é o limite.</string>
 	<string name="popular_on_mastodon">Popular no Mastodon</string>
 	<string name="follow_all">Seguir todos</string>
 	<string name="server_rules_disagree">Discordo</string>
@@ -585,5 +572,6 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
-	<string name="see_new_posts">Ver novas publicações</string>
+	<string name="manage_list_members">Gerenciar membros da lista</string>
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-pt-rPT/strings.xml b/mastodon/src/main/res/values-pt-rPT/strings.xml
index 3f2a98681..226acf5ee 100644
--- a/mastodon/src/main/res/values-pt-rPT/strings.xml
+++ b/mastodon/src/main/res/values-pt-rPT/strings.xml
@@ -137,19 +137,7 @@
 	<string name="unfollow">Deixar de seguir</string>
 	<string name="back">Voltar</string>
 	<string name="password_note">Inclua letras maiúsculas, caracteres especiais e números para aumentar a força da sua senha.</string>
-	<string name="category_academia">Academia</string>
-	<string name="category_activism">Ativismo</string>
-	<string name="category_all">Tudo</string>
-	<string name="category_art">Arte</string>
-	<string name="category_food">Comida</string>
-	<string name="category_furry">Fofo</string>
-	<string name="category_games">Jogos</string>
 	<string name="category_general">Geral</string>
-	<string name="category_journalism">Jornalismo</string>
-	<string name="category_lgbt">LGBT</string>
-	<string name="category_music">Música</string>
-	<string name="category_regional">Regional</string>
-	<string name="category_tech">Tecnologia</string>
 	<!-- %s is the email address -->
 	<string name="resend">Reenviar</string>
 	<string name="open_email_app">Abrir aplicação de e-mail</string>
@@ -198,7 +186,6 @@
 		<item quantity="one">%,d favorito</item>
 		<item quantity="other">%,d favoritos</item>
 	</plurals>
-	<string name="timestamp_via_app">%1$s via %2$s</string>
 	<string name="time_now">agora</string>
 	<string name="edit_history">Editar histórico</string>
 	<string name="last_edit_at_x">Última edição: %s</string>
@@ -238,5 +225,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
-	<string name="see_new_posts">Ver novas publicações</string>
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-ro-rRO/strings.xml b/mastodon/src/main/res/values-ro-rRO/strings.xml
index 88524c8b5..67528979f 100644
--- a/mastodon/src/main/res/values-ro-rRO/strings.xml
+++ b/mastodon/src/main/res/values-ro-rRO/strings.xml
@@ -53,5 +53,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
-	<string name="see_new_posts">Se nye innlegg</string>
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-ru-rRU/strings.xml b/mastodon/src/main/res/values-ru-rRU/strings.xml
index e4b99b6ed..fda4fc71d 100644
--- a/mastodon/src/main/res/values-ru-rRU/strings.xml
+++ b/mastodon/src/main/res/values-ru-rRU/strings.xml
@@ -187,19 +187,7 @@
 	<string name="password">Пароль</string>
 	<string name="confirm_password">Подтверждение пароля</string>
 	<string name="password_note">Используйте заглавные буквы, числа и специальные символы, чтобы повысить стойкость пароля.</string>
-	<string name="category_academia">Академия</string>
-	<string name="category_activism">Активизм</string>
-	<string name="category_all">Все</string>
-	<string name="category_art">Искусство</string>
-	<string name="category_food">Еда</string>
-	<string name="category_furry">Фурри</string>
-	<string name="category_games">Игры</string>
 	<string name="category_general">Общей тематики</string>
-	<string name="category_journalism">Журнализм</string>
-	<string name="category_lgbt">ЛГБТ</string>
-	<string name="category_music">Музыка</string>
-	<string name="category_regional">Региональные</string>
-	<string name="category_tech">Технологии</string>
 	<string name="confirm_email_title">Проверьте входящие сообщения</string>
 	<!-- %s is the email address -->
 	<string name="confirm_email_subtitle">Нажмите на ссылку, которую мы вам отправили, чтобы подтвердить %s. Мы подождем здесь.</string>
@@ -282,12 +270,13 @@
 	<string name="file_saved">Файл сохранён</string>
 	<string name="downloading">Скачивание…</string>
 	<string name="no_app_to_handle_action">Нет приложения для обработки этого действия</string>
-	<string name="local_timeline">Локальные</string>
+	<string name="local_timeline">Локальная</string>
 	<string name="trending_posts_info_banner">Эти посты набирают популярность в Mastodon.</string>
 	<string name="trending_links_info_banner">Это новости, о которых говорят в Mastodon.</string>
 	<!-- %s is the server domain -->
 	<string name="local_timeline_info_banner">Это все посты от всех пользователей на вашем сервере (%s).</string>
 	<string name="recommended_accounts_info_banner">Вам могут понравиться эти учетные записи, основаные на ваших подписках.</string>
+	<string name="see_new_posts">Новые посты</string>
 	<string name="load_missing_posts">Загрузить недостающие посты</string>
 	<string name="follow_back">Подписаться в ответ</string>
 	<string name="button_follow_pending">В ожидании</string>
@@ -318,7 +307,6 @@
 		<item quantity="many">%,d продвинуто</item>
 		<item quantity="other">%,d продвинутых</item>
 	</plurals>
-	<string name="timestamp_via_app">%1$s через %2$s</string>
 	<string name="time_now">только что</string>
 	<string name="edit_history">История изменений</string>
 	<string name="last_edit_at_x">Последнее изменение: %s</string>
@@ -394,7 +382,6 @@
 	<string name="profile_add_row">Добавить строку</string>
 	<string name="profile_setup">Настройка профиля</string>
 	<string name="profile_setup_subtitle">Вы всегда можете завершить это позже на вкладке Профиль.</string>
-	<string name="profile_setup_explanation">Вы можете добавить до четырех полей профиля для всего, что хотите. Местоположение, ссылки, местоимения — нет предела возможностям.</string>
 	<string name="popular_on_mastodon">Популярно на Mastodon</string>
 	<string name="follow_all">Подписаться на всех</string>
 	<string name="server_rules_disagree">Отклонить</string>
@@ -590,10 +577,10 @@
 	<string name="selection_2_options">%1$s и %2$s</string>
 	<string name="selection_3_options">%1$s, %2$s и %3$s</string>
 	<string name="selection_4_or_more">%1$s, %2$s и ещё %3$d</string>
-	<string name="filter_context_home_lists">Главная &amp; списки</string>
+	<string name="filter_context_home_lists">Главная и списки</string>
 	<string name="filter_context_notifications">Уведомления</string>
 	<string name="filter_context_public_timelines">Публичная лента</string>
-	<string name="filter_context_threads_replies">Темы &amp; ответы</string>
+	<string name="filter_context_threads_replies">Темы и ответы</string>
 	<string name="filter_context_profiles">Профили</string>
 	<string name="settings_filter_title">Название</string>
 	<string name="settings_delete_filter_title">Удалить фильтр “%s”?</string>
@@ -661,8 +648,76 @@
 		<item quantity="other">%,d постов сегодня</item>
 	</plurals>
 	<string name="error_playing_video">Ошибка воспроизведения видео</string>
+	<string name="timeline_following">Главная</string>
+	<string name="lists">Списки</string>
+	<string name="followed_hashtags">Отслеживаемые хэштеги</string>
+	<string name="manage_lists">Управление списками</string>
+	<string name="manage_hashtags">Управление хэштегами</string>
 	<!-- Screen reader description for the menu on the home timeline screen -->
+	<string name="dropdown_menu">Выпадающее меню</string>
+	<string name="edit_list">Изменить список</string>
+	<string name="list_members">Список участников</string>
+	<string name="delete_list">Удалить список</string>
 	<!-- %s is the name of the list -->
+	<string name="delete_list_confirm">Удалить “%s”?</string>
+	<string name="list_exclusive">Скрыть участников в подписках</string>
+	<string name="list_exclusive_subtitle">Если кто-то есть в этом списке, скройте его в ленте подписок, чтобы его посты не появлялись дважды.</string>
+	<string name="list_name">Название списка</string>
+	<string name="list_show_replies_to">Показывать</string>
+	<string name="list_replies_no_one">Никого</string>
+	<string name="list_replies_members">Участников списка</string>
+	<string name="list_replies_anyone">Любого, на кого я подписан(а)</string>
+	<string name="confirm_remove_list_members">Удалить участников?</string>
+	<string name="remove">Удалить</string>
+	<string name="add_list_member">Добавить участника</string>
+	<string name="search_among_people_you_follow">Искать среди подписок</string>
+	<string name="add_user_to_list">Добавить в список…</string>
+	<string name="add_user_to_list_title">Добавить в список</string>
 	<!-- %s is a username -->
-	<string name="see_new_posts">Показать новые</string>
+	<string name="manage_user_lists">Управлять списками с %s</string>
+	<string name="remove_from_list">Удалить из списка</string>
+	<string name="confirm_remove_list_member">Удалить участника?</string>
+	<string name="no_followed_hashtags_title">Следите за интересами по хэштегам</string>
+	<string name="no_followed_hashtags_subtitle">Здесь появятся хэштеги</string>
+	<string name="no_lists_title">Организуйте свою ленту с помощью списков</string>
+	<string name="no_lists_subtitle">Здесь появятся списки</string>
+	<string name="manage_accounts">Добавить или переключить аккаунты</string>
+	<plurals name="x_posts_recently">
+		<item quantity="one">%,d пост недавно</item>
+		<item quantity="few">%,d поста недавно</item>
+		<item quantity="many">%,d постов недавно</item>
+		<item quantity="other">%,d постов недавно</item>
+	</plurals>
+	<string name="create_list">Создать список</string>
+	<string name="step_x_of_y">Шаг %1$d из %2$d</string>
+	<string name="create">Создать</string>
+	<string name="manage_list_members">Управление списоком участников</string>
+	<string name="list_no_members">Участников пока нет</string>
+	<string name="list_find_users">Найти пользователей для добавления</string>
+	<string name="reply_to_user">Ответить %s</string>
+	<string name="posted_at">Пост в %s</string>
+	<string name="non_mutual_sheet_title">Привет, новый контакт!</string>
+	<string name="non_mutual_sheet_text">Похоже, вы собираетесь ответить кому-то, с кем у вас пока не было контакта. Давайте произведем хорошее первое впечатление.</string>
+	<string name="got_it">Понятно</string>
+	<string name="dont_remind_again">Больше не напоминать</string>
+	<!-- %s is a time interval ("5 months") -->
+	<string name="old_post_sheet_title">Этому посту больше чем %s</string>
+	<string name="old_post_sheet_text">Вы все еще можете ответить, но это может быть уже неактуально.</string>
+	<plurals name="x_months">
+		<item quantity="one">%,d месяц</item>
+		<item quantity="few">%,d месяца</item>
+		<item quantity="many">%,d месяцев</item>
+		<item quantity="other">%,d месяцев</item>
+	</plurals>
+	<string name="more_than_two_years">2 года и более</string>
+	<string name="non_mutual_title1">Оставайтесь уважительными и уместными</string>
+	<string name="non_mutual_text1">Убедитесь, что ваш ответ вежлив и по теме.</string>
+	<string name="non_mutual_title2">Примите доброту</string>
+	<string name="non_mutual_text2">Позитивный тон всегда приветствуется.</string>
+	<string name="non_mutual_title3">Будьте открыты</string>
+	<string name="non_mutual_text3">У каждого свой стиль общения. Будьте к этому готовы.</string>
+	<string name="make_profile_discoverable">Сделать мой профиль открытым</string>
+	<string name="discoverability">Открытость</string>
+	<string name="discoverability_help">Когда вы станете открыты для просмотра на Mastodon, ваши посты могут появляться в результатах поиска и в трендах.\n\nВаш профиль может быть предложен людям со схожими с вами интересами.\n\nОткажитесь скрывать свой профиль, если кто-то ищет вас по имени.</string>
+	<string name="app_version_copied">Номер версии скопирован в буфер обмена</string>
 </resources>
diff --git a/mastodon/src/main/res/values-si-rLK/strings.xml b/mastodon/src/main/res/values-si-rLK/strings.xml
index 355d2615e..99b3f7c5c 100644
--- a/mastodon/src/main/res/values-si-rLK/strings.xml
+++ b/mastodon/src/main/res/values-si-rLK/strings.xml
@@ -80,4 +80,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-sl-rSI/strings.xml b/mastodon/src/main/res/values-sl-rSI/strings.xml
index 368da560f..ed3dd03a0 100644
--- a/mastodon/src/main/res/values-sl-rSI/strings.xml
+++ b/mastodon/src/main/res/values-sl-rSI/strings.xml
@@ -37,9 +37,9 @@
 	<string name="posts">Objave</string>
 	<string name="posts_and_replies">Objave in odgovori</string>
 	<string name="media">Mediji</string>
-	<string name="profile_about">O programu</string>
+	<string name="profile_about">O računu</string>
 	<string name="button_follow">Sledi</string>
-	<string name="button_following">Sledi</string>
+	<string name="button_following">Sleden</string>
 	<string name="edit_profile">Uredi profil</string>
 	<string name="share_user">Profil v skupno rabo</string>
 	<string name="mute_user">Utišaj %s</string>
@@ -170,8 +170,8 @@
 	<string name="sending_report">Pošiljanje prijave ...</string>
 	<string name="report_sent_title">Hvala za poročilo, bomo preverili.</string>
 	<string name="report_sent_subtitle">Medtem, ko to pregledujemo, lahko proti %s ukrepate:</string>
-	<string name="unfollow_user">Prenehaj slediti %s</string>
-	<string name="unfollow">Prenehaj slediti</string>
+	<string name="unfollow_user">Ne sledi več %s</string>
+	<string name="unfollow">Ne sledi več</string>
 	<string name="mute_user_explain">Njihovih objav ne boste videli. Še vedno vam lahko sledijo in vidijo vaše objave, ne bodo pa vedeli, da so utišani.</string>
 	<string name="block_user_explain">Njihovih objav ne boste videli. Oni ne bodo videli vaših objav, niti vam ne morejo slediti. Lahko bodo ugotovili, da so blokirani.</string>
 	<string name="report_personal_title">Ne želite videti tega?</string>
@@ -187,19 +187,7 @@
 	<string name="password">Geslo</string>
 	<string name="confirm_password">Potrdite geslo</string>
 	<string name="password_note">Vključite velike črke, posebne znake in števke, da okrepite geslo.</string>
-	<string name="category_academia">Akademsko</string>
-	<string name="category_activism">Aktivizem</string>
-	<string name="category_all">Vse</string>
-	<string name="category_art">Umetnost</string>
-	<string name="category_food">Hrana</string>
-	<string name="category_furry">Kosmato</string>
-	<string name="category_games">Igre</string>
 	<string name="category_general">Splošno</string>
-	<string name="category_journalism">Novinarstvo</string>
-	<string name="category_lgbt">LGBT</string>
-	<string name="category_music">Glasba</string>
-	<string name="category_regional">Regionalno</string>
-	<string name="category_tech">Tehnologija</string>
 	<string name="confirm_email_title">Preverite svojo dohodno e-pošto</string>
 	<!-- %s is the email address -->
 	<string name="confirm_email_subtitle">Tapnite povezavo, ki smo vam jo poslali, da overite %s. Počakali bomo.</string>
@@ -290,7 +278,7 @@
 	<string name="recommended_accounts_info_banner">Glede na to, komu sledite, vam bodo ti računi všeč.</string>
 	<string name="see_new_posts">Nove objave</string>
 	<string name="load_missing_posts">Naloži manjkajoče objave</string>
-	<string name="follow_back">Sledijo nazaj</string>
+	<string name="follow_back">Sledi nazaj</string>
 	<string name="button_follow_pending">Na čakanju</string>
 	<string name="follows_you">Vam sledi</string>
 	<string name="manually_approves_followers">Ročno odobri sledilce</string>
@@ -319,7 +307,6 @@
 		<item quantity="few">%,d izpostavitve</item>
 		<item quantity="other">%,d izpostavitev</item>
 	</plurals>
-	<string name="timestamp_via_app">%1$s prek %2$s</string>
 	<string name="time_now">zdaj</string>
 	<string name="edit_history">Uredi zgodovino</string>
 	<string name="last_edit_at_x">Zadnjič urejano %s</string>
@@ -395,7 +382,6 @@
 	<string name="profile_add_row">Dodaj vrstico</string>
 	<string name="profile_setup">Nastavitev profila</string>
 	<string name="profile_setup_subtitle">To lahko vedno izpolnite kasneje na zavihku Profil.</string>
-	<string name="profile_setup_explanation">Dodate lahko največ štiri polja profila za poljubne vsebine. Lokacija, povezave, vzdevki — ni meja.</string>
 	<string name="popular_on_mastodon">Priljubljeno na Mastodonu</string>
 	<string name="follow_all">Sledi vsem</string>
 	<string name="server_rules_disagree">Ne strinjam se</string>
@@ -411,7 +397,7 @@
 	<string name="spoiler_hide">Ponovno skrij</string>
 	<string name="poll_multiple_choice">Izberi eno ali več izbir</string>
 	<string name="save_changes">Shrani spremembe</string>
-	<string name="profile_featured">Predstavljeni</string>
+	<string name="profile_featured">Izpostavljeni</string>
 	<string name="profile_timeline">Časovnica</string>
 	<string name="view_all">Prikaži vse</string>
 	<string name="profile_endorsed_accounts">Računi</string>
@@ -515,7 +501,7 @@
 	<string name="pause_notifications_banner">Obveščanje se bo nadaljevalo: %s.</string>
 	<string name="resume_notifications_now">Nadaljuj zdaj</string>
 	<string name="open_system_notification_settings">Pojdi k nastavitvam obvestil</string>
-	<string name="about_server">O programu</string>
+	<string name="about_server">O strežniku</string>
 	<string name="server_rules">Pravila</string>
 	<string name="server_administrator">Skrbnik</string>
 	<string name="send_email_to_server_admin">Pošlji e-pošto skrbniku</string>
@@ -665,8 +651,6 @@
 	<string name="timeline_following">Dom</string>
 	<string name="lists">Seznami</string>
 	<string name="followed_hashtags">Sledeni ključniki</string>
-	<string name="no_lists">Ustvarili niste še nobenega seznama.</string>
-	<string name="no_followed_hashtags">Ne sledite še nobenemu ključniku.</string>
 	<string name="manage_lists">Upravljanje seznamov</string>
 	<string name="manage_hashtags">Upravljanje ključnikov</string>
 	<!-- Screen reader description for the menu on the home timeline screen -->
@@ -710,4 +694,30 @@
 	<string name="manage_list_members">Upravljanje članov seznama</string>
 	<string name="list_no_members">Ni še nobenega člana</string>
 	<string name="list_find_users">Poišči člane za dodajanje</string>
+	<string name="reply_to_user">Odgovori %s</string>
+	<string name="posted_at">Objavljeno %s</string>
+	<string name="non_mutual_sheet_title">Pozdravljena, nova povezava!</string>
+	<string name="non_mutual_sheet_text">Zdi se, da boste odgovorili nekomu, s katerim še nimate vzajemne povezave. Naredite odličen prvi vtis.</string>
+	<string name="got_it">Razumem</string>
+	<string name="dont_remind_again">Ne opominjaj me več</string>
+	<!-- %s is a time interval ("5 months") -->
+	<string name="old_post_sheet_title">Ta objava je stara %s</string>
+	<string name="old_post_sheet_text">Še vedno lahko odgovorite, a morda ni več relevantno.</string>
+	<plurals name="x_months">
+		<item quantity="one">%,d mesec</item>
+		<item quantity="two">%,d meseca</item>
+		<item quantity="few">%,d meseci</item>
+		<item quantity="other">%,d mesecev</item>
+	</plurals>
+	<string name="more_than_two_years">več kot dve leti</string>
+	<string name="non_mutual_title1">Ostanite spoštljivi in pri temi</string>
+	<string name="non_mutual_text1">Poskrbite, da bo vaš odgovor vljuden in v skladu s temo.</string>
+	<string name="non_mutual_title2">Oprimite se prijaznosti</string>
+	<string name="non_mutual_text2">Pozitiven ton je vedno cenjen.</string>
+	<string name="non_mutual_title3">Bodite odprti</string>
+	<string name="non_mutual_text3">Vsakdo ima edinstven slog pogovora. Bodite pripravljeni na prilagajanje.</string>
+	<string name="make_profile_discoverable">Naj bo moj profil mogoče najti</string>
+	<string name="discoverability">Razkrivanje</string>
+	<string name="discoverability_help">Ko se odločite za razkrivanje na Mastodonu, se lahko vaše objave pojavijo v rezultatih iskanja in trendih.\n\nVaš profil se lahko predlaga ljudem s podobnimi interesi kot vi.\n\nOdjava ne skrije vašega profila, če vas nekdo išče po imenu.</string>
+	<string name="app_version_copied">Številka različice je kopirana v odložišče</string>
 </resources>
diff --git a/mastodon/src/main/res/values-sv-rSE/strings.xml b/mastodon/src/main/res/values-sv-rSE/strings.xml
index 7c5b9df45..a2c63fec9 100644
--- a/mastodon/src/main/res/values-sv-rSE/strings.xml
+++ b/mastodon/src/main/res/values-sv-rSE/strings.xml
@@ -163,19 +163,7 @@
 	<string name="password">Lösenord</string>
 	<string name="confirm_password">Bekräfta lösenord</string>
 	<string name="password_note">Inkludera stora bokstäver, specialtecken och siffror för att öka ditt lösenords styrka.</string>
-	<string name="category_academia">Vetenskap</string>
-	<string name="category_activism">Aktivism</string>
-	<string name="category_all">Allt</string>
-	<string name="category_art">Konst</string>
-	<string name="category_food">Mat</string>
-	<string name="category_furry">Furry</string>
-	<string name="category_games">Spel</string>
 	<string name="category_general">Allmänt</string>
-	<string name="category_journalism">Journalistik</string>
-	<string name="category_lgbt">HBTQ</string>
-	<string name="category_music">Musik</string>
-	<string name="category_regional">Regionalt</string>
-	<string name="category_tech">Teknik</string>
 	<string name="confirm_email_title">Kolla din inkorg</string>
 	<!-- %s is the email address -->
 	<string name="confirm_email_subtitle">Klicka på länken som vi har skickat till dig för att bekräfta %s. Vi väntar här.</string>
@@ -258,6 +246,7 @@
 	<!-- %s is the server domain -->
 	<string name="local_timeline_info_banner">Detta är alla inlägg från alla användare på din server (%s).</string>
 	<string name="recommended_accounts_info_banner">Du kanske gillar dessa konton baserat på andra konton du följer.</string>
+	<string name="see_new_posts">Nya inlägg</string>
 	<string name="load_missing_posts">Ladda saknade inlägg</string>
 	<string name="follow_back">Följ tillbaka</string>
 	<string name="button_follow_pending">Väntande</string>
@@ -276,7 +265,6 @@
 		<item quantity="one">%,d favorit</item>
 		<item quantity="other">%,d favoriter</item>
 	</plurals>
-	<string name="timestamp_via_app">%1$s via %2$s</string>
 	<string name="time_now">nu</string>
 	<string name="edit_history">Redigera historik</string>
 	<string name="last_edit_at_x">Senaste redigering %s</string>
@@ -348,7 +336,6 @@
 	<string name="profile_add_row">Lägg till rad</string>
 	<string name="profile_setup">Konfiguration av profil</string>
 	<string name="profile_setup_subtitle">Du kan alltid fylla i detta senare i fliken Profil.</string>
-	<string name="profile_setup_explanation">Du kan lägga till upp till fyra profilfält för vad du vill. Plats, länkar, pronomen - himlen är gränsen.</string>
 	<string name="popular_on_mastodon">Populärt på Mastodon</string>
 	<string name="follow_all">Följ alla</string>
 	<string name="server_rules_disagree">Instämmer inte alls</string>
@@ -543,12 +530,17 @@
 	<string name="translation_failed">Översättningen misslyckades. Det kan hända att administratören inte har aktiverat översättningar på den här servern eller att servern kör en äldre version av Mastodon som inte har stöd för översättningar ännu.</string>
 	<string name="settings_privacy">Integritet och räckvidd</string>
 	<string name="settings_indexable">Inkludera offentliga inlägg i sökresultaten</string>
+	<plurals name="x_participants">
+		<item quantity="one">%,d deltagare</item>
+		<item quantity="other">%,d deltagare</item>
+	</plurals>
+	<plurals name="x_posts_today">
+		<item quantity="one">%,d inlägg idag</item>
+		<item quantity="other">%,d inlägg idag</item>
+	</plurals>
 	<string name="error_playing_video">Fel vid videouppspelning</string>
-	<string name="timeline_following">Följer</string>
 	<string name="lists">Listor</string>
 	<string name="followed_hashtags">Följda hashtaggar</string>
-	<string name="no_lists">Du har inga listor ännu.</string>
-	<string name="no_followed_hashtags">Du följer inga hashtaggar.</string>
 	<string name="manage_lists">Hantera listor</string>
 	<string name="manage_hashtags">Hantera hashtaggar</string>
 	<!-- Screen reader description for the menu on the home timeline screen -->
@@ -572,5 +564,10 @@
 	<!-- %s is a username -->
 	<string name="remove_from_list">Ta bort från lista</string>
 	<string name="confirm_remove_list_member">Ta bort medlem?</string>
-	<string name="see_new_posts">Se nya inlägg</string>
+	<string name="create_list">Skapa lista</string>
+	<string name="step_x_of_y">Steg %1$d av %2$d</string>
+	<string name="create">Skapa</string>
+	<string name="manage_list_members">Hantera listmedlemmar</string>
+	<string name="list_no_members">Inga medlemmar än</string>
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-th-rTH/strings.xml b/mastodon/src/main/res/values-th-rTH/strings.xml
index bb367a4ee..79313ee8f 100644
--- a/mastodon/src/main/res/values-th-rTH/strings.xml
+++ b/mastodon/src/main/res/values-th-rTH/strings.xml
@@ -151,19 +151,7 @@
 	<string name="password">รหัสผ่าน</string>
 	<string name="confirm_password">ยืนยันรหัสผ่าน</string>
 	<string name="password_note">รวมตัวพิมพ์ใหญ่, อักขระพิเศษ และตัวเลขเพื่อเพิ่มความแข็งแรงของรหัสผ่านของคุณ</string>
-	<string name="category_academia">สถาบันการศึกษา</string>
-	<string name="category_activism">กิจกรรมเพื่อการเปลี่ยนแปลง</string>
-	<string name="category_all">ทั้งหมด</string>
-	<string name="category_art">ศิลปะ</string>
-	<string name="category_food">อาหาร</string>
-	<string name="category_furry">สัตว์ขนยาว</string>
-	<string name="category_games">เกม</string>
 	<string name="category_general">ทั่วไป</string>
-	<string name="category_journalism">วารสารศาสตร์</string>
-	<string name="category_lgbt">LGBT</string>
-	<string name="category_music">ดนตรี</string>
-	<string name="category_regional">ภูมิภาค</string>
-	<string name="category_tech">เทคโนโลยี</string>
 	<string name="confirm_email_title">ตรวจสอบกล่องขาเข้าของคุณ</string>
 	<!-- %s is the email address -->
 	<string name="confirm_email_subtitle">แตะลิงก์ที่เราส่งถึงคุณเพื่อยืนยัน %s เราจะรออยู่ตรงนี้</string>
@@ -268,7 +256,6 @@
 	<plurals name="x_reblogs">
 		<item quantity="other">%,d การดัน</item>
 	</plurals>
-	<string name="timestamp_via_app">%1$s ผ่าน %2$s</string>
 	<string name="time_now">ตอนนี้</string>
 	<string name="edit_history">ประวัติการแก้ไข</string>
 	<string name="last_edit_at_x">การแก้ไขล่าสุดเมื่อ %s</string>
@@ -338,7 +325,6 @@
 	<string name="profile_add_row">เพิ่มแถว</string>
 	<string name="profile_setup">การตั้งค่าโปรไฟล์</string>
 	<string name="profile_setup_subtitle">คุณสามารถทำสิ่งนี้ให้เสร็จสมบูรณ์ได้ในภายหลังเสมอในแท็บโปรไฟล์</string>
-	<string name="profile_setup_explanation">คุณสามารถเพิ่มได้มากถึงสี่ช่องโปรไฟล์สำหรับสิ่งใดก็ตามที่คุณต้องการ ตำแหน่งที่ตั้ง, ลิงก์, สรรพนาม — ไม่มีที่สิ้นสุด</string>
 	<string name="popular_on_mastodon">เป็นที่นิยมใน Mastodon</string>
 	<string name="follow_all">ติดตามทั้งหมด</string>
 	<string name="server_rules_disagree">ไม่เห็นด้วย</string>
@@ -572,8 +558,6 @@
 	<string name="timeline_following">หน้าแรก</string>
 	<string name="lists">รายการ</string>
 	<string name="followed_hashtags">แฮชแท็กที่ติดตาม</string>
-	<string name="no_lists">คุณยังไม่มีรายการใด ๆ</string>
-	<string name="no_followed_hashtags">คุณไม่ได้ติดตามแฮชแท็กใด ๆ</string>
 	<string name="manage_lists">จัดการรายการ</string>
 	<string name="manage_hashtags">จัดการแฮชแท็ก</string>
 	<!-- Screen reader description for the menu on the home timeline screen -->
@@ -614,4 +598,27 @@
 	<string name="manage_list_members">จัดการสมาชิกของรายการ</string>
 	<string name="list_no_members">ยังไม่มีสมาชิก</string>
 	<string name="list_find_users">ค้นหาผู้ใช้ที่จะเพิ่ม</string>
+	<string name="reply_to_user">ตอบกลับ %s</string>
+	<string name="posted_at">โพสต์เมื่อ %s</string>
+	<string name="non_mutual_sheet_title">สวัสดี การเชื่อมต่อใหม่!</string>
+	<string name="non_mutual_sheet_text">ดูเหมือนว่าคุณกำลังจะตอบกลับใครสักคนที่ยังไม่มีการเชื่อมต่อร่วมกัน มาสร้างความประทับใจแรกที่ยอดเยี่ยมกันเลย</string>
+	<string name="got_it">เข้าใจแล้ว</string>
+	<string name="dont_remind_again">ไม่ต้องเตือนฉันอีก</string>
+	<!-- %s is a time interval ("5 months") -->
+	<string name="old_post_sheet_title">โพสต์นี้มีอายุ %s</string>
+	<string name="old_post_sheet_text">คุณยังคงสามารถตอบกลับ แต่การตอบกลับอาจไม่เกี่ยวข้องอีกต่อไป</string>
+	<plurals name="x_months">
+		<item quantity="other">%,d เดือน</item>
+	</plurals>
+	<string name="more_than_two_years">มากกว่า 2 ปี</string>
+	<string name="non_mutual_title1">แสดงความเคารพและเกี่ยวข้อง</string>
+	<string name="non_mutual_text1">ทำให้แน่ใจว่าการตอบกลับของคุณสุภาพและตรงประเด็น</string>
+	<string name="non_mutual_title2">นำความกรุณามาใช้</string>
+	<string name="non_mutual_text2">น้ำเสียงเชิงบวกเป็นที่ชื่นชมเสมอ</string>
+	<string name="non_mutual_title3">เปิดกว้าง</string>
+	<string name="non_mutual_text3">ลักษณะการสนทนาของทุกคนมีเอกลักษณ์เฉพาะตัว เตรียมพร้อมที่จะปรับตัว</string>
+	<string name="make_profile_discoverable">ทำให้โปรไฟล์ของฉันสามารถค้นพบได้</string>
+	<string name="discoverability">ความสามารถในการค้นพบ</string>
+	<string name="discoverability_help">เมื่อคุณเลือกรับความสามารถในการค้นพบใน Mastodon โพสต์ของคุณอาจปรากฏในผลลัพธ์การค้นหาและกำลังนิยม\n\nอาจเสนอแนะโปรไฟล์ของคุณให้กับผู้คนที่มีความสนใจคล้ายกับคุณ\n\nการเลือกไม่รับจะไม่ซ่อนโปรไฟล์ของคุณหากใครสักคนค้นหาคุณโดยชื่อ</string>
+	<string name="app_version_copied">คัดลอกหมายเลขรุ่นไปยังคลิปบอร์ดแล้ว</string>
 </resources>
diff --git a/mastodon/src/main/res/values-tr-rTR/strings.xml b/mastodon/src/main/res/values-tr-rTR/strings.xml
index b4540a1a5..e684b4e33 100644
--- a/mastodon/src/main/res/values-tr-rTR/strings.xml
+++ b/mastodon/src/main/res/values-tr-rTR/strings.xml
@@ -159,29 +159,17 @@
 	<string name="signup_title">Hesap oluştur</string>
 	<string name="display_name">Ad</string>
 	<string name="username">Kullanıcı adı</string>
-	<string name="email">Eposta</string>
+	<string name="email">E-Posta</string>
 	<string name="password">Parola</string>
 	<string name="confirm_password">Parolayı doğrula</string>
 	<string name="password_note">Daha güçlü parolalar için parolanıza büyük harfler, özel karakterler ve sayılar ekleyin.</string>
-	<string name="category_academia">Akademi</string>
-	<string name="category_activism">Aktivizm</string>
-	<string name="category_all">Hepsi</string>
-	<string name="category_art">Sanat</string>
-	<string name="category_food">Yiyecek</string>
-	<string name="category_furry">Kostüm</string>
-	<string name="category_games">Oyunlar</string>
 	<string name="category_general">Genel</string>
-	<string name="category_journalism">Gazetecilik</string>
-	<string name="category_lgbt">LGBT</string>
-	<string name="category_music">Müzik</string>
-	<string name="category_regional">Bölgesel</string>
-	<string name="category_tech">Teknoloji</string>
-	<string name="confirm_email_title">E-posta gelen kutunuzu kontrol edin</string>
+	<string name="confirm_email_title">E-Posta gelen kutunuzu kontrol edin</string>
 	<!-- %s is the email address -->
 	<string name="confirm_email_subtitle">%s adresini doğrulamak için size gönderdiğimiz bağlantıya dokunun. Hemen burada bekleyeceğiz.</string>
 	<string name="confirm_email_didnt_get">Bağlantı gelmedi mi?</string>
 	<string name="resend">Yeniden gönder</string>
-	<string name="open_email_app">Eposta uygulamasını aç</string>
+	<string name="open_email_app">E-Posta uygulamasını aç</string>
 	<string name="resent_email">Onay epostası gönderildi</string>
 	<string name="compose_hint">Aklınızdan geçenleri yazın veya yapıştırın</string>
 	<string name="content_warning">İçerik uyarısı</string>
@@ -193,12 +181,12 @@
 	<string name="recent_searches">Son aramalar</string>
 	<string name="skip">Atla</string>
 	<string name="notification_type_follow">Yeni takipçiler</string>
-	<string name="notification_type_favorite">Favoriler</string>
+	<string name="notification_type_favorite">Gözdeler</string>
 	<string name="notification_type_reblog">Yinelemeler</string>
 	<string name="notification_type_mention">Bahsetmeler</string>
 	<string name="notification_type_poll">Anketler</string>
 	<string name="choose_account">Hesap seç</string>
-	<string name="err_not_logged_in">Lütfen önce Mastodon\'da oturum açın</string>
+	<string name="err_not_logged_in">Lütfen önce Mastodonda oturum açın</string>
 	<plurals name="cant_add_more_than_x_attachments">
 		<item quantity="one">%d adetten fazla medya ekleyemezsiniz</item>
 		<item quantity="other">%d adetten fazla medya ekleyemezsiniz</item>
@@ -226,7 +214,7 @@
 	<string name="new_post">Yeni gönderi</string>
 	<string name="button_reply">Cevapla</string>
 	<string name="button_reblog">Yinele</string>
-	<string name="button_favorite">Gözdele</string>
+	<string name="button_favorite">Favorile</string>
 	<string name="button_share">Paylaş</string>
 	<string name="media_no_description">Açıklamasız medya</string>
 	<string name="add_media">Medya ekle</string>
@@ -257,11 +245,12 @@
 	<string name="downloading">İndiriliyor…</string>
 	<string name="no_app_to_handle_action">Bu eylemi gerçekleştirebilecek bir uygulama bulunmuyor</string>
 	<string name="local_timeline">Yerel</string>
-	<string name="trending_posts_info_banner">Bunlar, Mastodon\'da ilgi gören gönderilerdir.</string>
+	<string name="trending_posts_info_banner">Bunlar, Mastodon\'da ilgi gören gönderiler.</string>
 	<string name="trending_links_info_banner">Bunlar Mastodon\'da konuşulan haberler.</string>
 	<!-- %s is the server domain -->
-	<string name="local_timeline_info_banner">Bunlar, sunucunuzdaki (%s) tüm kullanıcıların gönderileridir.</string>
+	<string name="local_timeline_info_banner">Bunlar, sunucunuzdaki (%s) tüm kullanıcıların gönderileri.</string>
 	<string name="recommended_accounts_info_banner">Takip ettiğiniz hesaplara göre bu hesapları beğenebilirsiniz.</string>
+	<string name="see_new_posts">Yeni gönderiler</string>
 	<string name="load_missing_posts">Daha fazlası</string>
 	<string name="follow_back">Geri takip et</string>
 	<string name="button_follow_pending">Bekliyor</string>
@@ -277,14 +266,13 @@
 		<item quantity="other">%,d takipçiler</item>
 	</plurals>
 	<plurals name="x_favorites">
-		<item quantity="one">%,d gözde</item>
+		<item quantity="one">%,d favori</item>
 		<item quantity="other">%,d gözdeler</item>
 	</plurals>
 	<plurals name="x_reblogs">
 		<item quantity="one">%,d yineleme</item>
 		<item quantity="other">%,d yineleme</item>
 	</plurals>
-	<string name="timestamp_via_app">%1$s tarihinde %2$s uygulamasıyla</string>
 	<string name="time_now">şimdi</string>
 	<string name="edit_history">Düzenleme geçmişi</string>
 	<string name="last_edit_at_x">Son düzenleme: %s</string>
@@ -334,7 +322,7 @@
 	<string name="add_bookmark">Yer imlerine ekle</string>
 	<string name="remove_bookmark">Yer imini kaldır</string>
 	<string name="bookmarks">Yer imleri</string>
-	<string name="your_favorites">Gözdelerin</string>
+	<string name="your_favorites">Favorilerin</string>
 	<string name="login_title">Hoşgeldiniz</string>
 	<string name="login_subtitle">Hesabınızı oluşturduğunuz sunucuya giriş yapın.</string>
 	<string name="server_url">Sunucu bağlantısı</string>
@@ -356,7 +344,6 @@
 	<string name="profile_add_row">Satır ekle</string>
 	<string name="profile_setup">Profilini ayarla</string>
 	<string name="profile_setup_subtitle">Bunu istediğin zaman Profil sekmesinden tamamlayabilirsin.</string>
-	<string name="profile_setup_explanation">İstediğiniz herhangi bir şey için dört adede kadar profil alanı ekleyebilirsiniz. Konum, bağlantılar, yönelim — sınır gökyüzü.</string>
 	<string name="popular_on_mastodon">Mastodon\'da popüler</string>
 	<string name="follow_all">Hepsini takip et</string>
 	<string name="server_rules_disagree">Reddet</string>
@@ -582,7 +569,7 @@
 	<string name="time_hours_ago_short">%dsa önce</string>
 	<string name="time_days_ago_short">%dg önce</string>
 	<!-- %s is the name of the post language -->
-	<string name="translate_post">%s dilinden çevrildi</string>
+	<string name="translate_post">%s dilinden çevir</string>
 	<!-- %1$s is the language, %2$s is the name of the translation service -->
 	<string name="post_translated">%2$s kullanılarak %1$s dilinden çevrildi</string>
 	<string name="translation_show_original">Özgün içeriği göster</string>
@@ -598,8 +585,69 @@
 		<item quantity="one">%,d bunu gönder</item>
 		<item quantity="other">%,d bunları gönder</item>
 	</plurals>
+	<string name="error_playing_video">Video oynatılırken hata oluştu</string>
+	<string name="timeline_following">Anasayfa</string>
+	<string name="lists">Listeler</string>
+	<string name="followed_hashtags">Takip edilen etiketler</string>
+	<string name="manage_lists">Listeleri yönetin</string>
+	<string name="manage_hashtags">Etiketleri yönetin</string>
 	<!-- Screen reader description for the menu on the home timeline screen -->
+	<string name="dropdown_menu">Açılır menü</string>
+	<string name="edit_list">Listeyi düzenle</string>
+	<string name="list_members">Liste üyeleri</string>
+	<string name="delete_list">Listeyi sil</string>
 	<!-- %s is the name of the list -->
+	<string name="delete_list_confirm">Sil “%s”?</string>
+	<string name="list_exclusive">Takip edilen üyeleri gizle</string>
+	<string name="list_exclusive_subtitle">Birisi bu listede yer alıyorsa, gönderilerini iki kez görmekten kaçınmak için onu Takip Edenleri zaman akışınızdan gizleyin.</string>
+	<string name="list_name">Liste ismi</string>
+	<string name="list_show_replies_to">Yanıtları göster</string>
+	<string name="list_replies_no_one">Hiç kimse</string>
+	<string name="list_replies_members">Liste üyeleri</string>
+	<string name="list_replies_anyone">Takip ettiğim herkes</string>
+	<string name="confirm_remove_list_members">Üyeleri çıkar?</string>
+	<string name="remove">Kaldır</string>
+	<string name="add_list_member">Üye ekle</string>
+	<string name="search_among_people_you_follow">Takip ettiğiniz kişiler arasında arama yapın</string>
+	<string name="add_user_to_list">Listeye ekle...</string>
+	<string name="add_user_to_list_title">Listeye ekle</string>
 	<!-- %s is a username -->
-	<string name="see_new_posts">Yeni gönderileri gör</string>
+	<string name="manage_user_lists">Listeleri yönet %s şurada görünür</string>
+	<string name="remove_from_list">Listeden çıkar</string>
+	<string name="confirm_remove_list_member">Üyeyi çıkar?</string>
+	<string name="no_followed_hashtags_title">Etiketleri takip ederek ilgi alanlarınızı takip edin</string>
+	<string name="no_followed_hashtags_subtitle">Takipler burada görüntülenecek</string>
+	<string name="no_lists_title">Ev beslemenizi Listeler ile düzenleyin</string>
+	<string name="no_lists_subtitle">Sizinki burada görüntülenecek</string>
+	<string name="manage_accounts">Hesap ekleme veya değiştirme</string>
+	<plurals name="x_posts_recently">
+		<item quantity="one">%,d son zamanlardaki yayın</item>
+		<item quantity="other">%,d yakın zamanda gönderilerim</item>
+	</plurals>
+	<string name="create_list">Liste oluştur</string>
+	<string name="step_x_of_y">Step %1$d ile %2$d</string>
+	<string name="create">Oluştur</string>
+	<string name="manage_list_members">Liste üyelerini yönet</string>
+	<string name="list_no_members">Henüz üye yok.</string>
+	<string name="list_find_users">Eklenecek kullanıcıları bul</string>
+	<string name="reply_to_user">Yanıtla %s</string>
+	<string name="posted_at">%s tarafından gönderildi</string>
+	<string name="non_mutual_sheet_title">Merhaba, yeni bağlantı!</string>
+	<string name="non_mutual_sheet_text">Görünüşe göre henüz ortak bağlantınız olmayan birine yanıt vermek üzeresiniz. Harika bir ilk izlenim bırakınız.</string>
+	<string name="got_it">Anladım</string>
+	<string name="dont_remind_again">Bana tekrar hatırlatmayınız.</string>
+	<!-- %s is a time interval ("5 months") -->
+	<string name="old_post_sheet_title">Bu gönderi %s eski</string>
+	<string name="old_post_sheet_text">Hâlâ yanıt verebilirsiniz, ancak konuyla ilgili olmayabilir.</string>
+	<string name="more_than_two_years">2 yıldan fazla süredir</string>
+	<string name="non_mutual_title1">Saygılı ve ilgili &amp; plunuz</string>
+	<string name="non_mutual_text1">Yanıtınızın nazik ve konuyla ilgili olduğundan emin olunuz.</string>
+	<string name="non_mutual_title2">Nezaketle sarıl</string>
+	<string name="non_mutual_text2">Olumlu bir yaklaşım her zaman takdir edilir.</string>
+	<string name="non_mutual_title3">Açık olunuz</string>
+	<string name="non_mutual_text3">Herkesin konuşma tarzı kendine özgüdür. Uyum sağlamaya hazır olunuz.</string>
+	<string name="make_profile_discoverable">Profilimi keşfedilebilir hale getiriniz</string>
+	<string name="discoverability">Keşfedebilirlik</string>
+	<string name="discoverability_help">Mastodon\'da keşfedilebilirliği tercih ettiğinizde, gönderileriniz arama sonuçlarında ve trendlerde görünebilir.\n\nProfiliniz sizinle benzer ilgi alanlarına sahip kişilere önerilebilir.\n\nBirisi sizi isminizle ararsa, devre dışı bırakma işlemi profilinizi gizlemez.</string>
+	<string name="app_version_copied">Sürüm numarası panoya kopyalandı</string>
 </resources>
diff --git a/mastodon/src/main/res/values-uk-rUA/strings.xml b/mastodon/src/main/res/values-uk-rUA/strings.xml
index 8c16edee6..dee8a1ee4 100644
--- a/mastodon/src/main/res/values-uk-rUA/strings.xml
+++ b/mastodon/src/main/res/values-uk-rUA/strings.xml
@@ -187,19 +187,7 @@
 	<string name="password">Пароль</string>
 	<string name="confirm_password">Підтвердження паролю</string>
 	<string name="password_note">Використовуйте великі літери, спеціальні символи та цифри для посилення пароля.</string>
-	<string name="category_academia">Академія</string>
-	<string name="category_activism">Активізм</string>
-	<string name="category_all">Все</string>
-	<string name="category_art">Мистецтво</string>
-	<string name="category_food">Їжа</string>
-	<string name="category_furry">Фурі</string>
-	<string name="category_games">Ігри</string>
 	<string name="category_general">Загальні</string>
-	<string name="category_journalism">Журналістика</string>
-	<string name="category_lgbt">ЛГБТ</string>
-	<string name="category_music">Музика</string>
-	<string name="category_regional">Регіональні</string>
-	<string name="category_tech">Технології</string>
 	<string name="confirm_email_title">Перевірте вашу електронну пошту</string>
 	<!-- %s is the email address -->
 	<string name="confirm_email_subtitle">Натисніть на посилання, яке ми надіслали вам, щоб підтвердити %s. Ми чекатимемо прямо тут.</string>
@@ -319,7 +307,6 @@
 		<item quantity="many">%,d поширень</item>
 		<item quantity="other">%,d поширень</item>
 	</plurals>
-	<string name="timestamp_via_app">%1$s через %2$s</string>
 	<string name="time_now">щойно</string>
 	<string name="edit_history">Історія редагувань</string>
 	<string name="last_edit_at_x">Востаннє відредаговано %s</string>
@@ -395,7 +382,6 @@
 	<string name="profile_add_row">Додати рядок</string>
 	<string name="profile_setup">Налаштування профілю</string>
 	<string name="profile_setup_subtitle">Ви завжди можете завершити це пізніше у вкладці профілю.</string>
-	<string name="profile_setup_explanation">Ви можете додати до чотирьох рядків у профілі для будь-чого. Місце, посилання, інтереси — безмежні можливості.</string>
 	<string name="popular_on_mastodon">Популярне на Mastodon</string>
 	<string name="follow_all">Підписатися на всіх</string>
 	<string name="server_rules_disagree">Не погоджуюся</string>
@@ -665,8 +651,6 @@
 	<string name="timeline_following">Головна</string>
 	<string name="lists">Списки</string>
 	<string name="followed_hashtags">Відстежувані хештеги</string>
-	<string name="no_lists">У вас ще немає списків.</string>
-	<string name="no_followed_hashtags">Ви не підписані на жодний хештег.</string>
 	<string name="manage_lists">Керувати списками</string>
 	<string name="manage_hashtags">Керувати хештегами</string>
 	<!-- Screen reader description for the menu on the home timeline screen -->
@@ -702,4 +686,5 @@
 	<string name="create">Створити</string>
 	<string name="manage_list_members">Керувати учасниками списку</string>
 	<string name="list_no_members">Ще немає учасників</string>
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-ur-rIN/strings.xml b/mastodon/src/main/res/values-ur-rIN/strings.xml
index d610a4e07..e428c80dc 100644
--- a/mastodon/src/main/res/values-ur-rIN/strings.xml
+++ b/mastodon/src/main/res/values-ur-rIN/strings.xml
@@ -25,4 +25,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<!-- %s is a time interval ("5 months") -->
 </resources>
diff --git a/mastodon/src/main/res/values-vi-rVN/strings.xml b/mastodon/src/main/res/values-vi-rVN/strings.xml
index 6055fec21..a9ff57e5c 100644
--- a/mastodon/src/main/res/values-vi-rVN/strings.xml
+++ b/mastodon/src/main/res/values-vi-rVN/strings.xml
@@ -151,19 +151,7 @@
 	<string name="password">Mật khẩu</string>
 	<string name="confirm_password">Nhập lại mật khẩu</string>
 	<string name="password_note">Hãy thêm chữ viết hoa, ký tự đặc biệt và số để tăng độ mạnh mật khẩu.</string>
-	<string name="category_academia">Học thuật</string>
-	<string name="category_activism">Hoạt động xã hội</string>
-	<string name="category_all">Toàn bộ</string>
-	<string name="category_art">Nghệ thuật</string>
-	<string name="category_food">Ăn uống</string>
-	<string name="category_furry">Furry</string>
-	<string name="category_games">Trò chơi điện tử</string>
 	<string name="category_general">Chung</string>
-	<string name="category_journalism">Tin tức</string>
-	<string name="category_lgbt">LGBT</string>
-	<string name="category_music">Âm nhạc</string>
-	<string name="category_regional">Khu vực</string>
-	<string name="category_tech">Công nghệ</string>
 	<string name="confirm_email_title">Kiểm tra hộp thư của bạn</string>
 	<!-- %s is the email address -->
 	<string name="confirm_email_subtitle">Nhấn vào liên kết chúng tôi vừa gửi để xác minh %s. Nhanh nhé bạn.</string>
@@ -268,7 +256,6 @@
 	<plurals name="x_reblogs">
 		<item quantity="other">%,d đăng lại</item>
 	</plurals>
-	<string name="timestamp_via_app">%1$s qua %2$s</string>
 	<string name="time_now">vừa xong</string>
 	<string name="edit_history">Lịch sử chỉnh sửa</string>
 	<string name="last_edit_at_x">Sửa lần cuối %s</string>
@@ -336,9 +323,8 @@
 	<string name="signup_passwords_dont_match">Mật khẩu không khớp</string>
 	<string name="pick_server_for_me">Chọn giúp tôi</string>
 	<string name="profile_add_row">Thêm hàng</string>
-	<string name="profile_setup">Thiệt lập hồ sơ</string>
+	<string name="profile_setup">Thiết lập hồ sơ</string>
 	<string name="profile_setup_subtitle">Bạn có thể sửa sau trong mục Hồ sơ.</string>
-	<string name="profile_setup_explanation">Bạn có thể thêm tối đa bốn trường hồ sơ cho bất cứ thứ gì bạn muốn. Vị trí, liên kết, công việc - không giới hạn.</string>
 	<string name="popular_on_mastodon">Thịnh hành trên Mastodon</string>
 	<string name="follow_all">Theo dõi tất cả</string>
 	<string name="server_rules_disagree">Không đồng ý</string>
@@ -569,11 +555,9 @@
 		<item quantity="other">%,d tút hôm nay</item>
 	</plurals>
 	<string name="error_playing_video">Lỗi khi phát video</string>
-	<string name="timeline_following">Đang theo dõi</string>
+	<string name="timeline_following">Trang chính</string>
 	<string name="lists">Danh sách</string>
 	<string name="followed_hashtags">Hashtag theo dõi</string>
-	<string name="no_lists">Bạn chưa có danh sách nào.</string>
-	<string name="no_followed_hashtags">Bạn chưa theo dõi hashtag nào.</string>
 	<string name="manage_lists">Quản lý danh sách</string>
 	<string name="manage_hashtags">Quản lý hashtag</string>
 	<!-- Screen reader description for the menu on the home timeline screen -->
@@ -608,4 +592,33 @@
 	<plurals name="x_posts_recently">
 		<item quantity="other">%,d tút mới</item>
 	</plurals>
+	<string name="create_list">Tạo danh sách</string>
+	<string name="step_x_of_y">Bước %1$d trong %2$d</string>
+	<string name="create">Tạo</string>
+	<string name="manage_list_members">Quản lý danh sách</string>
+	<string name="list_no_members">Chưa có người nào</string>
+	<string name="list_find_users">Tìm người để thêm vào</string>
+	<string name="reply_to_user">Trả lời %s</string>
+	<string name="posted_at">Được đăng tại %s</string>
+	<string name="non_mutual_sheet_title">Xin chào, kết nối mới!</string>
+	<string name="non_mutual_sheet_text">Có vẻ như bạn sắp trả lời một người chưa có mối quan hệ chung. Hãy tạo ấn tượng đầu tiên tuyệt vời.</string>
+	<string name="got_it">Đã hiểu</string>
+	<string name="dont_remind_again">Đừng nhắc nữa</string>
+	<!-- %s is a time interval ("5 months") -->
+	<string name="old_post_sheet_title">Tút đăng %s trước</string>
+	<string name="old_post_sheet_text">Bạn vẫn có thể trả lời nhưng nó có thể không còn phù hợp nữa.</string>
+	<plurals name="x_months">
+		<item quantity="other">%,d tháng</item>
+	</plurals>
+	<string name="more_than_two_years">hơn 2 năm</string>
+	<string name="non_mutual_title1">Tôn trọng &amp; liên quan</string>
+	<string name="non_mutual_text1">Đảm bảo câu trả lời của bạn lịch sự và đúng chủ đề.</string>
+	<string name="non_mutual_title2">Nói chuyện tử tế</string>
+	<string name="non_mutual_text2">Thái độ tích cực luôn được đánh giá cao.</string>
+	<string name="non_mutual_title3">Hãy cởi mở</string>
+	<string name="non_mutual_text3">Phong cách trò chuyện của mỗi người là duy nhất. Hãy sẵn sàng để thích nghi.</string>
+	<string name="make_profile_discoverable">Bật khám phá cho hồ sơ của tôi</string>
+	<string name="discoverability">Khám phá</string>
+	<string name="discoverability_help">Khi bạn chọn bật khám phá trên Mastodon, tút của bạn sẽ được xuất hiện trong kết quả tìm kiếm và thịnh hành.\n\nHồ sơ của bạn có thể được đề xuất cho những người có cùng sở thích với bạn.\n\nViệc tắt khám phá sẽ không làm ẩn hồ sơ của bạn nếu ai đó tìm kiếm bạn.</string>
+	<string name="app_version_copied">Số phiên bản đã được sao chép vào bộ nhớ tạm</string>
 </resources>
diff --git a/mastodon/src/main/res/values-zh-rCN/strings.xml b/mastodon/src/main/res/values-zh-rCN/strings.xml
index 48ba49e48..9aefbb952 100644
--- a/mastodon/src/main/res/values-zh-rCN/strings.xml
+++ b/mastodon/src/main/res/values-zh-rCN/strings.xml
@@ -105,7 +105,7 @@
 	<string name="log_out">注销</string>
 	<string name="add_account">添加账户</string>
 	<string name="search_hint">搜索</string>
-	<string name="hashtags">话题</string>
+	<string name="hashtags">标签</string>
 	<string name="news">新闻</string>
 	<string name="for_you">推荐关注</string>
 	<string name="all_notifications">全部</string>
@@ -151,19 +151,7 @@
 	<string name="password">密码</string>
 	<string name="confirm_password">确认密码</string>
 	<string name="password_note">包括大写字母、特殊字符和数字以增加你的密码强度。</string>
-	<string name="category_academia">学术</string>
-	<string name="category_activism">行动主义</string>
-	<string name="category_all">全部</string>
-	<string name="category_art">艺术</string>
-	<string name="category_food">美食</string>
-	<string name="category_furry">兽迷</string>
-	<string name="category_games">游戏</string>
 	<string name="category_general">通用</string>
-	<string name="category_journalism">新闻</string>
-	<string name="category_lgbt">性少数</string>
-	<string name="category_music">音乐</string>
-	<string name="category_regional">地区</string>
-	<string name="category_tech">科技</string>
 	<string name="confirm_email_title">检查你的收件箱</string>
 	<!-- %s is the email address -->
 	<string name="confirm_email_subtitle">点击我们发送给你的链接来验证 %s。我们在此守候。</string>
@@ -267,7 +255,6 @@
 	<plurals name="x_reblogs">
 		<item quantity="other">%d 次转嘟</item>
 	</plurals>
-	<string name="timestamp_via_app">%1$s 来自 %2$s</string>
 	<string name="time_now">刚刚</string>
 	<string name="edit_history">编辑记录</string>
 	<string name="last_edit_at_x">编辑于 %s</string>
@@ -337,7 +324,6 @@
 	<string name="profile_add_row">添加</string>
 	<string name="profile_setup">个人资料设定</string>
 	<string name="profile_setup_subtitle">你可以随时在个人资料标签中进行补充。</string>
-	<string name="profile_setup_explanation">你可以将任何你喜欢的信息填入这四个字段。地点、链接、人称代词——请发挥想象。</string>
 	<string name="popular_on_mastodon">Mastodon上流行的</string>
 	<string name="follow_all">全部关注</string>
 	<string name="server_rules_disagree">不同意</string>
@@ -560,8 +546,26 @@
 	<string name="settings_privacy">隐私与可达性</string>
 	<string name="settings_discoverable">在发现算法中展示您的个人资料和嘟文</string>
 	<string name="settings_indexable">将您的公开嘟文纳入搜索范围</string>
+	<string name="error_playing_video">播放视频出错</string>
+	<string name="timeline_following">主页</string>
+	<string name="lists">列表</string>
+	<string name="followed_hashtags">关注的标签</string>
+	<string name="manage_hashtags">管理标签</string>
 	<!-- Screen reader description for the menu on the home timeline screen -->
+	<string name="dropdown_menu">下拉菜单</string>
+	<string name="edit_list">编辑列表</string>
+	<string name="list_members">列表成员</string>
 	<!-- %s is the name of the list -->
+	<string name="list_exclusive_subtitle">列表成员不显示在主页时间线上，以免重复看到嘟文</string>
+	<string name="list_name">列表名</string>
+	<string name="remove">移除</string>
 	<!-- %s is a username -->
-	<string name="see_new_posts">查看新嘟文</string>
+	<string name="confirm_remove_list_member">移除成员？</string>
+	<string name="manage_accounts">管理账户</string>
+	<string name="create_list">创建列表</string>
+	<string name="create">创建</string>
+	<string name="dont_remind_again">不再提醒</string>
+	<!-- %s is a time interval ("5 months") -->
+	<string name="non_mutual_title1">保持尊重 &amp; 切题</string>
+	<string name="non_mutual_text1">确保您的回复礼貌且切题。</string>
 </resources>
diff --git a/mastodon/src/main/res/values-zh-rTW/strings.xml b/mastodon/src/main/res/values-zh-rTW/strings.xml
index d15d3a1da..80f443ddf 100644
--- a/mastodon/src/main/res/values-zh-rTW/strings.xml
+++ b/mastodon/src/main/res/values-zh-rTW/strings.xml
@@ -151,19 +151,7 @@
 	<string name="password">密碼</string>
 	<string name="confirm_password">確認密碼</string>
 	<string name="password_note">包含大寫、特殊字元、以及數字來提升您的密碼強度。</string>
-	<string name="category_academia">學術</string>
-	<string name="category_activism">社會運動</string>
-	<string name="category_all">全部</string>
-	<string name="category_art">藝術</string>
-	<string name="category_food">食物</string>
-	<string name="category_furry">毛茸茸</string>
-	<string name="category_games">遊戲</string>
 	<string name="category_general">一般</string>
-	<string name="category_journalism">新聞記者</string>
-	<string name="category_lgbt">LGBT</string>
-	<string name="category_music">音樂</string>
-	<string name="category_regional">區域性</string>
-	<string name="category_tech">科技</string>
 	<string name="confirm_email_title">請檢查您的收件夾</string>
 	<!-- %s is the email address -->
 	<string name="confirm_email_subtitle">請點擊我們寄給您連結以驗證 %s。我們將於此稍候。</string>
@@ -268,7 +256,6 @@
 	<plurals name="x_reblogs">
 		<item quantity="other">%,d 轉嘟</item>
 	</plurals>
-	<string name="timestamp_via_app">%1$s 透過 %2$s</string>
 	<string name="time_now">剛剛</string>
 	<string name="edit_history">編輯記錄</string>
 	<string name="last_edit_at_x">上次編輯於 %s</string>
@@ -338,7 +325,6 @@
 	<string name="profile_add_row">新增</string>
 	<string name="profile_setup">個人檔案設定</string>
 	<string name="profile_setup_subtitle">您隨時能稍候於個人檔案頁面完成此設定。</string>
-	<string name="profile_setup_explanation">您至多能於個人檔案替任何您想要的內容新增四個欄位。地點、連結、稱謂 — 想像力是您的超能力！</string>
 	<string name="popular_on_mastodon">Mastodon 上之流行內容</string>
 	<string name="follow_all">跟隨所有</string>
 	<string name="server_rules_disagree">不同意</string>
@@ -572,8 +558,6 @@
 	<string name="timeline_following">首頁</string>
 	<string name="lists">列表</string>
 	<string name="followed_hashtags">已跟隨主題標籤</string>
-	<string name="no_lists">您尚未建立任何列表。</string>
-	<string name="no_followed_hashtags">您尚未跟隨任何主題標籤。</string>
 	<string name="manage_lists">管理列表</string>
 	<string name="manage_hashtags">管理主題標籤</string>
 	<!-- Screen reader description for the menu on the home timeline screen -->
@@ -614,4 +598,27 @@
 	<string name="manage_list_members">管理列表成員</string>
 	<string name="list_no_members">尚無成員</string>
 	<string name="list_find_users">尋找欲新增之使用者</string>
+	<string name="reply_to_user">回覆 %s</string>
+	<string name="posted_at">於 %s 發嘟</string>
+	<string name="non_mutual_sheet_title">歡迎，新朋友！</string>
+	<string name="non_mutual_sheet_text">您似乎正在似乎正在回覆沒有互相跟隨的帳號。讓我們建立個美好的第一印象。</string>
+	<string name="got_it">了解</string>
+	<string name="dont_remind_again">不要再提醒我</string>
+	<!-- %s is a time interval ("5 months") -->
+	<string name="old_post_sheet_title">此嘟文已有 %s 的歷史了</string>
+	<string name="old_post_sheet_text">您仍可繼續回覆，但可能不再引起任何波瀾。</string>
+	<plurals name="x_months">
+		<item quantity="other">%,d 個月</item>
+	</plurals>
+	<string name="more_than_two_years">超過兩年</string>
+	<string name="non_mutual_title1">請保持禮貌並且不偏離主題</string>
+	<string name="non_mutual_text1">請確保您的回覆彬彬有禮且切合主題。</string>
+	<string name="non_mutual_title2">請保持語氣親切得體</string>
+	<string name="non_mutual_text2">積極正面的語氣總是值得讚賞的。</string>
+	<string name="non_mutual_title3">請保持思想開放</string>
+	<string name="non_mutual_text3">每個人的談話風格總是獨一無二的。請做好適應的準備。</string>
+	<string name="make_profile_discoverable">使我的個人檔案可以被找到</string>
+	<string name="discoverability">可發現性</string>
+	<string name="discoverability_help">當您於 Mastodon 上選擇加入可發現性時，您的嘟文可能會出現於搜尋結果與趨勢中。\n\n您的個人檔案可能會被推薦給與您志趣相投的人。\n\n即使選擇退出，當其他人以帳號搜尋您時仍將顯示您的個人檔案。</string>
+	<string name="app_version_copied">版本號碼已複製到剪貼簿</string>
 </resources>
diff --git a/mastodon/src/main/res/values/attrs.xml b/mastodon/src/main/res/values/attrs.xml
index 8df5c2256..8f8ff0228 100644
--- a/mastodon/src/main/res/values/attrs.xml
+++ b/mastodon/src/main/res/values/attrs.xml
@@ -15,7 +15,9 @@
 	<attr name="colorM3Background" format="color"/>
 	<attr name="colorM3OnBackground" format="color"/>
 	<attr name="colorM3Surface" format="color"/>
+	<attr name="colorM3SurfaceInverse" format="color"/>
 	<attr name="colorM3OnSurface" format="color"/>
+	<attr name="colorM3OnSurfaceInverse" format="color"/>
 	<attr name="colorM3SurfaceVariant" format="color"/>
 	<attr name="colorM3OnSurfaceVariant" format="color"/>
 	<attr name="colorM3Outline" format="color"/>
@@ -121,4 +123,23 @@
 	<declare-styleable name="HeaderSubtitleLinearLayout">
 		<attr name="firstFraction" format="fraction"/>
 	</declare-styleable>
+
+	<declare-styleable name="WrappingLinearLayout">
+		<attr name="android:verticalGap" format="dimension"/>
+		<attr name="android:horizontalGap" format="dimension"/>
+	</declare-styleable>
+
+	<declare-styleable name="FixedAspectRatioImageView">
+		<attr name="aspectRatio" format="float"/>
+		<attr name="useHeight" format="boolean"/>
+	</declare-styleable>
+
+	<declare-styleable name="ProgressBarButton">
+		<attr name="progressBar" format="reference"/>
+	</declare-styleable>
+
+	<declare-styleable name="RoundedImageView">
+		<attr name="cornerRadius" format="dimension"/>
+		<attr name="roundBottomCorners" format="boolean"/>
+	</declare-styleable>
 </resources>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values/ids.xml b/mastodon/src/main/res/values/ids.xml
index a38c04aa4..56a9d3c41 100644
--- a/mastodon/src/main/res/values/ids.xml
+++ b/mastodon/src/main/res/values/ids.xml
@@ -22,6 +22,11 @@
 	<item name="notifications_mentions" type="id"/>
 
 	<item name="save" type="id"/>
+	<item name="remove_from_list" type="id"/>
+
+	<item name="menu_add_timeline" type="id" />
+	<item name="menu_back" type="id" />
+	<item name="menu_add_local_timelines" type="id" />
 
 	<item name="menu_add_timeline" type="id" />
 	<item name="menu_back" type="id" />
@@ -32,8 +37,13 @@
 	<item name="list_item_switch" type="id"/>
 	<item name="list_item_checkbox" type="id"/>
 	<item name="list_item_radio" type="id"/>
+	<item name="list_item_switch_separated" type="id"/>
 	<item name="list_item_account" type="id"/>
+	<item name="list_item_options" type="id"/>
+	<item name="list_item_avatar_pile" type="id"/>
 
 	<item name="server_about" type="id"/>
 	<item name="server_rules" type="id"/>
+
+	<item name="button_progress_orig_color" type="id"/>
 </resources>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values/palettes.xml b/mastodon/src/main/res/values/palettes.xml
index 855cf4bc6..d2b8646ec 100644
--- a/mastodon/src/main/res/values/palettes.xml
+++ b/mastodon/src/main/res/values/palettes.xml
@@ -60,6 +60,8 @@
 		<item name="colorM3Background">?colorGray25</item>
 		<item name="colorM3OnBackground">?colorGray900</item>
 		<item name="colorM3Surface">?colorGray25</item>
+		<item name="colorM3SurfaceInverse">?colorNeutral800</item>
+		<item name="colorM3OnSurfaceInverse">?colorNeutral50</item>
 		<item name="colorM3OnSurface">?colorGray900</item>
 		<item name="colorM3SurfaceVariant">?colorNeutral100</item>
 		<item name="colorM3OnSurfaceVariant">?colorNeutral700</item>
@@ -150,6 +152,8 @@
 		<item name="colorM3OnBackground">?colorGray100</item>
 		<item name="colorM3Surface">?colorGray900</item>
 		<item name="colorM3OnSurface">?colorGray100</item>
+		<item name="colorM3SurfaceInverse">?colorNeutral100</item>
+		<item name="colorM3OnSurfaceInverse">?colorNeutral800</item>
 		<item name="colorM3SurfaceVariant">?colorNeutral700</item>
 		<item name="colorM3OnSurfaceVariant">?colorNeutral100</item>
 		<item name="colorM3Outline">?colorGray300</item>
diff --git a/mastodon/src/main/res/values/signup_params.xml b/mastodon/src/main/res/values/signup_params.xml
new file mode 100644
index 000000000..8f4285a4a
--- /dev/null
+++ b/mastodon/src/main/res/values/signup_params.xml
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string-array name="server_supported_timezones" translatable="false">
+		<item>Africa/Algiers</item>
+		<item>Africa/Cairo</item>
+		<item>Africa/Casablanca</item>
+		<item>Africa/Harare</item>
+		<item>Africa/Johannesburg</item>
+		<item>Africa/Monrovia</item>
+		<item>Africa/Nairobi</item>
+		<item>America/Argentina/Buenos_Aires</item>
+		<item>America/Bogota</item>
+		<item>America/Caracas</item>
+		<item>America/Chicago</item>
+		<item>America/Chihuahua</item>
+		<item>America/Denver</item>
+		<item>America/Godthab</item>
+		<item>America/Guatemala</item>
+		<item>America/Guyana</item>
+		<item>America/Halifax</item>
+		<item>America/Indiana/Indianapolis</item>
+		<item>America/Juneau</item>
+		<item>America/La_Paz</item>
+		<item>America/Lima</item>
+		<item>America/Los_Angeles</item>
+		<item>America/Mazatlan</item>
+		<item>America/Mexico_City</item>
+		<item>America/Monterrey</item>
+		<item>America/Montevideo</item>
+		<item>America/New_York</item>
+		<item>America/Phoenix</item>
+		<item>America/Puerto_Rico</item>
+		<item>America/Regina</item>
+		<item>America/Santiago</item>
+		<item>America/Sao_Paulo</item>
+		<item>America/St_Johns</item>
+		<item>America/Tijuana</item>
+		<item>Asia/Almaty</item>
+		<item>Asia/Baghdad</item>
+		<item>Asia/Baku</item>
+		<item>Asia/Bangkok</item>
+		<item>Asia/Chongqing</item>
+		<item>Asia/Colombo</item>
+		<item>Asia/Dhaka</item>
+		<item>Asia/Hong_Kong</item>
+		<item>Asia/Irkutsk</item>
+		<item>Asia/Jakarta</item>
+		<item>Asia/Jerusalem</item>
+		<item>Asia/Kabul</item>
+		<item>Asia/Kamchatka</item>
+		<item>Asia/Karachi</item>
+		<item>Asia/Kathmandu</item>
+		<item>Asia/Kolkata</item>
+		<item>Asia/Krasnoyarsk</item>
+		<item>Asia/Kuala_Lumpur</item>
+		<item>Asia/Kuwait</item>
+		<item>Asia/Magadan</item>
+		<item>Asia/Muscat</item>
+		<item>Asia/Novosibirsk</item>
+		<item>Asia/Rangoon</item>
+		<item>Asia/Riyadh</item>
+		<item>Asia/Seoul</item>
+		<item>Asia/Shanghai</item>
+		<item>Asia/Singapore</item>
+		<item>Asia/Srednekolymsk</item>
+		<item>Asia/Taipei</item>
+		<item>Asia/Tashkent</item>
+		<item>Asia/Tbilisi</item>
+		<item>Asia/Tehran</item>
+		<item>Asia/Tokyo</item>
+		<item>Asia/Ulaanbaatar</item>
+		<item>Asia/Urumqi</item>
+		<item>Asia/Vladivostok</item>
+		<item>Asia/Yakutsk</item>
+		<item>Asia/Yekaterinburg</item>
+		<item>Asia/Yerevan</item>
+		<item>Atlantic/Azores</item>
+		<item>Atlantic/Cape_Verde</item>
+		<item>Atlantic/South_Georgia</item>
+		<item>Australia/Adelaide</item>
+		<item>Australia/Brisbane</item>
+		<item>Australia/Canberra</item>
+		<item>Australia/Darwin</item>
+		<item>Australia/Hobart</item>
+		<item>Australia/Melbourne</item>
+		<item>Australia/Perth</item>
+		<item>Australia/Sydney</item>
+		<item>Etc/GMT+12</item>
+		<item>Etc/UTC</item>
+		<item>Europe/Amsterdam</item>
+		<item>Europe/Athens</item>
+		<item>Europe/Belgrade</item>
+		<item>Europe/Berlin</item>
+		<item>Europe/Bratislava</item>
+		<item>Europe/Brussels</item>
+		<item>Europe/Bucharest</item>
+		<item>Europe/Budapest</item>
+		<item>Europe/Copenhagen</item>
+		<item>Europe/Dublin</item>
+		<item>Europe/Helsinki</item>
+		<item>Europe/Istanbul</item>
+		<item>Europe/Kaliningrad</item>
+		<item>Europe/Kiev</item>
+		<item>Europe/Lisbon</item>
+		<item>Europe/Ljubljana</item>
+		<item>Europe/London</item>
+		<item>Europe/Madrid</item>
+		<item>Europe/Minsk</item>
+		<item>Europe/Moscow</item>
+		<item>Europe/Paris</item>
+		<item>Europe/Prague</item>
+		<item>Europe/Riga</item>
+		<item>Europe/Rome</item>
+		<item>Europe/Samara</item>
+		<item>Europe/Sarajevo</item>
+		<item>Europe/Skopje</item>
+		<item>Europe/Sofia</item>
+		<item>Europe/Stockholm</item>
+		<item>Europe/Tallinn</item>
+		<item>Europe/Vienna</item>
+		<item>Europe/Vilnius</item>
+		<item>Europe/Volgograd</item>
+		<item>Europe/Warsaw</item>
+		<item>Europe/Zagreb</item>
+		<item>Europe/Zurich</item>
+		<item>Pacific/Apia</item>
+		<item>Pacific/Auckland</item>
+		<item>Pacific/Chatham</item>
+		<item>Pacific/Fakaofo</item>
+		<item>Pacific/Fiji</item>
+		<item>Pacific/Guadalcanal</item>
+		<item>Pacific/Guam</item>
+		<item>Pacific/Honolulu</item>
+		<item>Pacific/Majuro</item>
+		<item>Pacific/Midway</item>
+		<item>Pacific/Noumea</item>
+		<item>Pacific/Pago_Pago</item>
+		<item>Pacific/Port_Moresby</item>
+		<item>Pacific/Tongatapu</item>
+	</string-array>
+	<string-array name="server_supported_locales" translatable="false">
+		<item>af</item>
+		<item>an</item>
+		<item>ar</item>
+		<item>ast</item>
+		<item>be</item>
+		<item>bg</item>
+		<item>bn</item>
+		<item>br</item>
+		<item>bs</item>
+		<item>ca</item>
+		<item>ckb</item>
+		<item>co</item>
+		<item>cs</item>
+		<item>cy</item>
+		<item>da</item>
+		<item>de</item>
+		<item>el</item>
+		<item>en</item>
+		<item>en-GB</item>
+		<item>eo</item>
+		<item>es</item>
+		<item>es-AR</item>
+		<item>es-MX</item>
+		<item>et</item>
+		<item>eu</item>
+		<item>fa</item>
+		<item>fi</item>
+		<item>fo</item>
+		<item>fr</item>
+		<item>fr-QC</item>
+		<item>fy</item>
+		<item>ga</item>
+		<item>gd</item>
+		<item>gl</item>
+		<item>he</item>
+		<item>hi</item>
+		<item>hr</item>
+		<item>hu</item>
+		<item>hy</item>
+		<item>id</item>
+		<item>ig</item>
+		<item>io</item>
+		<item>is</item>
+		<item>it</item>
+		<item>ja</item>
+		<item>ka</item>
+		<item>kab</item>
+		<item>kk</item>
+		<item>kn</item>
+		<item>ko</item>
+		<item>ku</item>
+		<item>kw</item>
+		<item>la</item>
+		<item>lt</item>
+		<item>lv</item>
+		<item>mk</item>
+		<item>ml</item>
+		<item>mr</item>
+		<item>ms</item>
+		<item>my</item>
+		<item>nl</item>
+		<item>nn</item>
+		<item>no</item>
+		<item>oc</item>
+		<item>pa</item>
+		<item>pl</item>
+		<item>pt-BR</item>
+		<item>pt-PT</item>
+		<item>ro</item>
+		<item>ru</item>
+		<item>sa</item>
+		<item>sc</item>
+		<item>sco</item>
+		<item>si</item>
+		<item>sk</item>
+		<item>sl</item>
+		<item>sq</item>
+		<item>sr</item>
+		<item>sr-Latn</item>
+		<item>sv</item>
+		<item>szl</item>
+		<item>ta</item>
+		<item>te</item>
+		<item>th</item>
+		<item>tr</item>
+		<item>tt</item>
+		<item>ug</item>
+		<item>uk</item>
+		<item>ur</item>
+		<item>vi</item>
+		<item>zgh</item>
+		<item>zh-CN</item>
+		<item>zh-HK</item>
+		<item>zh-TW</item>
+	</string-array>
+</resources>
\ 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 c4319e652..e701d8638 100644
--- a/mastodon/src/main/res/values/strings.xml
+++ b/mastodon/src/main/res/values/strings.xml
@@ -36,13 +36,13 @@
 		<item quantity="other">following</item>
 	</plurals>
 	<string name="posts">Posts</string>
-	<string name="posts_and_replies">Posts and Replies</string>
+	<string name="posts_and_replies">Posts and replies</string>
 	<string name="media">Media</string>
 	<string name="profile_about">About</string>
 	<string name="button_follow">Follow</string>
 	<string name="button_following">Following</string>
-	<string name="edit_profile">Edit Profile</string>
-	<string name="share_user">Share profile</string>
+	<string name="edit_profile">Edit profile</string>
+	<string name="share_user">Share profile via…</string>
 	<string name="mute_user">Mute %s</string>
 	<string name="unmute_user">Unmute %s</string>
 	<string name="block_user">Block %s</string>
@@ -159,29 +159,17 @@
 	<string name="report_personal_subtitle">Here are your options for controlling what you see on Mastodon:</string>
 	<string name="back">Back</string>
 	<string name="search_communities">Server name or URL</string>
-	<string name="instance_rules_title">Server Rules</string>
+	<string name="instance_rules_title">Server rules</string>
 	<string name="instance_rules_subtitle">By continuing, you agree to follow by the following rules set and enforced by the %s moderators.</string>
-	<string name="signup_title">Create Account</string>
+	<string name="signup_title">Create account</string>
 	<string name="display_name">Name</string>
 	<string name="username">Username</string>
 	<string name="email">Email</string>
 	<string name="password">Password</string>
 	<string name="confirm_password">Confirm password</string>
 	<string name="password_note">Include capital letters, special characters, and numbers to increase your password strength.</string>
-	<string name="category_academia">Academia</string>
-	<string name="category_activism">Activism</string>
-	<string name="category_all">All</string>
-	<string name="category_art">Art</string>
-	<string name="category_food">Food</string>
-	<string name="category_furry">Furry</string>
-	<string name="category_games">Games</string>
 	<string name="category_general">General</string>
-	<string name="category_journalism">Journalism</string>
-	<string name="category_lgbt">LGBT</string>
-	<string name="category_music">Music</string>
-	<string name="category_regional">Regional</string>
-	<string name="category_tech">Tech</string>
-	<string name="confirm_email_title">Check Your Inbox</string>
+	<string name="confirm_email_title">Check your inbox</string>
 	<!-- %s is the email address -->
 	<string name="confirm_email_subtitle">Tap the link we sent you to verify %s. We’ll wait right here.</string>
 	<string name="confirm_email_didnt_get">Didn’t get a link?</string>
@@ -216,7 +204,7 @@
 	<string name="theme_dark">Dark</string>
 	<string name="settings_behavior">Behavior</string>
 	<string name="settings_gif">Play animated avatars and emoji</string>
-	<string name="settings_custom_tabs">Use in-app browser</string>
+	<string name="settings_custom_tabs">Open links in</string>
 	<string name="settings_notifications">Notifications</string>
 	<string name="settings_contribute">Contribute to Mastodon</string>
 	<string name="settings_tos">Terms of service</string>
@@ -245,8 +233,8 @@
 	<string name="followed_user">You’re now following %s</string>
 	<string name="following_user_requested">Requested to follow %s</string>
 	<string name="open_in_browser">Open in browser</string>
-	<string name="hide_boosts_from_user">Hide boosts from %s</string>
-	<string name="show_boosts_from_user">Show boosts from %s</string>
+	<string name="hide_boosts_from_user">Hide boosts</string>
+	<string name="show_boosts_from_user">Show boosts</string>
 	<string name="signup_reason">Why do you want to join?</string>
 	<string name="signup_reason_note">This will help us review your application.</string>
 	<string name="clear">Clear</string>
@@ -269,7 +257,7 @@
 	<string name="recommended_accounts_info_banner">You might like these accounts based on others you follow.</string>
 	<string name="see_new_posts">New posts</string>
 	<string name="load_missing_posts">Load missing posts</string>
-	<string name="follow_back">Follow Back</string>
+	<string name="follow_back">Follow back</string>
 	<string name="button_follow_pending">Pending</string>
 	<string name="follows_you">Follows you</string>
 	<string name="manually_approves_followers">Manually approves followers</string>
@@ -291,7 +279,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>
@@ -327,29 +314,26 @@
 	<string name="file_size_mb">%.2f MB</string>
 	<string name="file_size_gb">%.2f GB</string>
 	<string name="upload_processing">Processing…</string>
-	<!-- %s is version like 1.2.3 -->
-	<!-- %s is version like 1.2.3 -->
 	<!-- %s is file size -->
 	<string name="download_update">Download (%s)</string>
 	<string name="install_update">Install</string>
-	<string name="privacy_policy_title">Your Privacy</string>
+	<string name="privacy_policy_title">Your privacy</string>
 	<string name="privacy_policy_subtitle">Although the Mastodon app does not collect any data, the server you sign up through may have a different policy.\n\nIf you disagree with the policy for %s, you can go back and pick a different server.</string>
-	<string name="i_agree">I Agree</string>
+	<string name="i_agree">I agree</string>
 	<string name="empty_list">This list is empty</string>
 	<string name="instance_signup_closed">This server does not accept new registrations.</string>
 	<string name="text_copied">Copied to clipboard</string>
 	<string name="add_bookmark">Bookmark</string>
 	<string name="remove_bookmark">Remove bookmark</string>
 	<string name="bookmarks">Bookmarks</string>
-	<string name="your_favorites">Your Favorites</string>
-	<string name="login_title">Welcome Back</string>
+	<string name="your_favorites">Your favorites</string>
+	<string name="login_title">Welcome back</string>
 	<string name="login_subtitle">Log in with the server where you created your account.</string>
 	<string name="server_url">Server URL</string>
-	<string name="signup_random_server_explain">We’ll pick a server based on your language if you continue without making a selection.</string>
-	<string name="server_filter_any_language">Any Language</string>
-	<string name="server_filter_instant_signup">Instant Sign-up</string>
-	<string name="server_filter_manual_review">Manual Review</string>
-	<string name="server_filter_any_signup_speed">Any Sign-up Speed</string>
+	<string name="server_filter_any_language">Any language</string>
+	<string name="server_filter_instant_signup">Instant sign-up</string>
+	<string name="server_filter_manual_review">Manual review</string>
+	<string name="server_filter_any_signup_speed">Any sign-up speed</string>
 	<string name="server_filter_region_europe">Europe</string>
 	<string name="server_filter_region_north_america">North America</string>
 	<string name="server_filter_region_south_america">South America</string>
@@ -357,14 +341,11 @@
 	<string name="server_filter_region_asia">Asia</string>
 	<string name="server_filter_region_oceania">Oceania</string>
 	<string name="not_accepting_new_members">Not accepting new members</string>
-	<string name="category_special_interests">Special Interests</string>
+	<string name="category_special_interests">Special interests</string>
 	<string name="signup_passwords_dont_match">Passwords don’t match</string>
-	<string name="pick_server_for_me">Pick for me</string>
 	<string name="profile_add_row">Add row</string>
 	<string name="profile_setup">Profile setup</string>
 	<string name="profile_setup_subtitle">You can always complete this later in the Profile tab.</string>
-	<string name="profile_setup_explanation">You can add up to four profile fields for anything you want. Location, links, pronouns — the sky is the limit.</string>
-	<string name="popular_on_mastodon">Popular on Mastodon</string>
 	<string name="follow_all">Follow all</string>
 	<string name="server_rules_disagree">Disagree</string>
 	<string name="privacy_policy_explanation">TL;DR: We don’t collect or process anything.</string>
@@ -613,8 +594,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 -->
@@ -635,7 +614,7 @@
 	<string name="remove">Remove</string>
 	<string name="add_list_member">Add member</string>
 	<string name="search_among_people_you_follow">Search among people you follow</string>
-	<string name="add_user_to_list">Add to list…</string>
+	<string name="add_user_to_list">Add/remove from lists…</string>
 	<string name="add_user_to_list_title">Add to list</string>
 	<!-- %s is a username -->
 	<string name="manage_user_lists">Manage the lists %s appears on</string>
@@ -656,6 +635,99 @@
 	<string name="manage_list_members">Manage list members</string>
 	<string name="list_no_members">No members yet</string>
 	<string name="list_find_users">Find users to add</string>
-	<string name="sk_poll_results">View results</string>
-	<string name="sk_poll_view">Hide results</string>
+	<string name="reply_to_user">Reply to %s</string>
+	<string name="posted_at">Posted at %s</string>
+	<string name="non_mutual_sheet_title">Hello, new connection!</string>
+	<string name="non_mutual_sheet_text">Looks like you’re about to reply to someone who isn’t a mutual connection yet. Let’s make a great first impression.</string>
+	<string name="got_it">Got it</string>
+	<string name="dont_remind_again">Don’t remind me again</string>
+	<!-- %s is a time interval ("5 months") -->
+	<string name="old_post_sheet_title">This post is %s old</string>
+	<string name="old_post_sheet_text">You can still reply, but it may no longer be relevant.</string>
+	<plurals name="x_months">
+		<item quantity="one">%,d month</item>
+		<item quantity="other">%,d months</item>
+	</plurals>
+	<string name="more_than_two_years">more than 2 years</string>
+	<string name="non_mutual_title1">Stay respectful &amp; relevant</string>
+	<string name="non_mutual_text1">Ensure your reply is courteous and on-topic.</string>
+	<string name="non_mutual_title2">Embrace kindness</string>
+	<string name="non_mutual_text2">A positive tone is always appreciated.</string>
+	<string name="non_mutual_title3">Be open</string>
+	<string name="non_mutual_text3">Everyone’s conversation style is unique. Be ready to adapt.</string>
+	<string name="make_profile_discoverable">Make my profile discoverable</string>
+	<string name="discoverability">Discoverability</string>
+	<string name="discoverability_help">When you opt into discoverability on Mastodon, your posts may appear in search results and trending.\n\nYour profile may be suggested to people with similar interests to you.\n\nOpting out does not hide your profile if someone searches for you by name.</string>
+	<string name="app_version_copied">Version number copied to clipboard</string>
+	<string name="onboarding_recommendations_intro">You curate your own home feed.
The more people you follow, the more active and interesting it will be.</string>
+	<string name="onboarding_recommendations_title">Personalize your home feed</string>
+	<string name="article_by_author">By %s</string>
+	<string name="info">Info</string>
+	<string name="button_reblogged">Boosted</string>
+	<string name="button_favorited">Favorited</string>
+	<string name="bookmarked">Bookmarked</string>
+	<string name="join_server_x_with_invite">Join %s with invite</string>
+	<string name="expired_invite_link">Expired invite link</string>
+	<string name="expired_clipboard_invite_link_alert">The invite link for %1$s in your clipboard has expired and cannot be used to sign up.\n\nYou can request a new link from an existing user, sign up through %2$s, or pick another server to sign up through.</string>
+	<string name="invalid_invite_link">Invalid invite link</string>
+	<string name="invalid_clipboard_invite_link_alert">The invite link for %1$s in your clipboard is not valid and cannot be used to sign up.\n\nYou can request a new link from an existing user, sign up through %2$s, or pick another server to sign up through.</string>
+	<string name="use_invite_link">Use invite link</string>
+	<string name="enter_invite_link">Enter invite link</string>
+	<string name="this_invite_is_invalid">This invite link is not valid.</string>
+	<string name="this_invite_has_expired">This invite link has expired.</string>
+	<string name="invite_link_pasted">Link pasted from your clipboard.</string>
+	<string name="need_invite_to_join_server">To join %s, you’ll need an invite link from an existing user.</string>
+	<string name="mute_user_confirm_title">Mute user?</string>
+	<string name="user_wont_know_muted">They won’t know they’ve been muted.</string>
+	<string name="user_can_still_see_your_posts">They can still see your posts, but you won’t see theirs.</string>
+	<string name="you_wont_see_user_mentions">You won’t see posts that mention them.</string>
+	<string name="user_can_mention_and_follow_you">They can mention and follow you, but you won’t see them.</string>
+	<string name="unmuted_user_x">Unmuted %s</string>
+	<string name="block_user_confirm_title">Block user?</string>
+	<string name="user_can_see_blocked">They can see that they’re blocked.</string>
+	<string name="user_cant_see_each_other_posts">They can’t see your posts and you won’t see theirs.</string>
+	<string name="user_cant_mention_or_follow_you">They can’t mention or follow you.</string>
+	<string name="unblocked_user_x">Unblocked %s</string>
+	<string name="block_domain_confirm_title">Block domain?</string>
+	<string name="do_block_server">Block server</string>
+	<string name="block_user_x_instead">Block %s instead</string>
+	<string name="users_cant_see_blocked">You won’t see posts or notifications from users on this server.</string>
+	<string name="you_wont_see_server_posts">You won’t see any posts from users on this server.</string>
+	<string name="server_followers_will_be_removed">Your followers from this server will be removed.</string>
+	<string name="server_cant_mention_or_follow_you">Nobody from this server can follow you.</string>
+	<string name="server_can_interact_with_older">People from this server can interact with your old posts.</string>
+	<string name="unblocked_domain_x">Unblocked domain %s</string>
+	<string name="handle_help_title">What’s in a handle?</string>
+	<string name="handle_title">Their handle</string>
+	<string name="handle_username_explanation">Their unique identifier on their server. It’s possible to find users with the same username on different servers.</string>
+	<string name="handle_title_own">Your handle</string>
+	<string name="handle_username_explanation_own">Your unique identifier on this server. It’s possible to find users with the same username on different servers.</string>
+	<string name="server">Server</string>
+	<string name="handle_server_explanation">Their digital home, where all of their posts live.</string>
+	<string name="handle_explanation">Since handles say who someone is and where they are, you can interact with people across the social web of &lt;a>ActivityPub-powered platforms&lt;/a>.</string>
+	<string name="handle_server_explanation_own">Your digital home, where all of your posts live. Don’t like this one? Transfer servers at any time and bring your followers, too.</string>
+	<string name="handle_explanation_own">Because your handle says who you are and where you are, people can interact with you across the social web of &lt;a>ActivityPub-powered platforms&lt;/a>.</string>
+	<string name="what_is_activitypub_title">What’s ActivityPub?</string>
+	<string name="what_is_activitypub">ActivityPub is like the language Mastodon speaks with other social networks.\n\nIt lets you connect and interact with people not just on Mastodon, but across different social apps too.</string>
+	<string name="handle_copied">Handle copied to clipboard.</string>
+	<string name="qr_code">QR code</string>
+	<string name="scan_qr_code">Scan QR code</string>
+	<!-- Shown on a button that saves a file, after it was successfully saved -->
+	<string name="saved">Saved</string>
+	<string name="image_saved">Image saved.</string>
+	<string name="video_saved">Video saved.</string>
+	<string name="view_file">View</string>
+	<string name="share_sheet_preview_profile">%s on Mastodon</string>
+	<string name="share_sheet_preview_post">%1$s on Mastodon: “%2$s”</string>
+	<string name="copy_profile_link">Copy link to profile</string>
+	<string name="in_app_browser">In-app browser</string>
+	<string name="system_browser">System browser</string>
+	<string name="add_muted_word_short">Add word</string>
+	<string name="tab_home">Home</string>
+	<string name="tab_search">Explore</string>
+	<string name="tab_profile">Profile</string>
+	<string name="pin_post">Pin on profile</string>
+	<string name="unpin_post">Unpin from profile</string>
+	<string name="post_pinned">Post has been pinned</string>
+	<string name="post_unpinned">Post has been unpinned</string>
 </resources>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values/styles.xml b/mastodon/src/main/res/values/styles.xml
index 3b0b70c32..6b6e4ec9a 100644
--- a/mastodon/src/main/res/values/styles.xml
+++ b/mastodon/src/main/res/values/styles.xml
@@ -199,6 +199,18 @@
 		<item name="android:paddingStart">16dp</item>
 	</style>
 
+	<style name="Widget.Mastodon.M3.Button.IconWithLabel">
+		<item name="android:background">@drawable/bg_button_m3_icon_label</item>
+		<item name="android:textColor">@color/button_text_m3_text</item>
+		<item name="android:drawableTint">@color/button_text_m3_text</item>
+		<item name="android:drawablePadding">4dp</item>
+		<item name="android:textSize">11dp</item>
+		<item name="android:paddingLeft">0dp</item>
+		<item name="android:paddingRight">0dp</item>
+		<item name="android:paddingTop">11dp</item>
+		<item name="android:paddingBottom">11dp</item>
+	</style>
+
 	<style name="Widget.Mastodon.M3.Button.Filled">
 		<item name="android:background">@drawable/bg_button_m3_filled</item>
 		<item name="android:textColor">@color/button_text_m3_filled</item>
diff --git a/mastodon/src/main/res/values/tokens.xml b/mastodon/src/main/res/values/tokens.xml
index 79f1bbe8e..1fc8c4323 100644
--- a/mastodon/src/main/res/values/tokens.xml
+++ b/mastodon/src/main/res/values/tokens.xml
@@ -109,4 +109,9 @@
   <!-- Linear motion path. -->
   <integer name="m3_sys_motion_path">0</integer>
 
+	<dimen name="m3_sys_elevation_level1">1dp</dimen>
+	<dimen name="m3_sys_elevation_level2">3dp</dimen>
+	<dimen name="m3_sys_elevation_level3">6dp</dimen>
+	<dimen name="m3_sys_elevation_level4">8dp</dimen>
+	<dimen name="m3_sys_elevation_level5">12dp</dimen>
 </resources>