diff --git a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml
index 4f64435d42..4007a99487 100644
--- a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml
+++ b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml
@@ -1,13 +1,13 @@
-<BoxContainer Orientation="Vertical"
-    xmlns="https://spacestation14.io">
-    <Control CustomMinimumSize="0 5" />
+<BoxContainer xmlns="https://spacestation14.io"
+              Orientation="Vertical">
+    <Control MinSize="0 5" />
     <BoxContainer Orientation="Horizontal">
         <!-- <Label Text="{Loc Search}" CustomMinimumSize="100 0" /> -->
         <!-- <Control CustomMinimumSize="50 0" /> -->
-        <LineEdit Name="FilterLineEdit" CustomMinimumSize="100 0" SizeFlagsHorizontal="FillExpand" PlaceHolder="{Loc Filter}"/>
+        <LineEdit Name="FilterLineEdit" MinSize="100 0" SizeFlagsHorizontal="FillExpand" PlaceHolder="{Loc Filter}"/>
     </BoxContainer>
     <!-- <Control CustomMinimumSize="0 5" /> -->
     <ItemList
         Name="PlayerItemList" SelectMode="Single" SizeFlagsVertical="FillExpand" SizeFlagsHorizontal="FillExpand"
-        CustomMinimumSize="100 100" />
+        MinSize="100 100" />
 </BoxContainer>
diff --git a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs
index fa1dfeb613..9877433289 100644
--- a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs
+++ b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs
@@ -10,7 +10,7 @@ using Robust.Shared.Players;
 namespace Content.Client.Administration.UI.CustomControls
 {
     [GenerateTypedNameReferences]
-    public partial class PlayerListControl : VBoxContainer
+    public partial class PlayerListControl : BoxContainer
     {
         private List<ICommonSession>? _data;
 
diff --git a/Content.Client/CharacterInfo/Components/CharacterInfoComponent.cs b/Content.Client/CharacterInfo/Components/CharacterInfoComponent.cs
index ce4f536335..fd0c1d5463 100644
--- a/Content.Client/CharacterInfo/Components/CharacterInfoComponent.cs
+++ b/Content.Client/CharacterInfo/Components/CharacterInfoComponent.cs
@@ -56,7 +56,7 @@ namespace Content.Client.CharacterInfo.Components
             }
         }
 
