diff --git a/Content.Client/Storage/UI/StorageWindow.cs b/Content.Client/Storage/UI/StorageWindow.cs
index 5c985779176329..fb3f7cd33fa8c8 100644
--- a/Content.Client/Storage/UI/StorageWindow.cs
+++ b/Content.Client/Storage/UI/StorageWindow.cs
@@ -67,7 +67,8 @@ public StorageWindow(IEntityManager entityManager)
                 VerticalAlignment = VAlignment.Center
             };
             _information.SetMessage(Loc.GetString("comp-storage-window-weight",
-                ("percent", 0),
+                ("weight", 0),
+                ("maxWeight", 0),
                 ("size", SharedItemSystem.GetItemSizeLocale(ItemSize.Normal))));
 
             vBox.AddChild(_information);
diff --git a/Content.Shared/Item/ItemComponent.cs b/Content.Shared/Item/ItemComponent.cs
index a14561d76606aa..2c667b778a2ab2 100644
--- a/Content.Shared/Item/ItemComponent.cs
+++ b/Content.Shared/Item/ItemComponent.cs
@@ -89,15 +89,15 @@ public enum ItemSize
     /// <summary>
     /// Items that are too large to fit inside of standard bags, but can worn in exterior slots or placed in custom containers.
     /// </summary>
-    Large = 16,
+    Large = 8,
 
     /// <summary>
     /// Items that are too large to place inside of any kind of container.
     /// </summary>
-    Huge = 24,
+    Huge = 16,
 
     /// <summary>
     /// Picture furry gf
     /// </summary>
-    Ginormous = 48
+    Ginormous = 32
 }
diff --git a/Content.Shared/Stacks/SharedStackSystem.cs b/Content.Shared/Stacks/SharedStackSystem.cs
index d70dfc52f95119..756c84cac55eed 100644
--- a/Content.Shared/Stacks/SharedStackSystem.cs
+++ b/Content.Shared/Stacks/SharedStackSystem.cs
@@ -329,6 +329,9 @@ public bool TryAdd(EntityUid insertEnt, EntityUid targetEnt, int count, StackCom
             if (!Resolve(insertEnt, ref insertStack) || !Resolve(targetEnt, ref targetStack))
                 return false;
 
+            if (insertStack.StackTypeId != targetStack.StackTypeId)
+                return false;
+
             var available = GetAvailableSpace(targetStack);
 
             if (available <= 0)
diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
index 05030edb82074f..91405883987911 100644
--- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@@ -1,4 +1,3 @@
-using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Shared.ActionBlocker;
 using Content.Shared.CombatMode;
@@ -473,32 +472,35 @@ public bool CanInsert(EntityUid uid, EntityUid insertEnt, out string? reason, St
             return false;
         }
 
-        if (item.Size > GetMaxItemSize((uid, storageComp)))
+        if (!_stackQuery.TryGetComponent(insertEnt, out var stack) || !HasSpaceInStacks(uid, stack.StackTypeId))
         {
-            reason = "comp-storage-too-big";
-            return false;
-        }
+            if (item.Size > GetMaxItemSize((uid, storageComp)))
+            {
+                reason = "comp-storage-too-big";
+                return false;
+            }
 
-        if (TryComp<StorageComponent>(insertEnt, out var insertStorage)
-            && GetMaxItemSize((insertEnt, insertStorage)) >= GetMaxItemSize((uid, storageComp)))
-        {
-            reason = "comp-storage-too-big";
-            return false;
-        }
+            if (TryComp<StorageComponent>(insertEnt, out var insertStorage)
+                && GetMaxItemSize((insertEnt, insertStorage)) >= GetMaxItemSize((uid, storageComp)))
+            {
+                reason = "comp-storage-too-big";
+                return false;
+            }
 
-        if (storageComp.MaxSlots != null)
-        {
-            if (storageComp.Container.ContainedEntities.Count >= storageComp.MaxSlots)
+            if (storageComp.MaxSlots != null)
+            {
+                if (storageComp.Container.ContainedEntities.Count >= storageComp.MaxSlots)
+                {
+                    reason = "comp-storage-insufficient-capacity";
+                    return false;
+                }
+            }
+            else if (SharedItemSystem.GetItemSizeWeight(item.Size) + GetCumulativeItemSizes(uid, storageComp) > storageComp.MaxTotalWeight)
             {
                 reason = "comp-storage-insufficient-capacity";
                 return false;
             }
         }
-        else if (SharedItemSystem.GetItemSizeWeight(item.Size) + GetCumulativeItemSizes(uid, storageComp) > storageComp.MaxTotalWeight)
-        {
-            reason = "comp-storage-insufficient-capacity";
-            return false;
-        }
 
         reason = null;
         return true;
@@ -554,7 +556,7 @@ public bool Insert(
 
             foreach (var ent in storageComp.Container.ContainedEntities)
             {
-                if (!_stackQuery.TryGetComponent(ent, out var containedStack) || !insertStack.StackTypeId.Equals(containedStack.StackTypeId))
+                if (!_stackQuery.TryGetComponent(ent, out var containedStack))
                     continue;
 
                 if (!_stack.TryAdd(insertEnt, ent, insertStack, containedStack))
@@ -571,18 +573,24 @@ public bool Insert(
             }
 
             // Still stackable remaining
-            if (insertStack.Count > 0)
+            if (toInsertCount > 0)
             {
                 // Try to insert it as a new stack.
                 if (!CanInsert(uid, insertEnt, out _, storageComp) ||
                     !storageComp.Container.Insert(insertEnt))
                 {
+                    UpdateUI(uid, storageComp);
+
                     // If we also didn't do any stack fills above then just end
                     // otherwise play sound and update UI anyway.
                     if (toInsertCount == insertStack.Count)
                         return false;
                 }
             }
+            else
+            {
+                UpdateUI(uid, storageComp);
+            }
         }
         // Non-stackable but no insertion for reasons.
         else if (!storageComp.Container.Insert(insertEnt))
@@ -657,11 +665,32 @@ public bool HasSpace(Entity<StorageComponent?> uid)
         //todo maybe this shouldn't be authoritative over weight? idk.
         if (uid.Comp.MaxSlots != null)
         {
-            return uid.Comp.Container.ContainedEntities.Count < uid.Comp.MaxSlots;
+            return uid.Comp.Container.ContainedEntities.Count < uid.Comp.MaxSlots || HasSpaceInStacks(uid);
+        }
+
+        return GetCumulativeItemSizes(uid, uid.Comp) < uid.Comp.MaxTotalWeight || HasSpaceInStacks(uid);
+    }
+
+    private bool HasSpaceInStacks(Entity<StorageComponent?> uid, string? stackType = null)
+    {
+        if (!Resolve(uid, ref uid.Comp))
+            return false;
+
+        foreach (var contained in uid.Comp.Container.ContainedEntities)
+        {
+            if (!_stackQuery.TryGetComponent(contained, out var stack))
+                continue;
+
+            if (stackType != null && !stack.StackTypeId.Equals(stackType))
+                continue;
+
+            if (_stack.GetAvailableSpace(stack) == 0)
+                continue;
 
+            return true;
         }
 
-        return GetCumulativeItemSizes(uid, uid.Comp) < uid.Comp.MaxTotalWeight;
+        return false;
     }
 
     /// <summary>
@@ -697,7 +726,9 @@ public ItemSize GetMaxItemSize(Entity<StorageComponent?> uid)
 
         // if there is no max item size specified, the value used
         // is one below the item size of the storage entity, clamped at ItemSize.Tiny
-        return (ItemSize) Math.Max((int) item.Size - 1, 1);
+        var sizes = Enum.GetValues<ItemSize>().ToList();
+        var currentSizeIndex = sizes.IndexOf(item.Size);
+        return sizes[Math.Max(currentSizeIndex - 1, 0)];
     }
 
     public FixedPoint2 GetStorageFillPercentage(Entity<StorageComponent?> uid)
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
index 3921843612321a..5f0f0abf28b0f3 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -317,6 +317,8 @@
   name: death squad backpack
   description: Holds the kit of CentComm's most feared agents.
   components:
