diff --git a/src/components/settings_modal/admin_tabs/emoji_tab.js b/src/components/settings_modal/admin_tabs/emoji_tab.js
index 6afd0be5c..115ef519b 100644
--- a/src/components/settings_modal/admin_tabs/emoji_tab.js
+++ b/src/components/settings_modal/admin_tabs/emoji_tab.js
@@ -12,7 +12,6 @@ import SharedComputedObject from '../helpers/shared_computed_object.js'
 import StringSetting from '../helpers/string_setting.vue'
 
 import { useInstanceStore } from 'src/stores/instance.js'
-import { useEmojiStore } from 'src/stores/emoji.js'
 import { useInterfaceStore } from 'src/stores/interface.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
@@ -175,9 +174,51 @@ const EmojiTab = {
       this.sortPackFiles(packName)
     },
 
+    loadPacksPaginated(listFunction) {
+      const pageSize = 25
+      const allPacks = {}
+
+      return listFunction({
+        instance: this.remotePackInstance,
+        page: 1,
+        pageSize: 0,
+      })
+        .then((data) => data.json())
+        .then((data) => {
+          if (data.error !== undefined) {
+            return Promise.reject(data.error)
+          }
+
+          let resultingPromise = Promise.resolve({})
+          for (let i = 0; i < Math.ceil(data.count / pageSize); i++) {
+            resultingPromise = resultingPromise
+              .then(() =>
+                listFunction({
+                  instance: this.remotePackInstance,
+                  page: i,
+                  pageSize,
+                }),
+              )
+              .then((data) => data.json())
+              .then((pageData) => {
+                if (pageData.error !== undefined) {
+                  return Promise.reject(pageData.error)
+                }
+
+                assign(allPacks, pageData.packs)
+              })
+          }
+
+          return resultingPromise
+        })
+        .then(() => allPacks)
+        .catch((data) => {
+          this.displayError(data)
+        })
+    },
+
     refreshPackList() {
-      useEmojiStore().getAdminPacks(
-        this.remotePackInstance,
+      this.loadPacksPaginated(
         this.$store.state.api.backendInteractor.listEmojiPacks,
       ).then((allPacks) => {
         this.knownLocalPacks = allPacks
@@ -187,8 +228,7 @@ const EmojiTab = {
       })
     },
     listRemotePacks() {
-      useEmojiStore().getAdminPacks(
-        this.remotePackInstance,
+      this.loadPacksPaginated(
         this.$store.state.api.backendInteractor.listRemoteEmojiPacks,
       )
         .then((allPacks) => {
diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index f710088d6..a87897ec5 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -31,10 +31,10 @@
   }
 
   .pin {
+    padding: var(--status-margin) var(--status-margin) 0;
     display: flex;
     align-items: center;
     justify-content: flex-end;
-    margin-right: 0.5em;
   }
 
   ._misclick-prevention & {
@@ -229,6 +229,7 @@
     display: flex;
     align-items: center;
     padding: 0.4em var(--status-margin);
+    border-bottom: 1px dotted var(--border);
 
     .repeater-avatar {
       flex: 0 0 1.5em;
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index a9312c8e6..e5e4bb75e 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -46,6 +46,16 @@
       </div>
     </template>
     <template v-else>
+      <div
+        v-if="showPinned"
+        class="pin"
+      >
+        <FAIcon
+          icon="thumbtack"
+          class="faint"
+        />
+        <span class="faint">{{ $t('status.pinned') }}</span>
+      </div>
       <div
         v-if="retweet && !noHeading && !inConversation"
         :class="[repeaterClass, { highlighted: repeaterStyle }]"
@@ -169,13 +179,6 @@
               </div>
 
               <span class="heading-right">
-                <span class="pin" v-if="showPinned">
-                  <FAIcon
-                    icon="thumbtack"
-                    class="faint"
-                  />
-                  <span class="faint">{{ $t('status.pinned') }}</span>
-                </span>
                 <router-link
                   class="timeago faint"
                   :to="{ name: 'conversation', params: { id: status.id } }"
diff --git a/src/components/still-image/still-image-emoji-popover.js b/src/components/still-image/still-image-emoji-popover.js
deleted file mode 100644
index 74d6a002f..000000000
--- a/src/components/still-image/still-image-emoji-popover.js
+++ /dev/null
@@ -1,72 +0,0 @@
-import Popover from 'components/popover/popover.vue'
-import SelectComponent from 'components/select/select.vue'
-
-import StillImage from './still-image.vue'
-import { mapState } from 'pinia'
-
-import { useInterfaceStore } from 'src/stores/interface'
-import { useEmojiStore } from 'src/stores/emoji'
-
-export default {
-  components: { StillImage, Popover, SelectComponent },
-  props: {
-    shortcode: {
-      type: String,
-      required: true,
-    },
-    isLocal: {
-      type: Boolean,
-      required: true,
-    },
-  },
-  data() {
-    return {
-      packName: '',
-    }
-  },
-  computed: {
-    isUserAdmin() {
-      return this.$store.state.users.currentUser?.rights.admin
-    },
-    ...mapState(useEmojiStore, ['adminPacksLocal', 'adminPacksLocalLoading'])
-  },
-  methods: {
-    displayError(msg) {
-      useInterfaceStore().pushGlobalNotice({
-        messageKey: 'admin_dash.emoji.error',
-        messageArgs: [msg],
-        level: 'error',
-      })
-    },
-    copyToLocalPack() {
-      this.$store.state.api.backendInteractor
-        .addNewEmojiFile({
-          packName: this.packName,
-          file: this.$attrs.src,
-          shortcode: this.shortcode,
-          filename: '',
-        })
-        .then((resp) => resp.json())
-        .then((resp) => {
-          if (resp.error !== undefined) {
-            this.displayError(resp.error)
-            return
-          }
-          useInterfaceStore().pushGlobalNotice({
-            messageKey: 'admin_dash.emoji.copied_successfully',
-            messageArgs: [this.shortcode, this.packName],
-            level: 'success',
-          })
-
-          this.$refs.emojiPopover.hidePopover()
-          this.packName = ''
-        })
-    },
-
-    fetchEmojiPacksIfAdmin() {
-      useEmojiStore().getAdminPacksLocal().then(() => {
-        this.$refs.emojiPopover.updateStyles()
-      })
-    },
-  },
-}
diff --git a/src/components/still-image/still-image-emoji-popover.vue b/src/components/still-image/still-image-emoji-popover.vue
index f80f111f7..4e087c094 100644
--- a/src/components/still-image/still-image-emoji-popover.vue
+++ b/src/components/still-image/still-image-emoji-popover.vue
@@ -21,53 +21,169 @@
           />
         </div>
 
-        <template v-if="isUserAdmin && !isLocal">
-          <span
-            v-if="adminPacksLocalLoading"
-            class="loading-spinner"
+        <div v-if="isUserAdmin && !isLocal">
+          <button
+            class="button button-default btn emoji-popover-button"
+            type="button"
+            :disabled="packName == ''"
+            @click="copyToLocalPack"
           >
-            <FAIcon
-              class="fa-old-padding"
-              spin
-              icon="circle-notch"
-            />
-          </span>
-          <div v-else>
-            <button
-              class="button button-default btn emoji-popover-button"
-              type="button"
-              :disabled="packName == ''"
-              @click="copyToLocalPack"
-            >
-              {{ $t('admin_dash.emoji.copy_to_pack') }}
-            </button>
+            {{ $t('admin_dash.emoji.copy_to_pack') }}
+          </button>
 
-            <SelectComponent
-              v-model="packName"
+          <SelectComponent
+            v-model="packName"
+          >
+            <option
+              value=""
+              disabled
+              hidden
             >
-              <option
-                value=""
-                disabled
-                hidden
-              >
-                {{ $t('admin_dash.emoji.emoji_pack') }}
-              </option>
-              <option
-                v-for="(pack, listPackName) in adminPacksLocal"
-                :key="listPackName"
-                :label="listPackName"
-              >
-                {{ listPackName }}
-              </option>
-            </SelectComponent>
-          </div>
-        </template>
+              {{ $t('admin_dash.emoji.emoji_pack') }}
+            </option>
+            <option
+              v-for="(pack, listPackName) in knownLocalPacks"
+              :key="listPackName"
+              :label="listPackName"
+            >
+              {{ listPackName }}
+            </option>
+          </SelectComponent>
+        </div>
       </div>
     </template>
   </Popover>
 </template>
 
-<script src="./still-image-emoji-popover" />
+<script>
+import Popover from 'components/popover/popover.vue'
+import SelectComponent from 'components/select/select.vue'
+import { assign } from 'lodash'
+
+import StillImage from './still-image.vue'
+
+import { useInstanceStore } from 'src/stores/instance.js'
+import { useInterfaceStore } from 'src/stores/interface'
+
+export default {
+  components: { StillImage, Popover, SelectComponent },
+  props: {
+    shortcode: {
+      type: String,
+      required: true,
+    },
+    isLocal: {
+      type: Boolean,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      knownLocalPacks: {},
+      packName: '',
+    }
+  },
+  computed: {
+    isUserAdmin() {
+      return this.$store.state.users.currentUser.rights.admin
+    },
+  },
+  methods: {
+    displayError(msg) {
+      useInterfaceStore().pushGlobalNotice({
+        messageKey: 'admin_dash.emoji.error',
+        messageArgs: [msg],
+        level: 'error',
+      })
+    },
+    copyToLocalPack() {
+      this.$store.state.api.backendInteractor
+        .addNewEmojiFile({
+          packName: this.packName,
+          file: this.$attrs.src,
+          shortcode: this.shortcode,
+          filename: '',
+        })
+        .then((resp) => resp.json())
+        .then((resp) => {
+          if (resp.error !== undefined) {
+            this.displayError(resp.error)
+            return
+          }
+          useInterfaceStore().pushGlobalNotice({
+            messageKey: 'admin_dash.emoji.copied_successfully',
+            messageArgs: [this.shortcode, this.packName],
+            level: 'success',
+          })
+
+          this.$refs.emojiPopover.hidePopover()
+          this.packName = ''
+        })
+    },
+
+    // Copied from emoji_tab.js
+    loadPacksPaginated(listFunction) {
+      const pageSize = 25
+      const allPacks = {}
+
+      return listFunction({
+        instance: useInstanceStore().server,
+        page: 1,
+        pageSize: 0,
+      })
+        .then((data) => data.json())
+        .then((data) => {
+          if (data.error !== undefined) {
+            return Promise.reject(data.error)
+          }
+
+          let resultingPromise = Promise.resolve({})
+          for (let i = 0; i < Math.ceil(data.count / pageSize); i++) {
+            resultingPromise = resultingPromise
+              .then(() =>
+                listFunction({
+                  instance: useInstanceStore().server,
+                  page: i,
+                  pageSize,
+                }),
+              )
+              .then((data) => data.json())
+              .then((pageData) => {
+                if (pageData.error !== undefined) {
+                  return Promise.reject(pageData.error)
+                }
+
+                assign(allPacks, pageData.packs)
+              })
+          }
+
+          return resultingPromise
+        })
+        .then(() => allPacks)
+        .catch((data) => {
+          this.displayError(data)
+        })
+    },
+    fetchEmojiPacksIfAdmin() {
+      if (!this.isUserAdmin) return
+
+      this.loadPacksPaginated(
+        this.$store.state.api.backendInteractor.listEmojiPacks,
+      ).then((allPacks) => {
+        // Sort by key
+        const sorted = Object.keys(allPacks)
+          .sort()
+          .reduce((acc, key) => {
+            if (key.length === 0) return acc
+            acc[key] = allPacks[key]
+            return acc
+          }, {})
+        this.knownLocalPacks = sorted
+      })
+    },
+  },
+}
+</script>
 
 <style>
   .emoji-popover {
@@ -75,8 +191,8 @@
     text-align: center;
 
     .emoji {
-      width: calc(var(--emoji-size) * 3);
-      height: calc(var(--emoji-size) * 3);
+      width: 4.6em;
+      height: 4.6em;
     }
 
     .emoji-popover-centered {
diff --git a/src/components/user_card/user_card.scss b/src/components/user_card/user_card.scss
index e676db766..524ba334e 100644
--- a/src/components/user_card/user_card.scss
+++ b/src/components/user_card/user_card.scss
@@ -86,7 +86,7 @@
     padding: 0.6em;
 
     &:not(:last-child) {
-      border-bottom: 1px dotted var(--border);
+      border-bottom: 1px solid var(--border);
     }
 
     .highlighter {
diff --git a/src/components/user_list_popover/user_list_popover.js b/src/components/user_list_popover/user_list_popover.js
index 440fe7694..6f79939da 100644
--- a/src/components/user_list_popover/user_list_popover.js
+++ b/src/components/user_list_popover/user_list_popover.js
@@ -4,9 +4,6 @@ import RichContent from 'src/components/rich_content/rich_content.jsx'
 import UnicodeDomainIndicator from '../unicode_domain_indicator/unicode_domain_indicator.vue'
 
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useInstanceStore } from 'src/stores/instance.js'
-
-import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'
@@ -32,15 +29,6 @@ const UserListPopover = {
       return useMergedConfigStore().mergedConfig.nonSquareEmoji
     },
   },
-  methods: {
-    generateProfileLink(user) {
-      return generateProfileLink(
-        user.id,
-        user.screen_name,
-        useInstanceStore().restrictedNicknames,
-      )
-    },
-  }
 }
 
 export default UserListPopover
diff --git a/src/components/user_list_popover/user_list_popover.vue b/src/components/user_list_popover/user_list_popover.vue
index 4e4ea41a5..dffce7de8 100644
--- a/src/components/user_list_popover/user_list_popover.vue
+++ b/src/components/user_list_popover/user_list_popover.vue
@@ -10,9 +10,8 @@
     <template #content>
       <div class="user-list-popover">
         <template v-if="users.length">
-          <router-link
+          <div
             v-for="(user) in usersCapped"
-            :to="generateProfileLink(user)"
             :key="user.id"
             class="user-list-row"
           >
@@ -33,7 +32,7 @@
               <!-- eslint-enable vue/no-v-html -->
               <span class="user-list-screen-name">{{ user.screen_name_ui }}</span><UnicodeDomainIndicator :user="user" />
             </div>
-          </router-link>
+          </div>
         </template>
         <template v-else>
           <FAIcon
@@ -59,7 +58,6 @@
     padding: 0.25em;
     display: flex;
     flex-direction: row;
-    color: var(--text);
 
     .user-list-names {
       display: flex;
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 899978132..2e2ca5a5c 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -2089,7 +2089,6 @@ const listEmojiPacks = ({ page, pageSize }) => {
 }
 
 const listRemoteEmojiPacks = ({ instance, page, pageSize }) => {
-  console.log(instance)
   if (!instance.startsWith('http')) {
     instance = 'https://' + instance
   }
diff --git a/src/stores/emoji.js b/src/stores/emoji.js
index b7f8262a6..0673862e9 100644
--- a/src/stores/emoji.js
+++ b/src/stores/emoji.js
@@ -1,6 +1,5 @@
 import { defineStore } from 'pinia'
 
-import { merge } from 'lodash'
 import { useInstanceStore } from 'src/stores/instance.js'
 
 import { ensureFinalFallback } from 'src/i18n/languages.js'
@@ -11,8 +10,6 @@ const defaultState = {
   // Custom emoji from server
   customEmoji: [],
   customEmojiFetched: false,
-  adminPacksLocal: null,
-  adminPacksLocalLoading: true,
 
   // Unicode emoji from bundle
   emoji: {},
@@ -181,78 +178,6 @@ export const useEmojiStore = defineStore('emoji', {
       )
     },
 
-    async getAdminPacksLocal(refresh) {
-      if (!refresh && this.adminPacksLocal) return this.adminPacksLocal
-      const backendInteractor = window.vuex.state.api.backendInteractor
-      const listFunction = backendInteractor.listEmojiPacks
-
-      this.adminPacksLocalLoading = true
-      this.adminPacksLocal = await this.getAdminPacks(useInstanceStore().server, listFunction)
-      this.adminPacksLocalLoading = false
-    },
-
-    async getAdminPacks(instance, listFunction) {
-      const currentUser = window.vuex.state.users.currentUser
-
-      if (!currentUser.rights.admin) return
-
-      const pageSize = 25
-      const allPacks = {}
-
-
-      return await listFunction({
-        instance,
-        page: 1,
-        pageSize: 0,
-      })
-        .then((data) => data.json())
-        .then((data) => {
-          if (data.error !== undefined) {
-            return Promise.reject(data.error)
-          }
-
-          const promises = []
-
-          for (let i = 0; i < Math.ceil(data.count / pageSize); i++) {
-            promises.push(
-              listFunction({
-                instance,
-                page: i,
-                pageSize,
-              })
-                .then((data) => data.json())
-                .then((pageData) => {
-                if (pageData.error !== undefined) {
-                  return Promise.reject(pageData.error)
-                }
-
-                  return pageData.packs
-                })
-            )
-          }
-
-          return Promise
-            .all(promises)
-            .then((results) => {
-              return merge({}, ...results)
-            })
-        })
-        .then((allPacks) => {
-          // Sort by key
-          return Object
-            .keys(allPacks)
-            .sort()
-            .reduce((acc, key) => {
-              if (key.length === 0) return acc
-              acc[key] = allPacks[key]
-              return acc
-            }, {})
-        })
-        .catch((data) => {
-          this.displayError(data)
-        })
-    },
-
     async getCustomEmoji() {
       try {
         let res = await window.fetch('/api/v1/pleroma/emoji')