diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index a87897ec5..483dca350 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 & {
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index e5e4bb75e..a9312c8e6 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -46,16 +46,6 @@
       </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 }]"
@@ -179,6 +169,13 @@
               </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/user_list_popover/user_list_popover.vue b/src/components/user_list_popover/user_list_popover.vue
index 3a93b9089..4e4ea41a5 100644
--- a/src/components/user_list_popover/user_list_popover.vue
+++ b/src/components/user_list_popover/user_list_popover.vue
@@ -10,9 +10,9 @@
     <template #content>
       <div class="user-list-popover">
         <template v-if="users.length">
-          <a
+          <router-link
             v-for="(user) in usersCapped"
-            :href="$router.resolve(generateProfileLink(user)).href"
+            :to="generateProfileLink(user)"
             :key="user.id"
             class="user-list-row"
           >
@@ -33,7 +33,7 @@
               <!-- eslint-enable vue/no-v-html -->
               <span class="user-list-screen-name">{{ user.screen_name_ui }}</span><UnicodeDomainIndicator :user="user" />
             </div>
-          </a>
+          </router-link>
         </template>
         <template v-else>
           <FAIcon