+    - type: Storage
+      maxTotalWeight: 56
     - type: StorageFill
       contents:
         - id: BoxSurvivalEngineering
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
index 355e2a1aff3b0d..4bff55acdc23bb 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
@@ -27,7 +27,7 @@
       - id: BoxSurvivalSecurity
       - id: Flash
       - id: MagazinePistol
-      
+
 - type: entity
   noSpawn: true
   parent: ClothingBackpackDuffelSecurity
@@ -47,7 +47,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvivalBrigmedic
       - id: Flash
 
 - type: entity
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
index bdedcd69a12307..b70ef28e76a79f 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
@@ -41,7 +41,7 @@
       - id: BoxSurvivalSecurity
       - id: Flash
       - id: MagazinePistol
-      
+
 - type: entity
   noSpawn: true
   parent: ClothingBackpackSatchelSecurity
@@ -61,7 +61,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvivalBrigmedic
       - id: Flash
 
 - type: entity
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
index 7fc62984a052e0..6482c5dd914719 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
@@ -20,7 +20,7 @@
   - type: StorageFill
     contents:
       - id: MagazinePistolCaselessRifle
-        amount: 6
+        amount: 4
 
 - type: entity
   name: box of .25 caseless (practice) magazines
@@ -31,7 +31,7 @@
   - type: StorageFill
     contents:
       - id: MagazinePistolCaselessRiflePractice
-        amount: 6
+        amount: 4
 
 - type: entity
   name: box of .25 caseless (rubber) magazines
@@ -42,7 +42,7 @@
   - type: StorageFill
     contents:
       - id: MagazineCaselessRifleRubber
-        amount: 6
+        amount: 4
 
 # LightRifle
 - type: entity
@@ -54,7 +54,7 @@
   - type: StorageFill
     contents:
       - id: MagazineLightRifle
-        amount: 6
+        amount: 4
 
 - type: entity
   name: box of .30 rifle (practice) magazines
@@ -65,7 +65,7 @@
   - type: StorageFill
     contents:
       - id: MagazineLightRiflePractice
-        amount: 6
+        amount: 4
 
 - type: entity
   name: box of .30 rifle (rubber) magazines
@@ -76,7 +76,7 @@
   - type: StorageFill
     contents:
       - id: MagazineLightRifleRubber
-        amount: 6
+        amount: 4
 
 - type: entity
   name: box of Vector magazines
@@ -132,7 +132,7 @@
   - type: StorageFill
     contents:
       - id: MagazinePistol
-        amount: 6
+        amount: 4
 
 - type: entity
   name: box of pistol .35 auto (practice) magazines
@@ -143,7 +143,7 @@
   - type: StorageFill
     contents:
       - id: MagazinePistolPractice
-        amount: 6
+        amount: 4
 
 - type: entity
   name: box of pistol .35 auto (rubber) magazines
@@ -154,7 +154,7 @@
   - type: StorageFill
     contents:
       - id: MagazinePistolRubber
-        amount: 6
+        amount: 4
 
 - type: entity
   name: box of machine pistol .35 auto magazines
@@ -165,7 +165,7 @@
   - type: StorageFill
     contents:
       - id: MagazinePistolHighCapacity
-        amount: 6
+        amount: 4
 
 - type: entity
   name: box of machine pistol .35 auto (practice) magazines
@@ -176,7 +176,7 @@
   - type: StorageFill
     contents:
       - id: MagazinePistolHighCapacityPractice
-        amount: 6
+        amount: 4
 
 - type: entity
   name: box of machine pistol .35 auto (rubber) magazines
@@ -187,7 +187,7 @@
   - type: StorageFill
     contents:
       - id: MagazinePistolHighCapacityRubber
