diff --git a/l2-unity/Assets/Resources/Data/Effects/skybox/L2Sky.mat b/l2-unity/Assets/Resources/Data/Effects/skybox/L2Sky.mat
index 4cc2fe3d1..00981a271 100644
--- a/l2-unity/Assets/Resources/Data/Effects/skybox/L2Sky.mat
+++ b/l2-unity/Assets/Resources/Data/Effects/skybox/L2Sky.mat
@@ -50,8 +50,8 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _SunMoon:
-        m_Texture: {fileID: 2800000, guid: 87bfdbc0202b0e440b4b25a3824f15db, type: 3}
-        m_Scale: {x: 1.5, y: 1.5}
+        m_Texture: {fileID: 2800000, guid: b443728fc86061b4f8ecbe8a96c9d2ef, type: 3}
+        m_Scale: {x: 2.5, y: 2.5}
         m_Offset: {x: 0.5, y: 0.5}
     - unity_Lightmaps:
         m_Texture: {fileID: 0}
@@ -70,13 +70,13 @@ Material:
     - _Cloud_Cutoff: 4.01
     - _Cloud_Distance: 0.8
     - _Clouds_Far_Tiling: 0.352
-    - _Clouds_Opacity: 2.54
+    - _Clouds_Opacity: 0.12
     - _Clouds_Tiling: 0.12
     - _GradientColor1Influence: 0.6
     - _GradientColor2Influence: 0.5
     - _HorizonCloudsRotationSpeed: -0.1
     - _Horizon_Clouds_Height: 1.44
-    - _Horizon_Clouds_Opacity: 1
+    - _Horizon_Clouds_Opacity: 0.05
     - _Horizon_Clouds_X_Tile: 1
     - _Horizon_Clouds_Y_Tile: 3.17
     - _QueueControl: 0
@@ -92,12 +92,12 @@ Material:
     - _Stars_Y_Tile: 1
     - _SunMoonSize: 0.13
     m_Colors:
-    - _GradientColor1: {r: 0, g: 0.3529412, b: 0.54901963, a: 1}
+    - _GradientColor1: {r: -0.003921569, g: -0.003921569, b: -0.007843138, a: -1}
     - _GradientColor2: {r: 0, g: 0, b: 0, a: 1}
     - _GradientColor3: {r: 6.1592746, g: 6.7682424, b: 7.37721, a: 1}
-    - _MainLightForward: {r: -0.0835492, g: -0.992995, b: -0.08354923, a: 0}
-    - _MainLightRight: {r: 0.7071067, g: 0, b: -0.7071068, a: 0}
-    - _MainLightUp: {r: 0.70215356, g: -0.11815645, b: 0.70215344, a: 0}
+    - _MainLightForward: {r: -0.470038, g: -0.7470802, b: -0.47003803, a: 0}
+    - _MainLightRight: {r: 0.7071067, g: 0, b: -0.7071069, a: 0}
+    - _MainLightUp: {r: 0.52826554, g: -0.6647341, b: 0.5282655, a: 0}
     - _SunMoonColor: {r: 1, g: 1, b: 1, a: 0}
   m_BuildTextureStacks: []
   m_AllowLocking: 1
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Game/InventoryWindow/InventoryWindow.uss b/l2-unity/Assets/Resources/Data/UI/_Elements/Game/InventoryWindow/InventoryWindow.uss
index fa1143f7c..8f6efd68b 100644
--- a/l2-unity/Assets/Resources/Data/UI/_Elements/Game/InventoryWindow/InventoryWindow.uss
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Game/InventoryWindow/InventoryWindow.uss
@@ -25,8 +25,8 @@
     opacity: 1;
 }
 
-.inventory-window #unity-content-viewport {
-    margin: 0;
+.inventory-window .l2-scroll-view #unity-content-viewport {
+    margin-bottom: 0;
     padding: 0;
 }
 
@@ -209,51 +209,12 @@
     padding-top: 0;
     padding-bottom: 0;
     padding-left: 5px;
-    height: 36px;
+    height: 38px;
     flex-direction: row;
     flex-grow: 0;
     padding-right: 3px;
 }
 
-.inventory-tab-view-container {
-    flex-grow: 1;
-    flex-shrink: 0;
-    flex-direction: column;
-    padding-left: 0;
-    padding-top: 5px;
-    padding-right: 0;
-    padding-bottom: 0;
-}
-
-.inventory-tab-header-container {
-    flex-direction: row-reverse;
-    margin-left: 8px;
-    margin-bottom: -4px;
-}
-
-.inventory-tab-content-container {
-    flex-grow: 1;
-    flex-shrink: 0;
-    flex-direction: column-reverse;
-    background-image: resource('Data/UI/Assets/Tab/Tab_DF_bg');
-    -unity-slice-left: 10;
-    -unity-slice-top: 10;
-    -unity-slice-right: 10;
-    -unity-slice-bottom: 10;
-    padding-top: 7px;
-    padding-right: 4px;
-    padding-bottom: 8px;
-    padding-left: 6px;
-    margin-bottom: 0;
-}
-
-.inventory-tab-line {
-    flex-grow: 1;
-    margin-right: 5px;
-    background-image: resource('Data/UI/Assets/Tab/Tab_DF_Bg_line');
-    margin-bottom: -7px;
-}
-
 .inventory-button {
     width: 36px;
     height: 36px;
@@ -274,7 +235,7 @@
     margin-left: 0;
 }
 
