diff --git a/changelog.d/avatar_mentions.change b/changelog.d/avatar_mentions.change
deleted file mode 100644
index f75f02ea4..000000000
--- a/changelog.d/avatar_mentions.change
+++ /dev/null
@@ -1 +0,0 @@
-If user avatars next to mentions are enabled it will show empty placeholder avatar next to label while user is being fetched, to avoid jumps
diff --git a/changelog.d/follower-remove.fix b/changelog.d/follower-remove.fix
deleted file mode 100644
index 4b78b087d..000000000
--- a/changelog.d/follower-remove.fix
+++ /dev/null
@@ -1 +0,0 @@
-Fix follower remove API call
diff --git a/changelog.d/streaming_indicator.add b/changelog.d/streaming_indicator.add
index f2abe04a1..547307384 100644
--- a/changelog.d/streaming_indicator.add
+++ b/changelog.d/streaming_indicator.add
@@ -1,3 +1 @@
-Added an indicator next to instance's name showing WebSocket connection status (if enabled).
-Timeline no longer show "loading" indicator at the bottom when fetching newer posts.
-Added small indicator on top of timeline when new posts are being fetched
+Added an indicator next to instance's name showing WebSocket connection status (if enabled)
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index 69fca2f2c..cc4aecfe3 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -1,5 +1,6 @@
 import { get, reduce } from 'lodash'
-import { mapState } from 'pinia'
+import { mapState as mapPiniaState } from 'pinia'
+import { mapState } from 'vuex'
 
 import ChatMessageList from 'src/components/chat_message_list/chat_message_list.vue'
 import PostStatusForm from 'src/components/post_status_form/post_status_form.vue'
@@ -12,7 +13,6 @@ import { useInterfaceStore } from 'src/stores/interface.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
 import { useStatusesStore } from 'src/stores/statuses.js'
-import { useStreamingStore } from 'src/stores/streaming.js'
 
 import { fetchConversation, fetchStatus } from 'src/api/public.js'
 import { WSConnectionStatus } from 'src/api/websocket.js'
@@ -93,7 +93,6 @@ const conversation = {
       default: false,
     },
   },
