diff --git a/client/src/components/GameBoard.tsx b/client/src/components/GameBoard.tsx
index 48e924f..4da6aae 100644
--- a/client/src/components/GameBoard.tsx
+++ b/client/src/components/GameBoard.tsx
@@ -603,7 +603,7 @@ export default function GameBoard({ gameState, currentPlayerId, actions }: GameB
                                     <div className={`
                   w-16 h-16 rounded-full border-2 overflow-hidden relative shadow-lg bg-black
                   ${isSelected ? 'border-yellow-400 ring-4 ring-yellow-400/30' : 'border-gray-400'}
-                  ${player.isLeader ? 'ring-2 ring-white' : ''}
+                  ${gameState.currentLeaderId === player.id ? 'ring-2 ring-white' : ''}
                 `}>
                                         <Image
                                             src={avatarSrc}
@@ -613,18 +613,23 @@ export default function GameBoard({ gameState, currentPlayerId, actions }: GameB
                                         />
 
                                         {/* Icono de Líder */}
-                                        {player.isLeader && (
+                                        {gameState.currentLeaderId === player.id && (
                                             <div className="absolute bottom-0 right-0 bg-yellow-500 rounded-full p-1 w-6 h-6 flex items-center justify-center text-xs text-black font-bold border border-white z-10">
                                                 L
                                             </div>
                                         )}
 
                                         {/* Icono de Miembro del Equipo de Misión */}
-                                        {gameState.proposedTeam.includes(player.id) && (gameState.phase === GamePhase.MISSION || gameState.phase === 'mission_reveal' as any || gameState.phase === 'mission_result' as any) && (
-                                            <div className="absolute top-0 left-0 bg-green-500 rounded-full p-1 w-6 h-6 flex items-center justify-center text-xs text-white font-bold border border-white z-10">
-                                                ⭐
-                                            </div>
-                                        )}
+                                        {gameState.proposedTeam.includes(player.id) && (
+                                            gameState.phase === GamePhase.VOTING_TEAM ||
+                                            gameState.phase === GamePhase.MISSION ||
+                                            gameState.phase === 'mission_reveal' as any ||
+                                            gameState.phase === 'mission_result' as any
+                                        ) && (
+                                                <div className="absolute top-0 left-0 bg-green-500 rounded-full p-1 w-6 h-6 flex items-center justify-center text-xs text-white font-bold border border-white z-10">
+                                                    ⭐
+                                                </div>
+                                            )}
                                     </div>
 
                                     {/* Nombre */}