diff --git a/Packages/StatusKit/Sources/StatusKit/Row/StatusRowView.swift b/Packages/StatusKit/Sources/StatusKit/Row/StatusRowView.swift
index e82b30e6..e23d9db8 100644
--- a/Packages/StatusKit/Sources/StatusKit/Row/StatusRowView.swift
+++ b/Packages/StatusKit/Sources/StatusKit/Row/StatusRowView.swift
@@ -75,11 +75,13 @@ public struct StatusRowView: View {
             if !isCompact,
                theme.avatarPosition == .leading
             {
-              Button {
-                viewModel.navigateToAccountDetail(account: viewModel.finalStatus.account)
-              } label: {
-                AvatarView(viewModel.finalStatus.account.avatar)
-              }
+              AvatarView(viewModel.finalStatus.account.avatar)
+                .accessibility(addTraits: .isButton)
+                .contentShape(Circle())
+                .hoverEffect()
+                .onTapGesture {
+                  viewModel.navigateToAccountDetail(account: viewModel.finalStatus.account)
+                }
             }
             VStack(alignment: .leading, spacing: .statusComponentSpacing) {
               if !isCompact {
diff --git a/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowHeaderView.swift b/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowHeaderView.swift
index 526a135a..8395e958 100644
--- a/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowHeaderView.swift
+++ b/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowHeaderView.swift
@@ -15,12 +15,12 @@ struct StatusRowHeaderView: View {
   let viewModel: StatusRowViewModel
   var body: some View {
     HStack(alignment: theme.avatarPosition == .top ? .center : .top) {
-      Button {
-        viewModel.navigateToAccountDetail(account: viewModel.finalStatus.account)
-      } label: {
-        accountView
-      }
-      .buttonStyle(.plain)
+      accountView
+        .hoverEffect()
+        .accessibilityAddTraits(.isButton)
+        .onTapGesture {
+          viewModel.navigateToAccountDetail(account: viewModel.finalStatus.account)
+        }
       Spacer()
       if !redactionReasons.contains(.placeholder) {
         dateView