diff --git a/src/app/routes/_authed/tournaments/$id.bracket.tsx b/src/app/routes/_authed/tournaments/$id.bracket.tsx
index 9c0a3c2..38a18bc 100644
--- a/src/app/routes/_authed/tournaments/$id.bracket.tsx
+++ b/src/app/routes/_authed/tournaments/$id.bracket.tsx
@@ -27,7 +27,7 @@ export const Route = createFileRoute("/_authed/tournaments/$id/bracket")({
     withPadding: false,
     header: {
       withBackButton: true,
-      title: `${context.tournament.name} - Bracket`,
+      title: `${context.tournament.name}`,
     },
   }),
   component: RouteComponent,
diff --git a/src/app/routes/_authed/tournaments/$id.groups.tsx b/src/app/routes/_authed/tournaments/$id.groups.tsx
index 194406e..fe82dff 100644
--- a/src/app/routes/_authed/tournaments/$id.groups.tsx
+++ b/src/app/routes/_authed/tournaments/$id.groups.tsx
@@ -24,7 +24,7 @@ export const Route = createFileRoute("/_authed/tournaments/$id/groups")({
     withPadding: false,
     header: {
       withBackButton: true,
-      title: `${context.tournament.name} - Groups`,
+      title: `${context.tournament.name}`,
     },
   }),
   component: RouteComponent,
diff --git a/src/components/team-avatar.tsx b/src/components/team-avatar.tsx
index a639936..4a69d39 100644
--- a/src/components/team-avatar.tsx
+++ b/src/components/team-avatar.tsx
@@ -30,17 +30,7 @@ const TeamAvatar = ({
   const hasNoLogo = !team.logo;
   const hasTwoPlayers = team.players?.length === 2;
 
-  let shouldShowPlayerAvatars = false;
-
-  if (isRegional !== undefined) {
-    shouldShowPlayerAvatars = isRegional && hasTwoPlayers && hasNoLogo;
-  } else {
-    const tournaments = (team as any).tournaments;
-    const hasTournaments = tournaments && tournaments.length > 0;
-    const allTournamentsAreRegional = hasTournaments && tournaments.every((t: any) => t.regional === true);
-
-    shouldShowPlayerAvatars = hasTwoPlayers && hasNoLogo && (allTournamentsAreRegional || !hasTournaments);
-  }
+  const shouldShowPlayerAvatars = isRegional === true && hasTwoPlayers && hasNoLogo;
 
   if (shouldShowPlayerAvatars && team.players?.length === 2) {
     const playerSize = size * 0.6;
diff --git a/src/features/teams/components/regional-team-card.tsx b/src/features/teams/components/regional-team-card.tsx
index 1a5156c..8ad7372 100644
--- a/src/features/teams/components/regional-team-card.tsx
+++ b/src/features/teams/components/regional-team-card.tsx
@@ -37,6 +37,7 @@ const RegionalTeamCard = ({ teamId }: RegionalTeamCardProps) => {
           team={team}
           size={40}
           radius="md"
+          isRegional={true}
           style={{
             backgroundColor: team.primary_color || undefined,
             color: team.accent_color || undefined,
diff --git a/src/features/tournaments/components/group-match-card.tsx b/src/features/tournaments/components/group-match-card.tsx
index 37f2eb5..1b202a3 100644
--- a/src/features/tournaments/components/group-match-card.tsx
+++ b/src/features/tournaments/components/group-match-card.tsx
@@ -93,7 +93,7 @@ const GroupMatchCard: React.FC<GroupMatchCardProps> = ({ match, showControls })
             <Stack gap="sm">
               <Group justify="space-between" align="center" wrap="nowrap">
                 <Group gap="sm" style={{ flex: 1, minWidth: 0 }}>
-                  <TeamAvatar team={match.home} size={32} radius="sm" />
+                  <TeamAvatar team={match.home} size={32} radius="sm" isRegional={match.tournament.regional} />
                   <Text
                     size="sm"
                     fw={homeWon ? 700 : 500}
@@ -124,7 +124,7 @@ const GroupMatchCard: React.FC<GroupMatchCardProps> = ({ match, showControls })
 
               <Group justify="space-between" align="center" wrap="nowrap">
                 <Group gap="sm" style={{ flex: 1, minWidth: 0 }}>
-                  <TeamAvatar team={match.away} size={32} radius="sm" />
+                  <TeamAvatar team={match.away} size={32} radius="sm" isRegional={match.tournament.regional} />
                   <Text
                     size="sm"
                     fw={awayWon ? 700 : 500}
diff --git a/src/features/tournaments/components/group-stage-view.tsx b/src/features/tournaments/components/group-stage-view.tsx
index fe1f066..2499f22 100644
--- a/src/features/tournaments/components/group-stage-view.tsx
+++ b/src/features/tournaments/components/group-stage-view.tsx
@@ -334,7 +334,7 @@ const GroupStageView: React.FC<GroupStageViewProps> = ({
                             <Text size="sm" fw={700} c="dimmed" w={24} ta="center">
                               {index + 1}
                             </Text>
-                            <TeamAvatar team={standing.team} size={28} radius="sm" />
+                            <TeamAvatar team={standing.team} size={28} radius="sm" isRegional={matches[0]?.tournament?.regional} />
                             <Text size="sm" fw={500} style={{ flex: 1 }} lineClamp={1}>
                               {standing.teamName}
                             </Text>