-  emits: ['update:virtualHeight'],
   data() {
     return {
       focused: null,
@@ -102,7 +101,6 @@ const conversation = {
       inlineDivePosition: null,
       loadStatusError: null,
       unsuspendibleIds: new Set(),
-      virtualHeight: 120,
     }
   },
   created() {
@@ -110,9 +108,6 @@ const conversation = {
       this.fetchConversation()
     }
   },
-  mounted() {
-    this.updateVirtualHeight()
-  },
   computed: {
     status() {
       return useStatusesStore().allStatuses.get(this.statusId)
@@ -365,8 +360,8 @@ const conversation = {
       return !!(this.expanded || this.isPage)
     },
     hiddenStyle() {
-      if (this.isExpanded) return {}
-      return { height: this.virtualHeight + 'px' }
+      const height = this.status?.virtualHeight || '120px'
+      return this.virtualHidden ? { height } : {}
     },
     threadDisplayStatus() {
       return this.conversation.reduce((a, k) => {
@@ -393,11 +388,11 @@ const conversation = {
     maybeFocused() {
       return this.isExpanded ? this.focused : null
     },
-    ...mapState(useMergedConfigStore, ['mergedConfig']),
-    ...mapState(useStreamingStore, {
-      mastoUserSocketStatus: (state) => state.state,
+    ...mapPiniaState(useMergedConfigStore, ['mergedConfig']),
+    ...mapState({
+      mastoUserSocketStatus: (state) => state.api.mastoUserSocketStatus,
     }),
-    ...mapState(useInterfaceStore, {
+    ...mapPiniaState(useInterfaceStore, {
       mobileLayout: (store) => store.layoutType === 'mobile',
     }),
   },
@@ -431,7 +426,10 @@ const conversation = {
       }
     },
     virtualHidden() {
-      this.updateVirtualHeight()
+      useStatusesStore().setVirtualHeight({
+        statusId: this.statusId,
+        height: `${this.$el.clientHeight}px`,
+      })
     },
   },
   methods: {
@@ -620,16 +618,6 @@ const conversation = {
         this.$router.push({ name: 'conversation', params: { id: data.id } })
       }
     },
-    updateVirtualHeight() {
-      this.$nextTick(() => {
-        this.virtualHeight = this.$refs.body.getBoundingClientRect().height
-        this.$emit('update:virtualHeight', {
-          id: this.status.id,
-          height: this.virtualHeight,
-          top: this.$el.clientTop,
-        })
-      })
-    },
   },
 }
 
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index cc1376978..ae6e3a0ce 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -40,7 +40,6 @@
     <div
       v-if="isPage && !status"
       class="conversation-body"
-      ref="body"
       :class="{ 'panel-body': isExpanded }"
     >
       <p v-if="!loadStatusError">
@@ -57,7 +56,6 @@
     <div
       v-else
       class="conversation-body"
-      ref="body"
       :class="{ 'panel-body': isExpanded }"
     >
       <div
@@ -118,7 +116,6 @@
               @goto="setFocused"
               @dive="() => diveIntoStatus(status.id)"
               @suspendable-state-change="onStatusSuspendStateChange"
-              @height-change="updateVirtualHeight"
             />
             <div
               v-if="showOtherRepliesButtonBelowStatus && getReplies(status.id).length > 1"
@@ -177,7 +174,6 @@
           @goto="setFocused"
           @dive="diveIntoStatus"
           @suspendable-state-change="onStatusSuspendStateChange"
-          @height-change="updateVirtualHeight"
         />
       </div>
       <div
@@ -204,7 +200,6 @@
             @goto="setFocused"
             @toggle-expanded="toggleExpanded"
             @suspendable-state-change="onStatusSuspendStateChange"
-            @height-change="updateVirtualHeight"
           />
         </article>
       </div>
diff --git a/src/components/desktop_nav/desktop_nav.js b/src/components/desktop_nav/desktop_nav.js
index 15a5cfb15..32d0b37a9 100644
--- a/src/components/desktop_nav/desktop_nav.js
+++ b/src/components/desktop_nav/desktop_nav.js
@@ -135,9 +135,9 @@ export default {
         this.showConfirmLogout()
       }
     },
-    async doLogout() {
-      await useUsersStore().logout()
+    doLogout() {
       this.$router.replace('/main/public')
+      useUsersStore().logout()
       this.hideConfirmLogout()
     },
     onSearchBarToggled(hidden) {
diff --git a/src/components/login_form/login_form.js b/src/components/login_form/login_form.js
index 8801d2c2e..6c2750677 100644
--- a/src/components/login_form/login_form.js
+++ b/src/components/login_form/login_form.js
@@ -1,9 +1,9 @@
-import { mapActions, mapState } from 'pinia'
+import { mapActions, mapState as mapPiniaState } from 'pinia'
+import { mapState } from 'vuex'
 
 import { useAuthFlowStore } from 'src/stores/auth_flow.js'
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { getLoginUrl, getTokenWithCredentials } from 'src/api/oauth.js'
 
@@ -18,10 +18,12 @@ const LoginForm = {
     error: false,
   }),
   computed: {
-    ...mapState(useUsersStore, ['loggingIn']),
-    ...mapState(useOAuthStore, ['clientId', 'clientSecret']),
-    ...mapState(useInstanceStore, ['server', 'registrationOpen']),
-    ...mapState(useAuthFlowStore, {
+    ...mapState({
+      loggingIn: (state) => state.users.loggingIn,
+    }),
+    ...mapPiniaState(useOAuthStore, ['clientId', 'clientSecret']),
+    ...mapPiniaState(useInstanceStore, ['server', 'registrationOpen']),
+    ...mapPiniaState(useAuthFlowStore, {
       isTokenAuth: (store) => store.requiredToken,
       isPasswordAuth: (store) => !store.requiredToken,
     }),
diff --git a/src/components/mention_link/mention_link.js b/src/components/mention_link/mention_link.js
index 5db90ab41..374e62259 100644
--- a/src/components/mention_link/mention_link.js
+++ b/src/components/mention_link/mention_link.js
@@ -29,7 +29,7 @@ const MentionLink = {
   },
   props: {
     url: {
-      required: false,
+      required: true,
       type: String,
     },
     content: {
@@ -75,11 +75,11 @@ const MentionLink = {
   },
   computed: {
     user() {
-      return this.url ? useUsersStore().findUserByUrl(this.url) : null
+      return this.url && useUsersStore().findUserByUrl(this.url)
     },
     isYou() {
-      if (!this.currentUser) return false
-      return this.user === this.currentUser
+      // FIXME why user !== currentUser???
+      return this.user?.id === this.currentUser.id
     },
     userName() {
       return this.user && this.userNameFullUi.split('@')[0]
diff --git a/src/components/mention_link/mention_link.vue b/src/components/mention_link/mention_link.vue
index 3973522b0..33f0d9db7 100644
--- a/src/components/mention_link/mention_link.vue
+++ b/src/components/mention_link/mention_link.vue
@@ -8,20 +8,15 @@
       :href="url"
       class="original"
       target="_blank"
-    ><!-- eslint-enable vue/no-v-html -->
-      <UserAvatar
-        v-if="shouldShowAvatar"
-        class="mention-avatar"
-        :user-id="null"
-      />
-      <span v-html="content" />
-    </a>
+      v-html="content"
+    /><!-- eslint-enable vue/no-v-html -->
     <UserPopover
       v-else
       :user-id="user.id"
       :disabled="!shouldShowTooltip"
     >
       <span
+        v-if="user"
         class="new"
         :style="style"
         :class="classnames"
diff --git a/src/components/mobile_nav/mobile_nav.js b/src/components/mobile_nav/mobile_nav.js
index 97645ca73..163c0e9aa 100644
--- a/src/components/mobile_nav/mobile_nav.js
+++ b/src/components/mobile_nav/mobile_nav.js
@@ -145,9 +145,9 @@ const MobileNav = {
       }
     },
     doLogout() {
+      this.$router.replace('/main/public')
       useUsersStore().logout()
       this.hideConfirmLogout()
-      this.$router.replace('/main/public')
     },
     markNotificationsAsSeen() {
       useNotificationsStore().markNotificationsAsSeen()
diff --git a/src/components/nav_panel/nav_panel.js b/src/components/nav_panel/nav_panel.js
index c3e760efb..3e88ea564 100644
--- a/src/components/nav_panel/nav_panel.js
+++ b/src/components/nav_panel/nav_panel.js
@@ -1,5 +1,5 @@
-import { mapState } from 'pinia'
-import { mapState as mapVuexState } from 'vuex'
+import { mapState as mapPiniaState } from 'pinia'
+import { mapState } from 'vuex'
 
 import BookmarkFoldersMenuContent from 'src/components/bookmark_folders_menu/bookmark_folders_menu_content.vue'
 import Checkbox from 'src/components/checkbox/checkbox.vue'
@@ -111,29 +111,29 @@ const NavPanel = {
     },
   },
   computed: {
-    ...mapState(useAnnouncementsStore, {
+    ...mapPiniaState(useAnnouncementsStore, {
       unreadAnnouncementCount: 'unreadAnnouncementCount',
       supportsAnnouncements: (store) => store.supportsAnnouncements,
     }),
-    ...mapState(useInstanceCapabilitiesStore, [
+    ...mapPiniaState(useInstanceCapabilitiesStore, [
       'pleromaChatMessagesAvailable',
       'pleromaBookmarkFoldersAvailable',
       'localBubble',
     ]),
-    ...mapState(useInstanceStore, ['federating']),
-    ...mapState(useInstanceStore, {
+    ...mapPiniaState(useInstanceStore, ['federating']),
+    ...mapPiniaState(useInstanceStore, {
       privateMode: (store) => store.private,
     }),
-    ...mapState(useSyncConfigStore, {
+    ...mapPiniaState(useSyncConfigStore, {
       collapsed: (store) => store.prefsStorage.simple.collapseNav,
       pinnedItems: (store) =>
         new Set(store.prefsStorage.collections.pinnedNavItems),
     }),
-    ...mapState(useUsersStore, ['currentUser']),
-    ...mapVuexState({
+    ...mapPiniaState(useUsersStore, ['currentUser']),
+    ...mapState({
       followRequestCount: (state) => state.api.followRequests.length,
     }),
-    ...mapState(useChatsStore, ['unreadChatsCount']),
+    ...mapPiniaState(useChatsStore, ['unreadChatsCount']),
     timelinesItems() {
       return filterNavigation(
         Object.entries({ ...TIMELINES })
diff --git a/src/components/navigation/navigation_pins.js b/src/components/navigation/navigation_pins.js
index 2efa94ee4..d1be73819 100644
--- a/src/components/navigation/navigation_pins.js
+++ b/src/components/navigation/navigation_pins.js
@@ -1,5 +1,5 @@
-import { mapState } from 'pinia'
-import { mapState as mapVuexState } from 'vuex'
+import { mapState as mapPiniaState } from 'pinia'
+import { mapState } from 'vuex'
 
 import {
   filterNavigation,
@@ -59,26 +59,26 @@ const NavPanel = {
     getters() {
       return this.$store.getters
     },
-    ...mapState(useListsStore, {
+    ...mapPiniaState(useListsStore, {
       lists: getListEntries,
     }),
-    ...mapState(useAnnouncementsStore, {
+    ...mapPiniaState(useAnnouncementsStore, {
       supportsAnnouncements: (store) => store.supportsAnnouncements,
     }),
-    ...mapState(useBookmarkFoldersStore, {
+    ...mapPiniaState(useBookmarkFoldersStore, {
       bookmarks: getBookmarkFolderEntries,
     }),
-    ...mapState(useSyncConfigStore, {
+    ...mapPiniaState(useSyncConfigStore, {
       pinnedItems: (store) =>
         new Set(store.prefsStorage.collections.pinnedNavItems),
     }),
-    ...mapState(useInstanceStore, ['privateMode', 'federating']),
-    ...mapState(useInstanceCapabilitiesStore, [
+    ...mapPiniaState(useInstanceStore, ['privateMode', 'federating']),
+    ...mapPiniaState(useInstanceCapabilitiesStore, [
       'pleromaChatMessagesAvailable',
       'localBubble',
     ]),
-    ...mapState(useUsersStore, ['currentUser']),
-    ...mapVuexState({
+    ...mapPiniaState(useUsersStore, ['currentUser']),
+    ...mapState({
       followRequestCount: (state) => state.api.followRequests.length,
     }),
     pinnedList() {
diff --git a/src/components/notification/notification.js b/src/components/notification/notification.js
index 3c82f455c..a589c0cf6 100644
--- a/src/components/notification/notification.js
+++ b/src/components/notification/notification.js
@@ -118,6 +118,9 @@ const Notification = {
         useInstanceStore().restrictedNicknames,
       )
     },
+    getUser(notification) {
+      return this.$store.state.users.usersObject[notification.from_profile.id]
+    },
     interacted() {
       this.$emit('interacted')
     },
diff --git a/src/components/oauth_callback/oauth_callback.js b/src/components/oauth_callback/oauth_callback.js
index 824ab7bda..bf6e03c9e 100644
--- a/src/components/oauth_callback/oauth_callback.js
+++ b/src/components/oauth_callback/oauth_callback.js
@@ -16,10 +16,10 @@ const oac = {
         clientSecret,
         instance: useInstanceStore().server,
         code: this.code,
-      }).then(async ({ data: result }) => {
+      }).then(({ data: result }) => {
         oauthStore.setToken(result.access_token)
 
-        await useUsersStore().loginUser(result.access_token)
+        useUsersStore().loginUser(result.access_token)
         this.$router.push({ name: 'friends' })
       })
     }
diff --git a/src/components/quick_filter_settings/quick_filter_settings.js b/src/components/quick_filter_settings/quick_filter_settings.js
index 482524eb6..089cb1d26 100644
--- a/src/components/quick_filter_settings/quick_filter_settings.js
+++ b/src/components/quick_filter_settings/quick_filter_settings.js
@@ -28,7 +28,7 @@ const QuickFilterSettings = {
         path: 'replyVisibility',
         value: visibility,
       })
-      useStatusesStore().requireReloadAll()
+      useStatusesStore().queueFlushAll()
     },
     openTab(tab) {
       useInterfaceStore().openSettingsModalTab(tab)
diff --git a/src/components/registration/registration.vue b/src/components/registration/registration.vue
index 0ad7c026a..0abcfe656 100644
--- a/src/components/registration/registration.vue
+++ b/src/components/registration/registration.vue
@@ -303,7 +303,7 @@
           <!-- eslint-enable vue/no-v-html -->
           </div>
           <div
-            v-if="signUpErrors.length"
+            v-if="serverValidationErrors.length"
             class="form-group"
           >
             <div class="alert error">
diff --git a/src/components/settings_modal/helpers/vertical_tab_switcher.jsx b/src/components/settings_modal/helpers/vertical_tab_switcher.jsx
index 2f3d5e28f..996939c00 100644
--- a/src/components/settings_modal/helpers/vertical_tab_switcher.jsx
+++ b/src/components/settings_modal/helpers/vertical_tab_switcher.jsx
@@ -1,6 +1,6 @@
 // eslint-disable-next-line no-unused
 
-import { mapState } from 'pinia'
+import { mapState as mapPiniaState } from 'pinia'
 import { Fragment } from 'vue'
 
 import { FontAwesomeIcon as FAIcon } from '@fortawesome/vue-fontawesome'
@@ -60,7 +60,7 @@ export default {
         return this.$slots.default().findIndex(isWanted) === this.activeIndex
       }
     },
-    ...mapState(useInterfaceStore, {
+    ...mapPiniaState(useInterfaceStore, {
       mobileLayout: (store) => store.layoutType === 'mobile',
     }),
   },
diff --git a/src/components/settings_modal/tabs/clutter_tab.js b/src/components/settings_modal/tabs/clutter_tab.js
index 18300231c..a3f6e77a5 100644
--- a/src/components/settings_modal/tabs/clutter_tab.js
+++ b/src/components/settings_modal/tabs/clutter_tab.js
@@ -36,7 +36,7 @@ const ClutterTab = {
   // Updating nested properties
   watch: {
     replyVisibility() {
-      useStatusesStore().requireReloadAll()
+      useStatusesStore().queueFlushAll()
     },
   },
 }
diff --git a/src/components/settings_modal/tabs/filtering_tab.js b/src/components/settings_modal/tabs/filtering_tab.js
index fbc7b8902..9d49eca81 100644
--- a/src/components/settings_modal/tabs/filtering_tab.js
+++ b/src/components/settings_modal/tabs/filtering_tab.js
@@ -266,7 +266,7 @@ const FilteringTab = {
   // Updating nested properties
   watch: {
     replyVisibility() {
-      useStatusesStore().requireReloadAll()
+      useStatusesStore().queueFlushAll()
     },
     muteFiltersObject() {
       this.muteFiltersDraftObject = cloneDeep(
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 16625235d..749e0a12e 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -105,6 +105,7 @@ const Status = {
     isPreview: Boolean,
     noHeading: Boolean,
     inlineExpanded: Boolean,
+    showPinned: Boolean,
     inProfile: Boolean,
     inConversation: Boolean,
     inQuote: Boolean,
@@ -117,13 +118,7 @@ const Status = {
 
     threadDisplayStatus: String,
   },
-  emits: [
-    'goto',
-    'dive',
-    'toggleExpanded',
-    'suspendableStateChange',
-    'heightChange',
-  ],
+  emits: ['goto', 'dive', 'toggleExpanded', 'suspendableStateChange'],
   data() {
     return {
       replying: false,
@@ -194,7 +189,7 @@ const Status = {
         )
 
         // User referenced in post might not be yet present in store
-        // since their data is not included in status data, just the id
+        // since their data is not included in status data
         return user?.statusnet_profile_url
       }
     },
@@ -375,7 +370,7 @@ const Status = {
     },
     replyToName() {
       if (this.mainStatus.in_reply_to_screen_name) {
-        return this.mainStatus.in_reply_to_screen_name
+        return this.status.in_reply_to_screen_name
       } else {
         const user = useUsersStore().findUser(
           this.mainStatus.in_reply_to_user_id,
@@ -392,7 +387,7 @@ const Status = {
       return uniqBy(combinedUsers, 'id')
     },
     tags() {
-      return [...this.status.tags]
+      return this.status.tags
         .filter((tagObj) => Object.hasOwn(tagObj, 'name'))
         .map((tagObj) => tagObj.name)
         .join(' ')
@@ -544,7 +539,6 @@ const Status = {
       this.headTailLinks = headTailLinks
     },
     toggleThreadDisplay() {
-      // FIXME
       this.controlledToggleThreadDisplay()
     },
     scrollIfFocused(focused) {
@@ -563,22 +557,8 @@ const Status = {
         }
       }
     },
-    onTransitionEnd() {
-      this.$nextTick(() => {
-        this.$emit('heightChange')
-      })
-    },
   },
   watch: {
-    status: {
-      deep: true,
-      handler() {
-        this.$emit('heightChange')
-      },
-    },
-    replying() {
-      this.$emit('heightChange')
-    },
     focused: function (id) {
       this.scrollIfFocused(id)
     },
@@ -604,7 +584,6 @@ const Status = {
     },
     isSuspendable: function (suspend) {
       this.$emit('suspendableStateChange', { id: this.status.id, suspend })
-      this.$emit('heightChange')
     },
   },
 }
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 0db67f24b..f0b2f1277 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -169,7 +169,7 @@
 
               <span class="heading-right">
                 <span
-                  v-if="mainStatus.pinned"
+                  v-if="showPinned"
                   class="pin"
                 >
                   <FAIcon
@@ -454,10 +454,7 @@
             </StatusPopover>
           </div>
 
-          <Transition
-            @after-leave="onTransitionEnd"
-            name="fade"
-          >
+          <transition name="fade">
             <div
               v-if="shouldDisplayFavsAndRepeats"
               class="favs-repeated-users"
@@ -505,7 +502,7 @@
                 </div>
               </div>
             </div>
-          </Transition>
+          </transition>
 
           <EmojiReactions
             v-if="(mergedConfig.emojiReactionsOnTimeline || focused) && (!noHeading && !isPreview)"
diff --git a/src/components/status_history_modal/status_history_modal.js b/src/components/status_history_modal/status_history_modal.js
index 644e657fe..5a3fc2a41 100644
--- a/src/components/status_history_modal/status_history_modal.js
+++ b/src/components/status_history_modal/status_history_modal.js
@@ -1,14 +1,14 @@
 import { mapState } from 'pinia'
 
 import Modal from 'src/components/modal/modal.vue'
-import Status from 'src/components/status/status.vue'
+import StatusContent from 'src/components/status_content/status_content.vue'
 
 import { useStatusHistoryStore } from 'src/stores/statusHistory.js'
 
 const StatusHistoryModal = {
   components: {
     Modal,
-    Status,
+    StatusContent,
   },
   data() {
     return {
diff --git a/src/components/status_history_modal/status_history_modal.vue b/src/components/status_history_modal/status_history_modal.vue
index ee5f77fd2..a78e04c96 100644
--- a/src/components/status_history_modal/status_history_modal.vue
+++ b/src/components/status_history_modal/status_history_modal.vue
@@ -15,10 +15,10 @@
           v-if="historyCount > 0"
           class="history-body"
         >
-          <Status
+          <StatusContent
             v-for="status in history"
             :key="status.id"
-            :statusoid="status"
+            :status="status"
             :is-preview="true"
             class="conversation-status status-fadein panel-body"
           />
diff --git a/src/components/tab_switcher/tab_switcher.jsx b/src/components/tab_switcher/tab_switcher.jsx
index b21d4eb04..01913f709 100644
--- a/src/components/tab_switcher/tab_switcher.jsx
+++ b/src/components/tab_switcher/tab_switcher.jsx
@@ -101,10 +101,6 @@ export default {
         classesTab.push('active')
         classesWrapper.push('active')
       }
-      if (props.disabled) {
-        classesTab.push('disabled')
-        classesWrapper.push('disabled')
-      }
       if (props.image) {
         return (
           <div class={classesWrapper.join(' ')}>
diff --git a/src/components/thread_tree/thread_tree.js b/src/components/thread_tree/thread_tree.js
index 6bcfa469f..491fab78f 100644
--- a/src/components/thread_tree/thread_tree.js
+++ b/src/components/thread_tree/thread_tree.js
@@ -30,7 +30,7 @@ const ThreadTree = {
     totalReplyCount: Object,
     totalReplyDepth: Object,
   },
-  emits: ['suspendableStateChange', 'goto', 'dive', 'heightChange'],
+  emits: ['suspendableStateChange', 'goto', 'dive'],
   computed: {
     currentReplies() {
       return this.getReplies(this.statusId).map(({ id }) => id)
diff --git a/src/components/thread_tree/thread_tree.vue b/src/components/thread_tree/thread_tree.vue
index be95f8698..2dae7beee 100644
--- a/src/components/thread_tree/thread_tree.vue
+++ b/src/components/thread_tree/thread_tree.vue
@@ -22,7 +22,6 @@
       @goto="$emit('goto', statusId)"
       @toggle-expanded="toggleExpanded"
       @suspendable-state-change="e => $emit('suspendableStateChange', e)"
-      @height-change="e => $emit('heightChange', e)"
     />
     <div
       v-if="currentReplies.length > 0 && threadShowing"
@@ -56,7 +55,6 @@
         @goto="(e) => $emit('goto', e)"
         @dive="(e) => $emit('dive', e)"
         @suspendable-state-change="e => $emit('suspendableStateChange', e)"
-        @height-change="e => $emit('heightChange', e)"
       />
     </div>
     <div
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 029693651..a76438ad0 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -27,6 +27,7 @@ library.add(faCircleNotch, faCog, faMinus, faArrowUp, faCirclePlus, faCheck)
 const Timeline = {
   props: {
     timelineRef: Object,
+    count: Number,
     footerSlipgate: Object, // reference to an element where we should put our footer
     embedded: Boolean,
     inProfile: Boolean,
@@ -58,24 +59,21 @@ const Timeline = {
         .map((id) => useStatusesStore().allStatuses.get(id))
         .filter(({ pinned }) => (this.skipPinned ? !pinned : true))
     },
-    count() {
-      return this.timeline.order.length
-    },
     newStatusCount() {
       return this.timeline.newStatusCount
     },
     showLoadButton() {
-      return this.timeline.newStatusCount > 0 || this.timeline.reloadNeeded
+      return this.timeline.newStatusCount > 0 || this.timeline.flushMarker !== 0
     },
     loadButtonString() {
-      if (this.timeline.reloadNeeded) {
+      if (this.timeline.flushMarker !== 0) {
         return this.$t('timeline.reload')
       } else {
         return `${this.$t('timeline.show_new')} (${this.newStatusCount})`
       }
     },
     mobileLoadButtonString() {
-      if (this.timeline.reloadNeeded) {
+      if (this.timeline.flushMarker !== 0) {
         return '+'
       } else {
         return this.newStatusCount > 99 ? '∞' : this.newStatusCount
@@ -101,7 +99,6 @@ const Timeline = {
       }
     },
     statusesToDisplay() {
-      if (!this.virtualScrollingEnabled) return this.visibleStatusIds
       const amount = this.timeline.visibleStatusIds.size
       const statusesPerSide = Math.ceil(Math.max(3, window.innerHeight / 80))
       const min = Math.max(0, this.virtualScrollIndex - statusesPerSide)
@@ -170,8 +167,9 @@ const Timeline = {
       if (e.key === '.') this.showNewStatuses()
     },
     showNewStatuses() {
-      if (this.timeline.reloadNeeded) {
+      if (this.timeline.flushMarker !== 0) {
         useTimelinesStore().clearTimeline(this.timelineRef.name)
+        useTimelinesStore().queueFlush(this.timelineRef.name, '')
         this.fetchOlderStatuses()
       } else {
         this.blockClicksTemporarily()
@@ -192,12 +190,13 @@ const Timeline = {
       if (!this.virtualScrollingEnabled) return
 
       const statuses = this.$refs.timeline.children
-      if (statuses.length === 0) return
       const cappedScrollIndex = Math.max(
         0,
         Math.min(this.virtualScrollIndex, statuses.length - 1),
       )
 
+      if (statuses.length === 0) return
+
       const height = Math.max(document.body.offsetHeight, window.pageYOffset)
 
       const centerOfScreen = window.pageYOffset + window.innerHeight * 0.5
@@ -235,11 +234,11 @@ const Timeline = {
       this.virtualScrollIndex = approxIndex
     },
     scrollLoad() {
-      // TODO simplify this logic
       const bodyBRect = document.body.getBoundingClientRect()
       const height = Math.max(bodyBRect.height, -bodyBRect.y)
       if (
-        !this.timeline.fetcher.loadingOlder.value &&
+        !this.timeline.fetcher.loading.value &&
+        this.$el.offsetHeight > 0 &&
         window.innerHeight + window.pageYOffset >= height - 750
       ) {
         this.fetchOlderStatuses()
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index 1435bba48..745d8c399 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -1,6 +1,5 @@
 <template>
-  <!-- there is a brief moment during logout when old timeline gets forcibly deactivated -->
-  <div v-if="timeline.fetcher" :class="['Timeline', classes.root]">
+  <div :class="['Timeline', classes.root]">
     <div
       v-if="!embedded"
       :class="classes.header"
@@ -9,16 +8,6 @@
         v-if="!embedded"
         :timeline-name="timelineRef.name"
       />
-      <div
-        v-if="timeline.fetcher.loadingNewer"
-        class="loadingIndicator"
-      >
-        <FAIcon
-          fixed-width
-          icon="circle-notch"
-          spin
-        />
-      </div>
       <ScrollTopButton />
       <template v-if="mobileLayout">
         <div
@@ -95,7 +84,7 @@
         />
       </div>
     </div>
-    <div v-if="!embedded || footerSlipgate" :class="classes.footer">
+    <div :class="classes.footer">
       <teleport
         :to="footerSlipgate"
         :disabled="!embedded || !footerSlipgate"
@@ -113,7 +102,7 @@
           {{ $t('timeline.no_more_statuses') }}
         </div>
         <button
-          v-else-if="!timeline.fetcher.loadingOlder"
+          v-else-if="!timeline.fetcher.loading"
           class="button-unstyled -link"
           @click.prevent="fetchOlderStatuses()"
         >
diff --git a/src/components/user_avatar/user_avatar.js b/src/components/user_avatar/user_avatar.js
index c8701fe66..b80aa8fb8 100644
--- a/src/components/user_avatar/user_avatar.js
+++ b/src/components/user_avatar/user_avatar.js
@@ -12,7 +12,7 @@ const UserAvatar = {
   props: {
     // UserID of a user to show avatar of
     userId: {
-      required: false, // You can pass null to just render a placeholder
+      required: true,
       type: String,
     },
     // Use less space and use alternative roundness
diff --git a/src/components/user_avatar/user_avatar.vue b/src/components/user_avatar/user_avatar.vue
index 613d224a0..d9e96d52d 100644
--- a/src/components/user_avatar/user_avatar.vue
+++ b/src/components/user_avatar/user_avatar.vue
@@ -70,7 +70,6 @@
 
     &.-placeholder {
       background-color: var(--background);
-      border: 1px solid var(--border)
     }
   }
 
diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index dd91b8cc9..774ecd479 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -100,6 +100,7 @@ const UserProfile = {
     },
     load(userNameOrId) {
       const loadById = (userId) => {
+        console.log('LOAD', userId)
         this.userId = userId
       }
 
@@ -138,6 +139,7 @@ const UserProfile = {
       }
     },
     switchUser(userNameOrId) {
+      console.log('USER SWITCH')
       this.load(userNameOrId)
     },
     onTabSwitch(tab) {
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index f60521ffa..fbad5c42d 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -23,14 +23,18 @@
           key="statuses"
           class="statuses"
           :label="$t('user_card.statuses')"
+          :count="user.statuses_count"
           :title="$t('user_profile.timeline_title')"
         >
+          <!--
           <Timeline
             key="statuses"
             :timeline-ref="{ name: 'userPinned', argument: userId }"
             embedded
             in-profile
+            :footer-slipgate="footerRef"
           />
+          -->
           <Timeline
             :timeline-ref="{ name: 'user', argument: userId }"
             embedded
@@ -77,6 +81,7 @@
         <Timeline
           key="media"
           :label="$t('user_card.media')"
+          :disabled="media.visibleStatusIds.size === 0"
           :title="$t('user_card.media')"
           :timeline-ref="{ name: 'media', argument: userId }"
           embedded
diff --git a/src/components/user_profile/user_profile_admin_view.js b/src/components/user_profile/user_profile_admin_view.js
index 8fbac29c4..da0a05372 100644
--- a/src/components/user_profile/user_profile_admin_view.js
+++ b/src/components/user_profile/user_profile_admin_view.js
@@ -47,12 +47,10 @@ const UserProfileAdminView = {
   },
   methods: {
     fetchStatuses(page) {
-      return useAdminSettingsStore()
-        .fetchStatuses({
-          ...this.fetchOptions,
-          page,
-        })
-        .then(({ items }) => items)
+      return useAdminSettingsStore().fetchStatuses({
+        ...this.fetchOptions,
+        page,
+      })
     },
   },
   components: {
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 196af90a8..239d31e8b 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -259,7 +259,7 @@ export const parseStatus = (data) => {
   output.raw_html = data.content
   output.emojis = data.emojis
 
-  output.tags = new Set(data.tags ?? [])
+  output.tags = data.tags
 
   output.edited_at = data.edited_at
 
diff --git a/src/stores/auth_flow.js b/src/stores/auth_flow.js
index 6600fe3f8..0841dc558 100644
--- a/src/stores/auth_flow.js
+++ b/src/stores/auth_flow.js
@@ -63,8 +63,8 @@ export const useAuthFlowStore = defineStore('authFlow', {
       this.settings = {}
     },
     async login({ access_token: accessToken }) {
-      await useOAuthStore().setToken(accessToken)
-      await useUsersStore().loginUser(accessToken, { root: true })
+      useOAuthStore().setToken(accessToken)
+      useUsersStore().loginUser(accessToken, { root: true })
       this.resetState()
     },
   },
diff --git a/src/stores/fetchers/timeline_fetcher.js b/src/stores/fetchers/timeline_fetcher.js
index ac2611607..25e6e895f 100644
--- a/src/stores/fetchers/timeline_fetcher.js
+++ b/src/stores/fetchers/timeline_fetcher.js
@@ -18,17 +18,12 @@ const REPLY_VISIBILITY_TIMELINES = new Set([
 ])
 
 const timelineFetcher = (timeline, argument, credentials) => {
-  const loadingNewer = ref(false)
-  const loadingOlder = ref(false)
+  const loading = ref(false)
   const bottomedOut = ref(false)
   const interval = ref(null)
 
   const fetchAndUpdate = ({ older = false, showImmediately = false } = {}) => {
-    if (older) {
-      loadingOlder.value = true
-    } else {
-      loadingNewer.value = true
-    }
+    loading.value = true
 
     const { hideMutedPosts, replyVisibility } =
       useMergedConfigStore().mergedConfig
@@ -52,11 +47,10 @@ const timelineFetcher = (timeline, argument, credentials) => {
 
     const numStatusesBeforeFetch = timeline.statusIds.size
 
-    if (bottomedOut.value) return
     return fetchTimeline(args)
       .then(({ data: statuses, pagination, timestamp }) => {
         if (!older && statuses.length >= 20 && numStatusesBeforeFetch > 0) {
-          useTimelinesStore().requireReload(timeline.name)
+          useTimelinesStore().queueFlush(timeline.name, timeline.maxId)
         }
 
         if (older && statuses.length === 0) {
@@ -90,11 +84,7 @@ const timelineFetcher = (timeline, argument, credentials) => {
         })
       })
       .finally(() => {
-        if (older) {
-          loadingOlder.value = false
-        } else {
-          loadingNewer.value = false
-        }
+        loading.value = false
       })
   }
 
@@ -117,8 +107,7 @@ const timelineFetcher = (timeline, argument, credentials) => {
     startFetching,
     stopFetching,
     fetchOlder: () => fetchAndUpdate({ showImmediately: true, older: true }),
-    loadingOlder,
-    loadingNewer,
+    loading,
     bottomedOut,
   }
 }
diff --git a/src/stores/oauth.js b/src/stores/oauth.js
index 2d87645eb..35cd67afb 100644
--- a/src/stores/oauth.js
+++ b/src/stores/oauth.js
@@ -53,7 +53,7 @@ export const useOAuthStore = defineStore('oauth', {
       this.userToken = token
     },
     clearToken() {
-      this.userToken = null
+      this.userToken = false
     },
     async createApp() {
       const instance = useInstanceStore().server
diff --git a/src/stores/statuses.js b/src/stores/statuses.js
index 8836a0a77..a08d1293b 100644
--- a/src/stores/statuses.js
+++ b/src/stores/statuses.js
@@ -540,5 +540,10 @@ export const useStatusesStore = defineStore('statuses', {
       })
       return removed
     },
+
+    // Misc
+    setVirtualHeight({ statusId, height }) {
+      this.allStatuses.get(statusId).virtualHeight = height
+    },
   },
 })
diff --git a/src/stores/streaming.js b/src/stores/streaming.js
index 5129a571d..cce3c175b 100644
--- a/src/stores/streaming.js
+++ b/src/stores/streaming.js
@@ -180,6 +180,7 @@ export const useStreamingStore = defineStore('streaming', {
           case 'delete':
             return [data.id]
           default:
+            console.log('UNKNOWN', eventName, eventStream, data)
             return data
         }
       })()
diff --git a/src/stores/timelines.js b/src/stores/timelines.js
index fe098587a..ded412d4b 100644
--- a/src/stores/timelines.js
+++ b/src/stores/timelines.js
@@ -16,7 +16,7 @@ const emptyTl = (name, argument = null) => {
     maxId: '',
     minId: '',
     streaming: false,
-    reloadNeeded: false,
+    flushMarker: 0,
     fetcher: null,
     socket: null,
   }
@@ -158,7 +158,7 @@ export const useTimelinesStore = defineStore('timelines', {
       timeline.newStatusCount = 0
       timeline.maxId = ''
       timeline.minId = ''
-      timeline.reloadNeeded = false
+      timeline.flushMarker = 0
     },
     activatePersistents() {
       TIMELINES.forEach((name) => {
@@ -258,24 +258,14 @@ export const useTimelinesStore = defineStore('timelines', {
       timeline.fetcher.startFetching()
     },
     stopFetchingTimeline(timelineName, reason) {
+      console.debug(
+        '[Timelines] Stopped fetching timeline',
+        timelineName,
+        'Reason:',
+        reason,
+      )
       const timeline = this[timelineName]
-      if (timeline.fetcher === null) {
-        console.debug(
-          '[Timelines] Already inactive timeline',
-          timelineName,
-          'Reason:',
-          reason,
-        )
-        return
-      } else {
-        timeline.fetcher.stopFetching()
-        console.debug(
-          '[Timelines] Stopped fetching timeline',
-          timelineName,
-          'Reason:',
-          reason,
-        )
-      }
+      timeline.fetcher.stopFetching()
     },
 
     // Queues & Timeline manip
@@ -305,12 +295,12 @@ export const useTimelinesStore = defineStore('timelines', {
     syncOrder(timeline) {
       timeline.order = timeline.order.filter((id) => timeline.statusIds.has(id))
     },
-    requireReload(timeline, id) {
-      this[timeline].reloadNeeded = true
+    queueFlush(timeline, id) {
+      this[timeline].flushMarker = id
     },
-    requireReloadAll() {
+    queueFlushAll() {
       Object.keys(this).forEach((timeline) => {
-        this[timeline].reloadNeeded = true
+        this[timeline].flushMarker = this[timeline].maxId
       })
     },
 
diff --git a/test/unit/specs/components/rich_content.spec.js b/test/unit/specs/components/rich_content.spec.js
index 81ce72e87..19bfdc035 100644
--- a/test/unit/specs/components/rich_content.spec.js
+++ b/test/unit/specs/components/rich_content.spec.js
@@ -354,13 +354,11 @@ describe('RichContent', () => {
         '<span class="MentionLink mention-link">',
         '<a href="lol" class="original" target="_blank">',
         '<span>',
-        '<span>',
         'https://</span>',
         '<span>',
         'lol.tld/</span>',
         '<span>',
         '</span>',
-        '</span>',
         '</a>',
         '</span>',
         '</span>',
@@ -420,25 +418,21 @@ describe('RichContent', () => {
       '<span class="MentionLink mention-link">',
       '<a href="lol" class="original" target="_blank">',
       '<span>',
-      '<span>',
       'https://</span>',
       '<span>',
       'lol.tld/</span>',
       '<span>',
       '</span>',
-      '</span>',
       '</a>',
       '</span>',
       '<span class="MentionLink mention-link">',
       '<a href="lol" class="original" target="_blank">',
       '<span>',
-      '<span>',
       'https://</span>',
       '<span>',
       'lol.tld/</span>',
       '<span>',
       '</span>',
-      '</span>',
       '</a>',
       '</span>',
       '</span>',
diff --git a/test/unit/specs/stores/timelines.spec.js b/test/unit/specs/stores/timelines.spec.js
index cfc84ea3d..f810c029d 100644
--- a/test/unit/specs/stores/timelines.spec.js
+++ b/test/unit/specs/stores/timelines.spec.js
@@ -21,6 +21,7 @@ describe('Timelines store', () => {
       const sub = vi.fn()
       useStreamingStore().addSubscriber = sub
 
+      console.log(store.activate)
       store.activate('friends', undefined, true)
 
       expect(sub).to.have.been.called
@@ -33,6 +34,7 @@ describe('Timelines store', () => {
       const sub = vi.fn()
       useStreamingStore().addSubscriber = sub
 
+      console.log(store.activate)
       store.activate('user', '1')
 
       expect(sub).to.not.have.been.called
diff --git a/test/unit/specs/stores/users.spec.js b/test/unit/specs/stores/users.spec.js
index 7e196565d..e9e557960 100644
--- a/test/unit/specs/stores/users.spec.js
+++ b/test/unit/specs/stores/users.spec.js
@@ -1095,6 +1095,7 @@ describe('Users store', () => {
       const store = useUsersStore()
       const { storeAction, apiUrl } = actionKeys(action)
       await store[storeAction](userId)
+      console.log(apiUrl)
 
       expect(mockFetch).to.have.been.calledWith(
         USER_API[apiUrl](userId),