diff --git a/Content.Client/Arcade/BlockGameMenu.cs b/Content.Client/Arcade/BlockGameMenu.cs
index 040f398fdb..a6ae907cfc 100644
--- a/Content.Client/Arcade/BlockGameMenu.cs
+++ b/Content.Client/Arcade/BlockGameMenu.cs
@@ -59,6 +59,8 @@ namespace Content.Client.Arcade
             Title = Loc.GetString("Nanotrasen Block Game");
             _owner = owner;
 
+            MinSize = SetSize = (410, 490);
+
             var resourceCache = IoCManager.Resolve<IResourceCache>();
             var backgroundTexture = resourceCache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png");
 
diff --git a/Content.Client/Arcade/SpaceVillainArcadeMenu.cs b/Content.Client/Arcade/SpaceVillainArcadeMenu.cs
index 588b8f4f8c..8d4a281fc0 100644
--- a/Content.Client/Arcade/SpaceVillainArcadeMenu.cs
+++ b/Content.Client/Arcade/SpaceVillainArcadeMenu.cs
@@ -20,7 +20,7 @@ namespace Content.Client.Arcade
         private readonly Button[] _gameButtons = new Button[3]; //used to disable/enable all game buttons
         public SpaceVillainArcadeMenu(SpaceVillainArcadeBoundUserInterface owner)
         {
-            MinSize = SetSize = (400, 200);
+            MinSize = SetSize = (300, 225);
             Title = Loc.GetString("Space Villain");
             Owner = owner;
 
@@ -68,9 +68,7 @@ namespace Content.Client.Arcade
                 {Text = Loc.GetString("New Game")};
             grid.AddChild(newGame);
 
-            centerContainer = new CenterContainer();
-            centerContainer.AddChild(grid);
-            Contents.AddChild(centerContainer);
+            Contents.AddChild(grid);
         }
 
         private void UpdateMetadata(SharedSpaceVillainArcadeComponent.SpaceVillainArcadeMetaDataUpdateMessage message)
