From abc8c537b2bfcdb4180250e6b0729d2a99789b02 Mon Sep 17 00:00:00 2001
From: shnok <skyler.maki@gmail.com>
Date: Mon, 2 Dec 2024 17:00:43 +0800
Subject: [PATCH] post uxml update UI tweaks/fixes

---
 .../frames_df_btn_close.png.meta              |   2 +-
 .../Windows_DF_Large_Bg_Darker.png.meta       |   2 +-
 .../UI/_Elements/Components/L2Bar/L2Bar.uss   |  36 ++-
 .../UI/_Elements/Components/L2Bar/L2Bar.uxml  |   5 +-
 .../_Elements/Components/L2Input/L2Input.uss  |   5 +-
 .../_Elements/Components/L2Input/L2Input.uxml |   2 +-
 .../Components/L2ScrollView/L2Scrollview.uss  |   4 +
 .../UI/_Elements/Components/L2Slot/L2Slot.uss |   2 +-
 .../Game/ActionWindow/ActionWindow.uss        |   3 -
 .../Game/ActionWindow/ActionWindow.uxml       |   8 +-
 .../CharacterInfoWindow.uxml                  |   2 +-
 .../_Elements/Game/ChatWindow/ChatWindow.uss  |   2 +
 .../_Elements/Game/ExitWindow/ExitWindow.uss  |   6 +-
 .../_Elements/Game/MenuWindow/MenuWindow.uss  |   6 +-
 .../Game/StatusWindow/StatusWindow.uxml       |  12 +-
 .../Game/TargetWindow/TargetWindow.uss        |   5 +-
 .../Game/TargetWindow/TargetWindow.uxml       |   2 +-
 .../Data/UI/_Elements/L2StyleSheet.uss        |  22 +-
 .../CharSelectWindow/CharSelectWindow.uss     |   4 +-
 .../Login/LicenseWindow/LicenseWindow.uss     |   7 +-
 .../ServerListWindow/ServerListWindow.uss     |   5 +
 l2-unity/Assets/Resources/Scenes/Menu.unity   | 286 +++++++++---------
 .../Assets/Resources/Scenes/l2_lobby.unity    |   4 +-
 .../Scripts/UI/Game/Action/ActionWindow.cs    |  21 +-
 .../Assets/Scripts/UI/Game/CharacterWindow.cs |   2 +-
 .../Assets/Scripts/UI/Game/StatusWindow.cs    |  21 ++
 .../UserSettings/Layouts/default-6000.dwlt    | 199 +++++++-----
 27 files changed, 400 insertions(+), 275 deletions(-)

diff --git a/l2-unity/Assets/Resources/Data/UI/Assets/Frame/Frame_DF_Btn_Close/frames_df_btn_close.png.meta b/l2-unity/Assets/Resources/Data/UI/Assets/Frame/Frame_DF_Btn_Close/frames_df_btn_close.png.meta
index cd923c9f9..664c78c2f 100644
--- a/l2-unity/Assets/Resources/Data/UI/Assets/Frame/Frame_DF_Btn_Close/frames_df_btn_close.png.meta
+++ b/l2-unity/Assets/Resources/Data/UI/Assets/Frame/Frame_DF_Btn_Close/frames_df_btn_close.png.meta
@@ -113,7 +113,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 
diff --git a/l2-unity/Assets/Resources/Data/UI/Assets/Windows/Windows_DF_Large_Bg_Darker.png.meta b/l2-unity/Assets/Resources/Data/UI/Assets/Windows/Windows_DF_Large_Bg_Darker.png.meta
index 39faee14e..8431c654b 100644
--- a/l2-unity/Assets/Resources/Data/UI/Assets/Windows/Windows_DF_Large_Bg_Darker.png.meta
+++ b/l2-unity/Assets/Resources/Data/UI/Assets/Windows/Windows_DF_Large_Bg_Darker.png.meta
@@ -34,7 +34,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: 0
+    filterMode: 2
     aniso: 1
     mipBias: 0
     wrapU: 1
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Bar/L2Bar.uss b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Bar/L2Bar.uss
index a7842aff3..eed10079b 100644
--- a/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Bar/L2Bar.uss
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Bar/L2Bar.uss
@@ -1,6 +1,6 @@
 .l2-bar {
-    height: 14px;
-    max-height: 14px;
+    height: 12px;
+    max-height: 12px;
     flex-direction: row;
     flex-grow: 1;
 }
@@ -59,6 +59,12 @@
     width: 100%;
 }
 
+.l2-bar-container-wrap {
+    flex-grow: 1;
+    min-height: 12px;
+    max-height: 12px;
+}
+
 .l2-bar .l2-bar-bg .l2-bar-left {
     background-image: resource('Data/UI/Assets/Status/Gauge/Gauge_DF_Large_HP/Gauge_DF_Large_HP_bg_Left');
 }
@@ -314,8 +320,26 @@
     -unity-text-outline-color: rgba(0, 0, 0, 0.6);
 }
 
