diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/CreateListAddMembersFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/CreateListAddMembersFragment.java
index afd92a0c2..0e0ef88d4 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/CreateListAddMembersFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/CreateListAddMembersFragment.java
@@ -1,6 +1,7 @@
 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;
@@ -128,7 +129,7 @@ public class CreateListAddMembersFragment extends BaseAccountListFragment implem
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
 		MenuItem item=menu.add(R.string.add_list_member);
-		item.setIcon(R.drawable.ic_add_24px);
+		item.setIcon(R.drawable.ic_fluent_add_24_regular);
 		item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 	}
 
@@ -320,4 +321,10 @@ public class CreateListAddMembersFragment extends BaseAccountListFragment implem
 	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/ListTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
index b8ec041d3..514566874 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
@@ -97,7 +97,7 @@ 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(FollowList list) {
                                 if(getActivity()==null) return;
@@ -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/ManageListsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ManageListsFragment.java
index e1378acb0..796064d98 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ManageListsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ManageListsFragment.java
@@ -114,7 +114,7 @@ public class ManageListsFragment extends BaseSettingsFragment<FollowList> implem
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
 		fab=view.findViewById(R.id.fab);
-		fab.setImageResource(R.drawable.ic_add_24px);
+		fab.setImageResource(R.drawable.ic_fluent_add_24_regular);
 		fab.setContentDescription(getString(R.string.create_list));
 		fab.setOnClickListener(v->onFabClick());
 	}
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 755238e83..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
@@ -66,7 +66,8 @@ public class SettingsDebugFragment extends BaseSettingsFragment<Void>{
 	}
 
 	private void onResetPreReplySheetsClick(ListItem<?> item){
-		GlobalUserPreferences.resetPreReplySheets();
+		// TODO fix this
+//		GlobalUserPreferences.resetPreReplySheets();
 		Toast.makeText(getActivity(), "Pre-reply sheets were reset", Toast.LENGTH_SHORT).show();
 	}
 
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 a2a91dc2d..dd1c6068e 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
@@ -79,9 +79,9 @@ public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{
 			applicationName=findViewById(R.id.application_name);
 			visibility=findViewById(R.id.visibility);
 			time=findViewById(R.id.time);
-			date=findViewById(R.id.date);
-			app=findViewById(R.id.app_name);
-			dateAppSeparator=findViewById(R.id.date_app_separator);
+//			date=findViewById(R.id.date);
+//			app=findViewById(R.id.app_name);
+//			dateAppSeparator=findViewById(R.id.date_app_separator);
 
 			reblogs.setOnClickListener(v->startAccountListFragment(StatusReblogsListFragment.class));
 			favorites.setOnClickListener(v->startAccountListFragment(StatusFavoritesListFragment.class));
@@ -108,7 +108,7 @@ public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{
 			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, "") : "");
+				time.setText(timeStr != null ? item.parentFragment.getString(R.string., 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));