-.item-statistics-container {
+.inventory-window .item-statistics-container {
     margin-top: 0;
     margin-right: 0;
     margin-bottom: 0;
@@ -289,7 +250,7 @@
     width: 165px;
 }
 
-.item-statistic-icons {
+.inventory-window .item-statistic-icons {
     flex-direction: column;
     margin-top: 0;
     margin-right: 0;
@@ -301,7 +262,7 @@
     left: 10px;
 }
 
-.item-statistic-icon {
+.inventory-window .item-statistic-icon {
     flex-grow: 1;
     width: 32px;
     height: 16px;
@@ -404,4 +365,43 @@
     top: 17px;
     left: auto;
     right: 30px;
+}
+
+.inventory-window .l2-tab-view {
+    flex-grow: 1;
+    flex-shrink: 0;
+    flex-direction: column;
+    padding-left: 0;
+    padding-top: 5px;
+    padding-right: 0;
+    padding-bottom: 0;
+}
+
+.inventory-window .l2-tab-view .tab-header-container {
+    flex-direction: row-reverse;
+    margin-left: 8px;
+    margin-bottom: -4px;
+}
+
+.inventory-window .l2-tab-view .tab-content-container {
+    flex-grow: 1;
+    flex-shrink: 0;
+    flex-direction: column-reverse;
+    background-image: resource('Data/UI/Assets/Tab/Tab_DF_bg');
+    -unity-slice-left: 10;
+    -unity-slice-top: 10;
+    -unity-slice-right: 10;
+    -unity-slice-bottom: 10;
+    padding-bottom: 5px;
+    padding-top: 3px;
+    padding-right: 3px;
+    padding-left: 3px;
+    margin-bottom: 0;
+}
+
+.inventory-window .l2-tab-view .tab-line {
+    flex-grow: 1;
+    margin-right: 5px;
+    background-image: resource('Data/UI/Assets/Tab/Tab_DF_Bg_line');
+    margin-bottom: -7px;
 }
\ No newline at end of file
diff --git a/l2-unity/Assets/Resources/Scenes/Game.unity b/l2-unity/Assets/Resources/Scenes/Game.unity
index 42f7088aa..cf5d0d810 100644
--- a/l2-unity/Assets/Resources/Scenes/Game.unity
+++ b/l2-unity/Assets/Resources/Scenes/Game.unity
@@ -358,6 +358,42 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!21 &330517806
+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!21 &364615026
 Material:
   serializedVersion: 8
@@ -1553,76 +1589,6 @@ Material:
     - _SpecColor: {r: 1, g: 1, b: 1, a: 1}
   m_BuildTextureStacks: []
   m_AllowLocking: 1
---- !u!21 &808033065
-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!21 &1002695749
 Material:
   serializedVersion: 8
@@ -1945,19 +1911,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7988497584237515198, guid: 824ee6870a432f9439e35ee4e771a1f5, type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.35244504
+      value: 0.37849987
       objectReference: {fileID: 0}
     - target: {fileID: 7988497584237515198, guid: 824ee6870a432f9439e35ee4e771a1f5, type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0.85401165
+      value: 0.84278774
       objectReference: {fileID: 0}
     - target: {fileID: 7988497584237515198, guid: 824ee6870a432f9439e35ee4e771a1f5, type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.14598753
+      value: 0.1567798
       objectReference: {fileID: 0}
     - target: {fileID: 7988497584237515198, guid: 824ee6870a432f9439e35ee4e771a1f5, type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0.35374326
+      value: -0.34909415
       objectReference: {fileID: 0}
     - target: {fileID: 7988497584237515198, guid: 824ee6870a432f9439e35ee4e771a1f5, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -2012,42 +1978,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 581901348}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!21 &1224487394
-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!21 &1241030459
 Material:
   serializedVersion: 8
@@ -2188,6 +2118,76 @@ Material:
     - _SpecColor: {r: 1, g: 1, b: 1, a: 1}
   m_BuildTextureStacks: []
   m_AllowLocking: 1
+--- !u!21 &1269605096
+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 &1376216260
 GameObject:
   m_ObjectHideFlags: 0
@@ -3684,6 +3684,10 @@ PrefabInstance:
       propertyPath: nameplateHeightMultiplier
       value: 1.95
       objectReference: {fileID: 0}
+    - target: {fileID: 7106220370365892636, guid: d5d2a11e1a77f80418a7d8b1ec2abd25, type: 3}
+      propertyPath: _tabs.Array.data[0]._mainTab
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 8310766140472177322, guid: d5d2a11e1a77f80418a7d8b1ec2abd25, type: 3}
       propertyPath: m_Name
       value: UI
diff --git a/l2-unity/Assets/Resources/Scenes/Menu.unity b/l2-unity/Assets/Resources/Scenes/Menu.unity
index 0f6484675..77bc29202 100644
--- a/l2-unity/Assets/Resources/Scenes/Menu.unity
+++ b/l2-unity/Assets/Resources/Scenes/Menu.unity
@@ -20,10 +20,10 @@ RenderSettings:
   m_FogDensity: 0.01
   m_LinearFogStart: 0
   m_LinearFogEnd: 300
-  m_AmbientSkyColor: {r: 0.4528302, g: 0.4528302, b: 0.4528302, a: 0.5}
+  m_AmbientSkyColor: {r: 0.30980393, g: 0.30980393, b: 0.30980393, a: 1}
   m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
   m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
-  m_AmbientIntensity: 0.5
+  m_AmbientIntensity: 0.2
   m_AmbientMode: 3
   m_SubtractiveShadowColor: {r: 1, g: 1, b: 1, a: 1}
   m_SkyboxMaterial: {fileID: 2100000, guid: 74e09fc0417b6f94c95b3a55ae362ec9, type: 2}
@@ -179,6 +179,42 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 2739411394283231357, guid: b8058b387f238e743a236dc7eb14218d, type: 3}
   m_PrefabInstance: {fileID: 3260462222721604201}
   m_PrefabAsset: {fileID: 0}
+--- !u!21 &330517806
+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 &348931029 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 2427567039544435291, guid: 61d17eba8ddc9de41a84d9649422a179, type: 3}
@@ -376,6 +412,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 842763773635486120, guid: 2bc6245aea0342f4f8c76719bfe12012, type: 3}
+      propertyPath: _loading
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 842763773635486120, guid: 2bc6245aea0342f4f8c76719bfe12012, type: 3}
       propertyPath: _autoLogin
       value: 0
@@ -1054,7 +1094,7 @@ PrefabInstance:
     - target: {fileID: 14083907825353274, guid: 8742fc349ac4f354d9cfb98ebb79a0e3, type: 3}
       propertyPath: 'm_Materials.Array.data[0]'
       value: 
-      objectReference: {fileID: 1207216659}
+      objectReference: {fileID: 330517806}
     - target: {fileID: 2134954596300280144, guid: 8742fc349ac4f354d9cfb98ebb79a0e3, type: 3}
       propertyPath: m_Name
       value: Height Fog Global
@@ -1194,42 +1234,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 2018473782570864008, guid: c62264f2126e2b54bb9750d4e55a9881, type: 3}
   m_PrefabInstance: {fileID: 818515487845165693}
   m_PrefabAsset: {fileID: 0}