diff --git a/Content.Client/GameObjects/Components/Access/IdCardConsoleWindow.cs b/Content.Client/GameObjects/Components/Access/IdCardConsoleWindow.cs
index 9c6e68bf5e..defd81efe1 100644
--- a/Content.Client/GameObjects/Components/Access/IdCardConsoleWindow.cs
+++ b/Content.Client/GameObjects/Components/Access/IdCardConsoleWindow.cs
@@ -36,7 +36,7 @@ namespace Content.Client.GameObjects.Components.Access
 
         public IdCardConsoleWindow(IdCardConsoleBoundUserInterface owner, IPrototypeManager prototypeManager)
         {
-            MinSize = SetSize = (650, 270);
+            MinSize = SetSize = (650, 290);
             _owner = owner;
             var vBox = new VBoxContainer();
 
diff --git a/Content.Client/GameObjects/Components/Atmos/GasCanisterWindow.cs b/Content.Client/GameObjects/Components/Atmos/GasCanisterWindow.cs
index 7c5ed69956..c75d4d2d33 100644
--- a/Content.Client/GameObjects/Components/Atmos/GasCanisterWindow.cs
+++ b/Content.Client/GameObjects/Components/Atmos/GasCanisterWindow.cs
@@ -33,7 +33,7 @@ namespace Content.Client.GameObjects.Components.Atmos
 
         public GasCanisterWindow()
         {
-            SetSize = MinSize = (300, 200);
+            SetSize = MinSize = (450, 200);
             HBoxContainer releasePressureButtons;
 
             Contents.AddChild(new VBoxContainer
diff --git a/Content.Client/GameObjects/Components/Chemistry/ChemMaster/ChemMasterWindow.cs b/Content.Client/GameObjects/Components/Chemistry/ChemMaster/ChemMasterWindow.cs
index b88537ef2b..43b2ccbb0e 100644
--- a/Content.Client/GameObjects/Components/Chemistry/ChemMaster/ChemMasterWindow.cs
+++ b/Content.Client/GameObjects/Components/Chemistry/ChemMaster/ChemMasterWindow.cs
@@ -54,7 +54,7 @@ namespace Content.Client.GameObjects.Components.Chemistry.ChemMaster
         /// </summary>
         public ChemMasterWindow()
         {
-            MinSize = SetSize = (400, 200);
+            MinSize = SetSize = (400, 525);
             IoCManager.InjectDependencies(this);
 
             Contents.AddChild(new VBoxContainer
diff --git a/Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserWindow.cs b/Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserWindow.cs
index e0e5930aa7..df33c06a5d 100644
--- a/Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserWindow.cs
+++ b/Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserWindow.cs
@@ -67,7 +67,7 @@ namespace Content.Client.GameObjects.Components.Chemistry.ReagentDispenser
         /// </summary>
         public ReagentDispenserWindow()
         {
-            SetSize = MinSize = (500, 600);
+            SetSize = MinSize = (590, 400);
             IoCManager.InjectDependencies(this);
 
             var dispenseAmountGroup = new ButtonGroup();
diff --git a/Content.Client/GameObjects/Components/Disposal/DisposalMailingUnitWindow.cs b/Content.Client/GameObjects/Components/Disposal/DisposalMailingUnitWindow.cs
index d2f8d3138c..e40bc19e02 100644
--- a/Content.Client/GameObjects/Components/Disposal/DisposalMailingUnitWindow.cs
+++ b/Content.Client/GameObjects/Components/Disposal/DisposalMailingUnitWindow.cs
@@ -28,7 +28,7 @@ namespace Content.Client.GameObjects.Components.Disposal
 
         public DisposalMailingUnitWindow()
         {
-            MinSize = SetSize = (460, 220);
+            MinSize = SetSize = (460, 230);
             TargetList = new List<string>();
             Contents.AddChild(new HBoxContainer
             {
diff --git a/Content.Client/GameObjects/Components/Disposal/DisposalRouterWindow.cs b/Content.Client/GameObjects/Components/Disposal/DisposalRouterWindow.cs
index 45f5f9deaf..12ff2cc134 100644
--- a/Content.Client/GameObjects/Components/Disposal/DisposalRouterWindow.cs
+++ b/Content.Client/GameObjects/Components/Disposal/DisposalRouterWindow.cs
@@ -18,7 +18,7 @@ namespace Content.Client.GameObjects.Components.Disposal
 
         public DisposalRouterWindow()
         {
-            MinSize = SetSize = (400, 80);
+            MinSize = SetSize = (500, 110);
             Title = Loc.GetString("Disposal Router");
 
             Contents.AddChild(new VBoxContainer
diff --git a/Content.Client/GameObjects/Components/Disposal/DisposalTaggerWindow.cs b/Content.Client/GameObjects/Components/Disposal/DisposalTaggerWindow.cs
index 9275127a59..0802b16df1 100644
--- a/Content.Client/GameObjects/Components/Disposal/DisposalTaggerWindow.cs
+++ b/Content.Client/GameObjects/Components/Disposal/DisposalTaggerWindow.cs
@@ -18,7 +18,7 @@ namespace Content.Client.GameObjects.Components.Disposal
 
         public DisposalTaggerWindow()
         {
-            MinSize = SetSize = (400, 80);
+            MinSize = SetSize = (500, 110);
             Title = Loc.GetString("Disposal Tagger");
 
             Contents.AddChild(new VBoxContainer
diff --git a/Content.Client/GameObjects/Components/Disposal/DisposalUnitWindow.cs b/Content.Client/GameObjects/Components/Disposal/DisposalUnitWindow.cs
index 742506a69e..7826ea1dd3 100644
--- a/Content.Client/GameObjects/Components/Disposal/DisposalUnitWindow.cs
+++ b/Content.Client/GameObjects/Components/Disposal/DisposalUnitWindow.cs
@@ -23,7 +23,7 @@ namespace Content.Client.GameObjects.Components.Disposal
 
         public DisposalUnitWindow()
         {
-            MinSize = SetSize = (300, 200);
+            MinSize = SetSize = (300, 225);
 
             Contents.AddChild(new VBoxContainer
             {
diff --git a/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerWindow.cs b/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerWindow.cs
index 87ead148c1..5d32cdf72c 100644
--- a/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerWindow.cs
+++ b/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerWindow.cs
@@ -16,7 +16,7 @@ namespace Content.Client.GameObjects.Components.MedicalScanner
         private readonly Label _diagnostics;
         public MedicalScannerWindow()
         {
-            MinSize = SetSize = (485, 90);
+            SetSize = (250, 100);
 
             Contents.AddChild(new VBoxContainer
             {
@@ -44,6 +44,7 @@ namespace Content.Client.GameObjects.Components.MedicalScanner
             {
                 _diagnostics.Text = Loc.GetString("No patient data.");
                 ScanButton.Disabled = true;
+                SetSize = (250, 100);
             }
             else
             {
@@ -68,6 +69,8 @@ namespace Content.Client.GameObjects.Components.MedicalScanner
 
                 _diagnostics.Text = text.ToString();
                 ScanButton.Disabled = state.IsScanned;
+
+                SetSize = (250, 575);
             }
         }
     }
diff --git a/Content.Client/GameObjects/Components/Power/AME/AMEWindow.cs b/Content.Client/GameObjects/Components/Power/AME/AMEWindow.cs
index d5c861cea4..48e2b69ac0 100644
--- a/Content.Client/GameObjects/Components/Power/AME/AMEWindow.cs
+++ b/Content.Client/GameObjects/Components/Power/AME/AMEWindow.cs
@@ -28,6 +28,9 @@ namespace Content.Client.GameObjects.Components.Power.AME
             IoCManager.InjectDependencies(this);
 
             Title = "Antimatter Control Unit";
+
+            MinSize = SetSize = (250, 250);
+
             Contents.AddChild(new VBoxContainer
             {
                 Children =
diff --git a/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs b/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs
index 4d61447945..a926a6ad08 100644
--- a/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs
+++ b/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs
@@ -188,7 +188,7 @@ namespace Content.Client.GameObjects.Components.Storage
             public StorageWindow(ClientStorageComponent storageEntity)
             {
                 StorageEntity = storageEntity;
-                MinSize = SetSize = (180, 320);
+                SetSize = (200, 320);
                 Title = "Storage Item";
                 RectClipContent = true;
 
diff --git a/Content.Client/UserInterface/ParticleAccelerator/ParticleAcceleratorControlMenu.cs b/Content.Client/UserInterface/ParticleAccelerator/ParticleAcceleratorControlMenu.cs
index 9148ef4eb9..b55c2101be 100644
--- a/Content.Client/UserInterface/ParticleAccelerator/ParticleAcceleratorControlMenu.cs
+++ b/Content.Client/UserInterface/ParticleAccelerator/ParticleAcceleratorControlMenu.cs
@@ -52,7 +52,7 @@ namespace Content.Client.UserInterface.ParticleAccelerator
 
         public ParticleAcceleratorControlMenu(ParticleAcceleratorBoundUserInterface owner)
         {
-            SetSize = (400, 300);
+            SetSize = (400, 320);
             _greyScaleShader = IoCManager.Resolve<IPrototypeManager>().Index<ShaderPrototype>("Greyscale").Instance();
 
             Owner = owner;
diff --git a/Content.Client/VendingMachines/VendingMachineMenu.cs b/Content.Client/VendingMachines/VendingMachineMenu.cs
index 47702164ea..d1b75f700d 100644
--- a/Content.Client/VendingMachines/VendingMachineMenu.cs
+++ b/Content.Client/VendingMachines/VendingMachineMenu.cs
@@ -23,7 +23,7 @@ namespace Content.Client.VendingMachines
 
         public VendingMachineMenu(VendingMachineBoundUserInterface owner)
         {
-            SetSize = MinSize = (300, 450);
+            SetSize = (300, 450);
             IoCManager.InjectDependencies(this);
 
             Owner = owner;
@@ -42,17 +42,25 @@ namespace Content.Client.VendingMachines
         {
             _items.Clear();
             _cachedInventory = inventory;
+            var longestEntry = "";
             foreach (VendingMachineInventoryEntry entry in inventory)
             {
                 var itemName = _prototypeManager.Index<EntityPrototype>(entry.ID).Name;
+                if (itemName.Length > longestEntry.Length)
+                {
+                    longestEntry = itemName;
+                }
 
                 Texture? icon = null;
                 if(_prototypeManager.TryIndex(entry.ID, out EntityPrototype? prototype))
                 {
                     icon = SpriteComponent.GetPrototypeIcon(prototype, _resourceCache).Default;
                 }
+
                 _items.AddItem($"{itemName} ({entry.Amount} left)", icon);
             }
+
+            SetSize = ((longestEntry.Length + 8) * 12, _items.Count * 40 + 50);
         }
 
         public void ItemSelected(ItemList.ItemListSelectedEventArgs args)