chore: bump version to 1.1.41+46 [ci skip]

Merge branch 'main' of https://git.freetimelab.es/FreeTLab/farolero
Firma de la aplicación como pide play store
2026-05-12 21:51:20 +02:00 · 2026-05-12 21:50:18 +02:00 · 2026-05-12 21:50:16 +02:00 · 2026-05-12 01:37:36 +02:00 · 2026-05-12 01:36:41 +02:00 · 2026-05-12 01:20:19 +02:00
126 changed files with 2242 additions and 1586 deletions
@@ -0,0 +1 @@
+CYSATD23LTB4SAAAAAAAAAAAAA
@@ -0,0 +1,84 @@
+# Inventario de iconos/assets premium pendientes — Farolero
+
+Criterio: sustituir iconos Material/emoji/texto que tengan peso visual por ilustraciones premium transparentes, manteniendo texto/estado como Flutter real. Objetivo: assets WebP/PNG con alpha, tamaño ajustado al render real y peso controlado.
+
+## Resumen técnico
+
+- Assets totales de imagen: 122.
+- Peso por carpetas: `assets/avatars` ~9.16 MB, `assets/ui` ~2.07 MB, `assets/app_icon` ~1.54 MB, `assets/medals` ~0.35 MB, `assets/rewards` ~0.18 MB.
+- Assets no referenciados literalmente en código/pubspec: `assets/app_icon/farolero_app_icon.png` y `assets/ui/premium/*`.
+- `assets/ui/premium/*` debe eliminarse del runtime si no se usa: son glows/overlays antiguos y de baja calidad frente al sistema `assets/ui/generated/*`.
+- Se detectan ~190 usos de `Icons.*`; no todos deben sustituirse. Los de navegación/cierre/campos pueden seguir vectoriales. Los de acciones principales, fases, resultados y notas sí deberían ser assets generados.
+
+## Reglas de tamaño/peso propuestas
+
+| Tipo | Tamaño fuente generado | Tamaño runtime | Peso objetivo |
+| --- | ---: | ---: | ---: |
+| Icono de botón/acción | 512x512 | 128x128 o 160x160 WebP alpha | 12-35 KB |
+| Icono de fase/tarjeta | 768x768 | 192x192 o 256x256 WebP alpha | 35-90 KB |
+| Hero de pantalla | 1024x1024 | 512x512 WebP alpha | 70-160 KB |
+| Fondo pantalla | 1440x2560 fuente | 900x1599 WebP/JPEG | 80-180 KB |
+| Marco QR | 512x512 fuente | 192x192/256x256 WebP alpha | 40-100 KB |
+| App icon | 1024x1024 PNG fuente | mantener fuente + generar mipmaps | fuente puede pesar 1-2 MB |
+
+## Prioridad A — reemplazar ya
+
+| Uso visual | Iconos/líneas detectadas | Asset recomendado | Runtime recomendado | Peso objetivo | Motivo |
+| --- | --- | --- | --- | --- | --- |
+| Notas | `Icons.edit_note`, `Icons.note`, `Icons.save` en `pantalla_debate.dart`, `pantalla_notas*.dart`, `pantalla_gestor_host.dart`, `pantalla_resultado_online.dart`, `pantalla_fin_partida_online.dart` | `assets/ui/generated/actions/action_notes_quill.webp` | 160x160 WebP alpha | 20-45 KB | El botón de notas se ve pobre; debe ser cuaderno/pergamino/pluma/farol premium. |
+| Votación | `Icons.how_to_vote`, `Icons.person_search`, `Icons.gps_fixed` en voto/resultado/reglas | `assets/ui/generated/actions/action_vote_mask.webp` | 160x160 o 192x192 WebP alpha | 25-60 KB | Acción central de juego, ahora parece Material. |
+| Ver palabra / revelar | `Icons.visibility`, `Icons.visibility_off`, `Icons.key`, `Icons.lock`, `Icons.search` | `assets/ui/generated/actions/action_reveal_word.webp` | 160x160 WebP alpha | 20-45 KB | Fase clave; debe verse como secreto/farol/carta sellada. |
+| Impostor | `Icons.theater_comedy`, `Icons.psychology` | `assets/ui/generated/actions/action_impostor_mask.webp` | 192x192 WebP alpha | 35-75 KB | Se usa mucho y define identidad del juego. |
+| Resultado/victoria | `Icons.emoji_events`, `Icons.celebration`, `Icons.mood`, `Icons.sentiment_dissatisfied` | `assets/ui/generated/actions/action_result_trophy.webp` | 192x192 WebP alpha | 35-75 KB | Pantallas de resultado necesitan impacto/gamificación. |
+| Fuego/progreso | `Icons.local_fire_department`, emojis de fuego en medallas como fallback | `assets/ui/generated/actions/action_fire_badge.webp` | 160x160 WebP alpha | 20-45 KB | Mantener estética de farol/fuego sin emoji. |
+
+## Prioridad B — reutilizar/generar si queda feo en pantalla
+
+| Uso visual | Iconos/líneas detectadas | Asset recomendado | Runtime recomendado | Peso objetivo | Motivo |
+| --- | --- | --- | --- | --- | --- |
+| Debate | `Icons.forum`, `Icons.record_voice_over`, `Icons.chat_bubble` | `assets/ui/generated/actions/action_debate_voice.webp` | 160x160 WebP alpha | 20-45 KB | Fase frecuente; puede reutilizarse en reglas y host. |
+| Multidispositivo | `Icons.devices`, `Icons.phone_android`, `Icons.bluetooth_searching`, `Icons.wifi_tethering`, `Icons.radar` | reutilizar/mejorar `join_lobby/signal_art.webp` o nuevo `action_multidevice_signal.webp` | 192x192 WebP alpha | 35-80 KB | Hay asset de señal, pero varios botones siguen con iconos Material. |
+| Jugadores | `Icons.person`, `Icons.person_add`, `Icons.groups`, `Icons.person_off` | `action_players_token.webp` | 128x128 WebP alpha | 12-35 KB | En listas pequeñas puede bastar vectorial; en CTAs/tarjetas debería ser asset. |
+| Historial | `Icons.history_rounded`, `Icons.arrow_forward_ios` | reutilizar `meta/history_ledger_art.webp` | 160x160 WebP alpha | ya existe 130 KB; quizá recomprimir a 70-90 KB | Ya hay asset, pero botones siguen con icono. |
+| Ajustes/perfil | `Icons.settings_rounded`, `Icons.edit`, `Icons.alternate_email` | reutilizar `meta/settings_profile_art.webp` | 160x160 WebP alpha | ya existe 124 KB; quizá recomprimir a 60-90 KB | Útil en perfil/configuración. |
+| Crear partida | `Icons.category`, `Icons.add`, `Icons.remove_circle_outline`, `Icons.add_circle_outline` | `action_create_game.webp` / reutilizar `create_game_header_art.webp` | 128-192 WebP alpha | 20-70 KB | Pantalla aún básica en varias zonas. |
+
+## Prioridad C — mantener vectorial salvo que sea protagonista
+
+- `Icons.close`, `Icons.arrow_back`, `Icons.chevron_right_rounded`, `Icons.arrow_forward`, `Icons.check`, `Icons.cancel` como controles pequeños pueden seguir vectoriales.
+- En botones premium principales, si el icono ocupa mucho protagonismo, conviene usar asset ilustrado.
+- En `TextField.prefixIcon`, usar vectorial es aceptable salvo pantallas premium donde el icono sea grande o repetido.
+
+## Assets existentes a reutilizar antes de generar
+
+| Asset | Tamaño | Peso | Estado |
+| --- | ---: | ---: | --- |
+| `assets/ui/generated/gameplay/notes_strategy_art.webp` | 256x256 | ~126 KB | Bueno como hero de notas; pesado para botón. Generar derivado `action_notes_quill.webp` 128/160 px. |
+| `assets/ui/generated/meta/result_verdict_art.webp` | 256x256 | ~129 KB | Bueno para resultado; pesado como icono de botón. Crear derivado 160 px. |
+| `assets/ui/generated/gameplay/gameplay_phase_emblem.webp` | 256x256 | ~113 KB | Reutilizable como fase genérica; no sustituye iconos específicos. |
+| `assets/ui/generated/join_lobby/signal_art.webp` | 176x88 | ~129 KB | Calidad correcta pero peso alto para tamaño; recomprimir objetivo 45-80 KB. |
+| `assets/ui/generated/meta/history_ledger_art.webp` | 256x256 | ~131 KB | Reutilizable; recomprimir si se usa como icono pequeño. |
+| `assets/ui/generated/meta/settings_profile_art.webp` | 256x256 | ~124 KB | Reutilizable; recomprimir si se usa como icono pequeño. |
+| `assets/ui/generated/create_game/create_game_header_art.webp` | 176x88 | ~122 KB | Peso alto para tamaño; recomprimir o generar iconos derivados. |
+
+## Assets a retirar o no usar como runtime
+
+| Asset/carpeta | Motivo |
+| --- | --- |
+| `assets/ui/premium/lantern_radial_glow.png` | 1024x1024, 285 KB, no referenciado; glow procedural/antiguo. |
+| `assets/ui/premium/vote_danger_glow.png` | no referenciado; reemplazar por asset premium real si hace falta. |
+| `assets/ui/premium/word_reveal_glow.png` | no referenciado; reemplazar por asset premium real si hace falta. |
+| `assets/ui/premium/corner_orange_glow.png` | no referenciado; placeholder procedural. |
+| `assets/ui/premium/timer_ring_glow.png` | no referenciado; si se quiere temporizador premium, generar ilustración específica. |
+| `assets/ui/premium/card_sheen_overlay.png` | no referenciado; solo conservar si se integra conscientemente. |
+| `assets/ui/premium/qr_frame_overlay.png` | no referenciado; el QR debe mantener zona blanca limpia. |
+| `assets/ui/premium/sparks_overlay.png` | no referenciado; mejor usar efectos controlados o asset optimizado. |
+
+## Plan de generación recomendado
+
+1. Generar un kit pequeño `assets/ui/generated/actions/` con 8-10 iconos ilustrados transparentes.
+2. Redimensionar/comprimir cada icono a 128/160/192 px según uso.
+3. Añadir soporte en `BotonFarolero` y `TarjetaFaseFarolero` para `assetIconPath`, manteniendo `IconData` solo como fallback.
+4. Migrar primero acciones visibles: notas, votar, ver palabra, impostor, resultado, fuego.
+5. Reutilizar los mismos assets en host/cliente/local para no multiplicar peso.
+6. Eliminar `assets/ui/premium/` del runtime si sigue sin referencias reales.
@@ -301,5 +301,21 @@
        "type": "String"
      }
    }
+  },
+  "voteOf": "تصويت {name}",
+  "@voteOf": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "firstTurnInstruction": "يبدأ {name} بقول كلمته.",
+  "@firstTurnInstruction": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
  }
 }
@@ -301,5 +301,21 @@
        "type": "String"
      }
    }
+  },
+  "voteOf": "Vot de {name}",
+  "@voteOf": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "firstTurnInstruction": "Comença {name} dient la seva paraula.",
+  "@firstTurnInstruction": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
  }
 }
@@ -301,5 +301,21 @@
        "type": "String"
      }
    }
+  },
+  "voteOf": "Stimme von {name}",
+  "@voteOf": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "firstTurnInstruction": "{name} beginnt und sagt sein/ihr Wort.",
+  "@firstTurnInstruction": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
  }
 }
@@ -333,5 +333,21 @@
        "type": "String"
      }
    }
+  },
+  "voteOf": "Vote from {name}",
+  "@voteOf": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "firstTurnInstruction": "{name} starts by saying their word.",
+  "@firstTurnInstruction": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
  }
 }
@@ -369,5 +369,21 @@
        "type": "String"
      }
    }
+  },
+  "voteOf": "Voto de {name}",
+  "@voteOf": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "firstTurnInstruction": "Empieza {name} diciendo su palabra.",
+  "@firstTurnInstruction": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
  }
 }
@@ -301,5 +301,21 @@
        "type": "String"
      }
    }
+  },
+  "voteOf": "{name}(r)en botoa",
+  "@voteOf": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "firstTurnInstruction": "{name} hasiko da bere hitza esanez.",
+  "@firstTurnInstruction": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
  }
 }
@@ -301,5 +301,21 @@
        "type": "String"
      }
    }
+  },
+  "voteOf": "Vote de {name}",
+  "@voteOf": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "firstTurnInstruction": "{name} commence en disant son mot.",
+  "@firstTurnInstruction": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
  }
 }
@@ -301,5 +301,21 @@
        "type": "String"
      }
    }
+  },
+  "voteOf": "{name} का वोट",
+  "@voteOf": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "firstTurnInstruction": "{name} अपनी शब्द बोलकर शुरू करता है।",
+  "@firstTurnInstruction": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
  }
 }
@@ -301,5 +301,21 @@
        "type": "String"
      }
    }
