diff --git a/desktop/src/features/agents/ui/AddTeamToChannelDialog.tsx b/desktop/src/features/agents/ui/AddTeamToChannelDialog.tsx
index d9d0335389c..9eb0a9d6e66 100644
--- a/desktop/src/features/agents/ui/AddTeamToChannelDialog.tsx
+++ b/desktop/src/features/agents/ui/AddTeamToChannelDialog.tsx
@@ -178,7 +178,7 @@ export function AddTeamToChannelDialog({
                     >
                       <ProfileAvatar
                         avatarUrl={persona.avatarUrl}
-                        className="h-5 w-5 rounded-full text-[9px]"
+                        className="h-5 w-5 text-[9px]"
                         label={persona.displayName}
                       />
                       <span className="text-xs font-medium">
diff --git a/desktop/src/features/agents/ui/AgentSessionTranscriptList.tsx b/desktop/src/features/agents/ui/AgentSessionTranscriptList.tsx
index 53d9a26bb30..ef11f463fda 100644
--- a/desktop/src/features/agents/ui/AgentSessionTranscriptList.tsx
+++ b/desktop/src/features/agents/ui/AgentSessionTranscriptList.tsx
@@ -112,7 +112,7 @@ function MessageItem({
       {!isAssistant ? (
         <UserAvatar
           avatarUrl={authorProfile?.avatarUrl ?? null}
-          className="mr-2 mt-1 h-5 w-5 shrink-0 rounded-full text-[8px]"
+          className="mr-2 mt-1 h-5 w-5 shrink-0 text-[8px]"
           displayName={authorLabel}
           size="xs"
         />
diff --git a/desktop/src/features/agents/ui/PersonaCatalogDetailsSheet.tsx b/desktop/src/features/agents/ui/PersonaCatalogDetailsSheet.tsx
index 831f6b0085e..d80e9794921 100644
--- a/desktop/src/features/agents/ui/PersonaCatalogDetailsSheet.tsx
+++ b/desktop/src/features/agents/ui/PersonaCatalogDetailsSheet.tsx
@@ -52,7 +52,7 @@ export function PersonaCatalogDetailsSheet({
               <div className="flex items-start gap-3">
                 <ProfileAvatar
                   avatarUrl={persona.avatarUrl}
-                  className="h-12 w-12 rounded-xl text-sm"
+                  className="h-12 w-12 text-sm"
                   label={persona.displayName}
                 />
                 <div className="min-w-0 flex-1">
diff --git a/desktop/src/features/agents/ui/TeamDialog.tsx b/desktop/src/features/agents/ui/TeamDialog.tsx
index 2a4259aec64..06421bc5170 100644
--- a/desktop/src/features/agents/ui/TeamDialog.tsx
+++ b/desktop/src/features/agents/ui/TeamDialog.tsx
@@ -422,7 +422,7 @@ export function TeamDialog({
                           />
                           <ProfileAvatar
                             avatarUrl={persona.avatarUrl}
-                            className="h-6 w-6 rounded-full text-[10px]"
+                            className="h-6 w-6 text-[10px]"
                             label={persona.displayName}
                           />
                           <span className="text-sm">{persona.displayName}</span>
diff --git a/desktop/src/features/agents/ui/TeamsSection.tsx b/desktop/src/features/agents/ui/TeamsSection.tsx
index 593a93018ac..6ec719ec75c 100644
--- a/desktop/src/features/agents/ui/TeamsSection.tsx
+++ b/desktop/src/features/agents/ui/TeamsSection.tsx
@@ -161,7 +161,7 @@ export function TeamsSection({
                         {visible.map((persona) => (
                           <ProfileAvatar
                             avatarUrl={persona.avatarUrl}
-                            className="h-6 w-6 rounded-full border-2 border-card text-[10px]"
+                            className="h-6 w-6 border-2 border-card text-[10px]"
                             key={persona.id}
                             label={persona.displayName}
                           />
diff --git a/desktop/src/features/channels/ui/AddChannelBotPersonasSection.tsx b/desktop/src/features/channels/ui/AddChannelBotPersonasSection.tsx
index 0f60f53aaf2..c0742165288 100644
--- a/desktop/src/features/channels/ui/AddChannelBotPersonasSection.tsx
+++ b/desktop/src/features/channels/ui/AddChannelBotPersonasSection.tsx
@@ -49,7 +49,7 @@ function SelectionChipButton({
         <ProfileAvatar
           avatarUrl={avatarUrl}
           className={cn(
-            "h-6 w-6 rounded-full text-[10px]",
+            "h-6 w-6 text-[10px]",
             selected
               ? "bg-primary/20 text-primary ring-1 ring-primary/20"
               : "bg-background/80 text-muted-foreground ring-1 ring-border/70",
@@ -161,7 +161,7 @@ export function AddChannelBotPersonasSection({
                       <div className="flex items-center gap-2">
                         <ProfileAvatar
                           avatarUrl={persona.avatarUrl}
-                          className="h-7 w-7 rounded-full text-[10px] bg-primary-foreground/20 text-primary-foreground"
+                          className="h-7 w-7 text-[10px] bg-primary-foreground/20 text-primary-foreground"
                           iconClassName="h-3.5 w-3.5"
                           label={persona.displayName}
                         />
diff --git a/desktop/src/features/channels/ui/AddChannelBotTeamsSection.tsx b/desktop/src/features/channels/ui/AddChannelBotTeamsSection.tsx
index 03914f83e5f..acb12eb0c56 100644
--- a/desktop/src/features/channels/ui/AddChannelBotTeamsSection.tsx
+++ b/desktop/src/features/channels/ui/AddChannelBotTeamsSection.tsx
@@ -158,7 +158,7 @@ export function AddChannelBotTeamsSection({
                           >
                             <ProfileAvatar
                               avatarUrl={persona.avatarUrl}
-                              className="h-4 w-4 rounded-full text-[8px] bg-primary-foreground/20 text-primary-foreground"
+                              className="h-4 w-4 text-[8px] bg-primary-foreground/20 text-primary-foreground"
                               label={persona.displayName}
                             />
                             <span className="text-[10px] text-primary-foreground">
diff --git a/desktop/src/features/channels/ui/AgentSessionThreadPanel.tsx b/desktop/src/features/channels/ui/AgentSessionThreadPanel.tsx
index 72dba7d9630..924e1c1e76e 100644
--- a/desktop/src/features/channels/ui/AgentSessionThreadPanel.tsx
+++ b/desktop/src/features/channels/ui/AgentSessionThreadPanel.tsx
@@ -135,7 +135,7 @@ export function AgentSessionThreadPanel({
             >
               <UserAvatar
                 avatarUrl={avatarUrl}
-                className="h-5 w-5 shrink-0 rounded-full text-[8px]"
+                className="h-5 w-5 shrink-0 text-[8px]"
                 displayName={agent.name}
                 size="xs"
               />
diff --git a/desktop/src/features/channels/ui/BotActivityBar.tsx b/desktop/src/features/channels/ui/BotActivityBar.tsx
index faeecdf3099..54a19c6e9b3 100644
--- a/desktop/src/features/channels/ui/BotActivityBar.tsx
+++ b/desktop/src/features/channels/ui/BotActivityBar.tsx
@@ -181,7 +181,7 @@ export function BotActivityComposerAction({
               <UserAvatar
                 avatarUrl={agentAvatarUrl(agent)}
                 className={cn(
-                  "rounded-full border border-background",
+                  "border border-background",
                   isInline
                     ? "!h-[18px] !w-[18px] shadow-xs ring-1 ring-primary/25 text-[7px]"
                     : "!h-5 !w-5 text-[8px]",
@@ -243,7 +243,7 @@ export function BotActivityComposerAction({
               >
                 <UserAvatar
                   avatarUrl={agentAvatarUrl(agent)}
-                  className="!h-6 !w-6 shrink-0 rounded-full text-[9px]"
+                  className="!h-6 !w-6 shrink-0 text-[9px]"
                   displayName={agent.name}
                 />
                 <span className="min-w-0 flex-1 truncate">{agent.name}</span>
diff --git a/desktop/src/features/channels/ui/MembersSidebarMemberCard.tsx b/desktop/src/features/channels/ui/MembersSidebarMemberCard.tsx
index a09f779196c..e876fe0d597 100644
--- a/desktop/src/features/channels/ui/MembersSidebarMemberCard.tsx
+++ b/desktop/src/features/channels/ui/MembersSidebarMemberCard.tsx
@@ -121,7 +121,7 @@ export function MembersSidebarMemberCard({
         <div className="relative shrink-0">
           <ProfileAvatar
             avatarUrl={profileAvatarUrl ?? null}
-            className="h-9 w-9 rounded-full text-[11px] shadow-none"
+            className="h-9 w-9 text-[11px] shadow-none"
             iconClassName="h-4 w-4"
             label={memberAvatarLabel}
           />
diff --git a/desktop/src/features/channels/ui/QuickBotBar.tsx b/desktop/src/features/channels/ui/QuickBotBar.tsx
index a84153762fc..b4eec62c0fc 100644
--- a/desktop/src/features/channels/ui/QuickBotBar.tsx
+++ b/desktop/src/features/channels/ui/QuickBotBar.tsx
@@ -54,7 +54,7 @@ export function QuickBotBar({ personas, pending, onAdd }: QuickBotBarProps) {
                 <button
                   aria-label={`Add ${persona.displayName}`}
                   className={cn(
-                    "relative flex h-7 w-7 shrink-0 items-center justify-center rounded-full",
+                    "relative flex h-7 w-7 shrink-0 items-center justify-center rounded-lg",
                     "border border-border/50 shadow-xs",
                     "transition-transform duration-150 hover:scale-110",
                     "focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring",
@@ -70,7 +70,7 @@ export function QuickBotBar({ personas, pending, onAdd }: QuickBotBarProps) {
                   {persona.avatarUrl ? (
                     <img
                       alt={persona.displayName}
-                      className="h-full w-full rounded-full object-cover"
+                      className="h-full w-full rounded-lg object-cover"
                       referrerPolicy="no-referrer"
                       src={rewriteRelayUrl(persona.avatarUrl)}
                     />
@@ -80,7 +80,7 @@ export function QuickBotBar({ personas, pending, onAdd }: QuickBotBarProps) {
                     </span>
                   )}
                   {isThisPending ? (
-                    <div className="absolute inset-0 flex items-center justify-center rounded-full bg-background/70">
+                    <div className="absolute inset-0 flex items-center justify-center rounded-lg bg-background/70">
                       <Spinner className="h-3.5 w-3.5 text-primary" />
                     </div>
                   ) : null}
diff --git a/desktop/src/features/home/ui/InboxListPane.tsx b/desktop/src/features/home/ui/InboxListPane.tsx
index 781175b90e1..0ee5150f06d 100644
--- a/desktop/src/features/home/ui/InboxListPane.tsx
+++ b/desktop/src/features/home/ui/InboxListPane.tsx
@@ -133,7 +133,7 @@ export function InboxListPane({
                   <div className="relative">
                     <UserAvatar
                       avatarUrl={item.avatarUrl}
-                      className="h-8 w-8 rounded-xl"
+                      className="h-8 w-8"
                       displayName={item.senderLabel}
                       size="md"
                     />
diff --git a/desktop/src/features/home/ui/InboxMessageRow.tsx b/desktop/src/features/home/ui/InboxMessageRow.tsx
index c2b2f6c7e0e..f0f9ddc1a5d 100644
--- a/desktop/src/features/home/ui/InboxMessageRow.tsx
+++ b/desktop/src/features/home/ui/InboxMessageRow.tsx
@@ -105,7 +105,7 @@ export function InboxMessageRow({
         <div className="relative shrink-0">
           <UserAvatar
             avatarUrl={message.avatarUrl}
-            className="h-8 w-8 shrink-0 rounded-xl"
+            className="h-8 w-8 shrink-0"
             displayName={message.authorLabel}
             size="md"
           />
diff --git a/desktop/src/features/messages/ui/MessageThreadSummaryRow.tsx b/desktop/src/features/messages/ui/MessageThreadSummaryRow.tsx
index 9ee082f5740..50b8237eb3f 100644
--- a/desktop/src/features/messages/ui/MessageThreadSummaryRow.tsx
+++ b/desktop/src/features/messages/ui/MessageThreadSummaryRow.tsx
@@ -26,9 +26,11 @@ function formatLastReplyTime(unixSeconds: number): string {
 }
 
 function ParticipantAvatar({
+  hasNextParticipant,
   participant,
   index,
 }: {
+  hasNextParticipant: boolean;
   participant: TimelineThreadSummaryParticipant;
   index: number;
 }) {
@@ -40,7 +42,7 @@ function ParticipantAvatar({
     >
       <UserAvatar
         avatarUrl={participant.avatarUrl}
-        className="h-8 w-8 rounded-full border-2 border-background text-[10px]"
+        className={`h-8 w-8 text-[10px] ${hasNextParticipant ? "ring-2 ring-background" : ""}`}
         displayName={participant.author}
         size="sm"
       />
@@ -103,7 +105,7 @@ export function MessageThreadSummaryRow({
 
       <button
         aria-label={summaryAriaLabel}
-        className="group relative isolate inline-flex h-8 w-fit max-w-full cursor-pointer items-center gap-1.5 rounded-full text-left text-xs font-medium text-muted-foreground transition-[color,opacity] before:pointer-events-none before:absolute before:inset-y-0 before:left-0 before:-right-2 before:-z-10 before:rounded-full before:content-[''] before:transition-[background-color,box-shadow] hover:text-foreground hover:opacity-90 hover:before:bg-background/95 hover:before:ring-1 hover:before:ring-border/70 focus-visible:outline-hidden focus-visible:before:bg-background/95 focus-visible:before:ring-1 focus-visible:before:ring-ring"
+        className="group relative isolate inline-flex h-8 w-fit max-w-full cursor-pointer items-center gap-1.5 rounded-[12px] text-left text-xs font-medium text-muted-foreground transition-[color,opacity] before:pointer-events-none before:absolute before:-bottom-0.5 before:-left-0.5 before:-right-2 before:-top-0.5 before:-z-10 before:rounded-[12px] before:content-[''] before:transition-[background-color,box-shadow] hover:text-foreground hover:opacity-90 hover:before:bg-background/95 hover:before:ring-1 hover:before:ring-border/70 focus-visible:outline-hidden focus-visible:before:bg-background/95 focus-visible:before:ring-1 focus-visible:before:ring-ring"
         data-thread-head-id={message.id}
         data-testid="message-thread-summary"
         onClick={() => onOpenThread(message)}
@@ -113,6 +115,7 @@ export function MessageThreadSummaryRow({
         <div className="flex shrink-0 items-center">
           {summary.participants.map((participant, index) => (
             <ParticipantAvatar
+              hasNextParticipant={index < summary.participants.length - 1}
               index={index}
               key={participant.id}
               participant={participant}
diff --git a/desktop/src/features/messages/ui/TypingIndicatorRow.tsx b/desktop/src/features/messages/ui/TypingIndicatorRow.tsx
index 3eb8270a03e..06718e0adb6 100644
--- a/desktop/src/features/messages/ui/TypingIndicatorRow.tsx
+++ b/desktop/src/features/messages/ui/TypingIndicatorRow.tsx
@@ -101,7 +101,7 @@ export function TypingIndicatorRow({
                 <div
                   key={pubkey}
                   className={cn(
-                    "relative shrink-0 rounded-full ring-1 ring-background",
+                    "relative shrink-0 rounded-lg ring-1 ring-background",
                     isActivityVariant ? "h-[18px] w-[18px]" : "h-5 w-5",
                     index > 0 && "-ml-1.5",
                   )}
@@ -111,7 +111,6 @@ export function TypingIndicatorRow({
                     avatarUrl={profile?.avatarUrl ?? null}
                     label={label}
                     className={cn(
-                      "rounded-full",
                       isActivityVariant
                         ? "h-[18px] w-[18px] text-[7px]"
                         : "h-5 w-5 text-[8px]",
diff --git a/desktop/src/features/profile/ui/AvatarUpload.tsx b/desktop/src/features/profile/ui/AvatarUpload.tsx
index 921cbdd8c10..81a5c83cf6a 100644
--- a/desktop/src/features/profile/ui/AvatarUpload.tsx
+++ b/desktop/src/features/profile/ui/AvatarUpload.tsx
@@ -77,7 +77,7 @@ export function AvatarUpload({
         <div className="relative h-20 w-20 shrink-0">
           <ProfileAvatar
             avatarUrl={avatarUrl || null}
-            className="h-full w-full rounded-3xl text-xl"
+            className="h-full w-full text-xl"
             iconClassName="h-6 w-6"
             label={previewName}
             testId={`${testIdPrefix}-preview`}
diff --git a/desktop/src/features/profile/ui/ProfilePopover.tsx b/desktop/src/features/profile/ui/ProfilePopover.tsx
index 19d33b2cfbd..fabc4502d51 100644
--- a/desktop/src/features/profile/ui/ProfilePopover.tsx
+++ b/desktop/src/features/profile/ui/ProfilePopover.tsx
@@ -143,7 +143,7 @@ export function ProfilePopover({
               <div className="relative shrink-0">
                 <ProfileAvatar
                   avatarUrl={avatarUrl}
-                  className="h-8 w-8 rounded-xl text-xs"
+                  className="h-8 w-8 text-xs"
                   iconClassName="h-4 w-4"
                   label={displayName}
                 />
diff --git a/desktop/src/features/profile/ui/UserProfilePanel.tsx b/desktop/src/features/profile/ui/UserProfilePanel.tsx
index c2ad0741433..0d2a8fa09e1 100644
--- a/desktop/src/features/profile/ui/UserProfilePanel.tsx
+++ b/desktop/src/features/profile/ui/UserProfilePanel.tsx
@@ -283,12 +283,12 @@ export function UserProfilePanel({
             {profile?.avatarUrl ? (
               <img
                 alt={displayName}
-                className="aspect-square w-full rounded-2xl object-cover shadow-xs"
+                className="aspect-square w-full rounded-lg object-cover shadow-xs"
                 referrerPolicy="no-referrer"
                 src={rewriteRelayUrl(profile.avatarUrl)}
               />
             ) : (
-              <div className="flex aspect-square w-full items-center justify-center rounded-2xl bg-secondary text-5xl font-semibold text-secondary-foreground shadow-xs">
+              <div className="flex aspect-square w-full items-center justify-center rounded-lg bg-secondary text-5xl font-semibold text-secondary-foreground shadow-xs">
                 {displayName.slice(0, 2).toUpperCase()}
               </div>
             )}
diff --git a/desktop/src/features/profile/ui/UserProfilePopover.tsx b/desktop/src/features/profile/ui/UserProfilePopover.tsx
index 04733802bbc..d6e3d277c2f 100644
--- a/desktop/src/features/profile/ui/UserProfilePopover.tsx
+++ b/desktop/src/features/profile/ui/UserProfilePopover.tsx
@@ -172,12 +172,12 @@ export function UserProfilePopover({
             {profile?.avatarUrl ? (
               <img
                 alt={profile.displayName ?? "User avatar"}
-                className="h-10 w-10 shrink-0 rounded-xl object-cover shadow-xs"
+                className="h-10 w-10 shrink-0 rounded-lg object-cover shadow-xs"
                 referrerPolicy="no-referrer"
                 src={rewriteRelayUrl(profile.avatarUrl)}
               />
             ) : (
-              <div className="flex h-10 w-10 shrink-0 items-center justify-center rounded-xl bg-secondary text-xs font-semibold text-secondary-foreground shadow-xs">
+              <div className="flex h-10 w-10 shrink-0 items-center justify-center rounded-lg bg-secondary text-xs font-semibold text-secondary-foreground shadow-xs">
                 {(profile?.displayName ?? pubkey.slice(0, 2))
                   .slice(0, 2)
                   .toUpperCase()}
diff --git a/desktop/src/features/pulse/ui/NoteCard.tsx b/desktop/src/features/pulse/ui/NoteCard.tsx
index e5dd0f9bd63..67f4383869e 100644
--- a/desktop/src/features/pulse/ui/NoteCard.tsx
+++ b/desktop/src/features/pulse/ui/NoteCard.tsx
@@ -82,7 +82,7 @@ function ReplyParentContext({
             >
               <UserAvatar
                 avatarUrl={parentAvatarUrl}
-                className="!h-4 !w-4 shrink-0 rounded-md"
+                className="!h-4 !w-4 shrink-0"
                 displayName={parentDisplayName ?? "Parent note author"}
               />
             </button>
diff --git a/desktop/src/features/search/ui/TopbarSearch.tsx b/desktop/src/features/search/ui/TopbarSearch.tsx
index a9e359cbd04..3ee05c49c55 100644
--- a/desktop/src/features/search/ui/TopbarSearch.tsx
+++ b/desktop/src/features/search/ui/TopbarSearch.tsx
@@ -251,7 +251,7 @@ export function TopbarSearch({
                         resultProfiles?.[result.hit.pubkey.toLowerCase()]
                           ?.avatarUrl ?? null
                       }
-                      className="h-7 w-7 rounded-md"
+                      className="h-7 w-7"
                       displayName={resolveUserLabel({
                         currentPubkey,
                         profiles: resultProfiles,
diff --git a/desktop/src/features/settings/ui/ChannelTemplatesSettingsCard.tsx b/desktop/src/features/settings/ui/ChannelTemplatesSettingsCard.tsx
index 37de9f07258..6746ed5702d 100644
--- a/desktop/src/features/settings/ui/ChannelTemplatesSettingsCard.tsx
+++ b/desktop/src/features/settings/ui/ChannelTemplatesSettingsCard.tsx
@@ -758,7 +758,7 @@ function ProviderRow({
         ) : (
           <ProfileAvatar
             avatarUrl={avatarUrl ?? null}
-            className="h-5 w-5 shrink-0 rounded-full text-[8px] bg-muted text-muted-foreground ring-1 ring-border/50"
+            className="h-5 w-5 shrink-0 text-[8px] bg-muted text-muted-foreground ring-1 ring-border/50"
             label={label}
           />
         )}
diff --git a/desktop/src/features/sidebar/ui/NewDirectMessageDialog.tsx b/desktop/src/features/sidebar/ui/NewDirectMessageDialog.tsx
index ac59310eecc..b1fb688c8b8 100644
--- a/desktop/src/features/sidebar/ui/NewDirectMessageDialog.tsx
+++ b/desktop/src/features/sidebar/ui/NewDirectMessageDialog.tsx
@@ -180,7 +180,7 @@ export function NewDirectMessageDialog({
                   >
                     <ProfileAvatar
                       avatarUrl={user.avatarUrl}
-                      className="h-5 w-5 rounded-full text-[10px] shadow-none"
+                      className="h-5 w-5 text-[10px] shadow-none"
                       iconClassName="h-3 w-3"
                       label={formatUserName(user)}
                     />
@@ -238,7 +238,7 @@ export function NewDirectMessageDialog({
                     >
                       <ProfileAvatar
                         avatarUrl={user.avatarUrl}
-                        className="h-9 w-9 rounded-2xl text-xs shadow-none"
+                        className="h-9 w-9 text-xs shadow-none"
                         iconClassName="h-4 w-4"
                         label={formatUserName(user)}
                       />
diff --git a/desktop/src/features/sidebar/ui/SidebarProfileCard.tsx b/desktop/src/features/sidebar/ui/SidebarProfileCard.tsx
index 9112e51ba5f..7d7ad648aa1 100644
--- a/desktop/src/features/sidebar/ui/SidebarProfileCard.tsx
+++ b/desktop/src/features/sidebar/ui/SidebarProfileCard.tsx
@@ -99,7 +99,7 @@ export function SidebarProfileCard({
         >
           <ProfileAvatar
             avatarUrl={profile?.avatarUrl ?? null}
-            className="h-8 w-8 rounded-xl text-xs"
+            className="h-8 w-8 text-xs"
             iconClassName="h-4 w-4"
             label={resolvedDisplayName}
             testId="sidebar-profile-avatar"
diff --git a/desktop/src/features/sidebar/ui/SidebarSection.tsx b/desktop/src/features/sidebar/ui/SidebarSection.tsx
index 1d8f31beda8..26e2997514f 100644
--- a/desktop/src/features/sidebar/ui/SidebarSection.tsx
+++ b/desktop/src/features/sidebar/ui/SidebarSection.tsx
@@ -67,7 +67,7 @@ function DmChannelIcon({
       <span className="relative flex h-5 w-5 shrink-0 items-center justify-center">
         <ProfileAvatar
           avatarUrl={primaryParticipant.avatarUrl}
-          className="h-5 w-5 rounded-full border border-sidebar-border/80 bg-sidebar-accent/80 text-[9px] text-sidebar-foreground shadow-none"
+          className="h-5 w-5 rounded-[6px] border border-sidebar-border/80 bg-sidebar-accent/80 text-[9px] text-sidebar-foreground shadow-none"
           iconClassName="h-3 w-3"
           label={primaryParticipant.label}
         />
@@ -88,13 +88,13 @@ function DmChannelIcon({
     <span className="relative flex h-5 w-7 shrink-0 items-center">
       <ProfileAvatar
         avatarUrl={primaryParticipant.avatarUrl}
-        className="absolute left-0 top-0 h-[18px] w-[18px] rounded-full border-2 border-sidebar bg-sidebar-accent/80 text-[8px] text-sidebar-foreground shadow-none"
+        className="absolute left-0 top-0 h-[18px] w-[18px] rounded-[6px] border-2 border-sidebar bg-sidebar-accent/80 text-[8px] text-sidebar-foreground shadow-none"
         iconClassName="h-2.5 w-2.5"
         label={primaryParticipant.label}
       />
       <ProfileAvatar
         avatarUrl={secondaryParticipant.avatarUrl}
-        className="absolute bottom-0 right-0 h-[18px] w-[18px] rounded-full border-2 border-sidebar bg-sidebar-accent/80 text-[8px] text-sidebar-foreground shadow-none"
+        className="absolute bottom-0 right-0 h-[18px] w-[18px] rounded-[6px] border-2 border-sidebar bg-sidebar-accent/80 text-[8px] text-sidebar-foreground shadow-none"
         iconClassName="h-2.5 w-2.5"
         label={secondaryParticipant.label}
       />
diff --git a/desktop/src/shared/ui/UserAvatar.tsx b/desktop/src/shared/ui/UserAvatar.tsx
index a06d939ea96..cab6a8fd66c 100644
--- a/desktop/src/shared/ui/UserAvatar.tsx
+++ b/desktop/src/shared/ui/UserAvatar.tsx
@@ -31,9 +31,7 @@ export function UserAvatar({
   const initials = getInitials(displayName);
 
   return (
-    <Avatar
-      className={cn(sizeClasses[size], "rounded-lg shadow-xs", className)}
-    >
+    <Avatar className={cn(sizeClasses[size], "shadow-xs", className)}>
       {avatarUrl ? (
         <AvatarImage
           alt={`${displayName} avatar`}
@@ -45,7 +43,7 @@ export function UserAvatar({
       ) : null}
       <AvatarFallback
         className={cn(
-          "rounded-lg font-semibold",
+          "font-semibold",
           accent
             ? "bg-primary text-primary-foreground"
             : "bg-secondary text-secondary-foreground",
diff --git a/desktop/src/shared/ui/avatar.tsx b/desktop/src/shared/ui/avatar.tsx
index 9c90537b70e..ff2fc706bdc 100644
--- a/desktop/src/shared/ui/avatar.tsx
+++ b/desktop/src/shared/ui/avatar.tsx
@@ -10,7 +10,7 @@ const Avatar = React.forwardRef<
   <AvatarPrimitive.Root
     ref={ref}
     className={cn(
-      "relative flex h-10 w-10 shrink-0 overflow-hidden rounded-full",
+      "relative flex h-10 w-10 shrink-0 overflow-hidden rounded-lg",
       className,
     )}
     {...props}
diff --git a/web/src/features/repos/ui/PubkeyAvatar.tsx b/web/src/features/repos/ui/PubkeyAvatar.tsx
index eb6fa5bfb65..5af45a107e7 100644
--- a/web/src/features/repos/ui/PubkeyAvatar.tsx
+++ b/web/src/features/repos/ui/PubkeyAvatar.tsx
@@ -23,7 +23,7 @@ export function PubkeyAvatar({
     <Tooltip>
       <TooltipTrigger asChild>
         <div
-          className={`flex items-center justify-center rounded-full font-medium text-white ${sizeClasses}`}
+          className={`flex items-center justify-center rounded-lg font-medium text-white ${sizeClasses}`}
           style={{ backgroundColor: `hsl(${hue}, 55%, 45%)` }}
         >
           {pubkey.slice(0, 2)}