-        amount: 6
+        amount: 4
 
 
 - type: entity
@@ -233,7 +233,7 @@
   - type: StorageFill
     contents:
       - id: MagazineShotgun
-        amount: 6
+        amount: 4
 
 - type: entity
   name: box of (.50 beanbag) ammo drums
@@ -244,7 +244,7 @@
   - type: StorageFill
     contents:
       - id: MagazineShotgunBeanbag
-        amount: 6
+        amount: 4
 
 - type: entity
   name: box of (.50 slug) ammo drums
@@ -255,7 +255,7 @@
   - type: StorageFill
     contents:
       - id: MagazineShotgunSlug
-        amount: 6
+        amount: 4
 
 - type: entity
   name: box of (.50 incendiary) ammo drums
@@ -266,7 +266,7 @@
   - type: StorageFill
     contents:
       - id: MagazineShotgunIncendiary
-        amount: 6
+        amount: 4
 
 # base BallisticAmmoProvider dispensers
 - type: entity
@@ -396,7 +396,7 @@
   - type: StorageFill
     contents:
       - id: MagazineRifle
-        amount: 6
+        amount: 4
 
 - type: entity
   name: box of .20 rifle (practice) magazines
@@ -407,7 +407,7 @@
   - type: StorageFill
     contents:
       - id: MagazineRiflePractice
-        amount: 6
+        amount: 4
 
 - type: entity
   name: box of .20 rifle (rubber) magazines
@@ -418,4 +418,4 @@
   - type: StorageFill
     contents:
       - id: MagazineRifleRubber
-        amount: 6
+        amount: 4
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
index 2cd3960dde33a8..049780a9260e78 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
@@ -56,26 +56,6 @@
       - state: internals
       - state: emergencytank
 
-- type: entity
-  name: survival box
-  parent: BoxCardboard
-  id: BoxSurvivalBrigmedic
-  description: It's a box with basic internals inside.
-  suffix: MedSec
-  components:
-  - type: StorageFill
-    contents:
-      - id: ClothingMaskBreathMedicalSecurity
-      - id: EmergencyOxygenTankFilled
-      - id: SpaceMedipen
-      - id: EmergencyMedipen
-      - id: EmergencyMedipen
-      - id: FoodTinMRE
-  - type: Sprite
-    layers:
-      - state: internals
-      - state: emergencytank
-
 - type: entity
   name: survival box
   parent: BoxCardboard
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
index 6d30dac57a50f6..f86ba191e66e61 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
@@ -16,7 +16,7 @@
     - type: StorageFill
       contents:
         - id: Mousetrap
-          amount: 6
+          amount: 4
     - type: Sprite
       layers:
         - state: box
@@ -102,7 +102,7 @@
   - type: StorageFill
     contents:
       - id: PassengerPDA
-        amount: 6
+        amount: 4
   - type: Sprite
     layers:
       - state: box
@@ -117,7 +117,7 @@
   - type: StorageFill
     contents:
       - id: PassengerIDCard
-        amount: 6
+        amount: 4
   - type: Sprite
     layers:
       - state: box
@@ -132,7 +132,7 @@
   - type: StorageFill
     contents:
       - id: ClothingHeadsetGrey
-        amount: 6
+        amount: 4
   - type: Sprite
     layers:
       - state: box
@@ -212,17 +212,11 @@
 
 
 - type: entity
-  name: hatsune miku day box
-  parent: BoxCardboard
+  name: hatsune miku day bag
+  parent: ClothingBackpackDuffel
   id: BoxPerformer
   description: Happy Hatsune Miku Day!
   components:
-  - type: Storage
-    maxItemSize: Normal
-    whitelist:
-      components:
-      - Clothing
-      - Food
   - type: StorageFill
     contents:
       - id: ClothingShoesBootsPerformer
@@ -278,7 +272,7 @@
   - type: StorageFill
     contents:
       - id: EncryptionKeyCommon
-        amount: 6
+        amount: 4
   - type: Sprite
     layers:
       - state: box
@@ -296,7 +290,7 @@
   - type: StorageFill
     contents:
       - id: EncryptionKeyCargo
-        amount: 6
+        amount: 4
 
 - type: entity
   name: engineering encryption key box
@@ -306,7 +300,7 @@
   - type: StorageFill
     contents:
       - id: EncryptionKeyEngineering
-        amount: 6
+        amount: 4
 
 - type: entity
   name: med-sci encryption key box
@@ -316,7 +310,7 @@
   - type: StorageFill
     contents:
       - id: EncryptionKeyMedicalScience
-        amount: 6
+        amount: 4
 
 - type: entity
   name: medical encryption key box
@@ -326,7 +320,7 @@
   - type: StorageFill
     contents:
       - id: EncryptionKeyMedical
-        amount: 6
+        amount: 4
 
 - type: entity
   name: robotech encryption key box
@@ -336,7 +330,7 @@
   - type: StorageFill
     contents:
       - id: EncryptionKeyRobo
-        amount: 6
+        amount: 4
 
 - type: entity
   name: science encryption key box
@@ -346,7 +340,7 @@
   - type: StorageFill
     contents:
       - id: EncryptionKeyScience
-        amount: 6
+        amount: 4
 
 - type: entity
   name: security encryption key box
@@ -356,7 +350,7 @@
   - type: StorageFill
     contents:
       - id: EncryptionKeySecurity
-        amount: 6
+        amount: 4
 
 - type: entity
   name: service encryption key box
@@ -366,7 +360,7 @@
   - type: StorageFill
     contents:
       - id: EncryptionKeyService
-        amount: 6
+        amount: 4
 
 - type: entity
   name: syndicate encryption key box
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
index 02f4905693a083..e35e9086ffeb40 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
@@ -22,7 +22,7 @@
   - type: StorageFill
     contents:
       - id: PillCanister
-        amount: 6
+        amount: 4
   - type: Sprite
     layers:
       - state: box
