diff --git a/components/social-elements/notes/header.vue b/components/social-elements/notes/header.vue
index 14574d1..73fcf57 100644
--- a/components/social-elements/notes/header.vue
+++ b/components/social-elements/notes/header.vue
@@ -22,13 +22,13 @@
         </div>
     </div>
     <div v-else class="flex flex-row">
-        <NuxtLink :href="accountUrl" class="shrink-0">
-            <UserCard :account="note?.account">
+        <UserCard :account="note?.account">
+            <NuxtLink :href="accountUrl" class="shrink-0">
                 <Avatar :src="note?.account.avatar" :alt="`${note?.account.acct}'s avatar`"
                     class="h-12 w-12 rounded ring-1 ring-white/5" />
                 <span class="sr-only">Account profile</span>
-            </UserCard>
-        </NuxtLink>
+            </NuxtLink>
+        </UserCard>
         <div class="flex flex-col items-start justify-around ml-4 grow overflow-hidden">
             <div class="flex flex-row items-center justify-between w-full">
                 <NuxtLink :href="accountUrl" class="font-semibold text-gray-200 line-clamp-1 break-all">
diff --git a/components/social-elements/users/Account.vue b/components/social-elements/users/Account.vue
index 6acd2d4..8aa398c 100644
--- a/components/social-elements/users/Account.vue
+++ b/components/social-elements/users/Account.vue
@@ -29,7 +29,7 @@
                 <Skeleton :enabled="skeleton" :min-width="200" :max-width="350" class="h-6">
                     <span v-html="display_name"></span>
                     <iconify-icon v-if="account?.locked" icon="tabler:lock" width="1.25rem" height="1.25rem"
-                        class="text-gray-400 cursor-pointer align-text-top"
+                        class="text-gray-400 cursor-pointer align-text-top ml-1"
                         title="This account manually approves its followers" />
                 </Skeleton>
             </h2>
diff --git a/components/social-elements/users/UserCard.vue b/components/social-elements/users/UserCard.vue
index 0624c1a..73b22a9 100644
--- a/components/social-elements/users/UserCard.vue
+++ b/components/social-elements/users/UserCard.vue
@@ -14,7 +14,7 @@
             </Transition>
             <HoverCard.Positioner>
                 <HoverCard.Content
-                    class="bg-dark-700 w-96 z-20 overflow-y-auto rounded overflow-x-hidden ring-1 ring-white/20 shadow-xl max-h-[60vh] text-sm">
+                    class="bg-dark-700 pb-4 w-96 z-20 overflow-y-auto rounded overflow-x-hidden ring-1 ring-white/20 shadow-xl max-h-[60vh] text-sm">
                     <Avatar :src="account.header" :alt="`${account.acct}'s header image'`"
                         class="w-full aspect-[8/3] border-b border-white/10 bg-dark-700 !rounded-none" />
 
@@ -28,7 +28,7 @@
                             class="text-xl font-bold text-gray-100 tracking-tight bg-gradient-to-r from-primary-300 via-purple-300 to-indigo-400 text-transparent bg-clip-text">
                             <span v-html="display_name"></span>
                             <iconify-icon v-if="account.locked" icon="tabler:lock" width="1.25rem" height="1.25rem"
-                                class="text-gray-400 cursor-pointer align-text-top"
+                                class="text-gray-400 cursor-pointer align-text-top ml-1"
                                 title="This account manually approves its followers" />
                         </h2>
                         <span class="text-gray-300 block mt-2">
@@ -95,7 +95,7 @@ const props = defineProps<{
 }>();
 
 const config = useConfig();
-const isEnabled = useSetting(SettingIds.PopupAvatarHover);
+const isEnabled = ref({ value: false }); // useSetting(SettingIds.PopupAvatarHover);
 const open = ref(false);
 
 const formattedJoin = computed(() =>