+  },
+  "voteOf": "Voto di {name}",
+  "@voteOf": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "firstTurnInstruction": "{name} inizia dicendo la sua parola.",
+  "@firstTurnInstruction": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
  }
 }
@@ -301,5 +301,21 @@
        "type": "String"
      }
    }
+  },
+  "voteOf": "{name} の投票",
+  "@voteOf": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "firstTurnInstruction": "{name} が自分のワードを言って始めます。",
+  "@firstTurnInstruction": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
  }
 }
@@ -301,5 +301,21 @@
        "type": "String"
      }
    }
+  },
+  "voteOf": "{name}의 투표",
+  "@voteOf": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "firstTurnInstruction": "{name}님이 자신의 단어를 말하며 시작합니다.",
+  "@firstTurnInstruction": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
  }
 }
@@ -301,5 +301,21 @@
        "type": "String"
      }
    }
+  },
+  "voteOf": "Stem van {name}",
+  "@voteOf": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "firstTurnInstruction": "{name} begint door het woord te zeggen.",
+  "@firstTurnInstruction": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
  }
 }
@@ -301,5 +301,21 @@
        "type": "String"
      }
    }
+  },
+  "voteOf": "Głos gracza {name}",
+  "@voteOf": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "firstTurnInstruction": "{name} zaczyna, mówiąc swoje słowo.",
+  "@firstTurnInstruction": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
  }
 }
@@ -301,5 +301,21 @@
        "type": "String"
      }
    }
+  },
+  "voteOf": "Voto de {name}",
+  "@voteOf": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "firstTurnInstruction": "{name} começa dizendo a sua palavra.",
+  "@firstTurnInstruction": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
  }
 }
@@ -301,5 +301,21 @@
        "type": "String"
      }
    }
+  },
+  "voteOf": "Голос игрока {name}",
+  "@voteOf": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "firstTurnInstruction": "{name} начинает, называя своё слово.",
+  "@firstTurnInstruction": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
  }
 }
@@ -301,5 +301,21 @@
        "type": "String"
      }
    }
+  },
+  "voteOf": "{name} için oy",
+  "@voteOf": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "firstTurnInstruction": "{name} kelimesini söyleyerek başlar.",
+  "@firstTurnInstruction": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
  }
 }
@@ -301,5 +301,21 @@
        "type": "String"
      }
    }
+  },
+  "voteOf": "{name} 的投票",
+  "@voteOf": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "firstTurnInstruction": "{name} 先说出自己的词。",
+  "@firstTurnInstruction": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
  }
 }
@@ -301,5 +301,21 @@
        "type": "String"
      }
    }
+  },
+  "voteOf": "{name} 的投票",
+  "@voteOf": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "firstTurnInstruction": "{name} 先說出自己的詞。",
+  "@firstTurnInstruction": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
  }
 }