@@ -52,7 +52,7 @@
   - type: StorageFill
     contents:
       - id: ClothingMaskSterile
-        amount: 6
+        amount: 4
   - type: Sprite
     layers:
       - state: box
@@ -117,7 +117,7 @@
   - type: StorageFill
     contents:
       - id: BodyBag_Folded
-        amount: 5
+        amount: 4
   - type: Sprite
     layers:
       - state: box
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/security.yml b/Resources/Prototypes/Catalog/Fills/Boxes/security.yml
index 527194d104217a..2fa5c430465bf7 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/security.yml
@@ -7,7 +7,7 @@
   - type: StorageFill
     contents:
       - id: Handcuffs
-        amount: 6
+        amount: 4
   - type: Sprite
     layers:
       - state: box_security
diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
index 683162f9d47bcb..0e4fa72eedeb36 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
@@ -124,9 +124,10 @@
   suffix: Filled
   components:
   - type: Item
-    size: Large
+    size: Ginormous
   - type: Storage
     maxSlots: 8
+    maxItemSize: Normal
   - type: StorageFill
     contents:
       - id: ExGrenade
diff --git a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
index 714148a64d5c48..c36a4e6b79c134 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
@@ -16,9 +16,9 @@
   suffix: SniperBundle
   components:
   - type: Item
-    size: Huge
+    size: Ginormous
   - type: Storage
-    maxItemSize: Large
+    maxItemSize: Huge
   - type: StorageFill
     contents:
       - id: WeaponSniperHristov
diff --git a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
index faa8535ab45a31..6400dce5b6abf9 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
@@ -6,11 +6,8 @@
   components:
   - type: StorageFill
     contents:
-      - id: HandheldHealthAnalyzer
       - id: Brutepack
-        amount: 2
       - id: Ointment
-        amount: 2
       - id: Gauze
       - id: PillCanisterTricordrazine
       # see https://github.com/tgstation/blob/master/code/game/objects/items/storage/firstaid.dm for example contents
@@ -22,11 +19,8 @@
   components:
   - type: StorageFill
     contents:
-      - id: RegenerativeMesh
-        amount: 2
       - id: Ointment
         amount: 2
-      - id: SyringeSigynate
       - id: PillCanisterKelotane
       - id: PillCanisterDermaline
 
@@ -37,14 +31,10 @@
   components:
   - type: StorageFill
     contents:
-      - id: MedicatedSuture
       - id: Brutepack
       - id: Gauze
-      - id: Bloodpack
-      - id: SyringeTranexamicAcid
       - id: PillCanisterIron
       - id: PillCanisterCopper
-      - id: PillCanisterBicaridine
 
 - type: entity
   id: MedkitToxinFilled
@@ -79,12 +69,9 @@
   components:
   - type: StorageFill
     contents:
-      - id: GeigerCounter
       - id: SyringePhalanximine
       - id: RadAutoInjector
-        amount: 1
       - id: EmergencyMedipen
-        amount: 1
       - id: PillCanisterHyronalin
 
 - type: entity
@@ -95,9 +82,7 @@
   - type: StorageFill
     contents:
       - id: MedicatedSuture
-        amount: 2
       - id: RegenerativeMesh
-        amount: 2
       - id: Bloodpack
         amount: 2
 
@@ -108,13 +93,11 @@
   components:
   - type: StorageFill
     contents:
-      - id: HandheldHealthAnalyzer
       - id: MedicatedSuture
       - id: RegenerativeMesh
       - id: SyringeEphedrine
       - id: BruteAutoInjector
       - id: BurnAutoInjector
-      - id: EmergencyMedipen
 
 - type: entity
   id: StimkitFilled
diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
index 12532523906fc6..6bdcc80517c86c 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -8,13 +8,13 @@
     sprite: Clothing/Back/Backpacks/backpack.rsi
     state: icon
   - type: Item
-    size: Large
+    size: Huge
   - type: Clothing
     quickEquip: false
     slots:
     - back
   - type: Storage
-    maxItemSize: Large
+    maxItemSize: Huge
     maxTotalWeight: 28
   - type: ContainerContainer
     containers:
@@ -263,7 +263,7 @@
   - type: Item
     size: Ginormous
   - type: Storage
-    maxItemSize: Large
+    maxItemSize: Huge
     maxTotalWeight: 56 #14 normal-sized items.
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
index 8d2850172a3eed..3b153971f16b8f 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
@@ -7,7 +7,7 @@
   - type: Sprite
     sprite: Clothing/Back/Duffels/duffel.rsi
   - type: Storage
-    maxItemSize: Large
+    maxItemSize: Huge
     maxTotalWeight: 40
   - type: ClothingSpeedModifier
     walkModifier: 1
@@ -230,7 +230,7 @@
   - type: Item
     size: Ginormous
   - type: Storage
-    maxItemSize: Large
+    maxItemSize: Huge
     maxTotalWeight: 56 #14 normal-sized items.
   - type: ClothingSpeedModifier
     sprintModifier: 1 # makes its stats identical to other variants of bag of holding
@@ -242,7 +242,7 @@
   description: A duffel bag containing a variety of biological containment equipment.
   components:
   - type: Storage
-    maxItemSize: Large
+    maxItemSize: Huge
     maxTotalWeight: 40
   - type: ClothingSpeedModifier
     walkModifier: 1
diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
index 245c9f9fa8cf85..31756d5310e73d 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
@@ -170,5 +170,5 @@
   - type: Item
     size: Ginormous
   - type: Storage
-    maxItemSize: Large
+    maxItemSize: Huge
     maxTotalWeight: 56 #14 normal-sized items.
diff --git a/Resources/Prototypes/Entities/Clothing/Back/specific.yml b/Resources/Prototypes/Entities/Clothing/Back/specific.yml
index c36ddde03b56f3..8af00039b5d565 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/specific.yml
@@ -33,7 +33,7 @@
     sprite: Clothing/Back/Backpacks/waterbackpack.rsi
     state: icon
   - type: Item