-.l2-bar-container {
-    flex-grow: 1;
-    height: 14px;
-    max-height: 14px;
+.l2-bar.status .l2-bar-status-label {
+    display: flex;
 }
+
+.l2-bar-status-label {
+    position: absolute;
+    display: none;
+    margin-top: 0;
+    margin-right: 0;
+    margin-bottom: 0;
+    margin-left: 8px;
+    padding-top: 0;
+    padding-right: 0;
+    padding-bottom: 0;
+    padding-left: 0;
+    -unity-font-definition: resource('Data/UI/Assets/Font/asiahm-medium');
+    text-shadow: 0.9px 0.9px 3px rgb(0, 0, 0);
+    -unity-text-outline-width: 0.7px;
+    -unity-text-outline-color: rgb(0, 0, 0);
+    -unity-font-style: bold;
+    letter-spacing: -18px;
+    font-size: 12px;
+}
\ No newline at end of file
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Bar/L2Bar.uxml b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Bar/L2Bar.uxml
index ca20b7904..39d93a61a 100644
--- a/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Bar/L2Bar.uxml
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Bar/L2Bar.uxml
@@ -2,8 +2,8 @@
     <Style src="project://database/Assets/Resources/Data/UI/_Elements/L2StyleSheet.uss?fileID=7433441132597879392&amp;guid=72e99cc94b130bf4ba100dceaa830b13&amp;type=3#L2StyleSheet" />
     <Style src="project://database/Assets/Resources/Data/UI/_Elements/Components/L2Bar/L2Bar.uss?fileID=7433441132597879392&amp;guid=a56090906dc32294994ed8860c7b159e&amp;type=3#L2Bar" />
     <ui:VisualElement name="L2Bar" template="HpBar" class="bar-container l2-bar">
-        <ui:Label text="Label" name="Label" class="l2-bar-name" />
-        <ui:VisualElement name="Gauge" class="l2-bar-container">
+        <ui:Label text="Label" name="Label" class="l2-bar-name l2-color-3" />
+        <ui:VisualElement name="Gauge" class="l2-bar-container-wrap">
             <ui:GroupBox name="BarBg" class="l2-bar-container l2-bar-bg">
                 <ui:VisualElement name="BGLeft" class="l2-bar-side-ele l2-bar-left" />
                 <ui:VisualElement name="BGCenter" class="l2-bar-center-ele l2-bar-center" />
@@ -17,4 +17,5 @@
             <ui:Label text="1234/1234" name="Text" double-click-selects-word="true" class="bar-label l2-bar-label" />
         </ui:VisualElement>
     </ui:VisualElement>
+    <ui:Label text="HP" name="StatusLabel" class="l2-color-4 l2-bar-status-label" />
 </ui:UXML>
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Input/L2Input.uss b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Input/L2Input.uss
index 254986e0b..f1698693b 100644
--- a/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Input/L2Input.uss
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Input/L2Input.uss
@@ -7,7 +7,7 @@
     padding-top: 0;
     margin-bottom: 2px;
     margin-top: 2px;
-    overflow: hidden;
+    overflow: visible;
     margin: 0;
     padding: 0;
     flex-grow: 0;
@@ -27,8 +27,11 @@
 .l2-input-field #unity-text-input {
     background-color: rgba(0, 0, 0, 0);
     background-image: resource('Data/UI/Assets/Login/CharacterPassword_DF_EditBox_Scaled');
+    cursor: resource('Data/UI/Assets/Cursor/Default');
     border-width: 0;
     margin: 0;
+    padding-top: 0;
+    padding-bottom: 0;
     padding-left: 2px;
     padding-right: 2px;
     -unity-slice-left: 10;
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Input/L2Input.uxml b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Input/L2Input.uxml
index 04ac8681a..ce1bd3908 100644
--- a/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Input/L2Input.uxml
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Input/L2Input.uxml
@@ -1,5 +1,5 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
     <Style src="project://database/Assets/Resources/Data/UI/_Elements/L2StyleSheet.uss?fileID=7433441132597879392&amp;guid=72e99cc94b130bf4ba100dceaa830b13&amp;type=3#L2StyleSheet" />
     <Style src="project://database/Assets/Resources/Data/UI/_Elements/Components/L2Input/L2Input.uss?fileID=7433441132597879392&amp;guid=2fa480f78160edf4a8c4381744578912&amp;type=3#L2Input" />
-    <ui:TextField max-length="64" name="L2Input" tabindex="1" class="l2-input-field" />
+    <ui:TextField max-length="64" name="L2Input" tabindex="1" class="l2-input-field l2-color-4" />
 </ui:UXML>
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2ScrollView/L2Scrollview.uss b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2ScrollView/L2Scrollview.uss
index 46117a824..811b8b89f 100644
--- a/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2ScrollView/L2Scrollview.uss
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2ScrollView/L2Scrollview.uss
@@ -62,6 +62,10 @@
     border-width: 0;
 }
 
+.l2-scroll-view .unity-base-slider__tracker:hover:enabled {
+    background-color: transparent;
+}
+
 .l2-scroll-view .unity-scroller__high-button {
     background-color: transparent;
     -unity-background-image-tint-color: rgb(255, 255, 255);
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Slot/L2Slot.uss b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Slot/L2Slot.uss
index abbf27095..b12044a61 100644
--- a/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Slot/L2Slot.uss
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Slot/L2Slot.uss
@@ -88,7 +88,7 @@
     padding: 1px;
 }
 
-.inventory-slot.disabled .slot-bg {
+.l2-slot.disabled .slot-bg {
     border-width: 0;
     background-image: resource('Data/UI/Assets/Inventory/ItemWindow_DF_SlotBox_Disable');
 }
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Game/ActionWindow/ActionWindow.uss b/l2-unity/Assets/Resources/Data/UI/_Elements/Game/ActionWindow/ActionWindow.uss
index 74356a707..519558f1e 100644
--- a/l2-unity/Assets/Resources/Data/UI/_Elements/Game/ActionWindow/ActionWindow.uss
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Game/ActionWindow/ActionWindow.uss
@@ -20,10 +20,7 @@
     padding-right: 0;
     padding-bottom: 0;
     padding-left: 8px;
-    -unity-text-outline-width: 0.1px;
-    color: rgb(240, 240, 240);
     font-size: 11px;
-    letter-spacing: 3px;
 }
 
 .action-window-category-slots {
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Game/ActionWindow/ActionWindow.uxml b/l2-unity/Assets/Resources/Data/UI/_Elements/Game/ActionWindow/ActionWindow.uxml
index 4abdea119..093eca3ce 100644
--- a/l2-unity/Assets/Resources/Data/UI/_Elements/Game/ActionWindow/ActionWindow.uxml
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Game/ActionWindow/ActionWindow.uxml
@@ -5,19 +5,19 @@
     <ui:Instance template="WindowTemplate" name="WindowTemplate" class="action-window" style="height: 545px; width: 315px; position: absolute;">
         <ui:VisualElement name="Content" class="action-window-content">
             <ui:VisualElement name="Category" class="action-window-category">
-                <ui:Label tabindex="-1" text="Basic" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Title" class="action-window-category-title l2-color-4" />
+                <ui:Label tabindex="-1" text="Basic" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Title" class="action-window-category-title l2-color-3" />
                 <ui:VisualElement name="BasicSlots" class="action-window-category-slots" />
             </ui:VisualElement>
             <ui:VisualElement name="Category" class="action-window-category" style="margin-top: 4px;">
-                <ui:Label tabindex="-1" text="Party" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Title" class="action-window-category-title l2-color-4" />
+                <ui:Label tabindex="-1" text="Party" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Title" class="action-window-category-title l2-color-3" />
                 <ui:VisualElement name="PartySlots" class="action-window-category-slots" />
             </ui:VisualElement>
             <ui:VisualElement name="Category" class="action-window-category" style="margin-top: 4px;">
-                <ui:Label tabindex="-1" text="Token Action" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Title" class="action-window-category-title l2-color-4" />
+                <ui:Label tabindex="-1" text="Token Action" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Title" class="action-window-category-title l2-color-3" />
                 <ui:VisualElement name="TokenSlots" class="action-window-category-slots" />
             </ui:VisualElement>
             <ui:VisualElement name="Category" class="action-window-category" style="margin-top: 4px;">
-                <ui:Label tabindex="-1" text="Social" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Title" class="action-window-category-title l2-color-4" />
+                <ui:Label tabindex="-1" text="Social" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Title" class="action-window-category-title l2-color-3" />
                 <ui:VisualElement name="SocialSlots" class="action-window-category-slots" />
             </ui:VisualElement>
         </ui:VisualElement>
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Game/CharacterInfoWindow/CharacterInfoWindow.uxml b/l2-unity/Assets/Resources/Data/UI/_Elements/Game/CharacterInfoWindow/CharacterInfoWindow.uxml
index 2b8810396..8ccdfce11 100644
--- a/l2-unity/Assets/Resources/Data/UI/_Elements/Game/CharacterInfoWindow/CharacterInfoWindow.uxml
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Game/CharacterInfoWindow/CharacterInfoWindow.uxml
@@ -61,7 +61,7 @@
                             <ui:VisualElement name="BagIcon" class="l2-bar-name">
                                 <ui:VisualElement name="BagIconBg" class="char-icon-bag" />
                             </ui:VisualElement>
-                            <ui:Instance template="L2Bar" name="WeightBar" class="l2-bar l2-color-3 weight-4">
+                            <ui:Instance template="L2Bar" name="WeightBar" class="l2-bar l2-color-3">
                                 <AttributeOverrides element-name="Label" text="HP" />
                                 <AttributeOverrides element-name="Text" text="100.00%" />
                             </ui:Instance>
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Game/ChatWindow/ChatWindow.uss b/l2-unity/Assets/Resources/Data/UI/_Elements/Game/ChatWindow/ChatWindow.uss
index a93bedd7d..cff0e51a0 100644
--- a/l2-unity/Assets/Resources/Data/UI/_Elements/Game/ChatWindow/ChatWindow.uss
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Game/ChatWindow/ChatWindow.uss
@@ -435,6 +435,8 @@
     flex-grow: 1;
     flex-shrink: 0;
     flex-direction: column-reverse;
+    padding-left: 4px;
+    padding-top: 4px;
 }
 
 .chat-bg-container {
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Game/ExitWindow/ExitWindow.uss b/l2-unity/Assets/Resources/Data/UI/_Elements/Game/ExitWindow/ExitWindow.uss
index 0f1c3632e..6d2ee94de 100644
--- a/l2-unity/Assets/Resources/Data/UI/_Elements/Game/ExitWindow/ExitWindow.uss
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Game/ExitWindow/ExitWindow.uss
@@ -1,6 +1,6 @@
 .exit-window {
     width: 240px;
-    height: 336px;
+    height: 340px;
     position: absolute;
 }
 
@@ -181,7 +181,7 @@
 }
 
 .exit-window-buttons {
-    margin-top: 6px;
+    margin-top: 4px;
     margin-right: 0;
     margin-bottom: 0;
     margin-left: 0;
@@ -194,7 +194,7 @@
 }
 
 .exit-window #CancelButton {