@@ -520,6 +520,19 @@ abstract class AppLocalizations {
  /// **'Jugadores en debate'**
  String get playersInDebate;

+
+  /// No description provided for @voteOf.
+  ///
+  /// In en, this message translates to:
+  /// **'Vote from {name}'**
+  String voteOf(String name);
+
+  /// No description provided for @firstTurnInstruction.
+  ///
+  /// In en, this message translates to:
+  /// **'{name} starts by saying their word.'**
+  String firstTurnInstruction(String name);
+
  /// No description provided for @activePlayersInfo.
  ///
  /// In es, this message translates to:
@@ -213,6 +213,16 @@ class AppLocalizationsAr extends AppLocalizations {
  @override
  String get playersInDebate => 'اللاعبون في النقاش';

+  @override
+  String voteOf(String name) {
+    return "تصويت $name";
+  }
+
+  @override
+  String firstTurnInstruction(String name) {
+    return "يبدأ $name بقول كلمته.";
+  }
+
  @override
  String activePlayersInfo(int active, int impostors) {
    return '$active نشطون • $impostors منتحل(ون) مختبئون';
@@ -214,6 +214,16 @@ class AppLocalizationsCa extends AppLocalizations {
  @override
  String get playersInDebate => 'Jugadors en debat';

+  @override
+  String voteOf(String name) {
+    return "Vot de $name";
+  }
+
+  @override
+  String firstTurnInstruction(String name) {
+    return "Comença $name dient la seva paraula.";
+  }
+
  @override
  String activePlayersInfo(int active, int impostors) {
    return '$active actius • $impostors impostor(s) ocults';
@@ -216,6 +216,16 @@ class AppLocalizationsDe extends AppLocalizations {
  @override
  String get playersInDebate => 'Spieler in der Diskussion';

+  @override
+  String voteOf(String name) {
+    return "Stimme von $name";
+  }
+
+  @override
+  String firstTurnInstruction(String name) {
+    return "$name beginnt und sagt sein/ihr Wort.";
+  }
+
  @override
  String activePlayersInfo(int active, int impostors) {
    return '$active aktiv • $impostors versteckte(r) Hochstapler';
@@ -213,6 +213,16 @@ class AppLocalizationsEn extends AppLocalizations {
  @override
  String get playersInDebate => 'Players in discussion';

+  @override
+  String voteOf(String name) {
+    return "Vote from $name";
+  }
+
+  @override
+  String firstTurnInstruction(String name) {
+    return "$name starts by saying their word.";
+  }
+
  @override
  String activePlayersInfo(int active, int impostors) {
    return '$active active • $impostors hidden impostor(s)';
@@ -213,6 +213,16 @@ class AppLocalizationsEs extends AppLocalizations {
  @override
  String get playersInDebate => 'Jugadores en debate';

+  @override
+  String voteOf(String name) {
+    return "Voto de $name";
+  }
+
+  @override
+  String firstTurnInstruction(String name) {
+    return "Empieza $name diciendo su palabra.";
+  }
+
  @override
  String activePlayersInfo(int active, int impostors) {
    return '$active activos • $impostors impostor(es) ocultos';
@@ -216,6 +216,16 @@ class AppLocalizationsEu extends AppLocalizations {
  @override
  String get playersInDebate => 'Eztabaidan diren jokalariak';

+  @override
+  String voteOf(String name) {
+    return "$name(r)en botoa";
+  }
+
+  @override
+  String firstTurnInstruction(String name) {
+    return "$name hasiko da bere hitza esanez.";
+  }
+
  @override
  String activePlayersInfo(int active, int impostors) {
    return '$active aktibo • $impostors inpostore ezkutu';
@@ -214,6 +214,16 @@ class AppLocalizationsFr extends AppLocalizations {
  @override
  String get playersInDebate => 'Joueurs en débat';

+  @override
+  String voteOf(String name) {
+    return "Vote de $name";
+  }
+
+  @override
+  String firstTurnInstruction(String name) {
+    return "$name commence en disant son mot.";
+  }
+
  @override
  String activePlayersInfo(int active, int impostors) {
    return '$active actifs • $impostors imposteur(s) caché(s)';
@@ -213,6 +213,16 @@ class AppLocalizationsHi extends AppLocalizations {
  @override
  String get playersInDebate => 'बहस में खिलाड़ी';

+  @override
+  String voteOf(String name) {
+    return "$name का वोट";
+  }
+
+  @override
+  String firstTurnInstruction(String name) {
+    return "$name अपनी शब्द बोलकर शुरू करता है।";
+  }
+
  @override
  String activePlayersInfo(int active, int impostors) {
    return '$active सक्रिय • $impostors धोखेबाज़ छिपे हुए';
@@ -214,6 +214,16 @@ class AppLocalizationsIt extends AppLocalizations {
  @override
  String get playersInDebate => 'Giocatori in discussione';

+  @override
+  String voteOf(String name) {
+    return "Voto di $name";
+  }
+
+  @override
+  String firstTurnInstruction(String name) {
+    return "$name inizia dicendo la sua parola.";
+  }
+
  @override
  String activePlayersInfo(int active, int impostors) {
    return '$active attivi • $impostors impostore/i nascosti';
@@ -213,6 +213,16 @@ class AppLocalizationsJa extends AppLocalizations {
  @override
  String get playersInDebate => '議論中のプレイヤー';

+  @override
+  String voteOf(String name) {
+    return "$name の投票";
+  }
+
+  @override
+  String firstTurnInstruction(String name) {
+    return "$name が自分のワードを言って始めます。";
+  }
+
  @override
  String activePlayersInfo(int active, int impostors) {
    return '$active 人参加中 • $impostors 人のインポスターが潜伏中';
@@ -213,6 +213,16 @@ class AppLocalizationsKo extends AppLocalizations {
  @override
  String get playersInDebate => '토론 중인 플레이어';

+  @override
+  String voteOf(String name) {
+    return "$name의 투표";
+  }
+
+  @override
+  String firstTurnInstruction(String name) {
+    return "$name님이 자신의 단어를 말하며 시작합니다.";
+  }
+
  @override
  String activePlayersInfo(int active, int impostors) {
    return '$active명 참여 중 • $impostors명의 임포스터 잠복 중';
@@ -214,6 +214,16 @@ class AppLocalizationsNl extends AppLocalizations {
  @override
  String get playersInDebate => 'Spelers in debat';

+  @override
+  String voteOf(String name) {
+    return "Stem van $name";
+  }
+
+  @override
+  String firstTurnInstruction(String name) {
+    return "$name begint door het woord te zeggen.";
+  }
+
  @override
  String activePlayersInfo(int active, int impostors) {
    return '$active actief • $impostors verborgen bedrieger(s)';
@@ -214,6 +214,16 @@ class AppLocalizationsPl extends AppLocalizations {
  @override
  String get playersInDebate => 'Gracze w debacie';

+  @override
+  String voteOf(String name) {
+    return "Głos gracza $name";
+  }
+
+  @override
+  String firstTurnInstruction(String name) {
+    return "$name zaczyna, mówiąc swoje słowo.";
+  }
+
  @override
  String activePlayersInfo(int active, int impostors) {
    return '$active aktywnych • $impostors ukrytych oszustów';
@@ -215,6 +215,16 @@ class AppLocalizationsPt extends AppLocalizations {
  @override
  String get playersInDebate => 'Jogadores no debate';

+  @override
+  String voteOf(String name) {
+    return "Voto de $name";
+  }
+
+  @override
+  String firstTurnInstruction(String name) {
+    return "$name começa dizendo a sua palavra.";
+  }
+
  @override
  String activePlayersInfo(int active, int impostors) {
    return '$active ativos • $impostors impostor(es) ocultos';
@@ -214,6 +214,16 @@ class AppLocalizationsRu extends AppLocalizations {
  @override
  String get playersInDebate => 'Игроки в обсуждении';

+  @override
+  String voteOf(String name) {
+    return "Голос игрока $name";
+  }
+
+  @override
+  String firstTurnInstruction(String name) {
+    return "$name начинает, называя своё слово.";
+  }
+
  @override
  String activePlayersInfo(int active, int impostors) {
    return '$active активных • $impostors скрытый(-х) самозванец(-ев)';
@@ -213,6 +213,16 @@ class AppLocalizationsTr extends AppLocalizations {
  @override
  String get playersInDebate => 'Tartışmadaki oyuncular';

+  @override
+  String voteOf(String name) {
+    return "$name için oy";
+  }
+
+  @override
+  String firstTurnInstruction(String name) {
+    return "$name kelimesini söyleyerek başlar.";
+  }
+
  @override
  String activePlayersInfo(int active, int impostors) {
    return '$active aktif • $impostors gizli sahtekar';
@@ -213,6 +213,16 @@ class AppLocalizationsZh extends AppLocalizations {
  @override
  String get playersInDebate => '参与讨论的玩家';

+  @override
+  String voteOf(String name) {
+    return "$name 的投票";
+  }
+
+  @override
+  String firstTurnInstruction(String name) {
+    return "$name 先说出自己的词。";
+  }
+
  @override
  String activePlayersInfo(int active, int impostors) {
    return '$active 名在场 • $impostors 名冒牌者潜伏中';
@@ -30,6 +30,22 @@ class _PantallaAdivinanzaState extends State<PantallaAdivinanza> {
    setState(() => _acierto = resultado);
  }

+  void _continuarTrasNoAdivinar(EstadoJuego estado) {
+    final fin = estado.comprobarFinPartida();
+    if (fin) {
+      Navigator.pushReplacement(
+        context,
+        MaterialPageRoute(builder: (_) => const PantallaFinPartida()),
+      );
+    } else {
+      estado.siguienteRonda();
+      Navigator.pushReplacement(
+        context,
+        MaterialPageRoute(builder: (_) => const PantallaDebate()),
+      );
+    }
+  }
+
  @override
  Widget build(BuildContext context) {
    final l10n = AppLocalizations.of(context)!;
@@ -44,199 +60,132 @@ class _PantallaAdivinanzaState extends State<PantallaAdivinanza> {
      ),
      body: FondoFarolero(
        intenso: true,
-        child: Center(
-          child: SingleChildScrollView(
-          padding: const EdgeInsets.all(32),
-          child: Column(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              const ArteGameplayFarolero.fase(height: 132),
-              const SizedBox(height: 12),
-              EncabezadoFarolero(
-                icono: Icons.theater_comedy,
-                titulo: l10n.impostorCanGuess,
-                subtitulo: l10n.ifCorrectImpostorsWin,
-                color: TemaApp.colorAcento,
-                trailing: Image.asset(
-                  'assets/ui/generated/meta/result_verdict_art.webp',
-                  width: 42,
-                  height: 42,
-                  opacity: const AlwaysStoppedAnimation(0.64),
-                ),
+        child: SafeArea(
+          child: Center(
+            child: SingleChildScrollView(
+              padding: const EdgeInsets.all(24),
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  const ArteGameplayFarolero.fase(height: 132),
+                  const SizedBox(height: 12),
+                  TarjetaFaseFarolero(
+                    icono: Icons.theater_comedy,
+                    assetIconPath: 'assets/ui/generated/actions/action_impostor_mask.webp',
+                    titulo: l10n.impostorCanGuess,
+                    subtitulo: l10n.ifCorrectImpostorsWin,
+                    color: TemaApp.colorAcento,
+                    child: _buildContenido(context, l10n, estado, partida.palabraSecreta),
+                  ),
+                ],
              ),
-              const SizedBox(height: 32),
-
-              if (_acierto == null) ...[
-                TextField(
-                  controller: _controlador,
-                  decoration: InputDecoration(
-                    hintText: l10n.guessWordHint,
-                    prefixIcon: const Icon(Icons.search),
-                  ),
-                  textCapitalization: TextCapitalization.sentences,
-                  textAlign: TextAlign.center,
-                  style: const TextStyle(fontSize: 20),
-                  onSubmitted: (_) => _intentarAdivinar(),
-                ),
-                const SizedBox(height: 24),
-                Row(
-                  children: [
-                    Expanded(
-                      child: OutlinedButton(
-                        onPressed: () {
-                          // No intenta adivinar, siguiente ronda
-                          final fin = estado.comprobarFinPartida();
-                          if (fin) {
-                            Navigator.pushReplacement(
-                              context,
-                              MaterialPageRoute(
-                                builder: (_) => const PantallaFinPartida(),
-                              ),
-                            );
-                          } else {
-                            estado.siguienteRonda();
-                            Navigator.pushReplacement(
-                              context,
-                              MaterialPageRoute(
-                                builder: (_) => const PantallaDebate(),
-                              ),
-                            );
-                          }
-                        },
-                        child: Text(l10n.dontGuess),
-                      ),
-                    ),
-                    const SizedBox(width: 12),
-                    Expanded(
-                      flex: 2,
-                      child: ElevatedButton.icon(
-                        onPressed: _controlador.text.trim().isNotEmpty
-                            ? _intentarAdivinar
-                            : null,
-                        icon: const Icon(Icons.send),
-                        label: Text(l10n.guess),
-                      ),
-                    ),
-                  ],
-                ),
-              ],
-
-              if (_acierto == true) ...[
-                const SizedBox(height: 16),
-                Container(
-                  padding: const EdgeInsets.all(24),
-                  decoration: BoxDecoration(
-                    color: TemaApp.colorAcento.withValues(alpha: 0.3),
-                    borderRadius: BorderRadius.circular(16),
-                    border: Border.all(color: TemaApp.colorAcento),
-                  ),
-                  child: Column(
-                    children: [
-                      const Text('🎭🎉', style: TextStyle(fontSize: 48)),
-                      const SizedBox(height: 12),
-                      Text(
-                        l10n.correctGuess,
-                        style: Theme.of(context)
-                            .textTheme
-                            .headlineMedium
-                            ?.copyWith(color: TemaApp.colorAcento),
-                      ),
-                      const SizedBox(height: 8),
-                      Text(
-                        l10n.theWordWas(partida.palabraSecreta),
-                        style: Theme.of(context).textTheme.titleLarge,
-                      ),
-                      const SizedBox(height: 8),
-                      Text(
-                        l10n.impostorsWin,
-                        style: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                          color: TemaApp.colorNaranja,
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-                const SizedBox(height: 24),
-                SizedBox(
-                  width: double.infinity,
-                  height: 56,
-                  child: ElevatedButton.icon(
-                    onPressed: () {
-                      Navigator.pushReplacement(
-                        context,
-                        MaterialPageRoute(
-                          builder: (_) => const PantallaFinPartida(),
-                        ),
-                      );
-                    },
-                    icon: const Icon(Icons.emoji_events),
-                    label: Text(l10n.seeEndResult),
-                  ),
-                ),
-              ],
-
-              if (_acierto == false) ...[
-                const SizedBox(height: 16),
-                Container(
-                  padding: const EdgeInsets.all(24),
-                  decoration: BoxDecoration(
-                    color: TemaApp.colorVerde.withValues(alpha: 0.3),
-                    borderRadius: BorderRadius.circular(16),
-                    border: Border.all(color: TemaApp.colorVerde),
-                  ),
-                  child: Column(
-                    children: [
-                      const Text('❌', style: TextStyle(fontSize: 48)),
-                      const SizedBox(height: 12),
-                      Text(
-                        l10n.wrongGuess,
-                        style: Theme.of(context)
-                            .textTheme
-                            .headlineMedium
-                            ?.copyWith(color: TemaApp.colorVerde),
-                      ),
-                      const SizedBox(height: 8),
-                      Text(
-                        l10n.gameContinues,
-                        style: Theme.of(context).textTheme.bodyLarge,
-                      ),
-                    ],
-                  ),
-                ),
-                const SizedBox(height: 24),
-                SizedBox(
-                  width: double.infinity,
-                  height: 56,
-                  child: ElevatedButton.icon(
-                    onPressed: () {
-                      final fin = estado.comprobarFinPartida();
-                      if (fin) {
-                        Navigator.pushReplacement(
-                          context,
-                          MaterialPageRoute(
-                            builder: (_) => const PantallaFinPartida(),
-                          ),
-                        );
-                      } else {
-                        estado.siguienteRonda();
-                        Navigator.pushReplacement(
-                          context,
-                          MaterialPageRoute(
-                            builder: (_) => const PantallaDebate(),
-                          ),
-                        );
-                      }
-                    },
-                    icon: const Icon(Icons.skip_next),
-                    label: Text(l10n.nextRound),
-                  ),
-                ),
-              ],
-            ],
-          ),
+            ),
          ),
        ),
      ),
    );
  }
+
+  Widget _buildContenido(
+    BuildContext context,
+    AppLocalizations l10n,
+    EstadoJuego estado,
+    String palabraSecreta,
+  ) {
+    if (_acierto == null) {
+      return Column(
+        children: [
+          TextField(
+            controller: _controlador,
+            decoration: InputDecoration(
+              hintText: l10n.guessWordHint,
+              prefixIcon: IconoFarolero(Icons.search),
+            ),
+            textCapitalization: TextCapitalization.sentences,
+            textAlign: TextAlign.center,
+            style: const TextStyle(fontSize: 20),
+            onChanged: (value) => setState(() {}),
+            onSubmitted: (value) => _intentarAdivinar(),
+          ),
+          const SizedBox(height: 24),
+          Row(
+            children: [
+              Expanded(
+                child: BotonFarolero.oscuro(
+                  texto: l10n.dontGuess,
+                  icono: Icons.skip_next,
+                  onPressed: () => _continuarTrasNoAdivinar(estado),
+                ),
+              ),
+              const SizedBox(width: 12),
+              Expanded(
+                flex: 2,
+                child: BotonFarolero(
+                  texto: l10n.guess,
+                  icono: Icons.send,
+                  assetIconPath: 'assets/ui/generated/actions/action_impostor_mask.webp',
+                  onPressed: _controlador.text.trim().isNotEmpty ? _intentarAdivinar : null,
+                ),
+              ),
+            ],
+          ),
+        ],
+      );
+    }
+
+    final acierto = _acierto == true;
+    final color = acierto ? TemaApp.colorAcento : TemaApp.colorVerde;
+    return Column(
+      children: [
+        PanelFarolero(
+          padding: const EdgeInsets.all(24),
+          borderColor: color,
+          color: color.withValues(alpha: 0.18),
+          child: Column(
+            children: [
+              IconoFarolero(
+                acierto ? Icons.celebration : Icons.cancel,
+                color: color,
+                size: 52,
+              ),
+              const SizedBox(height: 12),
+              Text(
+                acierto ? l10n.correctGuess : l10n.wrongGuess,
+                textAlign: TextAlign.center,
+                style: Theme.of(context).textTheme.headlineMedium?.copyWith(color: color),
+              ),
+              const SizedBox(height: 8),
+              Text(
+                acierto ? l10n.theWordWas(palabraSecreta) : l10n.gameContinues,
+                textAlign: TextAlign.center,
+                style: Theme.of(context).textTheme.titleLarge,
+              ),
+              if (acierto) ...[
+                const SizedBox(height: 8),
+                Text(
+                  l10n.impostorsWin,
+                  textAlign: TextAlign.center,
+                  style: Theme.of(context).textTheme.bodyLarge?.copyWith(color: TemaApp.colorNaranja),
+                ),
+              ],
+            ],
+          ),
+        ),
+        const SizedBox(height: 24),
+        BotonFarolero(
+          texto: acierto ? l10n.seeEndResult : l10n.nextRound,
+          icono: acierto ? Icons.emoji_events : Icons.skip_next,
+          assetIconPath: acierto ? 'assets/ui/generated/actions/action_result_trophy.webp' : null,
+          onPressed: acierto
+              ? () {
+                  Navigator.pushReplacement(
+                    context,
+                    MaterialPageRoute(builder: (_) => const PantallaFinPartida()),
+                  );
+                }
+              : () => _continuarTrasNoAdivinar(estado),
+        ),
+      ],
+    );
+  }
 }
@@ -69,7 +69,12 @@ class _PantallaAjustesState extends State<PantallaAjustes> {
                          ),
                        ),
                        const SizedBox(width: 12),
-                        const Icon(Icons.edit),
+                        Image.asset(
+                          'assets/ui/generated/actions/action_settings_gear.webp',
+                          width: 38,
+                          height: 38,
+                          fit: BoxFit.contain,
+                        ),
                      ],
                    ),
                  ),
@@ -130,7 +135,7 @@ class _PantallaAjustesState extends State<PantallaAjustes> {
      leading: Text(bandera, style: const TextStyle(fontSize: 24)),
      title: Text(nombre),
      trailing: seleccionado
-          ? const Icon(Icons.check_circle, color: TemaApp.colorAcento)
+          ? IconoFarolero(Icons.check_circle, color: TemaApp.colorAcento)
          : null,
      onTap: onTap,
      dense: true,
@@ -167,7 +172,7 @@ class _PantallaAjustesState extends State<PantallaAjustes> {
                    onChanged: (_) => setDialogState(() {}),
                    decoration: InputDecoration(
                      labelText: l10n.profileName,
-                      prefixIcon: const Icon(Icons.person),
+                      prefixIcon: IconoFarolero(Icons.person),
                    ),
                  ),
                  const SizedBox(height: 12),
@@ -175,7 +180,7 @@ class _PantallaAjustesState extends State<PantallaAjustes> {
                    controller: nickController,
                    decoration: InputDecoration(
                      labelText: l10n.profileNick,
-                      prefixIcon: const Icon(Icons.alternate_email),
+                      prefixIcon: IconoFarolero(Icons.alternate_email),
                    ),
                  ),
                  const SizedBox(height: 18),
@@ -151,7 +151,7 @@ class _PantallaCrearPartidaState extends State<PantallaCrearPartida> {

  Future<void> _iniciarPartidaMulti() async {
    final l10n = AppLocalizations.of(context)!;
-    // 1. Pedir permisos automáticamente
+    // 1. Pedir permisos automÃƒÂ¡ticamente
    final permisosOk = await ServicioPermisos.solicitarPermisosNearby(context);
    if (!permisosOk) {
      if (mounted) {
@@ -353,12 +353,12 @@ class _PantallaCrearPartidaState extends State<PantallaCrearPartida> {
                          ButtonSegment(
                            value: false,
                            label: Text(l10n.singleDevice),
-                            icon: const Icon(Icons.phone_android),
+                            icon: IconoFarolero(Icons.phone_android),
                          ),
                          ButtonSegment(
                            value: true,
                            label: Text(l10n.multiDevice),
-                            icon: const Icon(Icons.devices),
+                            icon: IconoFarolero(Icons.devices),
                          ),
                        ],
                        selected: {_modoMultimovil},
@@ -382,7 +382,7 @@ class _PantallaCrearPartidaState extends State<PantallaCrearPartida> {
                padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 14),
                child: Row(
                  children: [
-                    Icon(
+                    IconoFarolero(
                      _modoMultimovil ? Icons.devices : Icons.phone_android,
                      color: TemaApp.colorNaranja,
                    ),
@@ -400,7 +400,7 @@ class _PantallaCrearPartidaState extends State<PantallaCrearPartida> {
              ),
              const SizedBox(height: 12),
            ],
-            // Categoría
+            // CategorÃƒÂa
            Card(
              child: Padding(
                padding: const EdgeInsets.fromLTRB(18, 18, 18, 28),
@@ -416,8 +416,16 @@ class _PantallaCrearPartidaState extends State<PantallaCrearPartida> {
                      width: double.infinity,
                      child: DropdownButtonFormField<String>(
                        initialValue: _categoria,
-                        decoration: const InputDecoration(
-                          prefixIcon: Icon(Icons.category),
+                        decoration: InputDecoration(
+                          prefixIcon: Padding(
+                            padding: EdgeInsets.all(10),
+                            child: Image.asset(
+                              'assets/ui/generated/actions/action_category_cards.webp',
+                              width: 24,
+                              height: 24,
+                              fit: BoxFit.contain,
+                            ),
+                          ),
                        ),
                        items: categorias.map((c) {
                          return DropdownMenuItem(
@@ -465,7 +473,15 @@ class _PantallaCrearPartidaState extends State<PantallaCrearPartida> {
                            controller: _controladorNombre,
                            decoration: InputDecoration(
                              hintText: l10n.playerNameHint,
-                              prefixIcon: const Icon(Icons.person_add),
+                              prefixIcon: Padding(
+                                padding: EdgeInsets.all(10),
+                                child: Image.asset(
+                                  'assets/ui/generated/actions/action_add_player.webp',
+                                  width: 24,
+                                  height: 24,
+                                  fit: BoxFit.contain,
+                                ),
+                              ),
                            ),
                            textCapitalization: TextCapitalization.words,
                            onSubmitted: (_) => _agregarJugador(),
@@ -474,7 +490,7 @@ class _PantallaCrearPartidaState extends State<PantallaCrearPartida> {
                        const SizedBox(width: 8),
                        IconButton.filled(
                          onPressed: _agregarJugador,
-                          icon: const Icon(Icons.add),
+                          icon: IconoFarolero(Icons.add),
                        ),
                      ],
                    ),
@@ -513,9 +529,9 @@ class _PantallaCrearPartidaState extends State<PantallaCrearPartida> {
                            ? Text(l10n.mainDeviceUser)
                            : null,
                        trailing: esPerfilLocal
-                            ? const Icon(Icons.lock, color: TemaApp.colorDorado)
+                            ? IconoFarolero(Icons.lock, color: TemaApp.colorDorado)
                            : IconButton(
-                                icon: const Icon(
+                                icon: IconoFarolero(
                                  Icons.close,
                                  color: TemaApp.colorAcento,
                                ),
@@ -530,7 +546,7 @@ class _PantallaCrearPartidaState extends State<PantallaCrearPartida> {
              const SizedBox(height: 12),
            ],

-            // Configuración de partida
+            // ConfiguraciÃƒÂ³n de partida
            Card(
              child: Padding(
                padding: const EdgeInsets.fromLTRB(18, 18, 18, 28),
@@ -543,7 +559,7 @@ class _PantallaCrearPartidaState extends State<PantallaCrearPartida> {
                    ),
                    const SizedBox(height: 12),

-                    // Número de impostores
+                    // NÃƒÂºmero de impostores
                    Row(
                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
                      children: [
@@ -554,7 +570,7 @@ class _PantallaCrearPartidaState extends State<PantallaCrearPartida> {
                              onPressed: _numImpostores > 1
                                  ? () => setState(() => _numImpostores--)
                                  : null,
-                              icon: const Icon(Icons.remove_circle_outline),
+                              icon: IconoFarolero(Icons.remove_circle_outline),
                            ),
                            Text(
                              '$_numImpostores',
@@ -564,7 +580,7 @@ class _PantallaCrearPartidaState extends State<PantallaCrearPartida> {
                              onPressed: _numImpostores < _maxImpostores
                                  ? () => setState(() => _numImpostores++)
                                  : null,
-                              icon: const Icon(Icons.add_circle_outline),
+                              icon: IconoFarolero(Icons.add_circle_outline),
                            ),
                          ],
                        ),
@@ -604,10 +620,11 @@ class _PantallaCrearPartidaState extends State<PantallaCrearPartida> {
            ),
            const SizedBox(height: 24),

-            // Botón iniciar
+            // BotÃƒÂ³n iniciar
            BotonFarolero(
              texto: l10n.startGame,
              icono: Icons.play_arrow,
+              assetIconPath: 'assets/ui/generated/actions/action_create_game.webp',
              onPressed: (_modoMultimovil || _jugadores.length >= 3)
                  ? _iniciarPartida
                  : null,
@@ -4,7 +4,6 @@ import 'package:farolero/l10n/generated/app_localizations.dart';
 import 'package:provider/provider.dart';
 import '../estado/estado_juego.dart';
 import '../tema/componentes_farolero.dart';
-import '../tema/tema_app.dart';
 import 'pantalla_notas.dart';
 import 'pantalla_votacion.dart';

@@ -67,9 +66,6 @@ class _PantallaDebateState extends State<PantallaDebate> {
    if (partida == null) return const SizedBox.shrink();

    final tieneTemporizador = partida.config.tiempoDebateSegundos != null;
-    final progreso = tieneTemporizador
-        ? _segundosRestantes / partida.config.tiempoDebateSegundos!
-        : 0.0;

    return Scaffold(
      appBar: AppBar(
@@ -78,172 +74,79 @@ class _PantallaDebateState extends State<PantallaDebate> {
      ),
      body: FondoFarolero(
        intenso: true,
-        child: Padding(
-          padding: const EdgeInsets.all(16),
-          child: Column(
-          children: [
-            const ArteGameplayFarolero.fase(height: 110),
-            const SizedBox(height: 10),
-            // Temporizador
-            if (tieneTemporizador) ...[
-              Container(
-                width: double.infinity,
-                padding: const EdgeInsets.all(20),
-                decoration: BoxDecoration(
-                  color: _tiempoAgotado
-                      ? TemaApp.colorAcento.withValues(alpha: 0.3)
-                      : TemaApp.colorTarjeta,
-                  borderRadius: BorderRadius.circular(16),
-                  border: _tiempoAgotado
-                      ? Border.all(color: TemaApp.colorAcento, width: 2)
-                      : null,
-                ),
-                child: Stack(
-                  alignment: Alignment.center,
-                  children: [
-                    Positioned.fill(
-                      child: Image.asset(
-                        'assets/ui/generated/gameplay/gameplay_phase_emblem.webp',
-                        fit: BoxFit.contain,
-                        opacity: const AlwaysStoppedAnimation(0.36),
+        child: SafeArea(
+          child: Padding(
+            padding: const EdgeInsets.all(16),
+            child: Column(
+              children: [
+                const ArteGameplayFarolero.fase(height: 110),
+                const SizedBox(height: 10),
+                if (tieneTemporizador) ...[
+                  TemporizadorFarolero(
+                    etiqueta: _tiempoAgotado ? l10n.timeUp : l10n.timeRemaining,
+                    tiempo: _formatearTiempo(_segundosRestantes),
+                    agotado: _tiempoAgotado,
+                  ),
+                  const SizedBox(height: 16),
+                ],
+                Expanded(
+                  child: TarjetaFaseFarolero(
+                    icono: Icons.forum,
+                    assetIconPath: 'assets/ui/generated/actions/action_rules_book.webp',
+                    titulo: l10n.playersInDebate,
+                    subtitulo: l10n.activePlayersInfo(
+                      partida.jugadoresActivos.length,
+                      partida.impostoresActivos.length,
+                    ),
+                    child: Expanded(
+                      child: ListView.separated(
+                      itemCount: partida.jugadores.length,
+                      separatorBuilder: (context, index) => const SizedBox(height: 8),
+                      itemBuilder: (context, index) {
+                        final jugador = partida.jugadores[index];
+                        return EstadoJugadorFarolero(
+                          nombre: '${index + 1}. ${jugador.nombre}',
+                          subtitulo: jugador.eliminado ? l10n.eliminated : null,
+                          icono: jugador.eliminado ? Icons.person_off : Icons.record_voice_over,
+                          assetIconPath: jugador.eliminado ? null : 'assets/ui/generated/actions/action_players_group.webp',
+                          destacado: !jugador.eliminado,
+                          completado: !jugador.eliminado,
+                        );
+                      },
                      ),
                    ),
-                    Column(
-                      mainAxisSize: MainAxisSize.min,
-                      children: [
-                        Text(
-                          _tiempoAgotado ? l10n.timeUp : l10n.timeRemaining,
-                          style:
-                              Theme.of(context).textTheme.titleMedium?.copyWith(
-                                    color: _tiempoAgotado
-                                        ? TemaApp.colorAcento
-                                        : TemaApp.colorTextoSecundario,
-                                  ),
-                        ),
-                        const SizedBox(height: 8),
-                        Text(
-                          _formatearTiempo(_segundosRestantes),
-                          style:
-                              Theme.of(context).textTheme.headlineLarge?.copyWith(
-                                    fontSize: 48,
-                                    fontWeight: FontWeight.bold,
-                                    color: _segundosRestantes < 10 &&
-                                            !_tiempoAgotado
-                                        ? TemaApp.colorAcento
-                                        : TemaApp.colorTexto,
-                                  ),
-                        ),
-                        const SizedBox(height: 8),
-                        ClipRRect(
-                          borderRadius: BorderRadius.circular(4),
-                          child: LinearProgressIndicator(
-                            value: progreso,
-                            backgroundColor: TemaApp.colorSuperficie,
-                            valueColor: AlwaysStoppedAnimation(
-                              _segundosRestantes < 10
-                                  ? TemaApp.colorAcento
-                                  : TemaApp.colorVerde,
-                            ),
-                            minHeight: 6,
-                          ),
-                        ),
-                      ],
+                  ),
+                ),
+                const SizedBox(height: 16),
+                Row(
+                  children: [
+                    Expanded(
+                      child: BotonFarolero.oscuro(
+                        texto: l10n.notes,
+                        icono: Icons.edit_note,
+                        assetIconPath: 'assets/ui/generated/actions/action_notes_quill.webp',
+                        onPressed: () {
+                          Navigator.push(
+                            context,
+                            MaterialPageRoute(builder: (_) => const PantallaNotas()),
+                          );
+                        },
+                      ),
+                    ),
+                    const SizedBox(width: 12),
+                    Expanded(
+                      flex: 2,
+                      child: BotonFarolero(
+                        texto: l10n.goToVoting,
+                        icono: Icons.how_to_vote,
+                        assetIconPath: 'assets/ui/generated/actions/action_vote_mask.webp',
+                        onPressed: _irAVotacion,
+                      ),
                    ),
                  ],
                ),
-              ),
-              const SizedBox(height: 16),
-            ],
-
-            // Jugadores activos
-            Expanded(
-              child: Card(
-                child: Padding(
-                  padding: const EdgeInsets.all(16),
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Text(
-                        l10n.playersInDebate,
-                        style: Theme.of(context).textTheme.titleLarge,
-                      ),
-                      const SizedBox(height: 4),
-                      Text(
-                        l10n.activePlayersInfo(partida.jugadoresActivos.length, partida.impostoresActivos.length),
-                        style: Theme.of(context).textTheme.bodyMedium,
-                      ),
-                      const SizedBox(height: 12),
-                      Expanded(
-                        child: ListView.builder(
-                          itemCount: partida.jugadores.length,
-                          itemBuilder: (context, index) {
-                            final j = partida.jugadores[index];
-                            return ListTile(
-                              leading: CircleAvatar(
-                                backgroundColor: j.eliminado
-                                    ? Colors.grey
-                                    : TemaApp.colorAcento,
-                                child: Text(
-                                  j.eliminado ? '💀' : '${index + 1}',
-                                  style: const TextStyle(
-                                      color: Colors.white, fontSize: 14),
-                                ),
-                              ),
-                              title: Text(
-                                j.nombre,
-                                style: TextStyle(
-                                  decoration: j.eliminado
-                                      ? TextDecoration.lineThrough
-                                      : null,
-                                  color: j.eliminado
-                                      ? TemaApp.colorTextoSecundario
-                                      : TemaApp.colorTexto,
-                                ),
-                              ),
-                              subtitle: j.eliminado
-                                  ? Text(l10n.eliminated)
-                                  : null,
-                              dense: true,
-                            );
-                          },
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-              ),
-            ),
-            const SizedBox(height: 16),
-
-            // Botones
-            Row(
-              children: [
-                Expanded(
-                  child: OutlinedButton.icon(
-                    onPressed: () {
-                      Navigator.push(
-                        context,
-                        MaterialPageRoute(
-                          builder: (_) => const PantallaNotas(),
-                        ),
-                      );
-                    },
-                    icon: const Text('📝', style: TextStyle(fontSize: 18)),
-                    label: Text(l10n.notes),
-                  ),
-                ),
-                const SizedBox(width: 12),
-                Expanded(
-                  flex: 2,
-                  child: ElevatedButton.icon(
-                    onPressed: _irAVotacion,
-                    icon: const Text('🗳️', style: TextStyle(fontSize: 18)),
-                    label: Text(l10n.goToVoting),
-                  ),
-                ),
              ],
            ),
-          ],
          ),
        ),
      ),
@@ -11,8 +11,6 @@ import 'package:farolero/tema/componentes_farolero.dart';
 import 'package:farolero/tema/tema_app.dart';
 import 'package:provider/provider.dart';

-/// Pantalla que ve el jugador durante la fase de debate (multidispositivo).
-/// El cliente recibe el cambio de fase via Nearby y se navega aquí.
 class PantallaDebateCliente extends StatefulWidget {
  final int? tiempoDebateSegundos;
  final String? primerTurnoNombre;
@@ -87,9 +85,7 @@ class _PantallaDebateClienteState extends State<PantallaDebateCliente> {
  void dispose() {
    _timer?.cancel();
    final listener = _listener;
-    if (listener != null) {
-      _nearby?.removeMensajeListener(listener);
-    }
+    if (listener != null) _nearby?.removeMensajeListener(listener);
    super.dispose();
  }

@@ -131,7 +127,7 @@ class _PantallaDebateClienteState extends State<PantallaDebateCliente> {
        actions: [
          IconButton(
            tooltip: l10n.seeYourWord,
-            icon: const Icon(Icons.visibility),
+            icon: IconoFarolero(Icons.visibility),
            onPressed: widget.jugadoresControlados.isEmpty
                ? null
                : () => mostrarRevisionPalabraOnline(
@@ -142,7 +138,7 @@ class _PantallaDebateClienteState extends State<PantallaDebateCliente> {
          ),
          IconButton(
            tooltip: l10n.notesTitle,
-            icon: const Icon(Icons.edit_note),
+            icon: IconoFarolero(Icons.edit_note),
            onPressed: _puedeAbrirNotas
                ? () => Navigator.push(
                      context,
@@ -160,138 +156,72 @@ class _PantallaDebateClienteState extends State<PantallaDebateCliente> {
      ),
      body: FondoFarolero(
        intenso: true,
-        child: Padding(
-          padding: const EdgeInsets.all(24),
-          child: Column(
-          children: [
-            const ArteGameplayFarolero.fase(height: 124),
-            const SizedBox(height: 10),
-            const Spacer(),
-
-            // Timer
-            if (widget.tiempoDebateSegundos != null) ...[
-              Container(
-                padding: const EdgeInsets.all(32),
-                decoration: BoxDecoration(
-                  color: _segundosRestantes == 0
-                      ? TemaApp.colorAcento.withValues(alpha: 0.3)
-                      : TemaApp.colorTarjeta,
-                  borderRadius: BorderRadius.circular(24),
-                ),
-                child: Stack(
-                  alignment: Alignment.center,
-                  children: [
-                    Positioned.fill(
-                      child: Image.asset(
-                        'assets/ui/generated/gameplay/gameplay_phase_emblem.webp',
-                        fit: BoxFit.contain,
-                        opacity: const AlwaysStoppedAnimation(0.42),
-                      ),
-                    ),
-                    Column(
-                      mainAxisSize: MainAxisSize.min,
-                      children: [
-                        Text(
-                          _segundosRestantes == 0
+        child: SafeArea(
+          top: false,
+          child: SingleChildScrollView(
+            padding: const EdgeInsets.all(24),
+            child: Column(
+              children: [
+                const ArteGameplayFarolero.fase(height: 124),
+                const SizedBox(height: 12),
+                TarjetaFaseFarolero(
+                  icono: Icons.forum,
+                  assetIconPath: 'assets/ui/generated/actions/action_rules_book.webp',
+                  titulo: l10n.debate,
+                  subtitulo: l10n.debateInstructions,
+                  child: Column(
+                    children: [
+                      if (widget.tiempoDebateSegundos != null) ...[
+                        TemporizadorFarolero(
+                          etiqueta: _segundosRestantes == 0
                              ? l10n.timeUp
                              : l10n.timeRemaining,
-                          style: Theme.of(context).textTheme.titleMedium,
+                          tiempo: _formatearTiempo(_segundosRestantes),
+                          agotado: _segundosRestantes == 0,
                        ),
-                        const SizedBox(height: 8),
+                        const SizedBox(height: 16),
+                      ] else ...[
                        Text(
-                          _formatearTiempo(_segundosRestantes),
-                          style:
-                              Theme.of(context).textTheme.displayMedium?.copyWith(
-                                    fontWeight: FontWeight.bold,
-                                    color: _segundosRestantes == 0
-                                        ? TemaApp.colorAcento
-                                        : TemaApp.colorTexto,
-                                  ),
+                          l10n.debatePhaseActive,
+                          style: Theme.of(context).textTheme.titleLarge,
+                          textAlign: TextAlign.center,
                        ),
+                        const SizedBox(height: 16),
                      ],
-                    ),
-                  ],
-                ),
-              ),
-              const SizedBox(height: 32),
-            ] else ...[
-              Text(
-                l10n.debatePhaseActive,
-                style: Theme.of(context).textTheme.headlineMedium,
-                textAlign: TextAlign.center,
-              ),
-              const SizedBox(height: 16),
-            ],
-
-            // Instrucciones
-            if (widget.primerTurnoNombre != null) ...[
-              Container(
-                width: double.infinity,
-                padding: const EdgeInsets.all(16),
-                decoration: BoxDecoration(
-                  color: TemaApp.colorNaranja.withValues(alpha: 0.18),
-                  borderRadius: BorderRadius.circular(16),
-                  border: Border.all(
-                    color: TemaApp.colorNaranja.withValues(alpha: 0.65),
+                      if (widget.primerTurnoNombre != null) ...[
+                        EstadoJugadorFarolero(
+                          nombre: l10n.firstTurnInstruction(
+                            widget.primerTurnoNombre!,
+                          ),
+                          destacado: true,
+                          completado: true,
+                          icono: Icons.record_voice_over,
+                          assetIconPath: 'assets/ui/generated/actions/action_players_group.webp',
+                        ),
+                        const SizedBox(height: 12),
+                      ],
+                      BotonFarolero.secundario(
+                        texto: _votacionSolicitada
+                            ? l10n.votacionSolicitada
+                            : l10n.solicitarVotacion,
+                        icono: _votacionSolicitada
+                            ? Icons.hourglass_empty
+                            : Icons.how_to_vote,
+                        assetIconPath: _votacionSolicitada
+                            ? null
+                            : 'assets/ui/generated/actions/action_vote_mask.webp',
+                        onPressed: _votacionSolicitada
+                            ? null
+                            : () {
+                                setState(() => _votacionSolicitada = true);
+                                widget.onSolicitarVotacion();
+                              },
+                      ),
+                    ],
                  ),
                ),
-                child: Row(
-                  children: [
-                    const Icon(
-                      Icons.record_voice_over,
-                      color: TemaApp.colorNaranja,
-                    ),
-                    const SizedBox(width: 12),
-                    Expanded(
-                      child: Text(
-                        widget.primerTurnoNombre!,
-                        style: Theme.of(context).textTheme.titleMedium,
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-              const SizedBox(height: 16),
-            ],
-
-            Text(
-              l10n.debateInstructions,
-              textAlign: TextAlign.center,
-              style: TextStyle(
-                color: TemaApp.colorTextoSecundario,
-                fontSize: 16,
-              ),
+              ],
            ),
-
-            const Spacer(),
-
-            // Botón solicitar votación
-            SizedBox(
-              width: double.infinity,
-              height: 56,
-              child: ElevatedButton.icon(
-                onPressed: _votacionSolicitada
-                    ? null
-                    : () {
-                        setState(() => _votacionSolicitada = true);
-                        widget.onSolicitarVotacion();
-                      },
-                icon: Icon(_votacionSolicitada ? Icons.hourglass_empty : Icons.how_to_vote),
-                label: Text(
-                  _votacionSolicitada
-                      ? l10n.votacionSolicitada
-                      : l10n.solicitarVotacion,
-                ),
-                style: ElevatedButton.styleFrom(
-                  backgroundColor: _votacionSolicitada
-                      ? TemaApp.colorTarjeta
-                      : TemaApp.colorAcento,
-                  foregroundColor: Colors.white,
-                  textStyle: const TextStyle(fontSize: 16),
-                ),
-              ),
-            ),
-          ],
          ),
        ),
      ),
@@ -341,7 +341,7 @@ class _IconoResultadoPremium extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    if (icono != Icons.theater_comedy) {
-      return Icon(icono, size: 82, color: TemaApp.colorDorado);
+      return IconoFarolero(icono, size: 82, color: TemaApp.colorDorado);
    }

    return Stack(
@@ -351,7 +351,7 @@ class _IconoResultadoPremium extends StatelessWidget {
          offset: const Offset(-18, 12),
          child: Transform.rotate(
            angle: -0.10,
-            child: Icon(
+            child: IconoFarolero(
              Icons.mood,
              size: 66,
              color: TemaApp.colorDorado.withValues(alpha: 0.98),
@@ -362,7 +362,7 @@ class _IconoResultadoPremium extends StatelessWidget {
          offset: const Offset(20, -13),
          child: Transform.rotate(
            angle: 0.12,
-            child: Icon(
+            child: IconoFarolero(
              Icons.sentiment_dissatisfied,
              size: 70,
              color: TemaApp.colorDorado.withValues(alpha: 0.98),
@@ -412,10 +412,13 @@ class _TarjetaProgresoGamificacion extends StatelessWidget {
                    ),
                  ],
                ),
-                child: const Icon(
-                  Icons.local_fire_department,
-                  color: Color(0xFF1B1010),
-                  size: 30,
+                child: Padding(
+                  padding: const EdgeInsets.all(7),
+                  child: Image.asset(
+                    'assets/ui/generated/actions/action_fire_badge.webp',
+                    fit: BoxFit.contain,
+                    filterQuality: FilterQuality.medium,
+                  ),
                ),
              ),
              const SizedBox(width: 14),
@@ -582,8 +585,13 @@ class _DeltaFuego extends StatelessWidget {
      child: Row(
        mainAxisSize: MainAxisSize.min,
        children: [
-          const Icon(Icons.local_fire_department,
-              color: TemaApp.colorNaranja, size: 24),
+          Image.asset(
+            'assets/ui/generated/actions/action_fire_badge.webp',
+            width: 26,
+            height: 26,
+            fit: BoxFit.contain,
+            filterQuality: FilterQuality.medium,
+          ),
          const SizedBox(width: 4),
          Text(
            texto,
@@ -838,7 +846,7 @@ class _TarjetaImpostores extends StatelessWidget {
          Row(
            mainAxisAlignment: MainAxisAlignment.center,
            children: [
-              const Icon(Icons.theater_comedy, color: TemaApp.colorAcento),
+              IconoFarolero(Icons.theater_comedy, color: TemaApp.colorAcento),
              const SizedBox(width: 8),
              Flexible(
                child: Text(
@@ -859,7 +867,7 @@ class _TarjetaImpostores extends StatelessWidget {
              child: Row(
                mainAxisAlignment: MainAxisAlignment.center,
                children: [
-                  const Icon(Icons.theater_comedy,
+                  IconoFarolero(Icons.theater_comedy,
                      size: 20, color: TemaApp.colorAcento),
                  const SizedBox(width: 8),
                  Text(
@@ -871,7 +879,7 @@ class _TarjetaImpostores extends StatelessWidget {
                  ),
                  if (j.eliminado) ...[
                    const SizedBox(width: 8),
-                    const Icon(Icons.close,
+                    IconoFarolero(Icons.close,
                        size: 16, color: TemaApp.colorTextoSecundario),
                  ],
                ],
@@ -950,6 +958,7 @@ class _BotonesFinPartida extends StatelessWidget {
        BotonFarolero(
          texto: l10n.rematch,
          icono: Icons.replay,
+          assetIconPath: 'assets/ui/generated/actions/action_create_game.webp',
          onPressed: () {
            estado.revancha();
            Navigator.pushReplacement(
@@ -164,6 +164,7 @@ class _PantallaFinPartidaOnlineState extends State<PantallaFinPartidaOnline> {
                    BotonFarolero.oscuro(
                      texto: l10n.mainMenu,
                      icono: Icons.home,
+                      assetIconPath: 'assets/ui/generated/actions/action_result_trophy.webp',
                      onPressed: () async {
                        await context.read<ServicioNearby>().desconectar();
                        if (!context.mounted) return;
@@ -195,7 +196,7 @@ class _PantallaFinPartidaOnlineState extends State<PantallaFinPartidaOnline> {
    return [
      IconButton(
        tooltip: l10n.seeYourWord,
-        icon: const Icon(Icons.visibility),
+        icon: IconoFarolero(Icons.visibility),
        onPressed: widget.jugadoresControlados.isEmpty
            ? null
            : () => mostrarRevisionPalabraOnline(
@@ -206,7 +207,7 @@ class _PantallaFinPartidaOnlineState extends State<PantallaFinPartidaOnline> {
      ),
      IconButton(
        tooltip: l10n.notesTitle,
-        icon: const Icon(Icons.edit_note),
+        icon: IconoFarolero(Icons.edit_note),
        onPressed: snapshot.roomId == null || widget.jugadoresControlados.isEmpty
            ? null
            : () => Navigator.push(
@@ -7,12 +7,14 @@ import '../estado/estado_juego.dart';
 import '../modelos/gamificacion_usuario.dart';
 import '../modelos/inicio_partida_multijugador.dart';
 import '../modelos/jugador.dart';
+import '../modelos/palabra.dart';
 import '../modelos/partida.dart';
 import '../modelos/snapshot_partida_online.dart';
 import '../servicios/servicio_historial_partidas.dart';
 import '../servicios/servicio_nearby.dart';
 import '../servicios/servicio_perfil_usuario.dart';
 import '../tema/componentes_farolero.dart';
+import '../tema/componentes_resultado_farolero.dart';
 import '../tema/tema_app.dart';
 import 'pantalla_notas_online.dart';
 import 'pantalla_revision_palabra.dart';
@@ -161,7 +163,7 @@ class _PantallaGestorHostState extends State<PantallaGestorHost> {
        actions: [
          IconButton(
            tooltip: l10n.seeYourWord,
-            icon: const Icon(Icons.visibility),
+            icon: IconoFarolero(Icons.visibility),
            onPressed: partida.fase.index <= FaseJuego.verPalabra.index
                ? null
                : () => mostrarRevisionPalabraOnline(
@@ -177,7 +179,7 @@ class _PantallaGestorHostState extends State<PantallaGestorHost> {
          ),
          IconButton(
            tooltip: l10n.notesTitle,
-            icon: const Icon(Icons.edit_note),
+            icon: IconoFarolero(Icons.edit_note),
            onPressed: partida.fase.index < FaseJuego.debate.index ||
                    nearby.roomId == null
                ? null
@@ -196,7 +198,7 @@ class _PantallaGestorHostState extends State<PantallaGestorHost> {
                    ),
          ),
          IconButton(
-            icon: const Icon(Icons.close),
+            icon: IconoFarolero(Icons.close),
            onPressed: () async {
              await nearby.desconectar();
              widget.onPartidaFin();
@@ -261,7 +263,7 @@ class _PantallaGestorHostState extends State<PantallaGestorHost> {
          children: [
            Row(
              children: [
-                const Icon(Icons.link_off, color: TemaApp.colorAcento),
+                IconoFarolero(Icons.link_off, color: TemaApp.colorAcento),
                const SizedBox(width: 8),
                Expanded(
                  child: Text(
@@ -279,10 +281,14 @@ class _PantallaGestorHostState extends State<PantallaGestorHost> {
            const SizedBox(height: 8),
            Align(
              alignment: Alignment.centerRight,
-              child: OutlinedButton.icon(
-                onPressed: () => nearby.asumirUsuariosDesconectados(),
-                icon: const Icon(Icons.person_add_alt_1),
-                label: Text(AppLocalizations.of(context)!.assumeOnThisPhone),
+              child: SizedBox(
+                width: 260,
+                child: BotonFarolero.oscuro(
+                  texto: AppLocalizations.of(context)!.assumeOnThisPhone,
+                  icono: Icons.person_add_alt_1,
+                  assetIconPath: 'assets/ui/generated/actions/action_add_player.webp',
+                  onPressed: () => nearby.asumirUsuariosDesconectados(),
+                ),
              ),
            ),
          ],
@@ -404,67 +410,37 @@ class _PantallaGestorHostState extends State<PantallaGestorHost> {
    bool todosListos,
    ServicioNearby nearby,
  ) {
-    return Card(
-      child: Padding(
-        padding: const EdgeInsets.all(16),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Text(
-              l10n.waitingPlayersSeeWord,
-              style: Theme.of(context).textTheme.titleLarge,
-            ),
-            const SizedBox(height: 16),
-            Text(
-              l10n.connectedPlayers,
-              style: Theme.of(context).textTheme.titleMedium,
-            ),
-            const SizedBox(height: 8),
-            _buildJugadorTile(nearby.miNombre ?? 'Host', true, _hostListo),
-            ...nearby.jugadores.map(
-              (j) => _buildJugadorTile(
-                j.nombre,
-                false,
-                _clientesListos[j.endpointId] ?? false,
-              ),
-            ),
-            const Spacer(),
-            // Botón para que el host vea su palabra
-            SizedBox(
-              width: double.infinity,
-              child: ElevatedButton.icon(
-                onPressed: () => _mostrarPalabraHost(context),
-                icon: const Icon(Icons.visibility),
-                label: Text(l10n.seeYourWord),
-                style: ElevatedButton.styleFrom(
-                  backgroundColor: TemaApp.colorNaranja,
-                  foregroundColor: Colors.white,
-                  padding: const EdgeInsets.symmetric(vertical: 16),
-                ),
-              ),
+    return TarjetaFaseFarolero(
+      icono: Icons.visibility,
+      assetIconPath: 'assets/ui/generated/actions/action_reveal_word.webp',
+      titulo: l10n.waitingPlayersSeeWord,
+      subtitulo: l10n.connectedPlayers,
+      child: Column(
+        children: [
+          _buildJugadorTile(nearby.miNombre ?? 'Host', true, _hostListo),
+          ...nearby.jugadores.map(
+            (jugador) => _buildJugadorTile(
+              jugador.nombre,
+              false,
+              _clientesListos[jugador.endpointId] ?? false,
            ),
+          ),
+          const SizedBox(height: 12),
+          BotonFarolero(
+            texto: l10n.seeYourWord,
+            icono: Icons.visibility,
+            assetIconPath: 'assets/ui/generated/actions/action_reveal_word.webp',
+            onPressed: () => _mostrarPalabraHost(context),
+          ),
+          if (todosListos) ...[
            const SizedBox(height: 12),
-            if (todosListos)
-              Container(
-                padding: const EdgeInsets.all(12),
-                decoration: BoxDecoration(
-                  color: TemaApp.colorVerde.withValues(alpha: 0.2),
-                  borderRadius: BorderRadius.circular(12),
-                ),
-                child: Row(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                    const Icon(Icons.check_circle, color: TemaApp.colorVerde),
-                    const SizedBox(width: 8),
-                    Text(
-                      l10n.allSeenStartDebate,
-                      style: const TextStyle(color: TemaApp.colorVerde),
-                    ),
-                  ],
-                ),
-              ),
+            EstadoJugadorFarolero(
+              nombre: l10n.allSeenStartDebate,
+              completado: true,
+              icono: Icons.check_circle,
+            ),
          ],
-        ),
+        ],
      ),
    );
  }
@@ -563,66 +539,33 @@ class _PantallaGestorHostState extends State<PantallaGestorHost> {
    final estado = context.read<EstadoJuego>();
    final tiempo = estado.partida?.config.tiempoDebateSegundos;

-    return Card(
-      child: Padding(
-        padding: const EdgeInsets.all(16),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            if (tiempo != null) ...[
-              Text(l10n.debate, style: Theme.of(context).textTheme.titleLarge),
-              const SizedBox(height: 16),
-              Container(
-                width: double.infinity,
-                padding: const EdgeInsets.all(16),
-                decoration: BoxDecoration(
-                  color: _segundosRestantes == 0
-                      ? TemaApp.colorAcento.withValues(alpha: 0.3)
-                      : TemaApp.colorTarjeta,
-                  borderRadius: BorderRadius.circular(12),
-                ),
-                child: Column(
-                  children: [
-                    Text(
-                      _segundosRestantes == 0
-                          ? l10n.timeUp
-                          : l10n.timeRemaining,
-                      style: Theme.of(context).textTheme.bodyMedium,
-                    ),
-                    Text(
-                      _formatearTiempo(_segundosRestantes),
-                      style: Theme.of(context).textTheme.headlineLarge,
-                    ),
-                  ],
-                ),
-              ),
-              const SizedBox(height: 16),
-            ],
-            _buildPrimerTurno(context),
+    return TarjetaFaseFarolero(
+      icono: Icons.forum,
+      assetIconPath: 'assets/ui/generated/actions/action_rules_book.webp',
+      titulo: l10n.debate,
+      subtitulo: l10n.debateInstructions,
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          if (tiempo != null) ...[
+            TemporizadorFarolero(
+              etiqueta: _segundosRestantes == 0
+                  ? l10n.timeUp
+                  : l10n.timeRemaining,
+              tiempo: _formatearTiempo(_segundosRestantes),
+              agotado: _segundosRestantes == 0,
+            ),
            const SizedBox(height: 16),
-            Text(
-              l10n.activePlayers,
-              style: Theme.of(context).textTheme.titleMedium,
-            ),
-            const SizedBox(height: 8),
-            Expanded(
-              child: ListView.builder(
-                itemCount: nearby.jugadores.length + 1,
-                itemBuilder: (context, index) {
-                  if (index == 0) {
-                    return _buildJugadorTile(
-                      nearby.miNombre ?? 'Host',
-                      true,
-                      true,
-                    );
-                  }
-                  final j = nearby.jugadores[index - 1];
-                  return _buildJugadorTile(j.nombre, false, true);
-                },
-              ),
-            ),
          ],
-        ),
+          _buildPrimerTurno(context),
+          const SizedBox(height: 16),
+          Text(l10n.activePlayers, style: Theme.of(context).textTheme.titleMedium),
+          const SizedBox(height: 8),
+          _buildJugadorTile(nearby.miNombre ?? 'Host', true, true),
+          ...nearby.jugadores.map(
+            (jugador) => _buildJugadorTile(jugador.nombre, false, true),
+          ),
+        ],
      ),
    );
  }
@@ -640,11 +583,11 @@ class _PantallaGestorHostState extends State<PantallaGestorHost> {
      ),
      child: Row(
        children: [
-          const Icon(Icons.record_voice_over, color: TemaApp.colorNaranja),
+          IconoFarolero(Icons.record_voice_over, color: TemaApp.colorNaranja),
          const SizedBox(width: 12),
          Expanded(
            child: Text(
-              'Empieza $nombre diciendo su palabra.',
+              AppLocalizations.of(context)!.firstTurnInstruction(nombre),
              style: Theme.of(context).textTheme.titleMedium,
            ),
          ),
@@ -664,89 +607,43 @@ class _PantallaGestorHostState extends State<PantallaGestorHost> {
    final votosEmitidos = estado.votos.length;
    final progreso = totalVotos == 0 ? 0.0 : votosEmitidos / totalVotos;

-    return Card(
-      child: Padding(
-        padding: const EdgeInsets.all(16),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Text(l10n.voting, style: Theme.of(context).textTheme.titleLarge),
-            const SizedBox(height: 16),
-            Container(
-              width: double.infinity,
-              padding: const EdgeInsets.all(16),
-              decoration: BoxDecoration(
-                color: TemaApp.colorTarjeta,
-                borderRadius: BorderRadius.circular(12),
-              ),
-              child: Column(
-                children: [
-                  Text(l10n.votesProgress(votosEmitidos, totalVotos)),
-                  const SizedBox(height: 8),
-                  ClipRRect(
-                    borderRadius: BorderRadius.circular(4),
-                    child: LinearProgressIndicator(
-                      value: progreso.clamp(0.0, 1.0).toDouble(),
-                      backgroundColor: TemaApp.colorSuperficie,
-                      valueColor: const AlwaysStoppedAnimation(
-                        TemaApp.colorAcento,
-                      ),
-                      minHeight: 8,
-                    ),
-                  ),
-                ],
-              ),
+    return TarjetaFaseFarolero(
+      icono: Icons.how_to_vote,
+      assetIconPath: 'assets/ui/generated/actions/action_vote_mask.webp',
+      titulo: l10n.voting,
+      subtitulo: l10n.votesProgress(votosEmitidos, totalVotos),
+      color: TemaApp.colorAcento,
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          ClipRRect(
+            borderRadius: BorderRadius.circular(999),
+            child: LinearProgressIndicator(
+              value: progreso.clamp(0.0, 1.0).toDouble(),
+              minHeight: 14,
+              backgroundColor: Colors.black.withValues(alpha: 0.35),
+              valueColor: const AlwaysStoppedAnimation(TemaApp.colorAcento),
            ),
-            const SizedBox(height: 12),
-            SizedBox(
-              width: double.infinity,
-              child: OutlinedButton.icon(
-                onPressed: _hostYaVoto(context) ? null : () => _abrirVotacionHost(context),
-                icon: const Icon(Icons.how_to_vote),
-                label: Text(
-                  _hostYaVoto(context)
-                      ? l10n.playersVoted
-                      : l10n.confirmVote,
-                ),
-              ),
+          ),
+          const SizedBox(height: 16),
+          if (!_hostYaVoto(context))
+            BotonFarolero.secundario(
+              texto: l10n.votar,
+              icono: Icons.how_to_vote,
+              onPressed: () => _abrirVotacionHost(context),
            ),
-            const SizedBox(height: 16),
-            Text(
-              l10n.playersVoted,
-              style: Theme.of(context).textTheme.titleMedium,
+          if (!_hostYaVoto(context)) const SizedBox(height: 16),
+          ...partida.jugadoresActivos.map((jugador) {
+            final haVotado = estado.votos.containsKey(jugador.id);
+            return _buildJugadorTile(jugador.nombre, false, haVotado);
+          }),
+          if (todosVotaron)
+            EstadoJugadorFarolero(
+              nombre: l10n.allVoted,
+              completado: true,
+              icono: Icons.check_circle,
            ),
-            const SizedBox(height: 8),
-            Expanded(
-              child: ListView.builder(
-                itemCount: partida.jugadoresActivos.length,
-                itemBuilder: (context, index) {
-                  final jugador = partida.jugadoresActivos[index];
-                  final haVotado = estado.votos.containsKey(jugador.id);
-                  return _buildJugadorTile(jugador.nombre, false, haVotado);
-                },
-              ),
-            ),
-            if (todosVotaron)
-              Container(
-                padding: const EdgeInsets.all(12),
-                decoration: BoxDecoration(
-                  color: TemaApp.colorVerde.withValues(alpha: 0.2),
-                  borderRadius: BorderRadius.circular(12),
-                ),
-                child: Row(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                    const Icon(Icons.check_circle, color: TemaApp.colorVerde),
-                    const SizedBox(width: 8),
-                    Text(
-                      l10n.allVoted,
-                      style: const TextStyle(color: TemaApp.colorVerde),
-                    ),
-                  ],
-                ),
-              ),
-          ],
-        ),
+        ],
      ),
    );
  }
@@ -760,132 +657,11 @@ class _PantallaGestorHostState extends State<PantallaGestorHost> {
      return Center(child: Text(l10n.noResult));
    }

-    final conteo = <String, int>{};
-    for (final votadoId in resultado.votos.values) {
-      conteo[votadoId] = (conteo[votadoId] ?? 0) + 1;
-    }
-    final maxVotos = conteo.values.isEmpty
-        ? 1
-        : conteo.values.reduce((a, b) => a > b ? a : b);
-    final ranking = conteo.entries.toList()
-      ..sort((a, b) => b.value.compareTo(a.value));
-
-    return Card(
-      child: Padding(
-        padding: const EdgeInsets.all(16),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Text(l10n.result, style: Theme.of(context).textTheme.titleLarge),
-            const SizedBox(height: 12),
-            Container(
-              width: double.infinity,
-              padding: const EdgeInsets.all(16),
-              decoration: TemaApp.decoracionPanel(
-                color: resultado.eraImpostor
-                    ? TemaApp.colorVerde.withValues(alpha: 0.18)
-                    : TemaApp.colorAcento.withValues(alpha: 0.18),
-                borderColor: resultado.eraImpostor
-                    ? TemaApp.colorVerde
-                    : TemaApp.colorAcento,
-              ),
-              child: Column(
-                children: [
-                  Text(
-                    resultado.eliminadoNombre,
-                    style: Theme.of(context).textTheme.headlineMedium,
-                  ),
-                  const SizedBox(height: 6),
-                  Text(
-                    resultado.eraImpostor
-                        ? l10n.wasImpostor
-                        : l10n.wasInnocent,
-                    style: TextStyle(
-                      color: resultado.eraImpostor
-                          ? TemaApp.colorVerde
-                          : TemaApp.colorAcento,
-                      fontWeight: FontWeight.bold,
-                    ),
-                  ),
-                ],
-              ),
-            ),
-            const SizedBox(height: 16),
-            Text(l10n.votesThisRound,
-                style: Theme.of(context).textTheme.titleMedium),
-            const SizedBox(height: 12),
-            Expanded(
-              child: ListView(
-                children: [
-                  ...ranking.map((entry) {
-                    final jugador = partida.jugadores.firstWhere(
-                      (j) => j.id == entry.key,
-                      orElse: () => partida.jugadores.first,
-                    );
-                    return _buildBarraResultado(
-                      context,
-                      nombre: jugador.nombre,
-                      votos: entry.value,
-                      maxVotos: maxVotos,
-                      destacado: entry.key == resultado.eliminadoId,
-                    );
-                  }),
-                  const Divider(height: 24),
-                  ...resultado.votos.entries.map((entry) {
-                    final votante = partida.jugadores.firstWhere(
-                      (j) => j.id == entry.key,
-                      orElse: () => partida.jugadores.first,
-                    );
-                    final votado = partida.jugadores.firstWhere(
-                      (j) => j.id == entry.value,
-                      orElse: () => partida.jugadores.first,
-                    );
-                    return ListTile(
-                      dense: true,
-                      leading: const Icon(Icons.how_to_vote),
-                      title: Text('${votante.nombre} → ${votado.nombre}'),
-                    );
-                  }),
-                ],
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildBarraResultado(
-    BuildContext context, {
-    required String nombre,
-    required int votos,
-    required int maxVotos,
-    required bool destacado,
-  }) {
-    final color = destacado ? TemaApp.colorAcento : TemaApp.colorNaranja;
-    return Padding(
-      padding: const EdgeInsets.only(bottom: 12),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Row(
-            children: [
-              Expanded(child: Text(nombre)),
-              Text('$votos',
-                  style: TextStyle(color: color, fontWeight: FontWeight.bold)),
-            ],
-          ),
-          const SizedBox(height: 6),
-          ClipRRect(
-            borderRadius: BorderRadius.circular(999),
-            child: LinearProgressIndicator(
-              value: (votos / maxVotos).clamp(0.0, 1.0).toDouble(),
-              minHeight: 10,
-              backgroundColor: TemaApp.colorSuperficie,
-              valueColor: AlwaysStoppedAnimation(color),
-            ),
-          ),
-        ],
+    return SingleChildScrollView(
+      padding: const EdgeInsets.only(bottom: 8),
+      child: ResultadoRondaFarolero(
+        resultado: resultado,
+        jugadores: partida.jugadores,
      ),
    );
  }
@@ -895,102 +671,64 @@ class _PantallaGestorHostState extends State<PantallaGestorHost> {
    final ultimo = partida?.historialVotaciones.isNotEmpty == true
        ? partida!.historialVotaciones.last
        : null;
-    return Card(
-      child: Padding(
-        padding: const EdgeInsets.all(20),
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: [
-            const Icon(Icons.psychology, size: 56, color: TemaApp.colorNaranja),
-            const SizedBox(height: 16),
-            Text(
-              l10n.impostorGuessTitle,
-              style: Theme.of(context).textTheme.headlineSmall,
-              textAlign: TextAlign.center,
-            ),
-            const SizedBox(height: 12),
-            Text(
-              ultimo == null
-                  ? l10n.impostorCanGuess
-                  : '${ultimo.eliminadoNombre}: ${l10n.impostorCanGuess}',
-              textAlign: TextAlign.center,
-            ),
-          ],
-        ),
-      ),
+    return TarjetaFaseFarolero(
+      icono: Icons.psychology,
+      assetIconPath: 'assets/ui/generated/actions/action_impostor_mask.webp',
+      titulo: l10n.impostorGuessTitle,
+      subtitulo: ultimo == null
+          ? l10n.impostorCanGuess
+          : '${ultimo.eliminadoNombre}: ${l10n.impostorCanGuess}',
+      color: TemaApp.colorNaranja,
+      child: const ArteGameplayFarolero.resultado(height: 132),
    );
  }

  Widget _buildFaseFinOnline(BuildContext context, AppLocalizations l10n) {
    final partida = context.watch<EstadoJuego>().partida;
-    final ganaronJugadores = partida?.ganador == 'jugadores';
-    return Card(
-      child: Padding(
-        padding: const EdgeInsets.all(24),
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: [
-            Text(
-              ganaronJugadores ? '🎉' : '🎭',
-              style: const TextStyle(fontSize: 64),
-            ),
-            const SizedBox(height: 16),
-            Text(
-              ganaronJugadores ? l10n.playersWin : l10n.impostorsWin,
-              textAlign: TextAlign.center,
-              style: Theme.of(context).textTheme.headlineMedium,
-            ),
-            const SizedBox(height: 12),
-            Text(
-              partida == null ? '' : l10n.theWordWas(partida.palabraSecreta),
-              textAlign: TextAlign.center,
-            ),
-            if (_progresoGamificacion != null) ...[
-              const SizedBox(height: 16),
-              _buildProgresoGamificacion(context, _progresoGamificacion!),
-            ],
-          ],
-        ),
-      ),
-    );
-  }
+    if (partida == null) return Center(child: Text(l10n.noResult));

-  Widget _buildProgresoGamificacion(
-    BuildContext context,
-    ProgresoGamificacionUsuario progreso,
-  ) {
-    final nuevas = progreso.nuevasMedallas;
-    return PanelFarolero(
-      padding: const EdgeInsets.all(14),
-      color: TemaApp.colorSuperficie.withValues(alpha: 0.82),
+    final ganaronJugadores = partida.ganador == 'jugadores';
+    final color = ganaronJugadores ? TemaApp.colorVerde : TemaApp.colorAcento;
+    final impostores = partida.jugadores.where((j) => j.esImpostor).toList();
+
+    return SingleChildScrollView(
+      padding: const EdgeInsets.only(bottom: 8),
      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
        children: [
-          Text('Tu progreso', style: Theme.of(context).textTheme.titleMedium),
-          const SizedBox(height: 10),
-          Row(
-            children: [
-              const Text('🔥', style: TextStyle(fontSize: 22)),
-              const SizedBox(width: 8),
-              Expanded(
-                child: ClipRRect(
-                  borderRadius: BorderRadius.circular(6),
-                  child: LinearProgressIndicator(
-                    value: progreso.despues.fuego / 100,
-                    minHeight: 8,
-                    color: TemaApp.colorNaranja,
-                    backgroundColor: Colors.black.withValues(alpha: 0.35),
-                  ),
-                ),
-              ),
-              const SizedBox(width: 8),
-              Text('${progreso.despues.fuego}%'),
-            ],
+          HeroFinalPartidaFarolero(
+            encabezado: l10n.gameOver,
+            titulo: ganaronJugadores ? l10n.playersWin : l10n.impostorsWin,
+            icono: ganaronJugadores ? Icons.emoji_events : Icons.theater_comedy,
+            color: color,
          ),
-          if (nuevas.isNotEmpty) ...[
-            const SizedBox(height: 10),
-            MedallasCompactasFarolero(ids: nuevas, max: nuevas.length),
-          ],
+          const SizedBox(height: 12),
+          if (_progresoGamificacion == null)
+            const TarjetaRecompensaCargandoPremium()
+          else
+            TarjetaProgresoGamificacionPremium(
+              progreso: _progresoGamificacion!,
+            ),
+          const SizedBox(height: 18),
+          TarjetaSecretoPremium(
+            palabra: partida.palabraSecreta,
+            categoria: BancoPalabras.nombreBonitoCategoria(
+              partida.categoriaReal,
+              l10n,
+            ),
+          ),
+          const SizedBox(height: 18),
+          TarjetaImpostoresPremium(
+            titulo: impostores.length == 1
+                ? l10n.theImpostorWas
+                : l10n.theImpostorsWere,
+            impostores: impostores,
+          ),
+          const SizedBox(height: 18),
+          if (partida.historialVotaciones.isNotEmpty)
+            TarjetaHistorialVotosPremium(
+              historial: partida.historialVotaciones,
+              jugadores: partida.jugadores,
+            ),
        ],
      ),
    );
@@ -1046,28 +784,12 @@ class _PantallaGestorHostState extends State<PantallaGestorHost> {
  }

  Widget _buildJugadorTile(String nombre, bool esHost, bool listo) {
-    return Container(
-      margin: const EdgeInsets.only(bottom: 8),
-      padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
-      decoration: BoxDecoration(
-        color: listo
-            ? TemaApp.colorVerde.withValues(alpha: 0.2)
-            : TemaApp.colorTarjeta,
-        borderRadius: BorderRadius.circular(8),
-      ),
-      child: Row(
-        children: [
-          Icon(
-            esHost ? Icons.phone_android : Icons.devices,
-            color: esHost ? TemaApp.colorDorado : TemaApp.colorNaranja,
-            size: 22,
-          ),
-          const SizedBox(width: 8),
-          Expanded(child: Text(nombre)),
-          if (listo)
-            const Icon(Icons.check_circle, color: TemaApp.colorVerde, size: 20),
-        ],
-      ),
+    return EstadoJugadorFarolero(
+      nombre: nombre,
+      destacado: esHost,
+      completado: listo,
+      icono: esHost ? Icons.phone_android : Icons.devices,
+      assetIconPath: esHost ? 'assets/ui/generated/actions/action_mobile_device.webp' : 'assets/ui/generated/actions/action_multidevice_signal.webp',
    );
  }

@@ -1080,60 +802,39 @@ class _PantallaGestorHostState extends State<PantallaGestorHost> {
  ) {
    switch (fase) {
      case FaseJuego.verPalabra:
-        return SizedBox(
-          width: double.infinity,
-          height: 56,
-          child: ElevatedButton.icon(
-            onPressed: todosListos
-                ? () => _avanzarAFase(FaseJuego.debate)
-                : null,
-            icon: const Icon(Icons.forum),
-            label: Text(
-              todosListos
-                  ? l10n.allSeenStartDebate
-                  : l10n.waitingPlayersSeeWord,
-            ),
-          ),
+        return BotonFarolero(
+          texto: todosListos ? l10n.allSeenStartDebate : l10n.waitingPlayersSeeWord,
+          icono: Icons.forum,
+          assetIconPath: 'assets/ui/generated/actions/action_rules_book.webp',
+          onPressed: todosListos ? () => _avanzarAFase(FaseJuego.debate) : null,
        );
      case FaseJuego.debate:
-        return SizedBox(
-          width: double.infinity,
-          height: 56,
-          child: ElevatedButton.icon(
-            onPressed: () => _avanzarAFase(FaseJuego.votacion),
-            icon: const Icon(Icons.how_to_vote),
-            label: Text(l10n.goToVoting),
-          ),
+        return BotonFarolero.secundario(
+          texto: l10n.goToVoting,
+          icono: Icons.how_to_vote,
+          assetIconPath: 'assets/ui/generated/actions/action_vote_mask.webp',
+          onPressed: () => _avanzarAFase(FaseJuego.votacion),
        );
      case FaseJuego.votacion:
-        return SizedBox(
-          width: double.infinity,
-          height: 56,
-          child: ElevatedButton.icon(
-            onPressed: todosVotaron
-                ? () => _avanzarAFase(FaseJuego.resultado)
-                : null,
-            icon: const Icon(Icons.visibility),
-            label: Text(todosVotaron ? l10n.revealResult : l10n.waitingVoting),
-          ),
+        return BotonFarolero(
+          texto: todosVotaron ? l10n.revealResult : l10n.waitingVoting,
+          icono: Icons.visibility,
+          assetIconPath: 'assets/ui/generated/actions/action_result_trophy.webp',
+          onPressed: todosVotaron ? () => _avanzarAFase(FaseJuego.resultado) : null,
        );
      case FaseJuego.resultado:
        return _buildAccionesResultado(context, l10n);
      case FaseJuego.adivinanza:
        return _buildAccionesAdivinanza(context, l10n);
      case FaseJuego.finPartida:
-        return SizedBox(
-          width: double.infinity,
-          height: 56,
-          child: OutlinedButton.icon(
-            onPressed: () async {
-              final nearby = context.read<ServicioNearby>();
-              await nearby.desconectar();
-              widget.onPartidaFin();
-            },
-            icon: const Icon(Icons.home),
-            label: Text(l10n.mainMenu),
-          ),
+        return BotonFarolero.oscuro(
+          texto: l10n.mainMenu,
+          icono: Icons.home,
+          onPressed: () async {
+            final nearby = context.read<ServicioNearby>();
+            await nearby.desconectar();
+            widget.onPartidaFin();
+          },
        );
      default:
        return const SizedBox.shrink();
@@ -1149,75 +850,54 @@ class _PantallaGestorHostState extends State<PantallaGestorHost> {
    if (partida == null || resultado == null) return const SizedBox.shrink();

    if (_hayFinTrasVotacion(partida)) {
-      return SizedBox(
-        width: double.infinity,
-        height: 56,
-        child: ElevatedButton.icon(
-          onPressed: () => _finalizarPartidaOnline(context),
-          icon: const Icon(Icons.emoji_events),
-          label: Text(l10n.seeEndResult),
-        ),
+      return BotonFarolero(
+        texto: l10n.seeEndResult,
+        icono: Icons.emoji_events,
+        assetIconPath: 'assets/ui/generated/actions/action_result_trophy.webp',
+        onPressed: () => _finalizarPartidaOnline(context),
      );
    }

    if (resultado.eraImpostor) {
      return Column(
        children: [
-          SizedBox(
-            width: double.infinity,
-            height: 56,
-            child: OutlinedButton.icon(
-              onPressed: () => _iniciarAdivinanzaOnline(context),
-              icon: const Icon(Icons.psychology),
-              label: Text(l10n.impostorGuessWord),
-            ),
+          BotonFarolero.oscuro(
+            texto: l10n.impostorGuessWord,
+            icono: Icons.psychology,
+            assetIconPath: 'assets/ui/generated/actions/action_impostor_mask.webp',
+            onPressed: () => _iniciarAdivinanzaOnline(context),
          ),
          const SizedBox(height: 12),
-          SizedBox(
-            width: double.infinity,
-            height: 56,
-            child: ElevatedButton.icon(
-              onPressed: () => _siguienteRondaOnline(context),
-              icon: const Icon(Icons.skip_next),
-              label: Text(l10n.nextRound),
-            ),
+          BotonFarolero(
+            texto: l10n.nextRound,
+            icono: Icons.skip_next,
+            onPressed: () => _siguienteRondaOnline(context),
          ),
        ],
      );
    }

-    return SizedBox(
-      width: double.infinity,
-      height: 56,
-      child: ElevatedButton.icon(
-        onPressed: () => _siguienteRondaOnline(context),
-        icon: const Icon(Icons.skip_next),
-        label: Text(l10n.nextRound),
-      ),
+    return BotonFarolero(
+      texto: l10n.nextRound,
+      icono: Icons.skip_next,
+      onPressed: () => _siguienteRondaOnline(context),
    );
  }

  Widget _buildAccionesAdivinanza(BuildContext context, AppLocalizations l10n) {
    return Column(
      children: [
-        SizedBox(
-          width: double.infinity,
-          height: 56,
-          child: ElevatedButton.icon(
-            onPressed: () => _resolverAdivinanzaOnline(context),
-            icon: const Icon(Icons.check_circle),
-            label: Text(l10n.guess),
-          ),
+        BotonFarolero(
+          texto: l10n.guess,
+          icono: Icons.check_circle,
+          assetIconPath: 'assets/ui/generated/actions/action_impostor_mask.webp',
+          onPressed: () => _resolverAdivinanzaOnline(context),
        ),
        const SizedBox(height: 12),
-        SizedBox(
-          width: double.infinity,
-          height: 56,
-          child: OutlinedButton.icon(
-            onPressed: () => _siguienteRondaOnline(context),
-            icon: const Icon(Icons.skip_next),
-            label: Text(l10n.dontGuess),
-          ),
+        BotonFarolero.oscuro(
+          texto: l10n.dontGuess,
+          icono: Icons.skip_next,
+          onPressed: () => _siguienteRondaOnline(context),
        ),
      ],
    );
@@ -1413,7 +1093,7 @@ class _PantallaRevelarPalabraHostState
                child: _manteniendo
                    ? Column(
                        children: [
-                          Icon(
+                          IconoFarolero(
                            widget.esImpostor
                                ? Icons.theater_comedy
                                : Icons.key,
@@ -1441,7 +1121,12 @@ class _PantallaRevelarPalabraHostState
                          if (widget.esImpostor && widget.pistaActiva) ...[
                            const SizedBox(height: 12),
                            Text(
-                              'Categoría: ${widget.categoria}',
+                              l10n.clueCategory(
+                                BancoPalabras.nombreBonitoCategoria(
+                                  widget.categoria,
+                                  l10n,
+                                ),
+                              ),
                              style: Theme.of(context).textTheme.bodyLarge
                                  ?.copyWith(color: TemaApp.colorNaranja),
                            ),
@@ -1450,7 +1135,11 @@ class _PantallaRevelarPalabraHostState
                      )
                    : Column(
                        children: [
-                          const Text('🔒', style: TextStyle(fontSize: 48)),
+                          IconoFarolero(
+                            Icons.lock,
+                            color: TemaApp.colorDorado,
+                            size: 48,
+                          ),
                          const SizedBox(height: 16),
                          Text(
                            l10n.holdToSeeWord,
@@ -1496,21 +1185,15 @@ class _PantallaRevelarPalabraHostState
                ),
              ),
              const SizedBox(height: 16),
-              SizedBox(
-                width: double.infinity,
-                height: 56,
-                child: ElevatedButton.icon(
-                  onPressed: _haRevelado
-                      ? () {
-                          widget.onVisto();
-                          Navigator.of(context).pop();
-                        }
-                      : null,
-                  icon: const Icon(Icons.check),
-                  label: Text(
-                    _haRevelado ? l10n.iveSeenIt : l10n.tapToSee,
-                  ),
-                ),
+              BotonFarolero(
+                texto: _haRevelado ? l10n.iveSeenIt : l10n.tapToSee,
+                icono: Icons.check,
+                onPressed: _haRevelado
+                    ? () {
+                        widget.onVisto();
+                        Navigator.of(context).pop();
+                      }
+                    : null,
              ),
            ],
            ),
@@ -30,6 +30,7 @@ class PantallaHistorial extends StatelessWidget {
                      const SizedBox(height: 12),
                      EstadoVacioFarolero(
                        icono: Icons.history_rounded,
+                        assetIconPath: 'assets/ui/generated/actions/action_history_ledger.webp',
                        titulo: l10n.history,
                        subtitulo: l10n.noSavedGames,
                      ),
@@ -68,7 +69,7 @@ class PantallaHistorial extends StatelessWidget {
                              color: color.withValues(alpha: 0.18),
                              border: Border.all(color: color),
                            ),
-                            child: Icon(
+                            child: IconoFarolero(
                              ganaronJugadores
                                  ? Icons.groups_rounded
                                  : Icons.theater_comedy_rounded,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
ShanaiaBot	553456836f	chore: bump version to 1.1.41+46 [ci skip]	2026-05-12 21:51:20 +02:00
FreeTLab	cee8c7c2ce	Merge branch 'main' of https://git.freetimelab.es/FreeTLab/farolero Build & Deploy Farolero / Análisis de código (push) Successful in 18s Details Build & Deploy Farolero / Build APK + AAB release (push) Successful in 2m17s Details	2026-05-12 21:50:18 +02:00
FreeTLab	8f78652ac6	Firma de la aplicación como pide play store	2026-05-12 21:50:16 +02:00
ShanaiaBot	bb4359656f	chore: bump version to 1.1.40+45 [ci skip]	2026-05-12 01:37:36 +02:00
FreeTLab	90ada9099f	Multitud de iconos más Build & Deploy Farolero / Análisis de código (push) Successful in 14s Details Build & Deploy Farolero / Build APK + AAB release (push) Successful in 1m46s Details	2026-05-12 01:36:41 +02:00
FreeTLab	158a7ae6a8	Iconografía básica	2026-05-12 01:20:19 +02:00
FreeTLab	5697c2a5a1	A ver si compila y publica en main Build & Deploy Farolero / Análisis de código (push) Failing after 15s Details Build & Deploy Farolero / Build APK + AAB release (push) Has been skipped Details	2026-05-12 01:11:59 +02:00
FreeTLab	7ee8c6ae2f	Merge branch 'main' of https://git.freetimelab.es/FreeTLab/farolero	2026-05-12 01:11:02 +02:00
FreeTLab	1885c85de9	uso de imágenes y eliminación de innecesarias	2026-05-12 01:09:05 +02:00
FreeTLab	a055ed808c	más iconos	2026-05-12 00:44:33 +02:00
FreeTLab	4334e06b04	multiples iconografías	2026-05-12 00:40:40 +02:00
FreeTLab	be255d5ea3	algunos iconos PRO	2026-05-12 00:11:43 +02:00
ShanaiaBot	50cf83826c	chore: bump version to 1.1.39+44 [ci skip]	2026-05-11 23:22:04 +02:00
FreeTLab	532e3b84f1	correcciones Build & Deploy Farolero / Análisis de código (push) Successful in 14s Details Build & Deploy Farolero / Build APK + AAB release (push) Successful in 1m34s Details	2026-05-11 23:21:13 +02:00
FreeTLab	e60fc27d6f	Merge branch 'main' of https://git.freetimelab.es/FreeTLab/farolero Build & Deploy Farolero / Análisis de código (push) Failing after 17s Details Build & Deploy Farolero / Build APK + AAB release (push) Has been skipped Details	2026-05-11 23:16:49 +02:00
FreeTLab	4599678e77	refactorización de pantallas	2026-05-11 23:16:38 +02:00