-    size: Huge
+    size: Ginormous
   - type: Clothing
     slots: BACK
     sprite: Clothing/Back/Backpacks/waterbackpack.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml b/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml
index ec6b48bf894783..b53c08159d6123 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml
@@ -25,7 +25,7 @@
     maxSlots: 7
     maxItemSize: Normal
   - type: Item
-    size: Huge
+    size: Ginormous
   - type: ContainerContainer
     containers:
       storagebase: !type:Container
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index 28f8ed0dcad550..2117c7916a3662 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -416,7 +416,7 @@
   - type: Clothing
     sprite: Clothing/Belt/bandolier.rsi
   - type: Item
-    size: Large
+    size: Huge
   - type: Storage
     whitelist:
       tags:
@@ -461,7 +461,7 @@
   - type: Clothing
     sprite: Clothing/Belt/syndieholster.rsi
   - type: Item
-    size: Large
+    size: Huge
   - type: Storage
     whitelist:
       components:
@@ -524,7 +524,7 @@
   - type: Clothing
     sprite: Clothing/Belt/militarywebbingmed.rsi
   - type: Item
-    size: Large
+    size: Huge
 
 - type: entity
   parent: ClothingBeltBase
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
index 63c8ac86ef7d9f..8b86d8e253a5d7 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
@@ -15,7 +15,7 @@
   id: ClothingOuterBaseLarge
   components:
   - type: Item
-    size: Large
+    size: Huge
   - type: Clothing
     slots:
     - outerClothing
@@ -70,7 +70,7 @@
     walkModifier: 0.4
     sprintModifier: 0.6
   - type: Item
-    size: Huge
+    size: Ginormous
   - type: Armor
     modifiers:
       coefficients:
@@ -105,7 +105,7 @@
     walkModifier: 0.8
     sprintModifier: 0.8
   - type: Item
-    size: Large
+    size: Huge
 
 - type: entity
   parent: ClothingOuterBase
@@ -128,7 +128,7 @@
   id: ClothingOuterBaseMedium
   components:
   - type: Item
-    size: Large
+    size: Huge
   - type: Clothing
     slots:
     - outerClothing
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
index 75a9df8f039104..caa84e00eda9ab 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -431,7 +431,7 @@
   - type: Sprite
     sprite: Clothing/OuterClothing/Hardsuits/syndicate.rsi
   - type: Item
-    size: Large
+    size: Huge
   - type: Clothing
     sprite: Clothing/OuterClothing/Hardsuits/syndicate.rsi
   - type: PressureProtection
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
index ee853777f5ac13..4e45061fb06142 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -172,7 +172,7 @@
     graph: SupplyBot
     node: bot
   - type: Storage
-    maxItemSize: Large
+    maxItemSize: Huge
     maxTotalWeight: 40
   - type: UserInterface
     interfaces:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
index eff790cdd19633..bea963b4b6c689 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
@@ -13,6 +13,8 @@
   - type: Item
     sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi
     size: Normal
+  - type: Storage
+    maxSlots: 6
   - type: StorageFill
     contents:
       - id: CigPackGreen
diff --git a/Resources/Prototypes/Entities/Objects/Decoration/lidsalami.yml b/Resources/Prototypes/Entities/Objects/Decoration/lidsalami.yml
index 65141af36fbba6..1f0e3591922123 100644
--- a/Resources/Prototypes/Entities/Objects/Decoration/lidsalami.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/lidsalami.yml
@@ -9,6 +9,6 @@
     layers:
       - state: icon
   - type: Item
-    size: Huge
+    size: Ginormous
   - type: StaticPrice
     price: 0
diff --git a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
index 2ec93b9c9be9df..46cc2dbd4fddb0 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
@@ -236,7 +236,7 @@
     state: box
   - type: Storage
     maxSlots: 7
-    maxTotalWeight: 7
+    maxItemSize: Tiny
   - type: Item
     sprite: Objects/Fun/crayons.rsi
     size: Small
diff --git a/Resources/Prototypes/Entities/Objects/Misc/box.yml b/Resources/Prototypes/Entities/Objects/Misc/box.yml
index b2c63f14a96c30..442e712851a892 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/box.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/box.yml
@@ -7,9 +7,10 @@
     sprite: Objects/Storage/boxes.rsi
   - type: Item
     sprite: Objects/Storage/boxes.rsi
-    size: Normal
+    size: Large
   - type: Storage
-    maxTotalWeight: 12
+    maxTotalWeight: 8
+    maxItemSize: Small
   - type: ContainerContainer
     containers:
       storagebase: !type:Container
diff --git a/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml b/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml
index ebf776a7b1e1da..c04801f0c7511c 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml
@@ -5,10 +5,9 @@
   description: Useful for carrying items in your hands.
   components:
   - type: Item
-    size: Large
+    size: Ginormous
   - type: Storage
-    maxSlots: 4
-    maxTotalWeight: 16
+    maxTotalWeight: 24
   - type: Tag
     tags:
     - Briefcase
@@ -33,7 +32,7 @@
   description: Useful for carrying items in your hands.
   components:
   - type: Item
-    size: Large
+    size: Huge
   - type: Storage
     maxSlots: 6
     maxTotalWeight: 24
diff --git a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
index 0697281a0ff289..1deafac00bfbc9 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
@@ -11,7 +11,7 @@
           map: [ "enabled" ]
   - type: Item
     sprite: Objects/Misc/fire_extinguisher.rsi
-    size: Small
+    size: Normal
   - type: SolutionContainerManager
     solutions:
       spray:
diff --git a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
index 4f2199bfa89825..569dddb47a354d 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
@@ -62,8 +62,6 @@
   id: Zipties
   parent: Handcuffs
   components:
-  - type: Item
-    size: Tiny
   - type: Handcuff
     breakoutTime: 20  # halfway between improvised cablecuffs and metal ones
     cuffedRSI: Objects/Misc/cablecuffs.rsi  # cablecuffs will look fine