-    margin-top: 6px;
+    margin-top: 0px;
 }
 
 .exit-window #RestartButton #Icon {
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Game/MenuWindow/MenuWindow.uss b/l2-unity/Assets/Resources/Data/UI/_Elements/Game/MenuWindow/MenuWindow.uss
index 2821b11d3..a2e4c6e0b 100644
--- a/l2-unity/Assets/Resources/Data/UI/_Elements/Game/MenuWindow/MenuWindow.uss
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Game/MenuWindow/MenuWindow.uss
@@ -71,7 +71,7 @@
     border-top-color: rgb(72, 65, 47);
     border-bottom-color: rgb(72, 65, 47);
     overflow: hidden;
-    width: 166px;
+    width: 167px;
     background-color: rgba(19, 19, 19, 0);
     background-image: none;
     -unity-slice-left: 11;
@@ -79,7 +79,7 @@
     -unity-slice-right: 11;
     -unity-slice-bottom: 11;
     -unity-slice-scale: 0.3px;
-    height: 86px;
+    height: 87px;
 }
 
 .menu-window-bg {
@@ -228,7 +228,7 @@
     margin-top: 5px;
     margin-right: 0;
     margin-bottom: 0;
-    margin-left: 5px;
+    margin-left: 6px;
     padding-top: 0;
     padding-right: 0;
     padding-bottom: 0;
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Game/StatusWindow/StatusWindow.uxml b/l2-unity/Assets/Resources/Data/UI/_Elements/Game/StatusWindow/StatusWindow.uxml
index 46dbbd4b1..81f9affd6 100644
--- a/l2-unity/Assets/Resources/Data/UI/_Elements/Game/StatusWindow/StatusWindow.uxml
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Game/StatusWindow/StatusWindow.uxml
@@ -15,16 +15,20 @@
                 <ui:Label text="Shnok" name="PlayerNameText" class="l2-color-4" style="align-items: auto; margin-top: 2px; margin-right: 0; margin-bottom: 0; margin-left: 5px; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; -unity-text-align: upper-center; -unity-font-definition: url(&quot;project://database/Assets/Resources/Data/UI/Assets/Font/tahoma.ttf?fileID=12800000&amp;guid=96fb7a735e76e0742bf125e2d4734bf3&amp;type=3#tahoma&quot;); -unity-text-outline-width: 0.3px; text-shadow: 0.5px 0.5px 0 rgb(0, 0, 0); letter-spacing: 3px; font-size: 11px; width: auto; scale: 1 1;" />
             </ui:VisualElement>
             <ui:GroupBox name="BarGroup" class="status-window-row-2">
-                <ui:Instance template="L2Bar" name="CPBar" class="l2-bar cp" />
-                <ui:Instance template="L2Bar" name="HPBar" class="l2-bar" />
-                <ui:Instance template="L2Bar" name="MPBar" class="l2-bar mp" />
+                <ui:Instance template="L2Bar" name="CPBar" class="l2-bar cp status">
+                    <AttributeOverrides element-name="StatusLabel" text="CP" />
+                </ui:Instance>
+                <ui:Instance template="L2Bar" name="HPBar" class="l2-bar status" />
+                <ui:Instance template="L2Bar" name="MPBar" class="l2-bar mp status">
+                    <AttributeOverrides element-name="StatusLabel" text="MP" />
+                </ui:Instance>
                 <ui:Instance template="L2Bar" name="EXPBar" class="l2-bar exp">
                     <AttributeOverrides element-name="Text" text="00.00%" />
                 </ui:Instance>
             </ui:GroupBox>
         </ui:GroupBox>
         <ui:VisualElement name="SizeControl" class="status-window-size-control">
-            <ui:VisualElement name="SizeControl" class="status-window-resize-handle" />
+            <ui:VisualElement name="SizeControl" class="status-window-resize-handle resize-hor" />
         </ui:VisualElement>
     </ui:GroupBox>
 </ui:UXML>
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Game/TargetWindow/TargetWindow.uss b/l2-unity/Assets/Resources/Data/UI/_Elements/Game/TargetWindow/TargetWindow.uss
index cce225796..fed81667c 100644
--- a/l2-unity/Assets/Resources/Data/UI/_Elements/Game/TargetWindow/TargetWindow.uss
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Game/TargetWindow/TargetWindow.uss
@@ -106,10 +106,9 @@
 
 .target-window-target-name {
     flex-grow: 0;
-    margin-top: 2px;
-    font-size: 11px;
+    font-size: 10px;
     letter-spacing: 3px;
-    height: 20px;
+    height: 12px;
     margin: 0;
     padding: 0;
     -unity-text-align: middle-center;
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Game/TargetWindow/TargetWindow.uxml b/l2-unity/Assets/Resources/Data/UI/_Elements/Game/TargetWindow/TargetWindow.uxml
index b52096b10..0a6f7192f 100644
--- a/l2-unity/Assets/Resources/Data/UI/_Elements/Game/TargetWindow/TargetWindow.uxml
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Game/TargetWindow/TargetWindow.uxml
@@ -14,7 +14,7 @@
             </ui:VisualElement>
         </ui:GroupBox>
         <ui:VisualElement name="SizeControl" class="target-window-size-control">
-            <ui:VisualElement name="SizeControl" class="target-window-resize-handle" />
+            <ui:VisualElement name="SizeControl" class="target-window-resize-handle resize-hor" />
         </ui:VisualElement>
         <ui:Button text="&#10;" name="CloseBtn" class="close-btn target-window-close-btn" />
     </ui:GroupBox>
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/L2StyleSheet.uss b/l2-unity/Assets/Resources/Data/UI/_Elements/L2StyleSheet.uss
index 3e1ad6e99..ccea03980 100644
--- a/l2-unity/Assets/Resources/Data/UI/_Elements/L2StyleSheet.uss
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/L2StyleSheet.uss
@@ -71,10 +71,6 @@
     rotate: 180deg;
 }
 
-.character-info-window .unity-label {
-    -unity-text-outline-width: 0.1px;
-}
-
 .close-btn {
     background-color: transparent;
     -unity-background-image-tint-color: rgb(255, 255, 255);
@@ -397,6 +393,8 @@
     padding-left: 0;
     flex-shrink: 1;
     height: 38px;
+    min-height: 38px;
+    max-height: 38px;
     flex-direction: row;
 }
 
@@ -415,13 +413,19 @@
     flex-grow: 0;
     background-image: resource('Data/UI/Assets/Frame/Frame_DF_Hor_Large/Frame_DF_Hor_Large_Left');
     width: 32px;
+    min-width: 32px;
+    max-width: 32px;
     height: 64px;
+    min-height: 64px;
+    max-height: 64px;
     flex-shrink: 0;
 }
 
 .frame_df_hor_large_tile {
     flex-grow: 1;
     height: 64px;
+    min-height: 64px;
+    max-height: 64px;
     background-image: resource('Data/UI/Assets/Frame/Frame_DF_Hor_Large/Frame_DF_Hor_Large_Tile');
 }
 
