diff --git a/components/account/AccountAvatar.vue b/components/account/AccountAvatar.vue
index 8bc609b4..ea7072ea 100644
--- a/components/account/AccountAvatar.vue
+++ b/components/account/AccountAvatar.vue
@@ -12,16 +12,12 @@ defineOptions({
 </script>
 
 <template>
-  <div relative flex-shrink-0>
+  <div v-if="hover" relative flex-shrink-0>
     <div group>
-      <AccountHoverCard v-if="hover" top="-3.2" left="-4.4" absolute :account="account" op0 pointer-events-none group-hover="pointer-events-auto op100 scale-100" delay-250 transition transform scale-20 class="ease-[cubic-bezier(0.4, 0.0, 0.2, 1)]" />
-      <img
-        :src="account.avatar"
-        :alt="account.username"
-        loading="lazy"
-        rounded-full bg-gray:10
-        v-bind="$attrs"
-      >
+      <AccountHoverCard top="-3.2" left="-4.4" absolute :account="account" op0 pointer-events-none group-hover="pointer-events-auto op100 scale-100" delay-250 transition transform scale-20 class="ease-[cubic-bezier(0.4, 0.0, 0.2, 1)]" />
+      <AccountAvatarImage :account="account" v-bind="$attrs" />
     </div>
   </div>
+
+  <AccountAvatarImage v-else :account="account" v-bind="$attrs" />
 </template>
diff --git a/components/account/AccountAvatarImage.vue b/components/account/AccountAvatarImage.vue
new file mode 100644
index 00000000..a295e984
--- /dev/null
+++ b/components/account/AccountAvatarImage.vue
@@ -0,0 +1,17 @@
+<script setup lang="ts">
+import type { Account } from 'masto'
+
+defineProps<{
+  account: Account
+}>()
+</script>
+
+<template>
+  <img
+    :src="account.avatar"
+    :alt="account.username"
+    loading="lazy"
+    rounded-full bg-gray:10
+    v-bind="$attrs"
+  >
+</template>
diff --git a/components/account/AccountHeader.vue b/components/account/AccountHeader.vue
index 451009df..0aadff04 100644
--- a/components/account/AccountHeader.vue
+++ b/components/account/AccountHeader.vue
@@ -53,11 +53,9 @@ function getFieldNameIcon(fieldName: string) {
     <div p4 mt--17 flex flex-col gap-6>
       <div flex justify-between>
         <div flex="~ col gap-2 1" min-w-0>
-          <div>
-            <NuxtLink :to="getAccountPath(account)">
-              <AccountAvatar :account="account" w-30 h-30 />
-            </NuxtLink>
-          </div>
+          <NuxtLink w-fit :to="getAccountPath(account)">
+            <AccountAvatar :account="account" w-30 h-30 />
+          </NuxtLink>
           <div flex flex-col>
             <ContentRichSetup font-bold text-2xl break-words :content="getDisplayName(account)" :emojis="account.emojis" />
             <p op50>