@@ -90,7 +88,7 @@
   abstract: true
   components:
   - type: Item
-    size: Tiny
+    size: Small
   - type: Tag
     tags:
     - Trash
diff --git a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml
index 6168fb9a5a03be..73025bdb01f13c 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml
@@ -39,6 +39,7 @@
     - type: Item
       sprite: Objects/Specific/Medical/implanter.rsi
       heldPrefix: 0
+      size: Small
     - type: Appearance
     - type: GenericVisualizer
       visuals:
@@ -97,7 +98,6 @@
   components:
     - type: Item
       sprite: Objects/Specific/Medical/syndi_implanter.rsi
-      size: Tiny
     - type: Sprite
       sprite: Objects/Specific/Medical/syndi_implanter.rsi
       state: implanter1
diff --git a/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml b/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml
index fcf47d713da2f7..3814ec29236442 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml
@@ -4,10 +4,6 @@
   id: MonkeyCubeBox
   description: Drymate brand monkey cubes. Just add water!
   components:
-  - type: Storage
-    whitelist:
-      tags:
-      - MonkeyCube
   - type: StorageFill
     contents:
       - id: MonkeyCubeWrapped
@@ -23,6 +19,8 @@
   id: MonkeyCubeWrapped
   description: Unwrap this to get a monkey cube.
   components:
+  - type: Item
+    size: Tiny
   - type: SpawnItemsOnUse
     items:
       - id: MonkeyCube
@@ -69,6 +67,8 @@
   - type: Sprite
     sprite: Objects/Misc/monkeycube.rsi
     state: wrapper
+  - type: Item
+    size: Tiny
   - type: Tag
     tags:
     - MonkeyCube
diff --git a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
index 25c9e7fc587bd2..d8d808c8934f3d 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
@@ -119,7 +119,7 @@
         components:
         - Hands # no use giving a mouse a storage implant, but a monkey is another story...
     - type: Item
-      size: Huge
+      size: Ginormous
     - type: Storage
       maxSlots: 4
       maxItemSize: Small
diff --git a/Resources/Prototypes/Entities/Objects/Power/antimatter_part.yml b/Resources/Prototypes/Entities/Objects/Power/antimatter_part.yml
index 7d428bcc5a96ce..b44779581314f5 100644
--- a/Resources/Prototypes/Entities/Objects/Power/antimatter_part.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/antimatter_part.yml
@@ -5,7 +5,7 @@
   description: A flatpack used for constructing an antimatter engine reactor. Use a multitool to unpack it.
   components:
   - type: Item
-    size: Small
+    size: Normal
     sprite: Objects/Power/AME/ame_part.rsi
   - type: Sprite
     sprite: Objects/Power/AME/ame_part.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Power/powersink.yml b/Resources/Prototypes/Entities/Objects/Power/powersink.yml
index c8684323a9046b..c44a167bcd659a 100644
--- a/Resources/Prototypes/Entities/Objects/Power/powersink.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/powersink.yml
@@ -5,7 +5,7 @@
   description: Drains immense amounts of electricity from the grid.
   components:
     - type: Item
-      size: Large
+      size: Huge
     - type: NodeContainer
       examinable: true
       nodes:
diff --git a/Resources/Prototypes/Entities/Objects/Power/solar_parts.yml b/Resources/Prototypes/Entities/Objects/Power/solar_parts.yml
index 5b3f5e90ce1d4b..7c8e7fa495111d 100644
--- a/Resources/Prototypes/Entities/Objects/Power/solar_parts.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/solar_parts.yml
@@ -4,7 +4,7 @@
   name: solar assembly part
   components:
   - type: Item
-    size: Small
+    size: Normal
   - type: Sprite
     sprite: Objects/Power/solar_parts.rsi
     state: solar_assembly_parts
diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
index 76a8e576a5a421..c3e3ea44ead7e3 100644
--- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml
+++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
@@ -10,7 +10,7 @@
       state: riot-icon
     - type: Item
       sprite: Objects/Weapons/Melee/shields.rsi
-      size: Huge
+      size: Ginormous
       heldPrefix: riot
     - type: Blocking
       passiveBlockModifier:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Forensics/forensics.yml b/Resources/Prototypes/Entities/Objects/Specific/Forensics/forensics.yml
index b7627e1016bed4..628ec7ee972a04 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Forensics/forensics.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Forensics/forensics.yml
@@ -5,7 +5,7 @@
   description: A forensic pad for collecting fingerprints or fibers.
   components:
   - type: Item
-    size: Tiny
+    size: Small
   - type: ForensicPad
   - type: Sprite
     sprite: Objects/Misc/bureaucracy.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Kitchen/foodcarts.yml b/Resources/Prototypes/Entities/Objects/Specific/Kitchen/foodcarts.yml
index 20ec7354fb81ea..ac81cff248ea91 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Kitchen/foodcarts.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Kitchen/foodcarts.yml
@@ -47,6 +47,8 @@
       - key: enum.StorageUiKey.Key
         type: StorageBoundUserInterface
     - type: Storage
+      maxItemSize: Normal
+      maxTotalWeight: 40
     - type: TileFrictionModifier
       modifier: 0.4 # makes it slide
 
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Librarian/books_bag.yml b/Resources/Prototypes/Entities/Objects/Specific/Librarian/books_bag.yml
index a2675ffaaf81a3..939af4a304086d 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Librarian/books_bag.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Librarian/books_bag.yml
@@ -13,7 +13,7 @@
       slots:
         - belt
     - type: Item
-      size: Huge
+      size: Ginormous
     - type: Storage
       maxSlots: 15
       quickInsert: true
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mech_construction.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mech_construction.yml
index a79e6e9037a869..c40073c659d5d7 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mech_construction.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mech_construction.yml
@@ -44,7 +44,7 @@
   abstract: true
   components:
   - type: Item
-    size: Huge
+    size: Ginormous
 
 - type: entity
   parent: BaseRipleyPart