@@ -430,6 +434,8 @@
     background-image: resource('Data/UI/Assets/Frame/Frame_DF_Hor_Large/Frame_DF_Hor_Large_Center');
     width: 128px;
     height: 64px;
+    min-height: 64px;
+    max-height: 64px;
     flex-shrink: 1;
 }
 
@@ -437,7 +443,11 @@
     flex-grow: 0;
     background-image: resource('Data/UI/Assets/Frame/Frame_DF_Hor_Large/Frame_DF_Hor_Large_Right');
     width: 32px;
+    min-width: 32px;
+    max-width: 32px;
     height: 64px;
+    min-height: 64px;
+    max-height: 64px;
     flex-shrink: 0;
 }
 
@@ -539,4 +549,6 @@
 
 .l2-color-4 {
     color: rgb(220, 220, 220);
-}
\ No newline at end of file
+}
+
+
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Login/CharSelectWindow/CharSelectWindow.uss b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/CharSelectWindow/CharSelectWindow.uss
index 79512c303..812184b24 100644
--- a/l2-unity/Assets/Resources/Data/UI/_Elements/Login/CharSelectWindow/CharSelectWindow.uss
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/CharSelectWindow/CharSelectWindow.uss
@@ -142,9 +142,9 @@
     -unity-slice-right: 20;
     margin-right: auto;
     margin-left: auto;
-    padding-top: 10px;
+    padding-top: 6px;
     padding-right: 5px;
-    padding-bottom: 12px;
+    padding-bottom: 8px;
     padding-left: 5px;
     margin-bottom: 40px;
     flex-wrap: nowrap;
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LicenseWindow/LicenseWindow.uss b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LicenseWindow/LicenseWindow.uss
index 8154ac381..31574ce6b 100644
--- a/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LicenseWindow/LicenseWindow.uss
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LicenseWindow/LicenseWindow.uss
@@ -33,7 +33,7 @@
 }
 
 .license-window-button-container {
-    height: 30px;
+    height: 38px;
     margin-top: 4px;
     flex-shrink: 0;
     align-items: center;
@@ -45,6 +45,11 @@
     width: 80px;
 }
 
+.license-window .l2-flex-button .l2-flex-button-label{
+    padding-top: 6px;
+    padding-bottom: 6px;
+}
+
 .license-window .unity-base-slider__tracker:hover:enabled {
     background-color: transparent;
 }
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Login/ServerListWindow/ServerListWindow.uss b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/ServerListWindow/ServerListWindow.uss
index 6944e732e..41e65fe56 100644
--- a/l2-unity/Assets/Resources/Data/UI/_Elements/Login/ServerListWindow/ServerListWindow.uss
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/ServerListWindow/ServerListWindow.uss
@@ -209,4 +209,9 @@
 .serverlist-window .l2-flex-button {
     padding: 0;
     width: 80px;
+}
+
+.serverlist-window .l2-flex-button .l2-flex-button-label {
+    padding-top: 6px;
+    padding-bottom: 6px;
 }
\ No newline at end of file
diff --git a/l2-unity/Assets/Resources/Scenes/Menu.unity b/l2-unity/Assets/Resources/Scenes/Menu.unity
index 295c57069..58f123acd 100644
--- a/l2-unity/Assets/Resources/Scenes/Menu.unity
+++ b/l2-unity/Assets/Resources/Scenes/Menu.unity
@@ -189,42 +189,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 4189295632494182095, guid: 69929eb1614e37f43b89527ff626f061, type: 3}
   m_PrefabInstance: {fileID: 8973643108962093886}
   m_PrefabAsset: {fileID: 0}
---- !u!21 &352124032
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Height Fog Global
-  m_Shader: {fileID: 4800000, guid: 3a7ef1b66bafb7a448a880ef76d2e6e6, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 3000
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_LockedProperties: 
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs: []
-    m_Ints: []
-    m_Floats:
-    - _AdvancedCat: 1
-    - _Banner: 1
-    - _DirectionalCat: 1
-    - _FogCat: 1
-    - _HeightFogGlobal: 1
-    - _IsHeightFogShader: 1
-    - _NoiseCat: 1
-    - _SkyboxCat: 1
-    m_Colors: []
-  m_BuildTextureStacks: []
-  m_AllowLocking: 1
 --- !u!4 &362100725 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 2871569206223582374, guid: d4fcefd241ce67b43b3be1358ec432a6, type: 3}