---- !u!21 &1207216659
-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 &1212301096
 GameObject:
   m_ObjectHideFlags: 0
@@ -1342,6 +1346,76 @@ Transform:
   - {fileID: 138039827}
   m_Father: {fileID: 1212301097}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!21 &1269605096
+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 &1321409734 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 6756565227048195884, guid: fd5b2b8e2dd2048408abed0e14b6ae44, type: 3}
@@ -1694,76 +1768,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 5559910820536787365, guid: 5c47efce44fcc384ab6b0ba129efbe07, type: 3}
   m_PrefabInstance: {fileID: 2356643007352247247}
   m_PrefabAsset: {fileID: 0}
---- !u!21 &1833515765
-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 &1865913877 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 5887943604173410154, guid: 32ade5df81389284ea6b6ba1e9ff5e11, type: 3}
diff --git a/l2-unity/Assets/Scripts/UI/Game/Action/ActionWindow.cs b/l2-unity/Assets/Scripts/UI/Game/Action/ActionWindow.cs
index 485aef686..8604449d0 100644
--- a/l2-unity/Assets/Scripts/UI/Game/Action/ActionWindow.cs
+++ b/l2-unity/Assets/Scripts/UI/Game/Action/ActionWindow.cs
@@ -6,7 +6,6 @@
 public class ActionWindow : L2PopupWindow
 {
     private const int SLOTS_PER_ROW = 8;
-    private VisualTreeAsset _slotTemplate;
     private VisualElement _basicContainer;
     private VisualElement _partyContainer;
     private VisualElement _tokenContainer;
@@ -36,7 +35,6 @@ private void OnDestroy()
     protected override void LoadAssets()
     {
         _windowTemplate = LoadAsset("Data/UI/_Elements/Game/ActionWindow/ActionWindow");
-        _slotTemplate = LoadAsset("Data/UI/_Elements/Components/L2Slot/ActionSlot");
     }
 
     protected override void InitWindow(VisualElement root)
@@ -115,7 +113,7 @@ protected override IEnumerator BuildWindow(VisualElement root)
 
     private ActionSlot AddSlot(int position, VisualElement container)
     {
-        VisualElement slotElement = _slotTemplate.Instantiate()[0];
+        VisualElement slotElement = L2SlotManager.Instance.ActionSlotTemplate.Instantiate()[0];
         container.Add(slotElement);
 
         ActionSlot slot = new ActionSlot(slotElement, position, L2Slot.SlotType.Action);
diff --git a/l2-unity/Assets/Scripts/UI/Game/Chat/ChatTab.cs b/l2-unity/Assets/Scripts/UI/Game/Chat/ChatTab.cs
index ae78a4bda..8e5989c86 100644
--- a/l2-unity/Assets/Scripts/UI/Game/Chat/ChatTab.cs
+++ b/l2-unity/Assets/Scripts/UI/Game/Chat/ChatTab.cs
@@ -8,6 +8,7 @@ public class ChatTab : L2Tab
     [SerializeField] private List<L2MessageType> _filteredMessages;
     public List<L2MessageType> FilteredMessages { get { return _filteredMessages; } }
     private int _messageCount = 0;
+    private L2Scrollable _l2scrollable;
 
     private Label _content;
     public Label Content { get { return _content; } }
@@ -17,7 +18,10 @@ public override void Initialize(L2TabView tabView, VisualElement tabContainer, V
         base.Initialize(tabView, tabContainer, tabHeader);
         _content = tabContainer.Q<Label>("Content");
         _content.text = "";
-        _scrollStepSize = 12f;
+
+        _l2scrollable = new L2Scrollable();
+        _l2scrollable.Initialize(tabContainer, true);
+        _l2scrollable.ScrollStepSize = 12f;
     }
 
     public void AddMessage(string message)
@@ -44,9 +48,9 @@ private void ConcatMessage(string message)
             _messageCount = ChatWindow.MAXIMUM_MESSAGE_COUNT;
         }
 
-        if (_autoscroll)
+        if (_l2scrollable.AutoScroll)
         {
-            ChatWindow.Instance.ScrollDown(_scroller);
+            ChatWindow.Instance.ScrollDown(_l2scrollable.Scroller);
         }
     }
 