-        private sealed class CharacterInfoControl : VBoxContainer
+        private sealed class CharacterInfoControl : BoxContainer
         {
             public SpriteView SpriteView { get; }
             public Label NameLabel { get; }
@@ -68,6 +68,8 @@ namespace Content.Client.CharacterInfo.Components
             {
                 IoCManager.InjectDependencies(this);
 
+                Orientation = LayoutOrientation.Vertical;
+
                 AddChild(new BoxContainer
                 {
                     Orientation = LayoutOrientation.Horizontal,
diff --git a/Content.Client/Chemistry/UI/TransferAmountWindow.xaml b/Content.Client/Chemistry/UI/TransferAmountWindow.xaml
index 50716c563c..63affa73b1 100644
--- a/Content.Client/Chemistry/UI/TransferAmountWindow.xaml
+++ b/Content.Client/Chemistry/UI/TransferAmountWindow.xaml
@@ -2,10 +2,10 @@
             Title="{Loc 'ui-transfer-amount-title'}"
             Resizable="False">
 
-    <VBoxContainer SeparationOverride="4" CustomMinimumSize="240 80">
-        <HBoxContainer>
+    <BoxContainer Orientation="Vertical" SeparationOverride="4" MinSize="240 80">
+        <BoxContainer Orientation="Horizontal">
             <LineEdit Name="AmountLineEdit" HorizontalExpand="True" PlaceHolder="{Loc 'ui-transfer-amount-line-edit-placeholder'}"/>
-        </HBoxContainer>
+        </BoxContainer>
         <Button Name="ApplyButton" Text="{Loc 'ui-transfer-amount-apply'}"/>
-    </VBoxContainer>
+    </BoxContainer>
 </SS14Window>
diff --git a/Content.Client/DoAfter/UI/DoAfterGui.cs b/Content.Client/DoAfter/UI/DoAfterGui.cs
index 1a2c91b952..2e6a5076c9 100644
--- a/Content.Client/DoAfter/UI/DoAfterGui.cs
+++ b/Content.Client/DoAfter/UI/DoAfterGui.cs
@@ -15,7 +15,7 @@ using Robust.Shared.Utility;
 
 namespace Content.Client.DoAfter.UI
 {
-    public sealed class DoAfterGui : VBoxContainer
+    public sealed class DoAfterGui : BoxContainer
     {
         [Dependency] private readonly IEntityManager _entityManager = default!;
         [Dependency] private readonly IEyeManager _eyeManager = default!;
@@ -32,6 +32,8 @@ namespace Content.Client.DoAfter.UI
 
         public DoAfterGui()
         {
+            Orientation = LayoutOrientation.Vertical;
+
             IoCManager.InjectDependencies(this);
             IoCManager.Resolve<IUserInterfaceManager>().StateRoot.AddChild(this);
             SeparationOverride = 0;
diff --git a/Content.Client/Ghost/Roles/UI/GhostRolesEntry.xaml b/Content.Client/Ghost/Roles/UI/GhostRolesEntry.xaml
index 04e50e46df..b9bd85e06d 100644
--- a/Content.Client/Ghost/Roles/UI/GhostRolesEntry.xaml
+++ b/Content.Client/Ghost/Roles/UI/GhostRolesEntry.xaml
@@ -1,6 +1,5 @@
-<BoxContainer Orientation="Vertical"
-    xmlns="https://spacestation14.io">
-
+<BoxContainer xmlns="https://spacestation14.io"
+              Orientation="Vertical">
     <RichTextLabel Name="Title" />
     <BoxContainer Orientation="Horizontal" SeparationOverride="10">
         <RichTextLabel Name="Description" HorizontalExpand="True" />
diff --git a/Content.Client/Ghost/Roles/UI/GhostRolesEntry.xaml.cs b/Content.Client/Ghost/Roles/UI/GhostRolesEntry.xaml.cs
index 6f3d255158..1c9f128ae7 100644
--- a/Content.Client/Ghost/Roles/UI/GhostRolesEntry.xaml.cs
+++ b/Content.Client/Ghost/Roles/UI/GhostRolesEntry.xaml.cs
@@ -7,7 +7,7 @@ using Robust.Client.UserInterface.XAML;
 namespace Content.Client.Ghost.Roles.UI
 {
     [GenerateTypedNameReferences]
-    public partial class GhostRolesEntry : VBoxContainer
+    public partial class GhostRolesEntry : BoxContainer
     {
         public GhostRolesEntry(GhostRoleInfo info, Action<BaseButton.ButtonEventArgs> requestAction)
         {
diff --git a/Content.Client/HealthOverlay/UI/HealthOverlayGui.cs b/Content.Client/HealthOverlay/UI/HealthOverlayGui.cs
index 4c0a157345..a4892d3dee 100644
--- a/Content.Client/HealthOverlay/UI/HealthOverlayGui.cs
+++ b/Content.Client/HealthOverlay/UI/HealthOverlayGui.cs
@@ -12,7 +12,7 @@ using Robust.Shared.Timing;
 
 namespace Content.Client.HealthOverlay.UI
 {
-    public class HealthOverlayGui : VBoxContainer
+    public class HealthOverlayGui : BoxContainer
     {
         [Dependency] private readonly IEyeManager _eyeManager = default!;
 
@@ -21,6 +21,7 @@ namespace Content.Client.HealthOverlay.UI
             IoCManager.InjectDependencies(this);
             IoCManager.Resolve<IUserInterfaceManager>().StateRoot.AddChild(this);
             SeparationOverride = 0;
+            Orientation = LayoutOrientation.Vertical;
 
             CritBar = new HealthOverlayBar
             {
diff --git a/Content.Client/Info/ServerInfo.cs b/Content.Client/Info/ServerInfo.cs
index 6cce59c2e8..75e39467b7 100644
--- a/Content.Client/Info/ServerInfo.cs
+++ b/Content.Client/Info/ServerInfo.cs
@@ -9,12 +9,14 @@ using Robust.Shared.Utility;
 
 namespace Content.Client.Info
 {
-    public class ServerInfo : VBoxContainer
+    public class ServerInfo : BoxContainer
     {
         private readonly RichTextLabel _richTextLabel;
 
         public ServerInfo()
         {
+            Orientation = LayoutOrientation.Vertical;
+
             _richTextLabel = new RichTextLabel
             {
                 VerticalExpand = true
diff --git a/Content.Client/Storage/ClientStorageComponent.cs b/Content.Client/Storage/ClientStorageComponent.cs
index 72df6c226f..b614ccb8c0 100644
--- a/Content.Client/Storage/ClientStorageComponent.cs
+++ b/Content.Client/Storage/ClientStorageComponent.cs
@@ -158,7 +158,6 @@ namespace Content.Client.Storage
 
         private void ChangeStorageVisualization(SharedBagState state)
         {
-           
             if (Owner.TryGetComponent<AppearanceComponent>(out var appearanceComponent))
             {
                 appearanceComponent.SetData(SharedBagOpenVisuals.BagState, state);
@@ -200,8 +199,9 @@ namespace Content.Client.Storage
             entity.TryGetComponent(out ISpriteComponent? sprite);
             entity.TryGetComponent(out ItemComponent? item);
 
-            button.AddChild(new HBoxContainer
+            button.AddChild(new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 SeparationOverride = 2,
                 Children =
                 {
diff --git a/Content.Client/Stylesheets/StyleNano.cs b/Content.Client/Stylesheets/StyleNano.cs
index 103205b6dc..def72ccdb9 100644
--- a/Content.Client/Stylesheets/StyleNano.cs
+++ b/Content.Client/Stylesheets/StyleNano.cs
@@ -647,7 +647,7 @@ namespace Content.Client.Stylesheets
                     new StyleProperty(TextureRect.StylePropertyTexture, checkBoxTextureChecked),
                 }),
 
-                new StyleRule(new SelectorElement(typeof(HBoxContainer), new [] { CheckBox.StyleClassCheckBox }, null, null), new[]
+                new StyleRule(new SelectorElement(typeof(BoxContainer), new [] { CheckBox.StyleClassCheckBox }, null, null), new[]
                 {
                     new StyleProperty(BoxContainer.StylePropertySeparation, 10),
                 }),
diff --git a/Content.Client/Targeting/TargetingDoll.cs b/Content.Client/Targeting/TargetingDoll.cs
index 884c12dd80..15d9ac0a95 100644
--- a/Content.Client/Targeting/TargetingDoll.cs
+++ b/Content.Client/Targeting/TargetingDoll.cs
@@ -6,7 +6,7 @@ using Robust.Client.UserInterface.Controls;
 
 namespace Content.Client.Targeting
 {
-    public sealed class TargetingDoll : VBoxContainer
+    public sealed class TargetingDoll : BoxContainer
     {
         private TargetingZone _activeZone = TargetingZone.Middle;
         public const string StyleClassTargetDollZone = "target-doll-zone";
@@ -40,6 +40,8 @@ namespace Content.Client.Targeting
 
         public TargetingDoll(IResourceCache resourceCache)
         {
+            Orientation = LayoutOrientation.Vertical;
+
             _buttonHigh = new TextureButton
             {
                 TextureNormal = resourceCache.GetTexture(TextureHigh),