diff --git a/Packages/Account/Sources/Account/AccountDetailHeaderView.swift b/Packages/Account/Sources/Account/AccountDetailHeaderView.swift
index dd4662f5..5e4e1a5d 100644
--- a/Packages/Account/Sources/Account/AccountDetailHeaderView.swift
+++ b/Packages/Account/Sources/Account/AccountDetailHeaderView.swift
@@ -101,7 +101,8 @@ struct AccountDetailHeaderView: View {
             .resizable()
             .frame(width: 25, height: 25)
             .foregroundColor(theme.tintColor)
-            .offset(x: 10, y: -10)
+            .offset(x: theme.avatarShape == .circle ? 0 : 10,
+                    y: theme.avatarShape == .circle ? 0 : -10)
         }
       }
       Spacer()