@@ -54,4 +58,6 @@ protected override void OnTabHeaderClicked()
     {
         base.OnTabHeaderClicked();
     }
+
+    //TODO: Disable autoscroll when manually scrolled, force scroll when window is resized
 }
diff --git a/l2-unity/Assets/Scripts/UI/Game/Chat/ChatWindow.cs b/l2-unity/Assets/Scripts/UI/Game/Chat/ChatWindow.cs
index 743146d50..5331bf7f6 100644
--- a/l2-unity/Assets/Scripts/UI/Game/Chat/ChatWindow.cs
+++ b/l2-unity/Assets/Scripts/UI/Game/Chat/ChatWindow.cs
@@ -105,7 +105,7 @@ private void CreateTabs()
         VisualElement chatTabView = GetElementById("ChatTabView");
 
         _l2TabView = new L2TabView();
-        _l2TabView.Initialize(chatTabView, _tabs, _tabTemplate, _tabHeaderTemplate);
+        _l2TabView.Initialize(chatTabView, _tabs, _tabTemplate, _tabHeaderTemplate, false);
     }
 
     void Update()
@@ -324,7 +324,6 @@ public void ScrollDown(Scroller scroller)
     IEnumerator ScrollDownWithDelay(Scroller scroller)
     {
         yield return new WaitForEndOfFrame();
-        //TODO: Handle this according to new L2Scrollable
-        // scroller.value = scroller.highValue > 0 ? scroller.highValue : 0;
+        scroller.value = scroller.highValue > 0 ? scroller.highValue : 0;
     }
 }
\ No newline at end of file
diff --git a/l2-unity/Assets/Scripts/UI/Game/Inventory/InventoryGearTab.cs b/l2-unity/Assets/Scripts/UI/Game/Inventory/InventoryGearTab.cs
index aa7ac6d80..bad75ef96 100644
--- a/l2-unity/Assets/Scripts/UI/Game/Inventory/InventoryGearTab.cs
+++ b/l2-unity/Assets/Scripts/UI/Game/Inventory/InventoryGearTab.cs
@@ -19,18 +19,18 @@ public override void Initialize(L2TabView tabView, VisualElement tabContainer, V
 
         _gearAnchors = new Dictionary<Paperdoll, VisualElement>
         {
-            { Paperdoll.HEAD, _windowEle.Q<VisualElement>("Helmet") },
-            { Paperdoll.GLOVES, _windowEle.Q<VisualElement>("Gloves") },
-            { Paperdoll.CHEST, _windowEle.Q<VisualElement>("Torso") },
-            { Paperdoll.FEET, _windowEle.Q<VisualElement>("Boots") },
-            { Paperdoll.LEGS, _windowEle.Q<VisualElement>("Legs") },
-            { Paperdoll.RHAND, _windowEle.Q<VisualElement>("Rhand") },
-            { Paperdoll.LHAND, _windowEle.Q<VisualElement>("Lhand") },
-            { Paperdoll.NECK, _windowEle.Q<VisualElement>("Neck") },
-            { Paperdoll.REAR, _windowEle.Q<VisualElement>("Rear") },
-            { Paperdoll.LEAR, _windowEle.Q<VisualElement>("Lear") },
-            { Paperdoll.RFINGER, _windowEle.Q<VisualElement>("Rring") },
-            { Paperdoll.LFINGER, _windowEle.Q<VisualElement>("Lring") }
+            { Paperdoll.HEAD, _tabContainer.Q<VisualElement>("Helmet") },
+            { Paperdoll.GLOVES, _tabContainer.Q<VisualElement>("Gloves") },
+            { Paperdoll.CHEST, _tabContainer.Q<VisualElement>("Torso") },
+            { Paperdoll.FEET, _tabContainer.Q<VisualElement>("Boots") },
+            { Paperdoll.LEGS, _tabContainer.Q<VisualElement>("Legs") },
+            { Paperdoll.RHAND, _tabContainer.Q<VisualElement>("Rhand") },
+            { Paperdoll.LHAND, _tabContainer.Q<VisualElement>("Lhand") },
+            { Paperdoll.NECK, _tabContainer.Q<VisualElement>("Neck") },
+            { Paperdoll.REAR, _tabContainer.Q<VisualElement>("Rear") },
+            { Paperdoll.LEAR, _tabContainer.Q<VisualElement>("Lear") },
+            { Paperdoll.RFINGER, _tabContainer.Q<VisualElement>("Rring") },
+            { Paperdoll.LFINGER, _tabContainer.Q<VisualElement>("Lring") }
         };
     }
 
@@ -66,7 +66,7 @@ public void UpdateItemList(List<ItemInstance> items)
             kvp.Value.Clear();
 
             // Create gear slots