@@ -172,7 +172,7 @@
   abstract: true
   components:
   - type: Item
-    size: Huge
+    size: Ginormous
 
 - type: entity
   parent: BaseHonkerPart
@@ -300,7 +300,7 @@
   abstract: true
   components:
   - type: Item
-    size: Large
+    size: Huge
 
 - type: entity
   parent: BaseHamtrPart
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_equipment.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_equipment.yml
index ac550b8e61919a..c489dec1c5672c 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_equipment.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_equipment.yml
@@ -7,7 +7,7 @@
     sprite: Objects/Specific/Mech/mecha_equipment.rsi
   - type: Item
     sprite: Objects/Specific/Mech/mecha_equipment.rsi
-    size: Huge
+    size: Ginormous
   - type: MechEquipment
   - type: GuideHelp
     guides:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
index 47d3c77024a283..bfa6aa2ed22410 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -291,7 +291,6 @@
       map: ["enum.SolutionContainerLayers.Fill"]
   - type: Item
     sprite: Objects/Specific/Medical/medipen.rsi
-    size: Small
   - type: SolutionContainerManager
     solutions:
       pen:
@@ -346,7 +345,6 @@
       map: ["enum.SolutionContainerLayers.Fill"]
   - type: Item
     sprite: Objects/Specific/Medical/medipen.rsi
-    size: Tiny
   - type: SolutionContainerManager
     solutions:
       pen:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml
index 34559b397750e6..1e73c47f9a5e94 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml
@@ -8,9 +8,10 @@
     sprite: Objects/Specific/Medical/firstaidkits.rsi
     state: firstaid
   - type: Storage
-    maxTotalWeight: 15
+    maxTotalWeight: 8
+    maxItemSize: Small
   - type: Item
-    size: Normal
+    size: Large
     sprite: Objects/Specific/Medical/firstaidkits.rsi
     heldPrefix: firstaid
   - type: Tag
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml b/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml
index 814ddb30da0cf2..231d82fb76a04d 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml
@@ -14,9 +14,9 @@
     slots:
     - belt
   - type: Item
-    size: Huge
+    size: Ginormous
   - type: Storage
-    maxSlots: 5
+    maxSlots: 10
     maxItemSize: Normal
     quickInsert: true
     areaInsert: true
diff --git a/Resources/Prototypes/Entities/Objects/Tools/flare.yml b/Resources/Prototypes/Entities/Objects/Tools/flare.yml
index 16ae88a0680cfb..6ef85c015ee352 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/flare.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/flare.yml
@@ -40,6 +40,7 @@
   - type: Item
     sprite: Objects/Misc/flare.rsi
     heldPrefix: unlit
+    size: Tiny
   - type: Appearance
   - type: PointLight
     enabled: false
diff --git a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
index d63225b2bd991a..255090b923f1b3 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
@@ -37,7 +37,7 @@
       state: icon
     - type: Item
       sprite: Objects/Tanks/Jetpacks/blue.rsi
-      size: Large
+      size: Huge
     - type: UserInterface
       interfaces:
         - key: enum.SharedGasTankUiKey.Key
diff --git a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
index 8a1c33df769498..f4149b5a6a170f 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
@@ -12,7 +12,7 @@
     maxItemSize: Normal
     maxTotalWeight: 14
   - type: Item
-    size: Huge
+    size: Ginormous
   - type: ItemCooldown
   - type: MeleeWeapon
     damage:
@@ -116,7 +116,7 @@
   - type: Item
     sprite: Objects/Tools/Toolboxes/toolbox_syn.rsi
   - type: Storage
-    maxItemSize: Large
+    maxItemSize: Huge
     maxTotalWeight: 28
   - type: MeleeWeapon
     damage:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index 0469f966739667..dc920caec042e7 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -5,7 +5,7 @@
   components:
   - type: Sprite
   - type: Item
-    size: Large
+    size: Huge
   - type: Clothing
     sprite: Objects/Weapons/Guns/Battery/laser_retro.rsi
     quickEquip: false
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
index 1b318beac85482..9d685e1ddc0e0c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
@@ -7,7 +7,7 @@
   components:
   - type: Sprite
   - type: Item
-    size: Huge
+    size: Ginormous
   - type: Gun
     fireRate: 20
     selectedMode: FullAuto
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
index 3d6cd680a0c0c9..729f06389fba69 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
@@ -7,7 +7,7 @@
   components:
   - type: Sprite
   - type: Item
-    size: Large
+    size: Huge
   - type: Clothing
     sprite: Objects/Weapons/Guns/LMGs/l6.rsi
     quickEquip: false
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
index 2dbf71840c9ab2..371e89d4cfc22e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
@@ -12,7 +12,7 @@
     slots:
     - Back
   - type: Item
-    size: Large
+    size: Huge
   - type: StaticPrice
     price: 500
   - type: ContainerContainer
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
index d460c0c8f03fab..bc3b65ff3a0ad1 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -7,7 +7,7 @@
   components:
   - type: Sprite
   - type: Item
-    size: Large
+    size: Huge
   - type: Clothing
     sprite: Objects/Weapons/Guns/Rifles/ak.rsi
     quickEquip: false
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index 6bf6fcf695618a..fbf56ec9e7aa30 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -7,7 +7,7 @@
   components:
   - type: Sprite
   - type: Item
-    size: Normal
+    size: Huge
   - type: Clothing
     sprite: Objects/Weapons/Guns/SMGs/atreides.rsi
     quickEquip: false
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
index 5a08eb3636978f..8e816abb55c20d 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -57,6 +57,8 @@
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-0
       map: ["enum.GunVisualLayers.Mag"]
+  - type: Item
+    size: Large
   - type: Clothing
     sprite: Objects/Weapons/Guns/Shotguns/bulldog.rsi
     quickEquip: false
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
index 4a16aadb6550be..ccccb633f695df 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -10,7 +10,7 @@
     - state: base
       map: ["enum.GunVisualLayers.Base"]
   - type: Item
