diff --git a/resources/images/SoldierIconAquarius.svg b/resources/images/SoldierIconAquarius.svg
deleted file mode 100644
index 81a6b021cc..0000000000
--- a/resources/images/SoldierIconAquarius.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="1200pt" height="1200pt" version="1.1" viewBox="0 0 1200 1200" fill="#3fa9f5" xmlns="http://www.w3.org/2000/svg">
- <path d="m417.86 237.12v-237.12h-40.664v432.45h78.738v-195.34z"/>
- <path d="m708.33 392.05h302.69v69.617l38.762-0.14453-0.046875-5.3555s-0.5-48.523-0.5-68.785c0-113.14-85.332-204.45-189.74-204.45-104.5 0-190.45 93.094-190.45 206.26 0 20.477-0.5 70.215-0.5 70.238l-0.046875 2.0703h39.809z"/>
- <path d="m735.59 418.45c-0.26172 2.9062-0.66797 5.7852-0.66797 8.7383 0 68.832 55.809 124.57 124.59 124.57 68.785 0 124.55-55.762 124.55-124.57 0-2.9766-0.45312-5.8555-0.64453-8.7383z"/>
- <path d="m1030.2 573.67h-331.57c-96.855 0-169.98 56.047-169.98 154.98v409.93c0 33.191 26.953 60.023 60.094 60.023 33.191 0 60.047-26.883 60.047-60.023l0.046875-367.07h37.738v428.5h355.53v-428.52h37.547l0.19141 367.07c0 33.191 26.953 60.023 60.023 60.023 33.238 0 60.094-26.883 60.094-60.023v-409.95c0.046875-98.926-72.953-154.93-169.76-154.93zm-47.5 207-48.785-25.668-48.762 25.668 9.3086-54.309-39.43-38.43 54.5-7.9297 24.383-49.406 24.355 49.406 54.523 7.9297-39.453 38.43z"/>
- <path d="m489.07 1162-0.90625-396.02-30.668 0.070312-0.71094-311.24-78.523 0.19141 0.71484 293.79s-24.262 41.57-100.19 41.57c-69.332 0-225.52-90.809-225.52-90.809l-53.262 131.71s112.19 55.883 173.67 65.43c23 3.5938 47.617 5.1172 71.191 5.4766-13.883 15.453-22.547 35.668-22.547 58.023 0 28.168 13.617 52.953 34.383 68.953l-133.91 67.977 55.07 97.906 136.24-93.93s13.93-9.8555 26.285-3.332c11.117 5.8828 12.617 20.57 12.617 20.57l0.11719 44.047 46.07-0.30859-0.57031 37.191h53.309l-0.023437-37.262zm-180-159.05c-23.43 0-42.406-19-42.406-42.406s18.977-42.406 42.406-42.406c18.023 0 33.332 11.309 39.477 27.168h-43.57v33.477h42.238c-6.832 14.238-21.262 24.168-38.145 24.168z"/>
-</svg>
diff --git a/resources/images/SwordIconAquarius.svg b/resources/images/SwordIconAquarius.svg
new file mode 100644
index 0000000000..bb978acbf7
--- /dev/null
+++ b/resources/images/SwordIconAquarius.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" shape-rendering="geometricPrecision" image-rendering="optimizeQuality" fill-rule="evenodd" fill="#3fa9f5" xmlns:v="https://vecta.io/nano"><path d="M486.5-.5h17c3.641 1.64121 6.308 4.30788 8 8v17l-6.5 60c-2.279 7.2245-5.612 13.8911-10 20L226.5 373c-6.667 4.667-13.333 4.667-20 0L187 353.5c-3.333-6.333-3.333-12.667 0-19l225-225c2.815-6.703.649-10.7028-6.5-12-2.291.1221-4.291.9554-6 2.5l-223 223c-5.34 3.613-11.007 4.28-17 2-7.803-6.802-15.303-13.969-22.5-21.5-3.698-7.415-3.031-14.415 2-21L407.5 15c7.148-5.27457 15.148-8.60791 24-10 18.516-1.51524 36.849-3.34857 55-5.5zm-468 280c16.3367-.167 32.6701 0 49 .5 2.1079.36 4.1079 1.027 6 2L226 433.5c1.586 2.17 2.92 4.504 4 7 .667 18.333.667 36.667 0 55-6.43 10.856-14.764 12.522-25 5-1.275-2.217-2.275-4.551-3-7l-1-43-39.5-39.5c-12.412 6.36-24.412 13.694-36 22-3.202 1.483-6.536 1.817-10 1-5.705-9.063-12.372-17.397-20-25-6.2553-4.378-12.422-8.878-18.5-13.5-.6667-2.333-.6667-4.667 0-7 6.4154-11.166 13.0821-22.166 20-33 1.5899-2.15 2.2566-4.483 2-7L59.5 309l-44-1c-9.22703-3.984-12.06036-10.818-8.5-20.5 2.82328-4.312 6.6566-6.979 11.5-8zm38 232h-20c-19.3333-5.333-31.66667-17.667-37-37v-20c12.0559-32.525 34.7225-43.359 68-32.5 26.8247 17.455 32.991 40.622 18.5 69.5-2.5402 2.205-4.7068 4.705-6.5 7.5-6.8651 5.764-14.5317 9.93-23 12.5z"/></svg>
diff --git a/src/client/hud/layers/PlayerInfoOverlay.ts b/src/client/hud/layers/PlayerInfoOverlay.ts
index 6ea92478a9..b9f074c9e4 100644
--- a/src/client/hud/layers/PlayerInfoOverlay.ts
+++ b/src/client/hud/layers/PlayerInfoOverlay.ts
@@ -37,7 +37,8 @@ import { ImmunityBarVisibleEvent } from "./ImmunityTimer";
 import { CloseRadialMenuEvent } from "./RadialMenu";
 import "./RelationSmiley";
 import { SpawnBarVisibleEvent } from "./SpawnTimer";
-const soldierIconAquarius = assetUrl("images/SoldierIconAquarius.svg");
+const swordIcon = assetUrl("images/SwordIcon.svg");
+const swordIconAquarius = assetUrl("images/SwordIconAquarius.svg");
 const allianceIcon = assetUrl("images/AllianceIcon.svg");
 const warshipIcon = assetUrl("images/BattleshipIconWhite.svg");
 const cityIcon = assetUrl("images/CityIconWhite.svg");
@@ -212,7 +213,7 @@ export class PlayerInfoOverlay extends LitElement implements Controller {
   private displayUnitCount(player: PlayerView, type: UnitType, icon: string) {
     return !this.game.config().isUnitDisabled(type)
       ? html`<div
-          class="flex items-center justify-center gap-0.5 lg:gap-1 p-0.5 lg:p-1 border rounded-md border-gray-500 text-[10px] lg:text-xs w-9 lg:w-12 h-6 lg:h-7"
+          class="flex items-center justify-center gap-0.5 lg:gap-1 p-0.5 lg:p-1 border rounded-md border-gray-500 text-[10px] lg:text-xs w-12 h-5 lg:h-6"
           translate="no"
         >
           <img
@@ -302,76 +303,75 @@ export class PlayerInfoOverlay extends LitElement implements Controller {
     const playerTeam = getTranslatedPlayerTeamLabel(player.team());
 
     return html`
-      <div class="flex items-start gap-1 lg:gap-2 p-1 lg:p-1.5">
+      <div class="flex items-start gap-1 p-1 lg:p-1.5">
         <!-- Left: Gold & Troop bar -->
-        <div class="flex flex-col gap-1 shrink-0 w-28 md:w-36">
+        <div class="flex flex-1 flex-col gap-1 shrink-0 w-28 md:w-36">
           <div class="flex items-center gap-1">
             <div
-              class="flex flex-1 items-center justify-center px-1 py-0.5 border rounded-md border-yellow-400 font-bold text-yellow-400 text-sm lg:gap-1"
+              class="flex flex-1 items-center justify-center gap-1 shrink-0 px-1 py-0.5 border rounded-md border-yellow-400 font-bold text-yellow-400 text-sm"
               translate="no"
             >
               <img src=${goldCoinIcon} width="13" height="13" />
               <span class="px-0.5">${renderNumber(player.gold())}</span>
             </div>
             <div
-              class="flex flex-1 flex-col items-center justify-center text-xs font-bold ${attackingTroops >
-              0
-                ? "text-aquarius"
-                : "text-white/40"} drop-shadow-[0_1px_1px_rgba(0,0,0,0.8)]"
+              class="flex flex-1 items-center justify-center gap-1 shrink-0 px-1 py-0.5 border rounded-md ${attackingTroops > 0 ? "border-aquarius text-aquarius" : "border-white/40 text-white/40"} font-bold text-sm"
               translate="no"
             >
-              <span class="flex items-center gap-px leading-none text-xs"
-                ><img
-                  class="w-2.5 h-2.5 inline-block ${attackingTroops > 0
-                    ? ""
-                    : "brightness-0 invert opacity-40"}"
-                  src=${attackingTroops > 0 ? soldierIconAquarius : soldierIcon}
-                  alt=""
-                  aria-hidden="true"
-                />↑</span
-              >
-              <span class="tabular-nums leading-none text-sm mt-0.5"
-                >${renderTroops(attackingTroops)}</span
-              >
+              <img
+                class="inline-block ${
+                  attackingTroops > 0 ? "" : "brightness-0 invert opacity-40"
+                }"
+                src=${attackingTroops > 0 ? swordIconAquarius : swordIcon}
+                width="13"
+                height="13"
+                alt=""
+                aria-hidden="true"
+              />
+              <span class="px-0.5 tabular-nums">${renderTroops(attackingTroops)}</span>
             </div>
           </div>
-          <div class="w-28 md:w-36" translate="no">
+          <div class="w-full translate="no">
             ${this.renderTroopBar(totalTroops, attackingTroops, maxTroops)}
           </div>
         </div>
         <!-- Right: Player identity + Units below -->
         <div class="flex flex-col justify-between self-stretch">
           <div
-            class="flex items-center gap-2 font-bold text-sm lg:text-lg ${this.getPlayerNameColor(
+            class="flex items-center gap-2 font-bold text-sm lg:text-lg ml-1 lg:-mt-0.5 min-h-6 ${this.getPlayerNameColor(
               isFriendly ?? false,
             )}"
           >
-            ${player.cosmetics.flag
-              ? html`<img
-                  class="h-6 object-contain"
-                  src=${assetUrl(player.cosmetics.flag!)}
-                />`
-              : html``}
+            ${
+              player.cosmetics.flag
+                ? html`<img
+                    class="h-6 object-contain"
+                    src=${assetUrl(player.cosmetics.flag!)}
+                  />`
+                : html``
+            }
             <span>${player.displayName()}</span>
             ${this.getRelationSmiley(player, myPlayer)}
-            ${playerTeam !== "" && player.type() !== PlayerType.Bot
-              ? html`<div class="flex flex-col leading-tight">
-                  <span class="text-gray-400 text-xs font-normal"
-                    >${playerType}</span
-                  >
-                  <span class="text-xs font-normal text-gray-400"
-                    >[<span
-                      style="color: ${themeProvider
-                        .current()
-                        .teamColor(player.team()!)
-                        .toHex()}"
-                      >${playerTeam}</span
-                    >]</span
-                  >
-                </div>`
-              : html`<span class="text-gray-400 text-xs font-normal"
-                  >${playerType}</span
-                >`}
+            ${
+              playerTeam !== "" && player.type() !== PlayerType.Bot
+                ? html`<div class="flex flex-col leading-tight">
+                    <span class="text-gray-400 text-xs font-normal"
+                      >${playerType}</span
+                    >
+                    <span class="text-xs font-normal text-gray-400"
+                      >[<span
+                        style="color: ${themeProvider
+                          .current()
+                          .teamColor(player.team()!)
+                          .toHex()}"
+                        >${playerTeam}</span
+                      >]</span
+                    >
+                  </div>`
+                : html`<span class="text-gray-400 text-xs font-normal"
+                    >(${playerType})</span
+                  >`
+            }
             ${this.renderPlayerNameIcons(player)} ${allianceHtml ?? ""}
           </div>
           <div class="flex gap-0.5 lg:gap-1 items-center mt-0.5">
@@ -496,7 +496,7 @@ export class PlayerInfoOverlay extends LitElement implements Controller {
         @contextmenu=${(e: MouseEvent) => e.preventDefault()}
       >
         <div
-          class="bg-gray-800/92 backdrop-blur-sm shadow-xs min-[1200px]:rounded-lg sm:rounded-b-lg shadow-lg text-white text-lg lg:text-base w-full sm:w-[500px] overflow-hidden ${containerClasses}"
+          class="bg-gray-800/92 backdrop-blur-sm shadow-xs min-[1200px]:rounded-lg sm:rounded-t-none sm:rounded-b-lg shadow-lg text-white text-lg lg:text-base w-full sm:w-[500px] overflow-hidden ${containerClasses}"
         >
           ${this.player !== null ? this.renderPlayerInfo(this.player) : ""}
           ${this.unit !== null ? this.renderUnitInfo(this.unit) : ""}