@@ -290,6 +254,42 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 4877871055344985101, guid: 5ce2b4f594de97e49bdb71fea5235fc4, type: 3}
   m_PrefabInstance: {fileID: 906917057694660954}
   m_PrefabAsset: {fileID: 0}
+--- !u!21 &409207257
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Height Fog Global
+  m_Shader: {fileID: 4800000, guid: 3a7ef1b66bafb7a448a880ef76d2e6e6, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs: []
+    m_Ints: []
+    m_Floats:
+    - _AdvancedCat: 1
+    - _Banner: 1
+    - _DirectionalCat: 1
+    - _FogCat: 1
+    - _HeightFogGlobal: 1
+    - _IsHeightFogShader: 1
+    - _NoiseCat: 1
+    - _SkyboxCat: 1
+    m_Colors: []
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
 --- !u!1 &413261805
 GameObject:
   m_ObjectHideFlags: 0
@@ -499,42 +499,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 6342414730586251301, guid: c363270938840bc449c3a42e3d197353, type: 3}
   m_PrefabInstance: {fileID: 9121576604518237071}
   m_PrefabAsset: {fileID: 0}
---- !u!21 &549111622
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Height Fog Global
-  m_Shader: {fileID: 4800000, guid: 3a7ef1b66bafb7a448a880ef76d2e6e6, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 3000
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_LockedProperties: 
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs: []
-    m_Ints: []
-    m_Floats:
-    - _AdvancedCat: 1
-    - _Banner: 1
-    - _DirectionalCat: 1
-    - _FogCat: 1
-    - _HeightFogGlobal: 1
-    - _IsHeightFogShader: 1
-    - _NoiseCat: 1
-    - _SkyboxCat: 1
-    m_Colors: []
-  m_BuildTextureStacks: []
-  m_AllowLocking: 1
 --- !u!4 &557414995 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 6358783125614899406, guid: 0bc1ac855144891449abb0e4e74728ed, type: 3}
@@ -1107,7 +1071,7 @@ PrefabInstance:
     - target: {fileID: 14083907825353274, guid: 8742fc349ac4f354d9cfb98ebb79a0e3, type: 3}
       propertyPath: 'm_Materials.Array.data[0]'
       value: 
-      objectReference: {fileID: 352124032}
+      objectReference: {fileID: 409207257}
     - target: {fileID: 2134954596300280144, guid: 8742fc349ac4f354d9cfb98ebb79a0e3, type: 3}
       propertyPath: m_Name
       value: Height Fog Global
@@ -1247,6 +1211,76 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 2018473782570864008, guid: c62264f2126e2b54bb9750d4e55a9881, type: 3}
   m_PrefabInstance: {fileID: 818515487845165693}
   m_PrefabAsset: {fileID: 0}
+--- !u!21 &1199505180
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Override
+  m_Shader: {fileID: 4800000, guid: a3a3bc8785681554d9558e2ea68f100e, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs: []
+    m_Ints: []
+    m_Floats:
+    - _AdvancedCat: 1
+    - _Banner: 1
+    - _DirectionalCat: 1
+    - _DirectionalFalloff: 2
+    - _DirectionalIntensity: 1
+    - _FarDistanceHeight: 0
+    - _FarDistanceOffset: 0
+    - _FogAxisMode: 1
+    - _FogCameraMode: 0
+    - _FogCat: 1
+    - _FogColorDuo: 1
+    - _FogDistanceEnd: 100
+    - _FogDistanceFalloff: 2
+    - _FogDistanceStart: 0
+    - _FogHeightEnd: 100
+    - _FogHeightFalloff: 2
+    - _FogHeightStart: 0
+    - _FogIntensity: 1
+    - _FogLayersMode: 0
+    - _IsHeightFogPreset: 1
+    - _IsHeightFogShader: 1
+    - _JitterIntensity: 1
+    - _NoiseCat: 1
+    - _NoiseDistanceEnd: 50
+    - _NoiseIntensity: 1
+    - _NoiseMax: 1
+    - _NoiseMin: 0
+    - _NoiseModeBlend: 1
+    - _NoiseScale: 30
+    - _SkyboxCat: 1
+    - _SkyboxFogBottom: 0
+    - _SkyboxFogFalloff: 1
+    - _SkyboxFogFill: 1
+    - _SkyboxFogHeight: 1
+    - _SkyboxFogIntensity: 1
+    - _SkyboxFogOffset: 0
+    m_Colors:
+    - _DirectionalColor: {r: 1, g: 0.7793103, b: 0.5, a: 1}
+    - _DirectionalDir: {r: 0, g: 0, b: 0, a: 0}
+    - _FogAxisOption: {r: 0, g: 0, b: 0, a: 0}
+    - _FogColorEnd: {r: 0.8862745, g: 1.443137, b: 2, a: 1}
+    - _FogColorStart: {r: 0.4411765, g: 0.722515, b: 1, a: 1}
+    - _NoiseSpeed: {r: 0.5, g: 0, b: 0.5, a: 0}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
 --- !u!1 &1212301096
 GameObject:
   m_ObjectHideFlags: 0
@@ -1374,76 +1408,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 7970840853338567417, guid: d5772e7de650d9b4c93729a090eefef6, type: 3}
   m_PrefabInstance: {fileID: 4374905327095023860}
   m_PrefabAsset: {fileID: 0}
---- !u!21 &1412981468
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Override
-  m_Shader: {fileID: 4800000, guid: a3a3bc8785681554d9558e2ea68f100e, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_LockedProperties: 
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs: []
-    m_Ints: []
-    m_Floats:
-    - _AdvancedCat: 1
-    - _Banner: 1
-    - _DirectionalCat: 1
-    - _DirectionalFalloff: 2
-    - _DirectionalIntensity: 1
-    - _FarDistanceHeight: 0
-    - _FarDistanceOffset: 0
-    - _FogAxisMode: 1
-    - _FogCameraMode: 0
-    - _FogCat: 1
-    - _FogColorDuo: 1
-    - _FogDistanceEnd: 100
-    - _FogDistanceFalloff: 2
-    - _FogDistanceStart: 0
-    - _FogHeightEnd: 100
-    - _FogHeightFalloff: 2
-    - _FogHeightStart: 0
-    - _FogIntensity: 1
-    - _FogLayersMode: 0
-    - _IsHeightFogPreset: 1
-    - _IsHeightFogShader: 1
-    - _JitterIntensity: 1
-    - _NoiseCat: 1
-    - _NoiseDistanceEnd: 50
-    - _NoiseIntensity: 1
-    - _NoiseMax: 1
-    - _NoiseMin: 0
-    - _NoiseModeBlend: 1
-    - _NoiseScale: 30
-    - _SkyboxCat: 1
-    - _SkyboxFogBottom: 0
-    - _SkyboxFogFalloff: 1
-    - _SkyboxFogFill: 1
-    - _SkyboxFogHeight: 1
-    - _SkyboxFogIntensity: 1
-    - _SkyboxFogOffset: 0
-    m_Colors:
-    - _DirectionalColor: {r: 1, g: 0.7793103, b: 0.5, a: 1}
-    - _DirectionalDir: {r: 0, g: 0, b: 0, a: 0}
-    - _FogAxisOption: {r: 0, g: 0, b: 0, a: 0}
-    - _FogColorEnd: {r: 0.8862745, g: 1.443137, b: 2, a: 1}
-    - _FogColorStart: {r: 0.4411765, g: 0.722515, b: 1, a: 1}
-    - _NoiseSpeed: {r: 0.5, g: 0, b: 0.5, a: 0}
-  m_BuildTextureStacks: []
-  m_AllowLocking: 1
 --- !u!4 &1453875285 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 5344243551557665710, guid: d4330641f80b3ed41b9bb1306ccec21c, type: 3}
@@ -1796,6 +1760,42 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 6494277511981815224, guid: 9e26ece1c355abd45835edac72dee7dd, type: 3}
   m_PrefabInstance: {fileID: 2633802724653778086}
   m_PrefabAsset: {fileID: 0}
+--- !u!21 &1895409954
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Height Fog Global
+  m_Shader: {fileID: 4800000, guid: 3a7ef1b66bafb7a448a880ef76d2e6e6, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs: []
+    m_Ints: []
+    m_Floats:
+    - _AdvancedCat: 1
+    - _Banner: 1
+    - _DirectionalCat: 1
+    - _FogCat: 1
+    - _HeightFogGlobal: 1
+    - _IsHeightFogShader: 1
+    - _NoiseCat: 1
+    - _SkyboxCat: 1
+    m_Colors: []
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
 --- !u!4 &1935287752 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 3464943749389224790, guid: 384b25ed7e96a7849bad7cdb391de0c7, type: 3}
diff --git a/l2-unity/Assets/Resources/Scenes/l2_lobby.unity b/l2-unity/Assets/Resources/Scenes/l2_lobby.unity
index 4bef422ae..74f731cdc 100644
--- a/l2-unity/Assets/Resources/Scenes/l2_lobby.unity
+++ b/l2-unity/Assets/Resources/Scenes/l2_lobby.unity
@@ -8565,7 +8565,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   mode: 1
-  size: {x: 488.25977, y: 608.2672, z: 477.07562}
+  size: {x: 488.25977, y: 608.2673, z: 477.07562}
   overrideRendererFilters: 0
   minRendererVolumeSize: 0.1
   objectLayerMask:
@@ -8605,7 +8605,7 @@ Transform:
   m_GameObject: {fileID: 805700821}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 4766.5156, y: 164.38974, z: -232.2955}
+  m_LocalPosition: {x: 4766.5156, y: 164.38977, z: -232.2955}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
diff --git a/l2-unity/Assets/Scripts/UI/Game/Action/ActionWindow.cs b/l2-unity/Assets/Scripts/UI/Game/Action/ActionWindow.cs
index 07e0ebf7a..9a8385d56 100644
--- a/l2-unity/Assets/Scripts/UI/Game/Action/ActionWindow.cs
+++ b/l2-unity/Assets/Scripts/UI/Game/Action/ActionWindow.cs
@@ -73,24 +73,34 @@ protected override IEnumerator BuildWindow(VisualElement root)
         _slots = new List<ActionSlot>();
 
         int position = 0;
+
+        ActionSlot slot;
         for (int i = 0; i < SLOTS_PER_ROW * 4; i++)
         {
-            AddSlot(position++, _basicContainer);
+            slot = AddSlot(position++, _basicContainer);
+            if (i < SLOTS_PER_ROW)
+                slot.SlotElement.AddToClassList("disabled");
         }
 
         for (int i = 0; i < SLOTS_PER_ROW * 2; i++)
         {
-            AddSlot(position++, _partyContainer);
+            slot = AddSlot(position++, _partyContainer);
+            if (i < SLOTS_PER_ROW)
+                slot.SlotElement.AddToClassList("disabled");
         }
 
         for (int i = 0; i < SLOTS_PER_ROW * 2; i++)
         {
-            AddSlot(position++, _tokenContainer);
+            slot = AddSlot(position++, _tokenContainer);
+            if (i < SLOTS_PER_ROW)
+                slot.SlotElement.AddToClassList("disabled");
         }
 
         for (int i = 0; i < SLOTS_PER_ROW * 3; i++)
         {
-            AddSlot(position++, _socialContainer);
+            slot = AddSlot(position++, _socialContainer);
+            if (i < SLOTS_PER_ROW)
+                slot.SlotElement.AddToClassList("disabled");
         }
 
         _slots[0].AssignAction(ActionType.Sit);
@@ -101,13 +111,14 @@ protected override IEnumerator BuildWindow(VisualElement root)
         _slots[5].AssignAction(ActionType.Assist);
     }
 
-    private void AddSlot(int position, VisualElement container)
+    private ActionSlot AddSlot(int position, VisualElement container)
     {
         VisualElement slotElement = _slotTemplate.Instantiate()[0];
         container.Add(slotElement);
 
         ActionSlot slot = new ActionSlot(slotElement, position, L2Slot.SlotType.Action);
         _slots.Add(slot);
+        return slot;
     }
 
     public override void ShowWindow()
diff --git a/l2-unity/Assets/Scripts/UI/Game/CharacterWindow.cs b/l2-unity/Assets/Scripts/UI/Game/CharacterWindow.cs
index 9add249c6..7fefe8db2 100644
--- a/l2-unity/Assets/Scripts/UI/Game/CharacterWindow.cs
+++ b/l2-unity/Assets/Scripts/UI/Game/CharacterWindow.cs
@@ -323,7 +323,7 @@ private void UpdateBars(PlayerStatus status, PlayerStats stats)
                 _weightBarContainer.RemoveFromClassList("weight-" + i);
             }
 
-            _weightBarContainer.parent.AddToClassList("weight-" + ((int)Mathf.Floor(weightRatio / 0.25f) + 1));
+            _weightBarContainer.AddToClassList("weight-" + ((int)Mathf.Floor(weightRatio / 0.25f) + 1));
 
             float barWidth = bgWidth * weightRatio;
             if (stats.MaxWeight == 0)
diff --git a/l2-unity/Assets/Scripts/UI/Game/StatusWindow.cs b/l2-unity/Assets/Scripts/UI/Game/StatusWindow.cs
index 6c16f0775..c9635b095 100644
--- a/l2-unity/Assets/Scripts/UI/Game/StatusWindow.cs
+++ b/l2-unity/Assets/Scripts/UI/Game/StatusWindow.cs
@@ -63,6 +63,11 @@ protected override IEnumerator BuildWindow(VisualElement root)
             horizontalResizeHandle, _windowEle, _statusWindowMinWidth, _statusWindowMaxWidth);
         horizontalResizeHandle.AddManipulator(horizontalResize);
 
+        _windowEle.RegisterCallback<GeometryChangedEvent>((evt) =>
+        {
+            UpdateStatusValues();
+        });
+
         _nameLabel = (Label)GetElementById("PlayerNameText");
         if (_nameLabel == null)
         {
@@ -151,6 +156,12 @@ protected override IEnumerator BuildWindow(VisualElement root)
         {
             Debug.LogError("Status windowar XPBar is null");
         }
+
+        VisualElement bgContainer = GetElementById("CenterContainer");
+        bgContainer.RegisterCallback<MouseDownEvent>((evt) =>
+        {
+            OnClickSelf();
+        }, TrickleDown.TrickleDown);
     }
 
     void FixedUpdate()
@@ -164,6 +175,11 @@ void FixedUpdate()
             _lastUpdateTime = Time.time;
         }
 
+        UpdateStatusValues();
+    }
+
+    private void UpdateStatusValues()
+    {
         if (PlayerEntity.Instance == null)
         {
             return;
@@ -258,6 +274,11 @@ public override void HideWindow()
     }
 
     public override void OnClick()
+    {
+        OnClickSelf();
+    }
+
+    private void OnClickSelf()
     {
         ObjectData data = new ObjectData(PlayerEntity.Instance.transform.gameObject);
         TargetManager.Instance.SetTarget(data);
diff --git a/l2-unity/UserSettings/Layouts/default-6000.dwlt b/l2-unity/UserSettings/Layouts/default-6000.dwlt
index d43520beb..089d4b3b1 100644
--- a/l2-unity/UserSettings/Layouts/default-6000.dwlt
+++ b/l2-unity/UserSettings/Layouts/default-6000.dwlt
@@ -19,7 +19,7 @@ MonoBehaviour:
     width: 2560
     height: 1357
   m_ShowMode: 4
-  m_Title: Scene
+  m_Title: Game
   m_RootView: {fileID: 6}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -48,7 +48,7 @@ MonoBehaviour:
   m_MinSize: {x: 300, y: 100}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 38
+  controlID: 109
   draggingID: 0
 --- !u!114 &3
 MonoBehaviour:
@@ -60,24 +60,24 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: InspectorWindow
+  m_Name: UIElementsDebugger
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 2038
+    x: 1569
     y: 0
-    width: 522
+    width: 991
     height: 1301
-  m_MinSize: {x: 276, y: 76}
+  m_MinSize: {x: 51, y: 76}
   m_MaxSize: {x: 4001, y: 4026}
-  m_ActualView: {fileID: 15}
+  m_ActualView: {fileID: 13}
   m_Panes:
-  - {fileID: 15}
+  - {fileID: 16}
+  - {fileID: 14}
   - {fileID: 13}
-  - {fileID: 12}
-  m_Selected: 0
-  m_LastSelected: 2
+  m_Selected: 2
+  m_LastSelected: 0
 --- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -95,13 +95,13 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 334
-    height: 671
+    width: 254
+    height: 932
   m_MinSize: {x: 201, y: 226}
   m_MaxSize: {x: 4001, y: 4026}
-  m_ActualView: {fileID: 16}
+  m_ActualView: {fileID: 17}
   m_Panes:
-  - {fileID: 16}
+  - {fileID: 17}
   m_Selected: 0
   m_LastSelected: 0
 --- !u!114 &5
@@ -120,15 +120,15 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 671
-    width: 2038
-    height: 630
+    y: 932
+    width: 1569
+    height: 369
   m_MinSize: {x: 231, y: 276}
   m_MaxSize: {x: 10001, y: 10026}
-  m_ActualView: {fileID: 14}
+  m_ActualView: {fileID: 15}
   m_Panes:
-  - {fileID: 14}
-  - {fileID: 19}
+  - {fileID: 15}
+  - {fileID: 20}
   m_Selected: 0
   m_LastSelected: 1
 --- !u!114 &6
@@ -221,12 +221,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 2038
+    width: 1569
     height: 1301
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 39
+  controlID: 40
   draggingID: 0
 --- !u!114 &10
 MonoBehaviour:
@@ -247,12 +247,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 2038
-    height: 671
+    width: 1569
+    height: 932
   m_MinSize: {x: 200, y: 50}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 40
+  controlID: 41
   draggingID: 0
 --- !u!114 &11
 MonoBehaviour:
@@ -264,24 +264,61 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: SceneView
+  m_Name: GameView
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 334
+    x: 254
     y: 0
-    width: 1704
-    height: 671
+    width: 1315
+    height: 932
   m_MinSize: {x: 202, y: 226}
   m_MaxSize: {x: 4002, y: 4026}
-  m_ActualView: {fileID: 17}
+  m_ActualView: {fileID: 19}
   m_Panes:
-  - {fileID: 17}
   - {fileID: 18}
-  m_Selected: 0
-  m_LastSelected: 0
+  - {fileID: 19}
+  - {fileID: 12}
+  m_Selected: 1
+  m_LastSelected: 2
 --- !u!114 &12
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 13999, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: UI Builder
+    m_Image: {fileID: 8683992553321208622, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+    m_TextWithWhitespace: "UI Builder\u200B"
+  m_Pos:
+    serializedVersion: 2
+    x: 254
+    y: 79
+    width: 1313
+    height: 906
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_ContainerData: []
+    m_OverlaysVisible: 1
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -302,9 +339,9 @@ MonoBehaviour:
     m_TextWithWhitespace: "UI Toolkit Debugger\u200B"
   m_Pos:
     serializedVersion: 2
-    x: 1298
-    y: 79
-    width: 1261
+    x: 1570
+    y: 24
+    width: 990
     height: 1275
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -327,7 +364,7 @@ MonoBehaviour:
     m_BreakBatches: 0
     m_ShowWireframe: 0
     m_ShowTextureAtlasViewer: 0
---- !u!114 &13
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -363,7 +400,7 @@ MonoBehaviour:
     m_SaveData: []
     m_ContainerData: []
     m_OverlaysVisible: 1
---- !u!114 &14
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -385,9 +422,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 695
-    width: 2037
-    height: 604
+    y: 956
+    width: 1568
+    height: 343
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -410,7 +447,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Resources/Data/UI/_Elements/Game/CharacterInfoWindow
+    - Assets/Resources/Data/UI/_Elements/Login/LicenseWindow
     m_Globs: []
     m_ProductIds: 
     m_AnyWithAssetOrigin: 0
@@ -420,16 +457,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Resources/Data/UI/_Elements/Game/CharacterInfoWindow
+  - Assets/Resources/Data/UI/_Elements/Login/LicenseWindow
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\Stock\Projects\L2-Unity\l2-unity\l2-unity
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 403}
-    m_SelectedIDs: 32ee0100
-    m_LastClickedID: 126514
-    m_ExpandedIDs: 000000005ae701005ce701005ee7010060e7010062e7010064e7010066e7010068e701006ae701006ce701006ee7010070e7010072e7010074e7010076e7010078e701007ae701007ce701007ee7010080e7010082e7010084e7010086e7010088e701008ae701008ce701008ee7010090e7010092e7010094e7010096e7010098e701009ae701009ce701009ee70100a0e70100a2e70100a4e70100a6e70100a8e70100aae70100ace70100aee70100b0e70100b2e70100b4e70100b6e70100b8e70100bae70100bce70100bee70100c0e70100c2e70100c4e70100c6e70100c8e70100
+    scrollPos: {x: 0, y: 374}
+    m_SelectedIDs: 94e80100
+    m_LastClickedID: 125076
+    m_ExpandedIDs: 00000000dae70100dce70100dee70100e0e70100e2e70100e4e70100e6e70100e8e70100eae70100ece70100eee70100f0e70100f2e70100f4e70100f6e70100f8e70100fae70100fce70100fee7010000e8010002e8010004e8010006e8010008e801000ae801000ce801000ee8010010e8010012e8010014e8010016e8010018e801001ae801001ce801001ee8010020e8010022e8010024e8010026e8010028e801002ae801002ce801002ee8010030e8010032e8010034e8010036e8010038e801003ae801003ce801003ee8010040e8010042e8010044e8010046e80100
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -458,7 +495,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 000000005ae701005ce701005ee7010060e7010062e7010064e7010066e7010068e701006ae701006ce701006ee7010070e7010072e7010074e7010076e7010078e701007ae701007ce701007ee7010080e7010082e7010084e7010086e7010088e701008ae701008ce701008ee7010090e7010092e7010094e7010096e7010098e701009ae701009ce701009ee70100a0e70100a2e70100a4e70100a6e70100a8e70100aae70100ace70100aee70100b0e70100b2e70100b4e70100b6e70100b8e70100bae70100bce70100bee70100c0e70100c2e70100c4e70100c6e70100c8e70100
+    m_ExpandedIDs: 00000000dae70100dce70100dee70100e0e70100e2e70100e4e70100e6e70100e8e70100eae70100ece70100eee70100f0e70100f2e70100f4e70100f6e70100f8e70100fae70100fce70100fee7010000e8010002e8010004e8010006e8010008e801000ae801000ce801000ee8010010e8010012e8010014e8010016e8010018e801001ae801001ce801001ee8010020e8010022e8010024e8010026e8010028e801002ae801002ce801002ee8010030e8010032e8010034e8010036e8010038e801003ae801003ce801003ee8010040e8010042e8010044e8010046e80100
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -516,7 +553,7 @@ MonoBehaviour:
     m_GridSize: 16
   m_SkipHiddenPackages: 0
   m_DirectoriesAreaWidth: 393
---- !u!114 &15
+--- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -537,8 +574,8 @@ MonoBehaviour:
     m_TextWithWhitespace: "Inspector\u200B"
   m_Pos:
     serializedVersion: 2
-    x: 2039
-    y: 24
+    x: 2038
+    y: 79
     width: 521
     height: 1275
   m_SerializedDataModeController:
@@ -565,7 +602,7 @@ MonoBehaviour:
   m_LockTracker:
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
---- !u!114 &16
+--- !u!114 &17
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -588,8 +625,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 24
-    width: 333
-    height: 645
+    width: 253
+    height: 906
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -606,7 +643,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 
+      m_ExpandedIDs: f46ffdff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -631,7 +668,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 4c969a2b90040154d917609493e03593
---- !u!114 &17
+--- !u!114 &18
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -652,8 +689,8 @@ MonoBehaviour:
     m_TextWithWhitespace: "Scene\u200B"
   m_Pos:
     serializedVersion: 2
-    x: 335
-    y: 24
+    x: 334
+    y: 79
     width: 1702
     height: 645
   m_SerializedDataModeController:
@@ -1201,7 +1238,7 @@ MonoBehaviour:
   m_LastSceneViewRotation: {x: 0, y: 0, z: 0, w: 0}
   m_LastSceneViewOrtho: 0
   m_Viewpoint:
-    m_SceneView: {fileID: 17}
+    m_SceneView: {fileID: 18}
     m_CameraOverscanSettings:
       m_Opacity: 50
       m_Scale: 1
@@ -1211,7 +1248,7 @@ MonoBehaviour:
   m_LastLockedObject: {fileID: 0}
   m_LastDebugDrawMode: 35
   m_ViewIsLockedToObject: 0
---- !u!114 &18
+--- !u!114 &19
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1232,10 +1269,10 @@ MonoBehaviour:
     m_TextWithWhitespace: "Game\u200B"
   m_Pos:
     serializedVersion: 2
-    x: 2811
-    y: 79
-    width: 1275
-    height: 534
+    x: 255
+    y: 24
+    width: 1313
+    height: 906
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1253,7 +1290,7 @@ MonoBehaviour:
   m_ShowGizmos: 0
   m_TargetDisplay: 0
   m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 1275, y: 513}
+  m_TargetSize: {x: 1313, y: 885}
   m_TextureFilterMode: 0
   m_TextureHideFlags: 61
   m_RenderIMGUI: 1
@@ -1268,10 +1305,10 @@ MonoBehaviour:
     m_VRangeLocked: 0
     hZoomLockedByDefault: 0
     vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -637.5
-    m_HBaseRangeMax: 637.5
-    m_VBaseRangeMin: -256.5
-    m_VBaseRangeMax: 256.5
+    m_HBaseRangeMin: -656.5
+    m_HBaseRangeMax: 656.5
+    m_VBaseRangeMin: -442.5
+    m_VBaseRangeMax: 442.5
     m_HAllowExceedBaseRangeMin: 1
     m_HAllowExceedBaseRangeMax: 1
     m_VAllowExceedBaseRangeMin: 1
@@ -1289,29 +1326,29 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 1275
-      height: 513
+      width: 1313
+      height: 885
     m_Scale: {x: 1, y: 1}
-    m_Translation: {x: 637.5, y: 256.5}
+    m_Translation: {x: 656.5, y: 442.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -637.5
-      y: -256.5
-      width: 1275
-      height: 513
+      x: -656.5
+      y: -442.5
+      width: 1313
+      height: 885
     m_MinimalGUI: 1
   m_defaultScale: 1
-  m_LastWindowPixelSize: {x: 1275, y: 534}
+  m_LastWindowPixelSize: {x: 1313, y: 906}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &19
+--- !u!114 &20
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1333,9 +1370,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 967
+    y: 980
     width: 2037
-    height: 387
+    height: 374
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0