-    size: Large
+    size: Huge
   - type: Clothing
     sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi
     quickEquip: false
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml
index fcd028a64e81eb..c978d2da05d3d4 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml
@@ -12,7 +12,7 @@
       map: [ "tank" ]
       visible: false
   - type: Item
-    size: Large
+    size: Huge
   - type: Clothing
     quickEquip: false
     slots:
@@ -124,10 +124,10 @@
   suffix: Admeme
   components:
   - type: Item
-    size: Huge
+    size: Ginormous
   - type: Storage
     maxSlots: 100
-    maxItemSize: Huge
+    maxItemSize: Ginormous
     maxTotalWeight: 1600
     whitelist:
       tags: [] #dodging a test fail like the IRS
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml
index ff80144f9fb966..d6622d93323c39 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml
@@ -75,7 +75,7 @@
         Slash: 12
         Structural: 30
   - type: Item
-    size: Huge
+    size: Ginormous
   - type: Clothing
     sprite: Objects/Weapons/Melee/cult_halberd.rsi
     quickEquip: false
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
index 87eb40dfe5f7a9..efb85ec35e7bcf 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
@@ -29,7 +29,7 @@
         Slash: 10.5
         Structural: 60
   - type: Item
-    size: Huge
+    size: Ginormous
   - type: Clothing
     sprite: Objects/Weapons/Melee/fireaxe.rsi
     quickEquip: false
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
index 98ecaa28a66625..ec813c1a40ae00 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -20,6 +20,7 @@
       path: /Audio/Weapons/bladeslice.ogg
   - type: Sprite
   - type: Item
+    size: Small
   - type: Tool
     qualities:
       - Slicing
@@ -39,7 +40,6 @@
     sprite: Objects/Weapons/Melee/kitchen_knife.rsi
     state: icon
   - type: Item
-    size: Small
     sprite: Objects/Weapons/Melee/kitchen_knife.rsi
   - type: GuideHelp
     guides:
@@ -64,7 +64,7 @@
       types:
         Slash: 10
   - type: Item
-    size: Small
+    size: Normal
     sprite: Objects/Weapons/Melee/cleaver.rsi
   - type: GuideHelp
     guides:
@@ -82,7 +82,6 @@
     - Knife
   - type: Sprite
     sprite: Objects/Weapons/Melee/combat_knife.rsi
-    size: Tiny
     state: icon
   - type: MeleeWeapon
     wideAnimationRotation: -135
@@ -91,7 +90,6 @@
       types:
         Slash: 10
   - type: Item
-    size: Small
     sprite: Objects/Weapons/Melee/combat_knife.rsi
   - type: DisarmMalus
     malus: 0.225
@@ -104,10 +102,8 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Melee/survival_knife.rsi
-    size: Tiny
     state: icon
   - type: Item
-    size: Small
     sprite: Objects/Weapons/Melee/survival_knife.rsi
 
 - type: entity
@@ -118,7 +114,6 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Melee/kukri_knife.rsi
-    size: Tiny
     state: icon
   - type: MeleeWeapon
     attackRate: 1.0
@@ -126,7 +121,6 @@
       types:
         Slash: 15
   - type: Item
-    size: Small
     sprite: Objects/Weapons/Melee/kukri_knife.rsi
 
 - type: entity
@@ -145,7 +139,6 @@
     node: icon
   - type: Sprite
     sprite: Objects/Weapons/Melee/shiv.rsi
-    size: Tiny
     state: icon
   - type: MeleeWeapon
     attackRate: 1.5
@@ -153,7 +146,6 @@
       types:
         Slash: 5.5
   - type: Item
-    size: Tiny #as much as a regular glass shard
     sprite: Objects/Weapons/Melee/shiv.rsi
   - type: DisarmMalus
     malus: 0.225
@@ -167,8 +159,6 @@
   - type: Construction
     graph: ReinforcedShiv
     node: icon
-    size: Tiny
-    state: icon
   - type: MeleeWeapon
     attackRate: 1.5
     damage:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
index e5046d5c1fa284..17e52846041ebf 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
@@ -57,7 +57,7 @@
         Slash: 2.5
   - type: GunRequiresWield
   - type: Item
-    size: Huge
+    size: Ginormous
   - type: DisarmMalus
   - type: Tool
     qualities:
@@ -112,4 +112,4 @@
     wideAnimationRotation: -135
     attackRate: 1.25
   - type: Item
-    size: Huge
+    size: Ginormous
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
index 037844507ffca3..aa383b6f0c8d53 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
@@ -47,7 +47,7 @@
       types:
         Piercing: 15
   - type: Item
-    size: Huge
+    size: Ginormous
   - type: Clothing
     quickEquip: false
     slots:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml
index 87b7c468c3cc46..b43ea5059c4198 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml
@@ -26,7 +26,7 @@
   - type: ItemCooldown
   - type: Item
     heldPrefix: off
-    size: Large
+    size: Huge
   - type: Clothing
     sprite: Objects/Weapons/Melee/stunprod.rsi
     quickEquip: false
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/weapon_toolbox.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/weapon_toolbox.yml
index e5a03d51367363..36259ddcc2256c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/weapon_toolbox.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/weapon_toolbox.yml
@@ -9,7 +9,7 @@
     sprite: Objects/Tools/Toolboxes/toolbox_red.rsi
     state: icon
   - type: Item
-    size: Huge
+    size: Ginormous
     sprite: Objects/Tools/Toolboxes/toolbox_red.rsi
   - type: MeleeWeapon
     wideAnimationRotation: -135
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
index 8d669ab6d23d10..e6ede719cf8821 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
@@ -305,7 +305,7 @@
       map: ["foldedLayer"]
       visible: false
   - type: Item
-    size: Large
+    size: Huge
   - type: Appearance
   - type: MeleeWeapon
     damage: