diff --git a/src/screens/Profile/Header/index.tsx b/src/screens/Profile/Header/index.tsx
--- a/src/screens/Profile/Header/index.tsx
+++ b/src/screens/Profile/Header/index.tsx
@@ -17,6 +17,7 @@ } from '@atproto/api'
 import {useIsFocused} from '@react-navigation/native'
 
 import {sanitizeHandle} from '#/lib/strings/handles'
+import {useEnableSquareAvatars} from '#/state/preferences/enable-square-avatars'
 import {useProfileShadow} from '#/state/cache/profile-shadow'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {useSetLightStatusBar} from '#/state/shell/light-status-bar'
@@ -37,6 +38,7 @@ } from './ProfileHeaderStandard'
 
 let ProfileHeaderLoading = (_props: {}): React.ReactNode => {
   const t = useTheme()
+  const enableSquareAvatars = useEnableSquareAvatars()
   return (
     <View style={t.atoms.bg}>
       <LoadingPlaceholder width="100%" height={150} style={{borderRadius: 0}} />
@@ -45,8 +47,13 @@ style={[
           t.atoms.bg,
           {borderColor: t.atoms.bg.backgroundColor},
           styles.avi,
+          enableSquareAvatars && styles.aviSquare,
         ]}>
-        <LoadingPlaceholder width={90} height={90} style={styles.br45} />
+        <LoadingPlaceholder
+          width={90}
+          height={90}
+          style={enableSquareAvatars ? styles.br8 : styles.br45}
+        />
       </View>
       <View style={styles.content}>
         <View style={[styles.buttonsLine]}>
@@ -229,6 +236,9 @@ height: 94,
     borderRadius: 47,
     borderWidth: 2,
   },
+  aviSquare: {
+    borderRadius: 10,
+  },
   content: {
     paddingTop: 12,
     paddingHorizontal: 16,
@@ -239,5 +249,6 @@ flexDirection: 'row',
     marginLeft: 'auto',
   },
   br45: {borderRadius: 45},
+  br8: {borderRadius: 8},
   br50: {borderRadius: 50},
 })
diff --git a/src/view/com/util/UserAvatar.tsx b/src/view/com/util/UserAvatar.tsx
--- a/src/view/com/util/UserAvatar.tsx
+++ b/src/view/com/util/UserAvatar.tsx
@@ -110,8 +110,6 @@ }): React.ReactNode => {
   const finalShape = overrideShape ?? (type === 'user' ? 'circle' : 'square')
   const t = useTheme()
 
-  const enableSquareAvatars = useEnableSquareAvatars()
-
   const aviStyle = useMemo(() => {
     if (finalShape === 'square') {
       return {borderRadius: size > 32 ? 8 : 3, overflow: 'hidden'} as const
@@ -206,7 +204,7 @@ viewBox="0 0 24 24"
       fill="none"
       stroke="none"
       style={aviStyle}>
-      {enableSquareAvatars ? (
+      {finalShape === 'square' ? (
         <Rect
           x="0"
           y="0"
diff --git a/src/view/shell/bottom-bar/BottomBarStyles.tsx b/src/view/shell/bottom-bar/BottomBarStyles.tsx
--- a/src/view/shell/bottom-bar/BottomBarStyles.tsx
+++ b/src/view/shell/bottom-bar/BottomBarStyles.tsx
@@ -74,6 +74,6 @@ borderRadius: 100,
   },
   onProfileSquare: {
     borderWidth: 1,
-    borderRadius: 5,
+    borderRadius: 3,
   },
 })
diff --git a/src/view/shell/bottom-bar/BottomBarWeb.tsx b/src/view/shell/bottom-bar/BottomBarWeb.tsx
--- a/src/view/shell/bottom-bar/BottomBarWeb.tsx
+++ b/src/view/shell/bottom-bar/BottomBarWeb.tsx
@@ -29,6 +29,7 @@ import {useSession} from '#/state/session'
 import {useLoggedOutViewControls} from '#/state/shell/logged-out'
 import {useShellLayout} from '#/state/shell/shell-layout'
 import {useCloseAllActiveElements} from '#/state/util'
+import {useEnableSquareAvatars} from '#/state/preferences/enable-square-avatars'
 import {Link} from '#/view/com/util/Link'
 import {UserAvatar} from '#/view/com/util/UserAvatar'
 import {Logo} from '#/view/icons/Logo'
@@ -71,6 +72,7 @@ const {footerHeight} = useShellLayout()
   const hideBorder = useHideBottomBarBorder()
   const accountSwitchControl = useDialogControl()
   const {data: profile} = useProfileQuery({did: currentAccount?.did})
+  const enableSquareAvatars = useEnableSquareAvatars()
   const iconWidth = 26
 
   const unreadMessageCount = useUnreadMessageCount()
@@ -199,7 +201,9 @@ style={[
                           styles.ctrlIcon,
                           styles.profileIcon,
                           isActive && [
-                            styles.onProfile,
+                            enableSquareAvatars
+                              ? styles.onProfileSquare
+                              : styles.onProfile,
                             {borderColor: t.atoms.text.color},
                           ],
                         ]}>