-            VisualElement slotElement = InventoryWindow.Instance.InventorySlotTemplate.Instantiate()[0];
+            VisualElement slotElement = L2SlotManager.Instance.InventorySlotTemplate.Instantiate()[0];
             kvp.Value.Add(slotElement);
 
             GearSlot slot = new GearSlot((int)kvp.Key, slotElement, null, L2Slot.SlotType.Gear);
diff --git a/l2-unity/Assets/Scripts/UI/Game/Inventory/InventoryTab.cs b/l2-unity/Assets/Scripts/UI/Game/Inventory/InventoryTab.cs
index 0ece9858d..c834aa93e 100644
--- a/l2-unity/Assets/Scripts/UI/Game/Inventory/InventoryTab.cs
+++ b/l2-unity/Assets/Scripts/UI/Game/Inventory/InventoryTab.cs
@@ -9,8 +9,8 @@ public class InventoryTab : L2Tab
 
     private VisualElement _contentContainer;
     public List<ItemType1> _filteredCategories;
-    public bool MainTab { get; internal set; }
     private L2SlotContainer _slotContainer;
+    [SerializeField] private bool _mainTab;
 
     public override void Initialize(L2TabView tabView, VisualElement tabContainer, VisualElement tabHeader)
     {
@@ -18,12 +18,13 @@ public override void Initialize(L2TabView tabView, VisualElement tabContainer, V
 
         _contentContainer = tabContainer.Q<VisualElement>("Content");
         _slotContainer = new L2SlotContainer();
-        _slotContainer.Initialize(_contentContainer, 9, 8);
+        _slotContainer.Initialize(_contentContainer, 8, 9);
     }
 
     public void UpdateItemList(List<ItemInstance> items)
     {
-        _slotContainer.UpdateSlots(PlayerInventory.Instance.InventorySize, InventoryWindow.Instance.Expanded ? 12 : 9, 8);
+        L2Slot.SlotType slotType = _mainTab ? slotType = L2Slot.SlotType.Inventory : L2Slot.SlotType.InventoryBis;
+        _slotContainer.UpdateSlots(PlayerInventory.Instance.InventorySize, 8, InventoryWindow.Instance.Expanded ? 12 : 9, slotType);
 
         // _slotContainer.AssignItemsToSlots(items);
 
diff --git a/l2-unity/Assets/Scripts/UI/Game/Inventory/InventoryWindow.cs b/l2-unity/Assets/Scripts/UI/Game/Inventory/InventoryWindow.cs
index ad0ae692a..63a10dec6 100644
--- a/l2-unity/Assets/Scripts/UI/Game/Inventory/InventoryWindow.cs
+++ b/l2-unity/Assets/Scripts/UI/Game/Inventory/InventoryWindow.cs
@@ -9,11 +9,9 @@ public class InventoryWindow : L2PopupWindow
 {
     private VisualTreeAsset _tabTemplate;
     private VisualTreeAsset _tabHeaderTemplate;
-    private VisualTreeAsset _inventorySlotTemplate;
     private VisualTreeAsset _minimizedTemplate;
     private VisualElement _inventoryTabView;
     private VisualElement _minimizedInventoryBtn;
-    private InventoryTab _activeTab;
 
     private MouseOverDetectionManipulator _minimizedInventoryMouseOverManipulator;
     private DragManipulator _minimizedInventoryDragManipulator;
@@ -39,7 +37,6 @@ public class InventoryWindow : L2PopupWindow
     private VisualElement _weightBarBg;
     private L2TabView _l2TabView;
 
-    public VisualTreeAsset InventorySlotTemplate { get { return _inventorySlotTemplate; } }
     public bool Expanded { get { return _expanded; } }
     public int UsedSlots { get { return _usedSlots; } }
 
@@ -88,7 +85,6 @@ protected override void LoadAssets()
         _windowTemplate = LoadAsset("Data/UI/_Elements/Game/InventoryWindow/InventoryWindow");
         _tabTemplate = LoadAsset("Data/UI/_Elements/Game/InventoryWindow/InventoryTab");
         _tabHeaderTemplate = LoadAsset("Data/UI/_Elements/Game/InventoryWindow/InventoryTabHeader");
-        _inventorySlotTemplate = LoadAsset("Data/UI/_Elements/Components/L2Slot/InventorySlot");
         _minimizedTemplate = LoadAsset("Data/UI/_Elements/Game/InventoryWindow/InventoryMin");
     }
 
@@ -240,12 +236,11 @@ private void CreateTabs()
         _inventoryTabView = GetElementById("InventoryTabView");
 
         _l2TabView = new L2TabView();
-        _l2TabView.Initialize(_inventoryTabView, _tabs, _tabTemplate, _tabHeaderTemplate);
-
-        _tabs[0].MainTab = true;
+        _l2TabView.Initialize(_inventoryTabView, _tabs, _tabTemplate, _tabHeaderTemplate, true);
 
+        VisualElement gearTabElement = GetElementById("GearContent");
         _gearTab = new InventoryGearTab();
-        _gearTab.Initialize(null, null, null);
+        _gearTab.Initialize(null, gearTabElement, null);
     }
 
 
diff --git a/l2-unity/Assets/Scripts/UI/Game/Shop/ShopTab.cs b/l2-unity/Assets/Scripts/UI/Game/Shop/ShopTab.cs
index 0bebdc4e6..6ec7a597d 100644
--- a/l2-unity/Assets/Scripts/UI/Game/Shop/ShopTab.cs
+++ b/l2-unity/Assets/Scripts/UI/Game/Shop/ShopTab.cs
@@ -29,7 +29,7 @@ public enum ShopTabType
 
     public override void Initialize(L2TabView tabView, VisualElement tabContainer, VisualElement tabHeader)
     {
-        base.Initialize(tabView, tabContainer, tabHeader, true);
+        base.Initialize(tabView, tabContainer, tabHeader);
 
         _containerLeft = tabContainer.Q<VisualElement>("ContainerInnerLeft");
         _containerRight = tabContainer.Q<VisualElement>("ContainerInnerRight");
@@ -62,8 +62,8 @@ public override void Initialize(L2TabView tabView, VisualElement tabContainer, V
 
     public void UpdateItemList()
     {
-        _slotContainers[0].UpdateSlots(42);
-        _slotContainers[1].UpdateSlots(42);
+        _slotContainers[0].UpdateSlots(42, L2Slot.SlotType.InventoryBis);
+        _slotContainers[1].UpdateSlots(42, L2Slot.SlotType.InventoryBis);
 
         if (_shopTabType == ShopTabType.SELL)
         {
diff --git a/l2-unity/Assets/Scripts/UI/Game/Shop/ShopWindow.cs b/l2-unity/Assets/Scripts/UI/Game/Shop/ShopWindow.cs
index 333e2b6e5..38722c0ba 100644
--- a/l2-unity/Assets/Scripts/UI/Game/Shop/ShopWindow.cs
+++ b/l2-unity/Assets/Scripts/UI/Game/Shop/ShopWindow.cs
@@ -9,7 +9,6 @@ public class ShopWindow : L2PopupWindow
 {
     private VisualTreeAsset _tabTemplate;
     private VisualTreeAsset _tabHeaderTemplate;
-    private VisualTreeAsset _shopSlotTemplate;
     private L2TabView _l2TabView;
 
     [SerializeField] private ShopTab[] _tabs;
@@ -22,9 +21,6 @@ public class ShopWindow : L2PopupWindow
     private VisualElement _weightBar;
     private VisualElement _weightBarBg;
 
-    public VisualTreeAsset ShopSlotTemplate { get { return _shopSlotTemplate; } }
-    public int UsedSlots { get { return _usedSlots; } }
-
     private static ShopWindow _instance;
     public static ShopWindow Instance
     {
@@ -41,23 +37,6 @@ private void Awake()
         {
             Destroy(this);
         }
-
-        // ItemTable.Instance.Initialize();
-        // ItemNameTable.Instance.Initialize();
-        // ItemStatDataTable.Instance.Initialize();
-        // ArmorgrpTable.Instance.Initialize();
-        // EtcItemgrpTable.Instance.Initialize();
-        // WeapongrpTable.Instance.Initialize();
-        // ItemTable.Instance.CacheItems();
-        // NpcgrpTable.Instance.Initialize();
-        // NpcNameTable.Instance.Initialize();
-        // ActionNameTable.Instance.Initialize();
-        // SysStringTable.Instance.Initialize();
-        // SkillNameTable.Instance.Initialize();
-        // SkillgrpTable.Instance.Initialize();
-        // SystemMessageTable.Instance.Initialize();
-        // IconTable.Instance.Initialize();
-        // KeyImageTable.Instance.Initialize();
     }
 
     private void OnDestroy()
@@ -70,7 +49,6 @@ protected override void LoadAssets()
         _windowTemplate = LoadAsset("Data/UI/_Elements/Game/ShopWindow/ShopWindow");
         _tabTemplate = LoadAsset("Data/UI/_Elements/Game/ShopWindow/ShopTab");
         _tabHeaderTemplate = LoadAsset("Data/UI/_Elements/Game/ShopWindow/ShopTabHeader");
-        _shopSlotTemplate = LoadAsset("Data/UI/_Elements/Components/L2Slot/InventorySlot");
     }
 
     protected override void InitWindow(VisualElement root)
@@ -104,10 +82,6 @@ protected override IEnumerator BuildWindow(VisualElement root)
 
         UpdateItemList();
 
-#if UNITY_EDITOR
-        // DebugData();
-#endif
-
         L2GameUI.Instance.WindowLoadComplete();
     }
 
@@ -116,7 +90,7 @@ private void CreateTabs()
         VisualElement shopTabView = GetElementById("ShopTabView");
 
         _l2TabView = new L2TabView();
-        _l2TabView.Initialize(shopTabView, _tabs, _tabTemplate, _tabHeaderTemplate);
+        _l2TabView.Initialize(shopTabView, _tabs, _tabTemplate, _tabHeaderTemplate, true);
     }
 
 
@@ -156,11 +130,4 @@ public override void HideWindow(bool silent)
 
         L2GameUI.Instance.WindowClosed(this);
     }
-
-#if UNITY_EDITOR
-    public void DebugData()
-    {
-
-    }
-#endif
 }
diff --git a/l2-unity/Assets/Scripts/UI/L2Scrollable.cs b/l2-unity/Assets/Scripts/UI/L2Scrollable.cs
index a71e5995e..15a89e9d4 100644
--- a/l2-unity/Assets/Scripts/UI/L2Scrollable.cs
+++ b/l2-unity/Assets/Scripts/UI/L2Scrollable.cs
@@ -1,19 +1,23 @@
 using UnityEngine;
 using UnityEngine.UIElements;
 
-public abstract class L2Scrollable
+public class L2Scrollable
 {
     protected ScrollView _scrollView;
     protected Scroller _scroller;
     protected VisualElement _container;
     public Scroller Scroller { get { return _scroller; } }
     protected float _scrollStepSize = 22f;
+    public float ScrollStepSize { get { return _scrollStepSize; } set { _scrollStepSize = value; } }
     private bool _autoscroll;
+    public bool AutoScroll { get { return _autoscroll; } set { _autoscroll = value; } }
 
     public virtual void Initialize(VisualElement container, bool autoscroll)
     {
         _container = container;
         _autoscroll = autoscroll;
+
+        Debug.LogWarning("Initialize scrollable from Element " + container);
         InitScroller();
     }
 
diff --git a/l2-unity/Assets/Scripts/UI/L2SlotContainer.cs b/l2-unity/Assets/Scripts/UI/L2SlotContainer.cs
index cd50f2005..cf25cb219 100644
--- a/l2-unity/Assets/Scripts/UI/L2SlotContainer.cs
+++ b/l2-unity/Assets/Scripts/UI/L2SlotContainer.cs
@@ -31,8 +31,8 @@ private void ClearSlots()
         {
             foreach (InventorySlot slot in _slots)
             {
-                slot.UnregisterClickableCallback();
-                slot.ClearManipulators();
+                slot?.UnregisterClickableCallback();
+                slot?.ClearManipulators();
             }
         }
 
@@ -54,7 +54,7 @@ private void PadSlots(int slotCount)
 
         for (int i = 0; i < padSlot; i++)
         {
-            VisualElement slotElement = ShopWindow.Instance.ShopSlotTemplate.Instantiate()[0];
+            VisualElement slotElement = L2SlotManager.Instance.InventorySlotTemplate.Instantiate()[0];
             slotElement.AddToClassList("inventory-slot");
             slotElement.AddToClassList("disabled");
             _slotContainerElement.Add(slotElement);
@@ -79,36 +79,40 @@ public void SelectSlot(int slotPosition)
         _currentSelectedSlotId = slotPosition;
     }
 
-    public void UpdateSlots(int slotCount, int colLenght, int rowLength)
+    public void UpdateSlots(int slotCount, int colLenght, int rowLength, L2Slot.SlotType slotType)
     {
         _colLength = colLenght;
         _rowLength = rowLength;
-        UpdateSlots(slotCount, colLenght, rowLength);
+        UpdateSlots(slotCount, slotType);
     }
 
-    public void UpdateSlots(int slotCount)
+    public void UpdateSlots(int slotCount, L2Slot.SlotType slotType)
     {
         ClearSlots();
 
         // Create empty slots
         _slots = new L2Slot[slotCount];
 
-        CreateSlotElements(slotCount);
+        CreateSlotElements(slotCount, slotType);
 
         PadSlots(slotCount);
 
         SelectDefaultSlot();
     }
 
-    public virtual void CreateSlotElements(int slotCount)
+    public virtual void CreateSlotElements(int slotCount, L2Slot.SlotType slotType)
     {
-        L2Slot.SlotType slotType = L2Slot.SlotType.Inventory;
         for (int i = 0; i < slotCount; i++)
         {
-            VisualElement slotElement = ShopWindow.Instance.ShopSlotTemplate.Instantiate()[0];
+            VisualElement slotElement = L2SlotManager.Instance.InventorySlotTemplate.Instantiate()[0];
             _slotContainerElement.Add(slotElement);
+            L2Slot slot = null;
+
+            if (slotType == L2Slot.SlotType.Inventory || slotType == L2Slot.SlotType.InventoryBis)
+            {
+                slot = new InventorySlot(i, slotElement, this, slotType);
+            }
 
-            L2Slot slot = new InventorySlot(i, slotElement, this, slotType);
             _slots[i] = slot;
         }
     }
diff --git a/l2-unity/Assets/Scripts/UI/L2SlotManager.cs b/l2-unity/Assets/Scripts/UI/L2SlotManager.cs
index 94537a49b..15c7c5f6d 100644
--- a/l2-unity/Assets/Scripts/UI/L2SlotManager.cs
+++ b/l2-unity/Assets/Scripts/UI/L2SlotManager.cs
@@ -8,6 +8,12 @@ public class L2SlotManager : L2PopupWindow
     [SerializeField] private L2Slot _draggedSlot;
     [SerializeField] private L2Slot _hoverSlot;
     private L2Slot _dragSlotData;
+    private VisualTreeAsset _actionSlotTemplate;
+    private VisualTreeAsset _inventorySlotTemplate;
+    private VisualTreeAsset _shopSlotTemplate;
+    public VisualTreeAsset ActionSlotTemplate { get { return _actionSlotTemplate; } }
+    public VisualTreeAsset InventorySlotTemplate { get { return _inventorySlotTemplate; } }
+    public VisualTreeAsset ShopSlotTemplate { get { return _shopSlotTemplate; } }
 
     private static L2SlotManager _instance;
     public static L2SlotManager Instance { get { return _instance; } }
@@ -32,6 +38,9 @@ private void OnDestroy()
     protected override void LoadAssets()
     {
         _windowTemplate = LoadAsset("Data/UI/_Elements/Components/L2Slot/DraggedSlot");
+        _inventorySlotTemplate = LoadAsset("Data/UI/_Elements/Components/L2Slot/InventorySlot");
+        _actionSlotTemplate = LoadAsset("Data/UI/_Elements/Components/L2Slot/ActionSlot");
+        _shopSlotTemplate = LoadAsset("Data/UI/_Elements/Components/L2Slot/InventorySlot");
     }
 
     protected override IEnumerator BuildWindow(VisualElement root)
diff --git a/l2-unity/Assets/Scripts/UI/L2Tab.cs b/l2-unity/Assets/Scripts/UI/L2Tab.cs
index 481c97b34..019ae5489 100644
--- a/l2-unity/Assets/Scripts/UI/L2Tab.cs
+++ b/l2-unity/Assets/Scripts/UI/L2Tab.cs
@@ -2,11 +2,11 @@
 using UnityEngine.UIElements;
 
 [System.Serializable]
-public abstract class L2Tab : L2Scrollable
+public abstract class L2Tab
 {
     [SerializeField] string _tabName = "Tab";
     [SerializeField] protected bool _autoscroll = true;
-    private VisualElement _tabContainer;
+    protected VisualElement _tabContainer;
     private VisualElement _tabHeader;
     protected VisualElement _windowEle;
     public string TabName { get { return _tabName; } }
@@ -14,13 +14,8 @@ public abstract class L2Tab : L2Scrollable
     public VisualElement TabHeader { get { return _tabHeader; } }
     private L2TabView _tabView;
 
-    public virtual void Initialize(L2TabView tabView, VisualElement tabContainer, VisualElement tabHeader, bool hasScrollView)
+    public virtual void Initialize(L2TabView tabView, VisualElement tabContainer, VisualElement tabHeader)
     {
-        if (hasScrollView)
-        {
-            base.Initialize(tabContainer, true);
-        }
-
         _tabContainer = tabContainer;
         _tabHeader = tabHeader;
         _tabView = tabView;
@@ -28,11 +23,6 @@ public virtual void Initialize(L2TabView tabView, VisualElement tabContainer, Vi
         InitTabHeader();
     }
 
-    public virtual void Initialize(L2TabView tabView, VisualElement tabContainer, VisualElement tabHeader)
-    {
-        Initialize(tabView, tabContainer, tabHeader, false);
-    }
-
     private void InitTabHeader()
     {
         _tabHeader?.AddManipulator(new ButtonClickSoundManipulator(_tabHeader));
@@ -42,7 +32,6 @@ private void InitTabHeader()
         }, TrickleDown.TrickleDown);
     }
 
-
     protected virtual void OnTabHeaderClicked()
     {
         _tabView.SwitchTab(this);
diff --git a/l2-unity/Assets/Scripts/UI/L2TabView.cs b/l2-unity/Assets/Scripts/UI/L2TabView.cs
index 2a8da21d6..a7eef40e9 100644
--- a/l2-unity/Assets/Scripts/UI/L2TabView.cs
+++ b/l2-unity/Assets/Scripts/UI/L2TabView.cs
@@ -11,17 +11,17 @@ public class L2TabView
     private VisualTreeAsset _tabHeaderTemplate;
     private L2Tab _activeTab;
 
-    public void Initialize(VisualElement tabViewElement, L2Tab[] tabs, VisualTreeAsset tabTemplate, VisualTreeAsset tabHeaderTemplate)
+    public void Initialize(VisualElement tabViewElement, L2Tab[] tabs, VisualTreeAsset tabTemplate, VisualTreeAsset tabHeaderTemplate, bool reverseOrder)
     {
         _tabViewElement = tabViewElement;
         _tabs = tabs;
         _tabTemplate = tabTemplate;
         _tabHeaderTemplate = tabHeaderTemplate;
 
-        CreateTabs();
+        CreateTabs(reverseOrder);
     }
 
-    private void CreateTabs()
+    private void CreateTabs(bool reverseOrder)
     {
         VisualElement tabHeaderContainer = _tabViewElement.Q<VisualElement>("tab-header-container");
         if (tabHeaderContainer == null)
@@ -37,24 +37,26 @@ private void CreateTabs()
 
         for (int i = 0; i < _tabs.Length; i++)
         {
+            L2Tab tab = reverseOrder ? _tabs[_tabs.Length - 1 - i] : _tabs[i];
+
             VisualElement tabElement = _tabTemplate.CloneTree()[0];
             // tabElement.name = _tabs[i].TabName;
-            tabElement.name = _tabs[i].TabName;
+            tabElement.name = tab.TabName;
             tabElement.AddToClassList("unselected-tab");
 
             VisualElement tabHeaderElement = _tabHeaderTemplate.CloneTree()[0];
-            tabHeaderElement.name = _tabs[i].TabName;
-            tabHeaderElement.Q<Label>().text = _tabs[i].TabName;
+            tabHeaderElement.name = tab.TabName;
+            tabHeaderElement.Q<Label>().text = tab.TabName;
 
             tabHeaderContainer.Add(tabHeaderElement);
             tabContainer.Add(tabElement);
 
-            _tabs[i].Initialize(this, tabElement, tabHeaderElement);
+            tab.Initialize(this, tabElement, tabHeaderElement);
         }
 
         if (_tabs.Length > 0)
         {
-            SwitchTab(_tabs[0]);
+            SwitchTab(_tabs[reverseOrder ? _tabs.Length - 1 : 0]);
         }
     }