diff --git a/resources/lang/en.json b/resources/lang/en.json
index 6f06528dc..9750864e8 100644
--- a/resources/lang/en.json
+++ b/resources/lang/en.json
@@ -187,7 +187,9 @@
     "icon_request": "Envelope - Alliance request. This player has sent you an alliance request.",
     "info_enemy_panel": "Enemy info panel",
     "exit_confirmation": "Are you sure you want to exit the game?",
-    "bomb_direction": "Atom / Hydrogen bomb arc direction"
+    "bomb_direction": "Atom / Hydrogen bomb arc direction",
+    "icon_alt_player_leaderboard": "Player Leaderboard Icon",
+    "icon_alt_team_leaderboard": "Team Leaderboard Icon"
   },
   "single_modal": {
     "title": "Solo",
diff --git a/src/client/graphics/layers/GameLeftSidebar.ts b/src/client/graphics/layers/GameLeftSidebar.ts
index 351d839a2..ef3650f82 100644
--- a/src/client/graphics/layers/GameLeftSidebar.ts
+++ b/src/client/graphics/layers/GameLeftSidebar.ts
@@ -16,8 +16,11 @@ export class GameLeftSidebar extends LitElement implements Layer {
   private isLeaderboardShow = false;
   @state()
   private isTeamLeaderboardShow = false;
+  @state()
   private isVisible = false;
+  @state()
   private isPlayerTeamLabelVisible = false;
+  @state()
   private playerTeam: string | null = null;
 
   private playerColor: Colord = new Colord("#FFFFFF");
@@ -59,7 +62,7 @@ export class GameLeftSidebar extends LitElement implements Layer {
       this.requestUpdate();
     }
 
-    if (!this.game.inSpawnPhase()) {
+    if (!this.game.inSpawnPhase() && this.isPlayerTeamLabelVisible) {
       this.isPlayerTeamLabelVisible = false;
       this.requestUpdate();
     }
@@ -91,27 +94,7 @@ export class GameLeftSidebar extends LitElement implements Layer {
           this.isVisible ? "translate-x-0" : "hidden"
         }`}
       >
-        ${this.isPlayerTeamLabelVisible
-          ? html`
-              <div
-                class="flex items-center w-full h-8 lg:h-10 text-white py-1 lg:p-2"
-                @contextmenu=${(e: Event) => e.preventDefault()}
-              >
-                ${translateText("help_modal.ui_your_team")}
-                <span
-                  style="--color: ${this.playerColor.toRgbString()}"
-                  class="text-(--color)"
-                >
-                  &nbsp;${this.getTranslatedPlayerTeamLabel()} &#10687;
-                </span>
-              </div>
-            `
-          : null}
-        <div
-          class=${`flex items-center gap-4 lg:gap-6 xl:gap-8 text-white ${this.isTeamGame ? "ml-8" : ""} ${
-            this.isLeaderboardShow || this.isTeamLeaderboardShow ? "mb-2" : ""
-          }`}
-        >
+        <div class="flex items-center gap-4 xl:gap-6 text-white">
           <div
             class="cursor-pointer p-0.5 bg-gray-700/50 hover:bg-gray-600 border rounded-md border-slate-500 transition-colors"
             @click=${this.toggleLeaderboard}
@@ -119,6 +102,7 @@ export class GameLeftSidebar extends LitElement implements Layer {
             tabindex="0"
             @keydown=${(e: KeyboardEvent) => {
               if (e.key === "Enter" || e.key === " " || e.code === "Space") {
+                e.preventDefault();
                 this.toggleLeaderboard();
               }
             }}
@@ -127,7 +111,8 @@ export class GameLeftSidebar extends LitElement implements Layer {
               src=${this.isLeaderboardShow
                 ? leaderboardSolidIcon
                 : leaderboardRegularIcon}
-              alt="treeIcon"
+              alt=${translateText("help_modal.icon_alt_player_leaderboard") ||
+              "Player Leaderboard Icon"}
               width="20"
               height="20"
             />
@@ -145,6 +130,7 @@ export class GameLeftSidebar extends LitElement implements Layer {
                       e.key === " " ||
                       e.code === "Space"
                     ) {
+                      e.preventDefault();
                       this.toggleTeamLeaderboard();
                     }
                   }}
@@ -153,7 +139,9 @@ export class GameLeftSidebar extends LitElement implements Layer {
                     src=${this.isTeamLeaderboardShow
                       ? teamSolidIcon
                       : teamRegularIcon}
-                    alt="treeIcon"
+                    alt=${translateText(
+                      "help_modal.icon_alt_team_leaderboard",
+                    ) || "Team Leaderboard Icon"}
                     width="20"
                     height="20"
                   />
@@ -161,7 +149,25 @@ export class GameLeftSidebar extends LitElement implements Layer {
               `
             : null}
         </div>
-        <div class="block lg:flex flex-wrap gap-2">
+        ${this.isPlayerTeamLabelVisible
+          ? html`
+              <div
+                class="flex items-center w-full text-white"
+                @contextmenu=${(e: Event) => e.preventDefault()}
+              >
+                ${translateText("help_modal.ui_your_team")}
+                <span
+                  style="--color: ${this.playerColor.toRgbString()}"
+                  class="text-(--color)"
+                >
+                  &nbsp;${this.getTranslatedPlayerTeamLabel()} &#10687;
+                </span>
+              </div>
+            `
+          : null}
+        <div
+          class=${`block lg:flex flex-wrap ${this.isLeaderboardShow && this.isTeamLeaderboardShow ? "gap-2" : ""}`}
+        >
           <leader-board .visible=${this.isLeaderboardShow}></leader-board>
           <team-stats
             class="flex-1"
diff --git a/src/client/graphics/layers/Leaderboard.ts b/src/client/graphics/layers/Leaderboard.ts
index 3e0a302c6..6de7e0f10 100644
--- a/src/client/graphics/layers/Leaderboard.ts
+++ b/src/client/graphics/layers/Leaderboard.ts
@@ -177,7 +177,7 @@ export class Leaderboard extends LitElement implements Layer {
     }
     return html`
       <div
-        class="max-h-[35vh] overflow-y-auto text-white text-xs md:text-xs lg:text-sm md:max-h-[50vh]  ${this
+        class="max-h-[35vh] overflow-y-auto text-white text-xs md:text-xs lg:text-sm md:max-h-[50vh] mt-2 ${this
           .visible
           ? ""
           : "hidden"}"
diff --git a/src/client/graphics/layers/TeamStats.ts b/src/client/graphics/layers/TeamStats.ts
index 5cf322e12..f48e38f29 100644
--- a/src/client/graphics/layers/TeamStats.ts
+++ b/src/client/graphics/layers/TeamStats.ts
@@ -132,7 +132,7 @@ export class TeamStats extends LitElement implements Layer {
 
     return html`
       <div
-        class="max-h-[30vh] overflow-y-auto grid bg-slate-800/70 w-full text-white text-xs md:text-sm"
+        class="max-h-[30vh] overflow-y-auto grid bg-slate-800/70 w-full text-white text-xs md:text-sm mt-2"
         @contextmenu=${(e: MouseEvent) => e.preventDefault()}
       >
         <div