diff --git a/Content.Client/Storage/UI/StorageWindow.cs b/Content.Client/Storage/UI/StorageWindow.cs
index 325cbd8a6a..1af50cb147 100644
--- a/Content.Client/Storage/UI/StorageWindow.cs
+++ b/Content.Client/Storage/UI/StorageWindow.cs
@@ -1,15 +1,16 @@
 using System.Numerics;
-using Content.Client.Message;
+using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
 using Content.Client.Stylesheets;
 using Content.Client.UserInterface.Controls;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Item;
 using Content.Shared.Stacks;
 using Content.Shared.Storage;
-using Content.Shared.Storage.EntitySystems;
 using Robust.Client.UserInterface;
+using Robust.Shared.Containers;
 using static Robust.Client.UserInterface.Controls.BoxContainer;
 using Direction = Robust.Shared.Maths.Direction;
 
@@ -22,9 +23,7 @@ namespace Content.Client.Storage.UI
     {
         private readonly IEntityManager _entityManager;
 
-        private readonly SharedStorageSystem _storage;
-
-        private readonly RichTextLabel _information;
+        private readonly Label _information;
         public readonly ContainerButton StorageContainerButton;
         public readonly ListContainer EntityList;
         private readonly StyleBoxFlat _hoveredBox = new() { BackgroundColor = Color.Black.WithAlpha(0.35f) };
@@ -33,7 +32,6 @@ namespace Content.Client.Storage.UI
         public StorageWindow(IEntityManager entityManager)
         {
             _entityManager = entityManager;
-            _storage = _entityManager.System<SharedStorageSystem>();
             SetSize = new Vector2(240, 320);
             Title = Loc.GetString("comp-storage-window-title");
             RectClipContent = true;
@@ -62,14 +60,11 @@ namespace Content.Client.Storage.UI
 
             StorageContainerButton.AddChild(vBox);
 
-            _information = new RichTextLabel
+            _information = new Label
             {
+                Text = Loc.GetString("comp-storage-window-volume", ("itemCount", 0), ("usedVolume", 0), ("maxVolume", 0)),
                 VerticalAlignment = VAlignment.Center
             };
-            _information.SetMessage(Loc.GetString("comp-storage-window-volume",
-                ("itemCount", 0),
-                ("maxCount", 0),
-                ("size", SharedItemSystem.GetItemSizeLocale(ItemSize.Normal))));
 
             vBox.AddChild(_information);
 
@@ -106,23 +101,15 @@ namespace Content.Client.Storage.UI
 
             EntityList.PopulateList(list);
 
-            SetStorageInformation((entity, component));
-        }
-
-        private void SetStorageInformation(Entity<StorageComponent> uid)
-        {
-            if (uid.Comp.MaxSlots != uid.Comp.Container.ContainedEntities.Count
-                && _storage.GetCumulativeItemSizes(uid, uid.Comp) == _storage.GetMaxTotalWeight((uid, uid.Comp)))
+            // Sets information about entire storage container current capacity
+            if (component.StorageCapacityMax != 0)
             {
-                _information.SetMarkup(Loc.GetString("comp-storage-window-volume-full",
-                    ("size", SharedItemSystem.GetItemSizeLocale(_storage.GetMaxItemSize((uid, uid.Comp))))));
+                _information.Text = Loc.GetString("comp-storage-window-volume", ("itemCount", storedCount),
+                    ("usedVolume", component.StorageUsed), ("maxVolume", component.StorageCapacityMax));
             }
             else
             {
-                _information.SetMarkup(Loc.GetString("comp-storage-window-volume",
-                    ("itemCount", uid.Comp.Container.ContainedEntities.Count),
-                    ("maxCount", uid.Comp.MaxSlots),
-                    ("size", SharedItemSystem.GetItemSizeLocale(_storage.GetMaxItemSize((uid, uid.Comp))))));
+                _information.Text = Loc.GetString("comp-storage-window-volume-unlimited", ("itemCount", storedCount));
             }
         }
 
@@ -135,9 +122,10 @@ namespace Content.Client.Storage.UI
                 || !_entityManager.EntityExists(entity))
                 return;
 
-            _entityManager.TryGetComponent(entity, out StackComponent? stack);
             _entityManager.TryGetComponent(entity, out ItemComponent? item);
+            _entityManager.TryGetComponent(entity, out StackComponent? stack);
             var count = stack?.Count ?? 1;
+            var size = item?.Size;
 
             var spriteView = new SpriteView
             {
@@ -159,14 +147,12 @@ namespace Content.Client.Storage.UI
                             HorizontalExpand = true,
                             ClipText = true,
                             Text = _entityManager.GetComponent<MetaDataComponent>(Identity.Entity(entity, _entityManager)).EntityName +
-                                   (count > 1 ? $" x {count}" : string.Empty)
+                                   (count > 1 ? $" x {count}" : string.Empty),
                         },
                         new Label
                         {
                             Align = Label.AlignMode.Right,
-                            Text = item?.Size != null
-                                ? SharedItemSystem.GetItemSizeLocale(item.Size)
-                                : Loc.GetString("comp-storage-no-item-size")
+                            Text = size.ToString() ?? Loc.GetString("comp-storage-no-item-size"),
                         }
                     }
             });
diff --git a/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs b/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs
index 4bba605f0a..3ea3dd7916 100644
--- a/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs
+++ b/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs
@@ -26,7 +26,7 @@ namespace Content.IntegrationTests.Tests
   - type: Clothing
     slots: [innerclothing]
   - type: Item
-    size: Tiny
+    size: 5
 
 - type: entity
   name: IDCardDummy
@@ -36,7 +36,7 @@ namespace Content.IntegrationTests.Tests
     slots:
     - idcard
   - type: Item
-    size: Tiny
+    size: 5
   - type: IdCard
 
 - type: entity
@@ -44,14 +44,14 @@ namespace Content.IntegrationTests.Tests
   id: FlashlightDummy
   components:
   - type: Item
-    size: Tiny
+    size: 5
 
 - type: entity
   name: ToolboxDummy
   id: ToolboxDummy
   components:
   - type: Item
-    size: Huge
+    size: 9999
 ";
         [Test]
         public async Task Test()
diff --git a/Content.IntegrationTests/Tests/StackTest.cs b/Content.IntegrationTests/Tests/StackTest.cs
new file mode 100644
index 0000000000..a34dd7e53d
--- /dev/null
+++ b/Content.IntegrationTests/Tests/StackTest.cs
@@ -0,0 +1,39 @@
+using Content.Shared.Item;
+using Content.Shared.Stacks;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Prototypes;
+
+namespace Content.IntegrationTests.Tests;
+
+[TestFixture]
+public sealed class StackTest
+{
+    [Test]
+    public async Task StackCorrectItemSize()
+    {
+        await using var pair = await PoolManager.GetServerClient();
+        var server = pair.Server;
+
+        var protoManager = server.ResolveDependency<IPrototypeManager>();
+        var compFact = server.ResolveDependency<IComponentFactory>();
+
+        Assert.Multiple(() =>
+        {
+            foreach (var entity in PoolManager.GetPrototypesWithComponent<StackComponent>(server))
+            {
+                if (!entity.TryGetComponent<StackComponent>(out var stackComponent, compFact) ||
+                    !entity.TryGetComponent<ItemComponent>(out var itemComponent, compFact))
+                    continue;
+
+                if (!protoManager.TryIndex<StackPrototype>(stackComponent.StackTypeId, out var stackProto) ||
+                    stackProto.ItemSize == null)
+                    continue;
+
+                var expectedSize = stackProto.ItemSize * stackComponent.Count;
+                Assert.That(itemComponent.Size, Is.EqualTo(expectedSize), $"Prototype id: {entity.ID} has an item size of {itemComponent.Size} but expected size of {expectedSize}.");
+            }
+        });
+
+        await pair.CleanReturnAsync();
+    }
+}
diff --git a/Content.IntegrationTests/Tests/StorageTest.cs b/Content.IntegrationTests/Tests/StorageTest.cs
index de3b7f149d..ea7f3f5866 100644
--- a/Content.IntegrationTests/Tests/StorageTest.cs
+++ b/Content.IntegrationTests/Tests/StorageTest.cs
@@ -3,12 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using Content.Server.Storage.Components;
 using Content.Shared.Item;
-using Content.Shared.Prototypes;
 using Content.Shared.Storage;
 using Content.Shared.Storage.Components;
-using Content.Shared.Storage.EntitySystems;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;
+using Robust.UnitTesting;
 
 namespace Content.IntegrationTests.Tests
 {
@@ -33,11 +32,9 @@ namespace Content.IntegrationTests.Tests
                 {
                     if (!proto.TryGetComponent<StorageComponent>("Storage", out var storage) ||
                         storage.Whitelist != null ||
-                        storage.MaxItemSize == null ||
-                        !proto.TryGetComponent<ItemComponent>("Item", out var item))
-                        continue;
+                        !proto.TryGetComponent<ItemComponent>("Item", out var item)) continue;
 
-                    Assert.That(storage.MaxItemSize.Value, Is.LessThan(item.Size), $"Found storage arbitrage on {proto.ID}");
+                    Assert.That(storage.StorageCapacityMax, Is.LessThanOrEqualTo(item.Size), $"Found storage arbitrage on {proto.ID}");
                 }
             });
             await pair.CleanReturnAsync();
@@ -85,120 +82,69 @@ namespace Content.IntegrationTests.Tests
             {
                 foreach (var proto in PoolManager.GetPrototypesWithComponent<StorageFillComponent>(server))
                 {
-                    if (proto.HasComponent<EntityStorageComponent>(compFact))
-                        continue;
+                    int capacity;
+                    var isEntStorage = false;
 
-                    if (!proto.TryGetComponent<StorageComponent>("Storage", out var storage))
+                    if (proto.TryGetComponent<StorageComponent>("Storage", out var storage))
+                    {
+                        capacity = storage.StorageCapacityMax;
+                    }
+                    else if (proto.TryGetComponent<EntityStorageComponent>("EntityStorage", out var entStorage))
+                    {
+                        capacity = entStorage.Capacity;
+                        isEntStorage = true;
+                    }
+                    else
                     {
                         Assert.Fail($"Entity {proto.ID} has storage-fill without a storage component!");
                         continue;
                     }
 
-                    proto.TryGetComponent<ItemComponent>("Item", out var item);
-
-                    var maxSize = storage.MaxItemSize ??
-                                  (item?.Size == null
-                                      ? SharedStorageSystem.DefaultStorageMaxItemSize
-                                      : (ItemSize) Math.Max(0, (int) item.Size - 1));
-
-                    var capacity = storage.MaxTotalWeight ??
-                                   storage.MaxSlots * SharedItemSystem.GetItemSizeWeight(storage.MaxItemSize ?? maxSize);
-
                     var fill = (StorageFillComponent) proto.Components[id].Component;
-                    var size = GetFillSize(fill, false, protoMan);
-
+                    var size = GetFillSize(fill, isEntStorage);
                     Assert.That(size, Is.LessThanOrEqualTo(capacity), $"{proto.ID} storage fill is too large.");
-                    Assert.That(GetFillSize(fill, true, protoMan), Is.LessThanOrEqualTo(storage.MaxSlots), $"{proto.ID} storage fill has too many items.");
-
-                    foreach (var entry in fill.Contents)
-                    {
-                        if (entry.PrototypeId == null)
-                            continue;
-
-                        if (!protoMan.TryIndex<EntityPrototype>(entry.PrototypeId, out var fillItem))
-                            continue;
-
-                        if (!fillItem.TryGetComponent<ItemComponent>("Item", out var entryItem))
-                            continue;
-
-                        Assert.That(entryItem.Size, Is.LessThanOrEqualTo(maxSize),
-                            $"Entity {proto.ID} has storage-fill item, {entry.PrototypeId}, that is too large");
-                    }
                 }
             });
 
-            await pair.CleanReturnAsync();
-
-        }
-
-        [Test]
-        public async Task TestSufficientSpaceForEntityStorageFill()
-        {
-            await using var pair = await PoolManager.GetServerClient();
-            var server = pair.Server;
-
-            var protoMan = server.ResolveDependency<IPrototypeManager>();
-            var compFact = server.ResolveDependency<IComponentFactory>();
-            var id = compFact.GetComponentName(typeof(StorageFillComponent));
-
-            Assert.Multiple(() =>
+            int GetEntrySize(EntitySpawnEntry entry, bool isEntStorage)
             {
-                foreach (var proto in PoolManager.GetPrototypesWithComponent<StorageFillComponent>(server))
+                if (entry.PrototypeId == null)
+                    return 0;
+
+                if (!protoMan.TryIndex<EntityPrototype>(entry.PrototypeId, out var proto))
                 {
-                    if (proto.HasComponent<StorageComponent>(compFact))
-                        continue;
-
-                    if (!proto.TryGetComponent<EntityStorageComponent>("EntityStorage", out var entStorage))
-                    {
-                        Assert.Fail($"Entity {proto.ID} has storage-fill without a storage component!");
-                        continue;
-                    }
-
-                    var fill = (StorageFillComponent) proto.Components[id].Component;
-                    var size = GetFillSize(fill, true, protoMan);
-                    Assert.That(size, Is.LessThanOrEqualTo(entStorage.Capacity),
-                        $"{proto.ID} storage fill is too large.");
+                    Assert.Fail($"Unknown prototype: {entry.PrototypeId}");
+                    return 0;
                 }
-            });
+
+                if (isEntStorage)
+                    return entry.Amount;
+
+                if (proto.TryGetComponent<ItemComponent>("Item", out var item))
+                    return item.Size * entry.Amount;
+
+                Assert.Fail($"Prototype is missing item comp: {entry.PrototypeId}");
+                return 0;
+            }
+
+            int GetFillSize(StorageFillComponent fill, bool isEntStorage)
+            {
+                var totalSize = 0;
+                var groups = new Dictionary<string, int>();
+                foreach (var entry in fill.Contents)
+                {
+                    var size = GetEntrySize(entry, isEntStorage);
+
+                    if (entry.GroupId == null)
+                        totalSize += size;
+                    else
+                        groups[entry.GroupId] = Math.Max(size, groups.GetValueOrDefault(entry.GroupId));
+                }
+
+                return totalSize + groups.Values.Sum();
+            }
+
             await pair.CleanReturnAsync();
         }
-
-        private int GetEntrySize(EntitySpawnEntry entry, bool getCount, IPrototypeManager protoMan)
-        {
-            if (entry.PrototypeId == null)
-                return 0;
-
-            if (!protoMan.TryIndex<EntityPrototype>(entry.PrototypeId, out var proto))
-            {
-                Assert.Fail($"Unknown prototype: {entry.PrototypeId}");
-                return 0;
-            }
-
-            if (getCount)
-                return entry.Amount;
-
-            if (proto.TryGetComponent<ItemComponent>("Item", out var item))
-                return SharedItemSystem.GetItemSizeWeight(item.Size) * entry.Amount;
-
-            Assert.Fail($"Prototype is missing item comp: {entry.PrototypeId}");
-            return 0;
-        }
-
-        private int GetFillSize(StorageFillComponent fill, bool getCount, IPrototypeManager protoMan)
-        {
-            var totalSize = 0;
-            var groups = new Dictionary<string, int>();
-            foreach (var entry in fill.Contents)
-            {
-                var size = GetEntrySize(entry, getCount, protoMan);
-
-                if (entry.GroupId == null)
-                    totalSize += size;
-                else
-                    groups[entry.GroupId] = Math.Max(size, groups.GetValueOrDefault(entry.GroupId));
-            }
-
-            return totalSize + groups.Values.Sum();
-        }
     }
 }
diff --git a/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs b/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs
index a35cb7703d..a831165e68 100644
--- a/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs
@@ -180,13 +180,14 @@ namespace Content.Server.Chemistry.EntitySystems
             var user = message.Session.AttachedEntity;
             var maybeContainer = _itemSlotsSystem.GetItemOrNull(chemMaster, SharedChemMaster.OutputSlotName);
             if (maybeContainer is not { Valid: true } container
-                || !TryComp(container, out StorageComponent? storage))
+                || !TryComp(container, out StorageComponent? storage)
+                || storage.Container is null)
             {
                 return; // output can't fit pills
             }
 
             // Ensure the number is valid.
-            if (message.Number == 0 || !_storageSystem.HasSpace((container, storage)))
+            if (message.Number == 0 || message.Number > storage.StorageCapacityMax - storage.StorageUsed)
                 return;
 
             // Ensure the amount is valid.
@@ -344,7 +345,7 @@ namespace Content.Server.Chemistry.EntitySystems
                 }
             }
 
-            if (!TryComp(container, out StorageComponent? storage) || storage.Container == null)
+            if (!TryComp(container, out StorageComponent? storage))
                 return null;
 
             var pills = storage.Container?.ContainedEntities.Select((Func<EntityUid, (string, FixedPoint2 quantity)>) (pill =>
@@ -357,7 +358,7 @@ namespace Content.Server.Chemistry.EntitySystems
             if (pills == null)
                 return null;
 
-            return new ContainerInfo(name, storage.Container!.ContainedEntities.Count, storage.MaxSlots)
+            return new ContainerInfo(name, storage.StorageUsed, storage.StorageCapacityMax)
             {
                 Entities = pills
             };
diff --git a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
index 758d42356e..ff4ec41dd9 100644
--- a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
@@ -1,4 +1,3 @@
-using System.Linq;
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
 using Content.Server.Inventory;
@@ -123,7 +122,7 @@ public sealed class FoodSystem : EntitySystem
             return (false, false);
 
         // Check for used storage on the food item
-        if (TryComp<StorageComponent>(food, out var storageState) && storageState.Container.ContainedEntities.Any())
+        if (TryComp<StorageComponent>(food, out var storageState) && storageState.StorageUsed != 0)
         {
             _popup.PopupEntity(Loc.GetString("food-has-used-storage", ("food", food)), user, user);
             return (false, true);
diff --git a/Content.Server/Storage/Components/SecretStashComponent.cs b/Content.Server/Storage/Components/SecretStashComponent.cs
index 6c7095617c..60d0c829e9 100644
--- a/Content.Server/Storage/Components/SecretStashComponent.cs
+++ b/Content.Server/Storage/Components/SecretStashComponent.cs
@@ -19,7 +19,7 @@ namespace Content.Server.Storage.Components
         ///     Max item size that can be fitted into secret stash.
         /// </summary>
         [DataField("maxItemSize")]
-        public ItemSize MaxItemSize = ItemSize.Small;
+        public int MaxItemSize = (int) ReferenceSizes.Pocket;
 
         /// <summary>
         ///     IC secret stash name. For example "the toilet cistern".
diff --git a/Content.Server/Storage/EntitySystems/StorageFillVisualizerSystem.cs b/Content.Server/Storage/EntitySystems/StorageFillVisualizerSystem.cs
index 5fbd328499..ed48de2e45 100644
--- a/Content.Server/Storage/EntitySystems/StorageFillVisualizerSystem.cs
+++ b/Content.Server/Storage/EntitySystems/StorageFillVisualizerSystem.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Rounding;
 using Content.Shared.Storage;
 using Content.Shared.Storage.Components;
+using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 
 namespace Content.Server.Storage.EntitySystems;
@@ -12,12 +13,12 @@ public sealed class StorageFillVisualizerSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<StorageFillVisualizerComponent, ComponentStartup>(OnStartup);
+        SubscribeLocalEvent<StorageFillVisualizerComponent, ComponentInit>(OnInit);
         SubscribeLocalEvent<StorageFillVisualizerComponent, EntInsertedIntoContainerMessage>(OnInserted);
         SubscribeLocalEvent<StorageFillVisualizerComponent, EntRemovedFromContainerMessage>(OnRemoved);
     }
 
-    private void OnStartup(EntityUid uid, StorageFillVisualizerComponent component, ComponentStartup args)
+    private void OnInit(EntityUid uid, StorageFillVisualizerComponent component, ComponentInit args)
     {
         UpdateAppearance(uid, component: component);
     }
@@ -41,7 +42,7 @@ public sealed class StorageFillVisualizerSystem : EntitySystem
         if (component.MaxFillLevels < 1)
             return;
 
-        var level = ContentHelpers.RoundToEqualLevels(storage.Container.ContainedEntities.Count, storage.MaxSlots, component.MaxFillLevels);
+        var level = ContentHelpers.RoundToEqualLevels(storage.StorageUsed, storage.StorageCapacityMax, component.MaxFillLevels);
         _appearance.SetData(uid, StorageFillVisuals.FillLevel, level, appearance);
     }
 }
diff --git a/Content.Server/Weapons/Melee/EnergySword/EnergySwordSystem.cs b/Content.Server/Weapons/Melee/EnergySword/EnergySwordSystem.cs
index 80316d64f9..fcd42f5a28 100644
--- a/Content.Server/Weapons/Melee/EnergySword/EnergySwordSystem.cs
+++ b/Content.Server/Weapons/Melee/EnergySword/EnergySwordSystem.cs
@@ -98,7 +98,7 @@ public sealed class EnergySwordSystem : EntitySystem
     {
         if (TryComp(uid, out ItemComponent? item))
         {
-            _item.SetSize(uid, ItemSize.Small, item);
+            _item.SetSize(uid, 5, item);
         }
 
         if (TryComp<DisarmMalusComponent>(uid, out var malus))
@@ -125,7 +125,7 @@ public sealed class EnergySwordSystem : EntitySystem
     {
         if (TryComp(uid, out ItemComponent? item))
         {
-            _item.SetSize(uid, ItemSize.Huge, item);
+            _item.SetSize(uid, 9999, item);
         }
 
         if (comp.IsSharp)
diff --git a/Content.Shared/Inventory/InventorySystem.Equip.cs b/Content.Shared/Inventory/InventorySystem.Equip.cs
index 23c0fbd0a2..90c9f0e1e0 100644
--- a/Content.Shared/Inventory/InventorySystem.Equip.cs
+++ b/Content.Shared/Inventory/InventorySystem.Equip.cs
@@ -264,7 +264,7 @@ public abstract partial class InventorySystem
         if (slotDefinition.DependsOn != null && !TryGetSlotEntity(target, slotDefinition.DependsOn, out _, inventory))
             return false;
 
-        var fittingInPocket = slotDefinition.SlotFlags.HasFlag(SlotFlags.POCKET) && item is { Size: <= ItemSize.Small };
+        var fittingInPocket = slotDefinition.SlotFlags.HasFlag(SlotFlags.POCKET) && item is { Size: <= (int) ReferenceSizes.Pocket };
         if (clothing == null && !fittingInPocket
             || clothing != null && !clothing.Slots.HasFlag(slotDefinition.SlotFlags) && !fittingInPocket)
         {
diff --git a/Content.Shared/Item/ItemComponent.cs b/Content.Shared/Item/ItemComponent.cs
index 6d91f7cb4e..7516f4faca 100644
--- a/Content.Shared/Item/ItemComponent.cs
+++ b/Content.Shared/Item/ItemComponent.cs
@@ -13,17 +13,18 @@ namespace Content.Shared.Item;
 [Access(typeof(SharedItemSystem))]
 public sealed partial class ItemComponent : Component
 {
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    [Access(typeof(SharedItemSystem))]
-    public ItemSize Size = ItemSize.Small;
+    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField("size")]
+    [Access(typeof(SharedItemSystem), Other = AccessPermissions.ReadExecute)]
+    public int Size = 5;
 
     [Access(typeof(SharedItemSystem))]
-    [DataField]
+    [DataField("inhandVisuals")]
     public Dictionary<HandLocation, List<PrototypeLayerData>> InhandVisuals = new();
 
     [Access(typeof(SharedItemSystem))]
     [ViewVariables(VVAccess.ReadWrite)]
-    [DataField]
+    [DataField("heldPrefix")]
     public string? HeldPrefix;
 
     /// <summary>
@@ -38,10 +39,10 @@ public sealed partial class ItemComponent : Component
 [Serializable, NetSerializable]
 public sealed class ItemComponentState : ComponentState
 {
-    public ItemSize Size { get; }
+    public int Size { get; }
     public string? HeldPrefix { get; }
 
-    public ItemComponentState(ItemSize size, string? heldPrefix)
+    public ItemComponentState(int size, string? heldPrefix)
     {
         Size = size;
         HeldPrefix = heldPrefix;
@@ -65,43 +66,6 @@ public sealed class VisualsChangedEvent : EntityEventArgs
     }
 }
 
-/// <summary>
-/// Abstracted sizes for items.
-/// Used to determine what can fit into inventories.
-/// </summary>
-public enum ItemSize
-{
-    /// <summary>
-    /// Items that can be held completely in one's hand.
-    /// </summary>
-    Tiny = 1,
-
-    /// <summary>
-    /// Items that can fit inside of a standard pocket.
-    /// </summary>
-    Small = 2,
-
-    /// <summary>
-    /// Items that can fit inside of a standard bag.
-    /// </summary>
-    Normal = 3,
-
-    /// <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 = 4,
-
-    /// <summary>
-    /// Items that are too large to place inside of any kind of container.
-    /// </summary>
-    Huge = 5,
-
-    /// <summary>
-    /// Picture furry gf
-    /// </summary>
-    Ginormous = 6
-}
-
 /// <summary>
 ///     Reference sizes for common containers and items.
 /// </summary>
diff --git a/Content.Shared/Item/ItemToggleComponent.cs b/Content.Shared/Item/ItemToggleComponent.cs
index 250306f8c7..fda4d0904a 100644
--- a/Content.Shared/Item/ItemToggleComponent.cs
+++ b/Content.Shared/Item/ItemToggleComponent.cs
@@ -1,4 +1,3 @@
-using Content.Shared.Item;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 
@@ -21,11 +20,11 @@ public sealed partial class ItemToggleComponent : Component
 
     [ViewVariables(VVAccess.ReadWrite)]
     [DataField("offSize")]
-    public ItemSize OffSize = ItemSize.Small;
+    public int OffSize = 1;
 
     [ViewVariables(VVAccess.ReadWrite)]
     [DataField("onSize")]
-    public ItemSize OnSize = ItemSize.Huge;
+    public int OnSize = 9999;
 }
 
 [ByRefEvent]
diff --git a/Content.Shared/Item/SharedItemSystem.cs b/Content.Shared/Item/SharedItemSystem.cs
index d7e7b3630f..5f890af99f 100644
--- a/Content.Shared/Item/SharedItemSystem.cs
+++ b/Content.Shared/Item/SharedItemSystem.cs
@@ -1,27 +1,23 @@
+using Content.Shared.CombatMode;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Interaction;
 using Content.Shared.Stacks;
 using Content.Shared.Verbs;
 using Content.Shared.Examine;
-using JetBrains.Annotations;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Item;
 
 public abstract class SharedItemSystem : EntitySystem
 {
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private   readonly SharedHandsSystem _handsSystem = default!;
+    [Dependency] private   readonly SharedCombatModeSystem _combatMode = default!;
     [Dependency] protected readonly SharedContainerSystem Container = default!;
 
-    public const int ItemSizeWeightTiny = 1;
-    public const int ItemSizeWeightSmall = 2;
-    public const int ItemSizeWeightNormal = 4;
-    public const int ItemSizeWeightLarge = 8;
-    public const int ItemSizeWeightHuge = 16;
-    public const int ItemSizeWeightGinormous = 32;
-
     public override void Initialize()
     {
         base.Initialize();
@@ -37,13 +33,13 @@ public abstract class SharedItemSystem : EntitySystem
 
     #region Public API
 
-    public void SetSize(EntityUid uid, ItemSize size, ItemComponent? component = null)
+    public void SetSize(EntityUid uid, int size, ItemComponent? component = null)
     {
         if (!Resolve(uid, ref component, false))
             return;
 
         component.Size = size;
-        Dirty(uid, component);
+        Dirty(component);
     }
 
     public void SetHeldPrefix(EntityUid uid, string? heldPrefix, ItemComponent? component = null)
@@ -55,7 +51,7 @@ public abstract class SharedItemSystem : EntitySystem
             return;
 
         component.HeldPrefix = heldPrefix;
-        Dirty(uid, component);
+        Dirty(component);
         VisualsChanged(uid);
     }
 
@@ -71,7 +67,7 @@ public abstract class SharedItemSystem : EntitySystem
         item.InhandVisuals = otherItem.InhandVisuals;
         item.HeldPrefix = otherItem.HeldPrefix;
 
-        Dirty(uid, item);
+        Dirty(item);
         VisualsChanged(uid);
     }
 
@@ -87,7 +83,14 @@ public abstract class SharedItemSystem : EntitySystem
 
     protected virtual void OnStackCountChanged(EntityUid uid, ItemComponent component, StackCountChangedEvent args)
     {
+        if (!TryComp<StackComponent>(uid, out var stack))
+            return;
 
+        if (!_prototype.TryIndex<StackPrototype>(stack.StackTypeId, out var stackProto) ||
+            stackProto.ItemSize is not { } size)
+            return;
+
+        SetSize(uid, args.NewCount * size, component);
     }
 
     private void OnHandleState(EntityUid uid, ItemComponent component, ref ComponentHandleState args)
@@ -132,7 +135,7 @@ public abstract class SharedItemSystem : EntitySystem
     private void OnExamine(EntityUid uid, ItemComponent component, ExaminedEvent args)
     {
         args.PushMarkup(Loc.GetString("item-component-on-examine-size",
-            ("size", GetItemSizeLocale(component.Size))));
+            ("size", component.Size)));
     }
 
     /// <summary>
@@ -145,32 +148,4 @@ public abstract class SharedItemSystem : EntitySystem
     public virtual void VisualsChanged(EntityUid owner)
     {
     }
-
-    [PublicAPI]
-    public static string GetItemSizeLocale(ItemSize size)
-    {
-        return Robust.Shared.Localization.Loc.GetString($"item-component-size-{size.ToString()}");
-    }
-
-    [PublicAPI]
-    public static int GetItemSizeWeight(ItemSize size)
-    {
-        switch (size)
-        {
-            case ItemSize.Tiny:
-                return ItemSizeWeightTiny;
-            case ItemSize.Small:
-                return ItemSizeWeightSmall;
-            case ItemSize.Normal:
-                return ItemSizeWeightNormal;
-            case ItemSize.Large:
-                return ItemSizeWeightLarge;
-            case ItemSize.Huge:
-                return ItemSizeWeightHuge;
-            case ItemSize.Ginormous:
-                return ItemSizeWeightGinormous;
-            default:
-                throw new ArgumentOutOfRangeException(nameof(size), size, null);
-        }
-    }
 }
diff --git a/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs b/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs
index c7505ab3c0..16657bdae4 100644
--- a/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs
@@ -1,7 +1,10 @@
 using Content.Server.Storage.Components;
+using Content.Shared.Hands;
 using Content.Shared.Inventory;
+using Content.Shared.Stacks;
 using Robust.Shared.Map;
 using Robust.Shared.Physics.Components;
+using Robust.Shared.Player;
 using Robust.Shared.Timing;
 
 namespace Content.Shared.Storage.EntitySystems;
@@ -53,7 +56,7 @@ public sealed class MagnetPickupSystem : EntitySystem
             comp.NextScan += ScanDelay;
 
             // No space
-            if (!_storage.HasSpace((uid, storage)))
+            if (storage.StorageUsed >= storage.StorageCapacityMax)
                 continue;
 
             if (!_inventory.TryGetContainingSlot(uid, out var slotDef))
diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
index 798d768191..5faec99fd5 100644
--- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@@ -4,6 +4,7 @@ using Content.Shared.CombatMode;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Destructible;
 using Content.Shared.DoAfter;
+using Content.Shared.Hands;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Implants.Components;
@@ -45,8 +46,6 @@ public abstract class SharedStorageSystem : EntitySystem
     private EntityQuery<StackComponent> _stackQuery;
     private EntityQuery<TransformComponent> _xformQuery;
 
-    public const ItemSize DefaultStorageMaxItemSize = ItemSize.Normal;
-
     /// <inheritdoc />
     public override void Initialize()
     {
@@ -90,7 +89,6 @@ public abstract class SharedStorageSystem : EntitySystem
     {
         // TODO: I had this.
         // We can get states being applied before the container is ready.
-        // ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
         if (component.Container == default)
             return;
 
@@ -231,7 +229,7 @@ public abstract class SharedStorageSystem : EntitySystem
                 return;
             }
 
-            if (_xformQuery.TryGetComponent(uid, out var transformOwner) && TryComp<TransformComponent>(target, out var transformEnt))
+            if (TryComp<TransformComponent>(uid, out var transformOwner) && TryComp<TransformComponent>(target, out var transformEnt))
             {
                 var parent = transformOwner.ParentUid;
 
@@ -241,7 +239,7 @@ public abstract class SharedStorageSystem : EntitySystem
                     _transform
                 );
 
-                if (PlayerInsertEntityInWorld((uid, storageComp), args.User, target))
+                if (PlayerInsertEntityInWorld(uid, args.User, target, storageComp))
                 {
                     RaiseNetworkEvent(new AnimateInsertingEntitiesEvent(GetNetEntity(uid),
                         new List<NetEntity> { GetNetEntity(target) },
@@ -287,7 +285,7 @@ public abstract class SharedStorageSystem : EntitySystem
 
             var angle = targetXform.LocalRotation;
 
-            if (PlayerInsertEntityInWorld((uid, component), args.Args.User, entity))
+            if (PlayerInsertEntityInWorld(uid, args.Args.User, entity, component))
             {
                 successfullyInserted.Add(entity);
                 successfullyInsertedPositions.Add(position);
@@ -324,7 +322,7 @@ public abstract class SharedStorageSystem : EntitySystem
     /// </summary>
     private void OnInteractWithItem(EntityUid uid, StorageComponent storageComp, StorageInteractWithItemEvent args)
     {
-        if (args.Session.AttachedEntity is not { } player)
+        if (args.Session.AttachedEntity is not EntityUid player)
             return;
 
         var entity = GetEntity(args.InteractedItemUID);
@@ -398,10 +396,27 @@ public abstract class SharedStorageSystem : EntitySystem
 
     public void RecalculateStorageUsed(EntityUid uid, StorageComponent storageComp)
     {
-        // it might make more sense to use the weights instead of the slots.
-        // I'm not sure.
-        _appearance.SetData(uid, StorageVisuals.StorageUsed, storageComp.Container.ContainedEntities.Count);
-        _appearance.SetData(uid, StorageVisuals.Capacity, storageComp.MaxSlots);
+        storageComp.StorageUsed = 0;
+
+        foreach (var entity in storageComp.Container.ContainedEntities)
+        {
+            if (!_itemQuery.TryGetComponent(entity, out var itemComp))
+                continue;
+
+            var size = itemComp.Size;
+            storageComp.StorageUsed += size;
+        }
+
+        _appearance.SetData(uid, StorageVisuals.StorageUsed, storageComp.StorageUsed);
+        _appearance.SetData(uid, StorageVisuals.Capacity, storageComp.StorageCapacityMax);
+    }
+
+    public int GetAvailableSpace(EntityUid uid, StorageComponent? component = null)
+    {
+        if (!Resolve(uid, ref component))
+            return 0;
+
+        return component.StorageCapacityMax - component.StorageUsed;
     }
 
     /// <summary>
@@ -434,20 +449,17 @@ public abstract class SharedStorageSystem : EntitySystem
     ///     Verifies if an entity can be stored and if it fits
     /// </summary>
     /// <param name="uid">The entity to check</param>
-    /// <param name="insertEnt"></param>
     /// <param name="reason">If returning false, the reason displayed to the player</param>
-    /// <param name="storageComp"></param>
-    /// <param name="item"></param>
     /// <returns>true if it can be inserted, false otherwise</returns>
-    public bool CanInsert(EntityUid uid, EntityUid insertEnt, out string? reason, StorageComponent? storageComp = null, ItemComponent? item = null)
+    public bool CanInsert(EntityUid uid, EntityUid insertEnt, out string? reason, StorageComponent? storageComp = null)
     {
-        if (!Resolve(uid, ref storageComp) || !Resolve(insertEnt, ref item))
+        if (!Resolve(uid, ref storageComp))
         {
             reason = null;
             return false;
         }
 
-        if (Transform(insertEnt).Anchored)
+        if (TryComp(insertEnt, out TransformComponent? transformComp) && transformComp.Anchored)
         {
             reason = "comp-storage-anchored-failure";
             return false;
@@ -465,19 +477,15 @@ public abstract class SharedStorageSystem : EntitySystem
             return false;
         }
 
-        if (item.Size > GetMaxItemSize((uid, storageComp)))
-        {
-            reason = "comp-storage-too-big";
-            return false;
-        }
-
-        if (storageComp.Container.ContainedEntities.Count >= storageComp.MaxSlots)
+        if (TryComp(insertEnt, out StorageComponent? storage) &&
+            storage.StorageCapacityMax >= storageComp.StorageCapacityMax)
         {
             reason = "comp-storage-insufficient-capacity";
             return false;
         }
 
-        if (SharedItemSystem.GetItemSizeWeight(item.Size) + GetCumulativeItemSizes(uid, storageComp) > GetMaxTotalWeight((uid, storageComp)))
+        if (TryComp(insertEnt, out ItemComponent? itemComp) &&
+            itemComp.Size > storageComp.StorageCapacityMax - storageComp.StorageUsed)
         {
             reason = "comp-storage-insufficient-capacity";
             return false;
@@ -534,7 +542,8 @@ public abstract class SharedStorageSystem : EntitySystem
             if (insertStack.Count > 0)
             {
                 // Try to insert it as a new stack.
-                if (!CanInsert(uid, insertEnt, out _, storageComp) ||
+                if (TryComp(insertEnt, out ItemComponent? itemComp) &&
+                    itemComp.Size > storageComp.StorageCapacityMax - storageComp.StorageUsed ||
                     !storageComp.Container.Insert(insertEnt))
                 {
                     // If we also didn't do any stack fills above then just end
@@ -559,9 +568,7 @@ public abstract class SharedStorageSystem : EntitySystem
     /// <summary>
     ///     Inserts an entity into storage from the player's active hand
     /// </summary>
-    /// <param name="uid"></param>
     /// <param name="player">The player to insert an entity from</param>
-    /// <param name="storageComp"></param>
     /// <returns>true if inserted, false otherwise</returns>
     public bool PlayerInsertHeldEntity(EntityUid uid, EntityUid player, StorageComponent? storageComp = null)
     {
@@ -582,23 +589,21 @@ public abstract class SharedStorageSystem : EntitySystem
             return false;
         }
 
-        return PlayerInsertEntityInWorld((uid, storageComp), player, toInsert.Value);
+        return PlayerInsertEntityInWorld(uid, player, toInsert.Value, storageComp);
     }
 
     /// <summary>
     ///     Inserts an Entity (<paramref name="toInsert"/>) in the world into storage, informing <paramref name="player"/> if it fails.
-    ///     <paramref name="toInsert"/> is *NOT* held, see <see cref="PlayerInsertHeldEntity(EntityUid,EntityUid,StorageComponent)"/>.
+    ///     <paramref name="toInsert"/> is *NOT* held, see <see cref="PlayerInsertHeldEntity(Robust.Shared.GameObjects.EntityUid)"/>.
     /// </summary>
-    /// <param name="uid"></param>
     /// <param name="player">The player to insert an entity with</param>
-    /// <param name="toInsert"></param>
     /// <returns>true if inserted, false otherwise</returns>
-    public bool PlayerInsertEntityInWorld(Entity<StorageComponent?> uid, EntityUid player, EntityUid toInsert)
+    public bool PlayerInsertEntityInWorld(EntityUid uid, EntityUid player, EntityUid toInsert, StorageComponent? storageComp = null)
     {
-        if (!Resolve(uid, ref uid.Comp) || !_sharedInteractionSystem.InRangeUnobstructed(player, uid))
+        if (!Resolve(uid, ref storageComp) || !_sharedInteractionSystem.InRangeUnobstructed(player, uid))
             return false;
 
-        if (!Insert(uid, toInsert, out _, user: player, uid.Comp))
+        if (!Insert(uid, toInsert, out _, user: player, storageComp))
         {
             _popupSystem.PopupClient(Loc.GetString("comp-storage-cant-insert"), uid, player);
             return false;
@@ -606,65 +611,6 @@ public abstract class SharedStorageSystem : EntitySystem
         return true;
     }
 
-    /// <summary>
-    /// Returns true if there is enough space to theoretically fit another item.
-    /// </summary>
-    public bool HasSpace(Entity<StorageComponent?> uid)
-    {
-        if (!Resolve(uid, ref uid.Comp))
-            return false;
-
-        return uid.Comp.Container.ContainedEntities.Count < uid.Comp.MaxSlots &&
-               GetCumulativeItemSizes(uid, uid.Comp) < GetMaxTotalWeight(uid);
-    }
-
-    /// <summary>
-    /// Returns the sum of all the ItemSizes of the items inside of a storage.
-    /// </summary>
-    public int GetCumulativeItemSizes(EntityUid uid, StorageComponent? component = null)
-    {
-        if (!Resolve(uid, ref component))
-            return 0;
-
-        var sum = 0;
-        foreach (var item in component.Container.ContainedEntities)
-        {
-            if (!_itemQuery.TryGetComponent(item, out var itemComp))
-                continue;
-            sum += SharedItemSystem.GetItemSizeWeight(itemComp.Size);
-        }
-
-        return sum;
-    }
-
-    public ItemSize GetMaxItemSize(Entity<StorageComponent?> uid)
-    {
-        if (!Resolve(uid, ref uid.Comp))
-            return DefaultStorageMaxItemSize;
-
-        // If we specify a max item size, use that
-        if (uid.Comp.MaxItemSize != null)
-            return uid.Comp.MaxItemSize.Value;
-
-        if (!_itemQuery.TryGetComponent(uid, out var item))
-            return DefaultStorageMaxItemSize;
-
-        // 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);
-    }
-
-    public int GetMaxTotalWeight(Entity<StorageComponent?> uid)
-    {
-        if (!Resolve(uid, ref uid.Comp))
-            return 0;
-
-        if (uid.Comp.MaxTotalWeight != null)
-            return uid.Comp.MaxTotalWeight.Value;
-
-        return uid.Comp.MaxSlots * SharedItemSystem.GetItemSizeWeight(GetMaxItemSize(uid));
-    }
-
     /// <summary>
     /// Plays a clientside pickup animation for the specified uid.
     /// </summary>
diff --git a/Content.Shared/Storage/StorageComponent.cs b/Content.Shared/Storage/StorageComponent.cs
index f05db44081..fdcf06bf5d 100644
--- a/Content.Shared/Storage/StorageComponent.cs
+++ b/Content.Shared/Storage/StorageComponent.cs
@@ -1,5 +1,3 @@
-using Content.Shared.Item;
-using Content.Shared.Storage.EntitySystems;
 using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
@@ -22,25 +20,6 @@ namespace Content.Shared.Storage
         [ViewVariables]
         public Container Container = default!;
 
-        /// <summary>
-        /// The max number of entities that can be inserted into this storage.
-        /// </summary>
-        [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
-        public int MaxSlots = 7;
-
-        /// <summary>
-        /// The maximum size item that can be inserted into this storage,
-        /// </summary>
-        [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
-        [Access(typeof(SharedStorageSystem))]
-        public ItemSize? MaxItemSize;
-
-        /// <summary>
-        /// A limit for the cumulative ItemSizes that can be inserted in this storage.
-        /// </summary>
-        [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
-        public int? MaxTotalWeight;
-
         // TODO: Make area insert its own component.
         [DataField("quickInsert")]
         public bool QuickInsert; // Can insert storables by "attacking" them with the storage entity
@@ -66,6 +45,18 @@ namespace Content.Shared.Storage
         [DataField("blacklist")]
         public EntityWhitelist? Blacklist;
 
+        /// <summary>
+        /// How much storage is currently being used by contained entities.
+        /// </summary>
+        [ViewVariables, DataField("storageUsed"), AutoNetworkedField]
+        public int StorageUsed;
+
+        /// <summary>
+        /// Maximum capacity for storage.
+        /// </summary>
+        [DataField("capacity"), AutoNetworkedField]
+        public int StorageCapacityMax = 10000;
+
         /// <summary>
         /// Sound played whenever an entity is inserted into storage.
         /// </summary>
diff --git a/Resources/Locale/en-US/components/storage-component.ftl b/Resources/Locale/en-US/components/storage-component.ftl
index cea37cd961..a6d542e4fb 100644
--- a/Resources/Locale/en-US/components/storage-component.ftl
+++ b/Resources/Locale/en-US/components/storage-component.ftl
@@ -1,10 +1,9 @@
 comp-storage-no-item-size = N/A
 comp-storage-cant-insert = Can't insert.
-comp-storage-too-big = Too big!
-comp-storage-insufficient-capacity = No room!
+comp-storage-insufficient-capacity = Insufficient capacity.
 comp-storage-invalid-container = This doesn't go in there!
 comp-storage-anchored-failure = Can't insert an anchored item.
 comp-storage-cant-drop = You can't let go of { THE($entity) }!
 comp-storage-window-title = Storage Item
-comp-storage-window-volume = Items: { $itemCount }/{ $maxCount }, Max Size: {$size}
-comp-storage-window-volume-full = [color=orange][bold]FULL[/bold][/color], Max Size: {$size}
+comp-storage-window-volume = Items: { $itemCount }, Stored: { $usedVolume }/{ $maxVolume }
+comp-storage-window-volume-unlimited = Items: { $itemCount }
diff --git a/Resources/Locale/en-US/items/components/item-component.ftl b/Resources/Locale/en-US/items/components/item-component.ftl
index 54354ef1ee..f9750a55fa 100644
--- a/Resources/Locale/en-US/items/components/item-component.ftl
+++ b/Resources/Locale/en-US/items/components/item-component.ftl
@@ -7,10 +7,3 @@ pick-up-verb-get-data-text = Pick Up
 pick-up-verb-get-data-text-inventory = Put in hand
 
 item-component-on-examine-size = Size: {$size}
-
-item-component-size-Tiny = tiny
-item-component-size-Small = small
-item-component-size-Normal = normal
-item-component-size-Large = large
-item-component-size-Huge = huge
-item-component-size-Ginormous = bulky
diff --git a/Resources/Maps/Shuttles/striker.yml b/Resources/Maps/Shuttles/striker.yml
index 2601c78160..1b71e29725 100644
--- a/Resources/Maps/Shuttles/striker.yml
+++ b/Resources/Maps/Shuttles/striker.yml
@@ -874,6 +874,36 @@ entities:
       pos: -0.5,0.5
       parent: 325
       type: Transform
+- proto: ClothingBeltSyndieHolster
+  entities:
+  - uid: 317
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 177
+      type: Transform
+    - canCollide: False
+      type: Physics
+- proto: ClothingHandsGlovesCombat
+  entities:
+  - uid: 316
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 177
+      type: Transform
+    - canCollide: False
+      type: Physics
+- proto: ClothingMaskGasSyndicate
+  entities:
+  - uid: 318
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 177
+      type: Transform
+    - canCollide: False
+      type: Physics
 - proto: ComputerIFFSyndicate
   entities:
   - uid: 40
@@ -896,6 +926,16 @@ entities:
           ents:
           - 245
       type: ContainerContainer
+- proto: Crowbar
+  entities:
+  - uid: 313
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 177
+      type: Transform
+    - canCollide: False
+      type: Physics
 - proto: CyberPen
   entities:
   - uid: 77
@@ -1632,6 +1672,16 @@ entities:
       pos: -2.5,-3.5
       parent: 325
       type: Transform
+- proto: Multitool
+  entities:
+  - uid: 314
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 177
+      type: Transform
+    - canCollide: False
+      type: Physics
 - proto: NitrogenTankFilled
   entities:
   - uid: 105
@@ -1830,6 +1880,20 @@ entities:
       type: Transform
     - canCollide: False
       type: Physics
+- proto: Screwdriver
+  entities:
+  - uid: 310
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 177
+      type: Transform
+    - selected:
+        enum.DamageStateVisualLayers.Base:
+          screwdriver: '#1861D5FF'
+      type: RandomSprite
+    - canCollide: False
+      type: Physics
 - proto: SheetGlass1
   entities:
   - uid: 244
@@ -2318,6 +2382,21 @@ entities:
     - pos: 1.5699697,-0.44908836
       parent: 325
       type: Transform
+    - containers:
+        storagebase: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 310
+          - 311
+          - 312
+          - 313
+          - 314
+          - 315
+          - 316
+          - 317
+          - 318
+      type: ContainerContainer
     - canCollide: False
       type: Physics
 - proto: ToyFigurineNukie
@@ -2577,6 +2656,16 @@ entities:
     - pos: -2.5,2.5
       parent: 325
       type: Transform
+- proto: Welder
+  entities:
+  - uid: 312
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 177
+      type: Transform
+    - canCollide: False
+      type: Physics
 - proto: WindoorSecure
   entities:
   - uid: 166
@@ -2598,6 +2687,30 @@ entities:
           ents:
           - 346
       type: ContainerContainer
+- proto: Wirecutter
+  entities:
+  - uid: 315
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 177
+      type: Transform
+    - selected:
+        enum.DamageStateVisualLayers.Base:
+          cutters: '#D58C18FF'
+      type: RandomSprite
+    - canCollide: False
+      type: Physics
+- proto: Wrench
+  entities:
+  - uid: 311
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 177
+      type: Transform
+    - canCollide: False
+      type: Physics
 - proto: YellowOxygenTankFilled
   entities:
   - uid: 167
diff --git a/Resources/Maps/core.yml b/Resources/Maps/core.yml
index d31189c43b..328400cd0b 100644
--- a/Resources/Maps/core.yml
+++ b/Resources/Maps/core.yml
@@ -102471,6 +102471,8 @@ entities:
       type: Transform
     - count: 15
       type: Stack
+    - size: 15
+      type: Item
 - proto: SheetPlasma
   entities:
   - uid: 12944
@@ -102562,6 +102564,8 @@ entities:
       type: Transform
     - count: 20
       type: Stack
+    - size: 20
+      type: Item
 - proto: Shovel
   entities:
   - uid: 12955
diff --git a/Resources/Maps/europa.yml b/Resources/Maps/europa.yml
index 98a2c5807d..ddba1100f2 100644
--- a/Resources/Maps/europa.yml
+++ b/Resources/Maps/europa.yml
@@ -78331,6 +78331,8 @@ entities:
       type: Transform
     - count: 15
       type: Stack
+    - size: 30
+      type: Item
 - proto: StoolBar
   entities:
   - uid: 921
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
index 5eeec04af2..1e0788cccd 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -28,7 +28,7 @@
       - id: BoxSurvivalSecurity
       - id: Flash
       - id: MagazinePistol
-
+      
 - type: entity
   noSpawn: true
   parent: ClothingBackpackSecurity
@@ -291,7 +291,8 @@
         - id: RegenerativeMesh
         - id: RCD
         - id: RCDAmmo
-          amount: 2
+        - id: RCDAmmo
+        - id: RCDAmmo
         - id: CableMVStack
         - id: CableHVStack
 
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
index 0569c4f58c..12f31bc016 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -198,9 +198,6 @@
   name: syndicate pyjama duffel bag
   description: Contains 3 pairs of syndicate pyjamas and 3 plushies for the ultimate sleepover.
   components:
-  - type: Storage
-    maxSlots: 16
-    maxTotalWeight: 44
   - type: StorageFill
     contents:
       - id: ClothingUniformJumpsuitPyjamaSyndicateRed
@@ -234,8 +231,6 @@
   id: ClothingBackpackChameleonFill
   suffix: Fill, Chameleon
   components:
-    - type: Storage
-      maxSlots: 9
     - type: StorageFill
       contents:
         - id: ClothingUniformJumpsuitChameleon
@@ -267,11 +262,6 @@
   name: syndicate hardsuit bundle
   description: "Contains the Syndicate's signature blood red hardsuit."
   components:
-  - type: Storage
-    maxItemSize: Huge
-    whitelist: #to snub 'dem metagamers
-      components:
-      - Clothing
   - type: StorageFill
     contents:
       - id: ClothingOuterHardsuitSyndie
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
index 7fc62984a0..20e291494f 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
@@ -278,7 +278,7 @@
     containers:
       ballistic-ammo: !type:Container
   - type: Item
-    size: Normal
+    size: 30
   - type: Sprite
     sprite: Objects/Storage/boxes.rsi
 
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
index e2ca59a7d2..d05dfbb4ed 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
@@ -37,8 +37,7 @@
       - state: box
       - state: light
   - type: Storage
-    maxSlots: 12
-    maxTotalWeight: 24
+    capacity: 60
     whitelist:
       components:
       - LightBulb
@@ -61,8 +60,7 @@
       - state: box
       - state: lighttube
   - type: Storage
-    maxSlots: 12
-    maxTotalWeight: 24
+    capacity: 60
     whitelist:
       components:
       - LightBulb
@@ -87,8 +85,7 @@
       - state: box
       - state: lightmixed
   - type: Storage
-    maxSlots: 12
-    maxTotalWeight: 24
+    capacity: 60
     whitelist:
       components:
       - LightBulb
@@ -111,6 +108,7 @@
       - state: box
       - state: pda
   - type: Storage
+    capacity: 60
     whitelist:
       components:
       - Pda
@@ -130,6 +128,7 @@
       - state: box
       - state: pda
   - type: Storage
+    capacity: 60
     whitelist:
       components:
       - IdCard
@@ -149,6 +148,7 @@
       - state: box
       - state: headset
   - type: Storage
+    capacity: 60
     whitelist:
       components:
       - Headset
@@ -192,6 +192,7 @@
   description: A special box for sensitive people.
   components:
   - type: Storage
+    capacity: 30
   - type: Sprite
     layers:
       - state: box_hug
@@ -233,12 +234,6 @@
   id: BoxPerformer
   description: Happy Hatsune Miku Day!
   components:
-  - type: Storage
-    maxItemSize: Normal
-    whitelist:
-      components:
-      - Clothing
-      - Food
   - type: StorageFill
     contents:
       - id: ClothingShoesBootsPerformer
@@ -272,7 +267,7 @@
       - id: TrashBag
         amount: 6
   - type: Storage
-    maxItemSize: Normal
+    capacity: 800
     whitelist:
       tags:
         - TrashBag
@@ -299,6 +294,7 @@
       - state: box
       - state: encryptokey
   - type: Storage
+    capacity: 30
     whitelist:
       components:
       - EncryptionKey
@@ -390,12 +386,13 @@
   description: Two syndicate encryption keys for the price of one. Miniaturized for ease of use.
   components:
   - type: Item
-    size: Normal
+    size: 15
   - type: StorageFill
     contents:
       - id: EncryptionKeySyndie
         amount: 2
   - type: Storage
+    capacity: 15
 
 - type: entity
   name: deathrattle implant box
@@ -404,7 +401,7 @@
   description: Six deathrattle implants and handheld GPS devices for the whole squad.
   components:
   - type: Item
-    size: Normal
+    size: 60
   - type: StorageFill
     contents:
       - id: DeathRattleImplanter
@@ -412,8 +409,7 @@
       - id: HandheldGPSBasic
         amount: 6
   - type: Storage
-    maxSlots: 12
-    maxTotalWeight: 24
+    capacity: 60
   - type: Sprite
     layers:
       - state: box
@@ -438,21 +434,20 @@
   description: This box filled with colorful darts.
   components:
   - type: Item
-    size: Normal
+    size: 40
   - type: StorageFill
     contents:
       - id: Dart
-        amount: 3
+        amount: 5
       - id: DartBlue
-        amount: 3
+        amount: 5
       - id: DartPurple
-        amount: 3
+        amount: 5
       - id: DartYellow
-        amount: 3
+        amount: 5
   - type: Storage
-    maxSlots: 12
-    maxTotalWeight: 24
+    capacity: 40
   - type: Sprite
     layers:
       - state: box
-      - state: darts
+      - state: darts
\ No newline at end of file
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
index 9a7f4b47e0..41ee064ce0 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
@@ -93,13 +93,10 @@
   parent: BoxCardboard
   id: BoxMouthSwab
   components:
-  - type: Storage
-    maxSlots: 10
-    maxTotalWeight: 20
   - type: StorageFill
     contents:
       - id: DiseaseSwab
-        amount: 10
+        amount: 30
   - type: Sprite
     layers:
       - state: box
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/security.yml b/Resources/Prototypes/Catalog/Fills/Boxes/security.yml
index 51dc512f91..027aaf19f6 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/security.yml
@@ -49,12 +49,6 @@
   id: BoxZiptie
   description: A box full of zipties.
   components:
-  - type: Storage
-    maxSlots: 10
-    maxTotalWeight: 20
-    whitelist:
-      components:
-      - Handcuff
   - type: StorageFill
     contents:
       - id: Zipties
@@ -70,9 +64,6 @@
   id: BoxForensicPad
   description: A box of forensic pads.
   components:
-  - type: Storage
-    maxSlots: 10
-    maxTotalWeight: 20
   - type: StorageFill
     contents:
       - id: ForensicPad
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
index 1526cf0f63..48877fd889 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -302,8 +302,8 @@
       - id: TargetDarts
         amount: 1
       - id: BoxDarts
-        amount: 2
+        amount: 1
       - id: BoxDarts
         amount: 1
         prob: 0.05
-
+  
diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
index baad216f47..1886b961c8 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
@@ -89,11 +89,14 @@
   - type: StorageFill
     contents:
       - id: Brutepack
+        amount: 1
       - id: Ointment
+        amount: 1
       - id: Bloodpack
+        amount: 1
       - id: Gauze
       - id: EmergencyMedipen #You never know what people are going to latejoin into
-        amount: 3
+        amount: 6
 
 - type: entity
   id: ClothingBeltPlantFilled
@@ -121,10 +124,6 @@
   name: grenadier chest rig
   suffix: Filled
   components:
-  - type: Item
-    size: Large
-  - type: Storage
-    maxSlots: 8
   - type: StorageFill
     contents:
       - id: ExGrenade
@@ -170,4 +169,4 @@
     contents:
         - id: WeaponRevolverInspector
         - id: SpeedLoaderMagnum
-        - id: SpeedLoaderMagnumRubber
+        - id: SpeedLoaderMagnumRubber
\ No newline at end of file
diff --git a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
index 714148a64d..c487909a4b 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
@@ -15,10 +15,6 @@
   parent: BriefcaseSyndie
   suffix: SniperBundle
   components:
-  - type: Item
-    size: Huge
-  - type: Storage
-    maxItemSize: Large
   - type: StorageFill
     contents:
       - id: WeaponSniperHristov
diff --git a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
index 832d357d83..8cc7d6b6d4 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
@@ -12,7 +12,8 @@
       - id: Ointment
         amount: 2
       - id: Gauze
-      - id: PillCanisterTricordrazine
+      - id: PillTricordrazine
+        amount: 5
       # see https://github.com/tgstation/blob/master/code/game/objects/items/storage/firstaid.dm for example contents
 
 - type: entity
@@ -27,8 +28,10 @@
       - id: Ointment
         amount: 2
       - id: SyringeSigynate
-      - id: PillCanisterKelotane
-      - id: PillCanisterDermaline
+      - id: PillKelotane
+        amount: 5
+      - id: PillDermaline
+        amount: 5
 
 - type: entity
   id: MedkitBruteFilled
@@ -42,8 +45,10 @@
       - id: Gauze
       - id: Bloodpack
       - id: SyringeTranexamicAcid
-      - id: PillCanisterIron
-      - id: PillCanisterBicaridine
+      - id: PillIron
+        amount: 5
+      - id: PillBicaridine
+        amount: 5
 
 - type: entity
   id: MedkitToxinFilled
@@ -55,8 +60,10 @@
       - id: SyringeIpecac
       - id: SyringeEthylredoxrazine
       - id: AntiPoisonMedipen
-      - id: PillCanisterDylovene
-      - id: PillCanisterCharcoal
+      - id: PillDylovene
+        amount: 5
+      - id: PillCharcoal
+        amount: 3
 
 - type: entity
   id: MedkitOxygenFilled
@@ -69,7 +76,8 @@
       - id: EmergencyOxygenTankFilled
       - id: EmergencyMedipen
       - id: SyringeInaprovaline
-      - id: PillCanisterDexalin
+      - id: PillDexalin
+        amount: 7
 
 - type: entity
   id: MedkitRadiationFilled
@@ -84,7 +92,8 @@
         amount: 1
       - id: EmergencyMedipen
         amount: 1
-      - id: PillCanisterHyronalin
+      - id: PillHyronalin
+        amount: 5
 
 - type: entity
   id: MedkitAdvancedFilled
@@ -111,9 +120,11 @@
       - id: MedicatedSuture
       - id: RegenerativeMesh
       - id: SyringeEphedrine
+      - id: SyringeSaline
       - id: BruteAutoInjector
       - id: BurnAutoInjector
       - id: EmergencyMedipen
+      - id: Bloodpack
 
 - type: entity
   id: StimkitFilled
diff --git a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
index bc9485d7f0..234481af8d 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
@@ -86,16 +86,9 @@
   suffix: Filled
   parent: ToolboxSyndicate
   components:
-  - type: Storage
-    maxSlots: 8
   - type: StorageFill
     contents:
-      - id: Crowbar
-      - id: Wrench
-      - id: Screwdriver
-      - id: Wirecutter
-      - id: Welder
-      - id: Multitool
+      - id: ClothingBeltUtilityEngineering
       - id: ClothingHandsGlovesCombat
       - id: ClothingMaskGasSyndicate
 
diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
index 5edce6be02..7277ebb10a 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -8,14 +8,13 @@
     sprite: Clothing/Back/Backpacks/backpack.rsi
     state: icon
   - type: Item
-    size: Huge
+    size: 9999
   - type: Clothing
     quickEquip: false
     slots:
     - back
   - type: Storage
-    maxSlots: 7
-    maxTotalWeight: 28
+    capacity: 100
   - type: ContainerContainer
     containers:
       storagebase: !type:Container
@@ -197,8 +196,7 @@
   - type: Sprite
     sprite: Clothing/Back/Backpacks/ertleader.rsi
   - type: Storage
-    maxSlots: 10
-    maxTotalWeight: 40
+    capacity: 250
 
 - type: entity
   parent: ClothingBackpackERTLeader
@@ -261,12 +259,8 @@
       shader: unshaded
   - type: Clothing
     equippedPrefix: holding
-  - type: Item
-    size: Ginormous
   - type: Storage
-    maxSlots: 14
-    maxItemSize: Large
-    maxTotalWeight: 56 #14 normal-sized items.
+    capacity: 9999
 
 - type: entity
   parent: ClothingBackpackClown
diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
index 1fb4b67824..b9cc9ca266 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
@@ -7,8 +7,7 @@
   - type: Sprite
     sprite: Clothing/Back/Duffels/duffel.rsi
   - type: Storage
-    maxSlots: 10
-    maxTotalWeight: 40
+    capacity: 120
   - type: ClothingSpeedModifier
     walkModifier: 1
     sprintModifier: 0.9
@@ -163,6 +162,8 @@
   components:
   - type: Sprite
     sprite: Clothing/Back/Duffels/syndicate.rsi
+  - type: Storage
+    capacity: 131
 
 - type: entity
   parent: ClothingBackpackDuffelSyndicate
@@ -227,11 +228,7 @@
     - state: icon
     - state: icon-unlit
       shader: unshaded
-  - type: Item
-    size: Ginormous
   - type: Storage
-    maxSlots: 14
-    maxItemSize: Large
-    maxTotalWeight: 56 #14 normal-sized items.
+    capacity: 9999
   - type: ClothingSpeedModifier
     sprintModifier: 1 # makes its stats identical to other variants of bag of holding
diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
index b3b36b70fb..e80b0d6f8b 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
@@ -167,9 +167,5 @@
     - state: icon
     - state: icon-unlit
       shader: unshaded
-  - type: Item
-    size: Ginormous
   - type: Storage
-    maxSlots: 14
-    maxItemSize: Large
-    maxTotalWeight: 56 #14 normal-sized items.
+    capacity: 9999
diff --git a/Resources/Prototypes/Entities/Clothing/Back/specific.yml b/Resources/Prototypes/Entities/Clothing/Back/specific.yml
index c36ddde03b..5964007356 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: 200
   - 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 ec6b48bf89..b37d3fd974 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml
@@ -6,7 +6,7 @@
   - type: Sprite
     state: icon
   - type: Item
-    size: Normal
+    size: 50
   - type: Clothing
     slots: [belt]
     quickEquip: false
@@ -22,10 +22,7 @@
   id: ClothingBeltStorageBase
   components:
   - type: Storage
-    maxSlots: 7
-    maxItemSize: Normal
-  - type: Item
-    size: Huge
+    capacity: 40
   - 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 28f8ed0dca..fa1a5e951f 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -11,7 +11,7 @@
   - type: Clothing
     sprite: Clothing/Belt/utility.rsi
   - type: Storage
-    maxItemSize: Normal
+    capacity: 45
     # TODO: Fill this out more.
     whitelist:
       tags:
@@ -83,6 +83,7 @@
   - type: Clothing
     sprite: Clothing/Belt/ce.rsi
   - type: Storage
+    capacity: 105
     # TODO: Fill this out more.
     whitelist:
       tags:
@@ -237,6 +238,7 @@
   - type: Clothing
     sprite: Clothing/Belt/medical.rsi
   - type: Storage
+    capacity: 60
     whitelist:
       tags:
         - Wrench
@@ -391,7 +393,7 @@
   - type: Clothing
     sprite: Clothing/Belt/sheath.rsi
   - type: Storage
-    maxSlots: 1
+    capacity: 15
     whitelist:
       tags:
         - CaptainSabre
@@ -416,8 +418,9 @@
   - type: Clothing
     sprite: Clothing/Belt/bandolier.rsi
   - type: Item
-    size: Large
+    size: 60
   - type: Storage
+    capacity: 60
     whitelist:
       tags:
         - ShellShotgun
@@ -448,7 +451,7 @@
   - type: Clothing
     sprite: Clothing/Belt/holster.rsi
   - type: Storage
-    maxSlots: 3
+    capacity: 20
 
 - type: entity
   parent: ClothingBeltStorageBase
@@ -461,8 +464,9 @@
   - type: Clothing
     sprite: Clothing/Belt/syndieholster.rsi
   - type: Item
-    size: Large
+    size: 60
   - type: Storage
+    capacity: 60
     whitelist:
       components:
         - Gun
@@ -524,7 +528,9 @@
   - type: Clothing
     sprite: Clothing/Belt/militarywebbingmed.rsi
   - type: Item
-    size: Large
+    size: 70
+  - type: Storage
+    capacity: 70
 
 - type: entity
   parent: ClothingBeltBase
@@ -553,7 +559,7 @@
   - type: Clothing
     sprite: Clothing/Belt/wand.rsi
   - type: Storage
-    maxSlots: 8
+    capacity: 120
     whitelist:
       tags:
       - WizardWand
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/quiver.yml b/Resources/Prototypes/Entities/Clothing/Belt/quiver.yml
index e6685eb47a..10332e46aa 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/quiver.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/quiver.yml
@@ -12,8 +12,7 @@
       visible: false
   - type: Clothing
   - type: Storage
-    maxSlots: 15
-    maxItemSize: Small
+    capacity: 150
     whitelist:
       tags:
       - Arrow
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/waist_bags.yml b/Resources/Prototypes/Entities/Clothing/Belt/waist_bags.yml
index e142376d07..6d47010efc 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/waist_bags.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/waist_bags.yml
@@ -9,9 +9,8 @@
   - type: Clothing
     sprite: Clothing/Belt/waistbag_leather.rsi
   - type: Storage
-    maxSlots: 5
-    maxItemSize: Small
-
+    capacity: 20
+        
 #Colorization on worn items doesn't work. If this ever gets fixed, you can duplicate this entry and change the color on the sprite to add color variants.
 #- type: entity
 #  parent: ClothingBeltStorageWaistbag
@@ -30,4 +29,4 @@
 #    layers:
 #    - state: "equipped-BELT"
 #      color: "#bf1313"
-#    - state: "equipped-trinkets"
+#    - state: "equipped-trinkets"
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
index 858ec6f0db..cae6a0ea17 100644
--- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
@@ -17,8 +17,6 @@
     keySlots: 4
   - type: Sprite
     state: icon
-  - type: Item
-    size: Small
   - type: Clothing
     slots:
     - ears
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml b/Resources/Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml
index a0c41120b8..dc37811fb8 100644
--- a/Resources/Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml
@@ -7,5 +7,3 @@
     state: icon
   - type: Clothing
     slots: [eyes]
-  - type: Item
-    size: Small
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml
index 5cf7fd645b..e7d8bec69f 100644
--- a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml
@@ -9,8 +9,6 @@
     slots: [gloves]
   - type: Food
     requiresSpecialDigestion: true
-  - type: Item
-    size: Small
   - type: SolutionContainerManager
     solutions:
       food:
diff --git a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
index dd67096b08..19fc25b233 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
@@ -8,8 +8,6 @@
     - HEAD
   - type: Sprite
     state: icon
-  - type: Item
-    size: Small
   - type: Food
     requiresSpecialDigestion: true
   - type: SolutionContainerManager
@@ -119,7 +117,7 @@
   name: base space helmet
   components:
   - type: Item
-    size: Small
+    size: 10
   - type: PressureProtection
     highPressureMultiplier: 0.6
     lowPressureMultiplier: 1000
@@ -243,4 +241,4 @@
   - type: GroupExamine
   - type: Tag
     tags:
-    - HidesHair
+    - HidesHair
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index 731513d31e..d5d13fbdd0 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -197,7 +197,7 @@
   - type: Clothing
     sprite: Clothing/Head/Hats/chefhat.rsi
   - type: Storage
-    maxSlots: 1
+    capacity: 5
   - type: UserInterface
     interfaces:
       - key: enum.StorageUiKey.Key
@@ -751,10 +751,10 @@
         offset: "0, 0.12"
     sprite: Clothing/Head/Hats/magician.rsi
   - type: Item
-    size: Small
+    size: 10
     sprite: Clothing/Head/Hats/magician.rsi
   - type: Storage
-    maxSlots: 1
+    capacity: 10
   - type: UserInterface
     interfaces:
       - key: enum.StorageUiKey.Key
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml b/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml
index d57065ba79..b79d76aa17 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml
@@ -5,8 +5,6 @@
   components:
   - type: Sprite
     state: icon
-  - type: Item
-    size: Small
   - type: Clothing
     slots: [mask]
 
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml b/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml
index 1bccb4c92a..06ec393c78 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml
@@ -4,7 +4,7 @@
   id: ClothingNeckBase
   components:
   - type: Item
-    size: Small
+    size: 10
   - type: Clothing
     quickEquip: true
     slots:
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
index 0d22a653db..fe72fd12e9 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
@@ -6,7 +6,7 @@
   description: be nothing do crime
   components:
   - type: Item
-    size: Tiny
+    size: 1
 
 - type: entity
   parent: ClothingNeckPinBase
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
index 6af455ab27..f92592f65e 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: 80
   - type: Clothing
     slots:
     - outerClothing
@@ -28,8 +28,10 @@
   parent: ClothingOuterBase
   id: ClothingOuterStorageBase
   components:
+  - type: Item
+    size: 10
   - type: Storage
-    maxSlots: 3
+    capacity: 10
   - type: ContainerContainer
     containers:
       storagebase: !type:Container
@@ -70,7 +72,7 @@
     walkModifier: 0.4
     sprintModifier: 0.6
   - type: Item
-    size: Huge
+    size: 121
   - type: Armor
     modifiers:
       coefficients:
@@ -105,7 +107,7 @@
     walkModifier: 0.8
     sprintModifier: 0.8
   - type: Item
-    size: Large
+    size: 80
 
 - type: entity
   parent: ClothingOuterBase
@@ -128,7 +130,7 @@
   id: ClothingOuterBaseMedium
   components:
   - type: Item
-    size: Large
+    size: 30
   - type: Clothing
     slots:
     - outerClothing
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
index 166657d65e..5389eb8bfc 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -350,7 +350,7 @@
     walkModifier: 0.75
     sprintModifier: 0.75
   - type: Item
-    size: Normal
+    size: 50
   - type: Tag
     tags:
     - WhitelistChameleon
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
index f0aa96f613..16bef8c7b2 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
@@ -176,7 +176,7 @@
   - type: Sprite
     sprite: Clothing/OuterClothing/Suits/iansuit.rsi
   - type: Item
-    size: Normal
+    size: 30
   - type: Clothing
     sprite: Clothing/OuterClothing/Suits/iansuit.rsi
   - type: ToggleableClothing
@@ -197,7 +197,7 @@
   - type: Sprite
     sprite: Clothing/OuterClothing/Suits/carpsuit.rsi
   - type: Item
-    size: Normal
+    size: 30
   - type: Clothing
     sprite: Clothing/OuterClothing/Suits/carpsuit.rsi
   - type: ToggleableClothing
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
index d15e114857..9bc3d25fc4 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
@@ -11,7 +11,7 @@
   - type: TemperatureProtection
     coefficient: 0.1
   - type: Item
-    size: Small
+    size: 10
   - type: Armor
     modifiers:
       coefficients:
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
index 9bd7e00546..c829dc5d44 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
@@ -8,8 +8,6 @@
     - FEET
   - type: Sprite
     state: icon
-  - type: Item
-    size: Normal
   - type: Food
     requiresSpecialDigestion: true
   - type: SolutionContainerManager
@@ -41,7 +39,7 @@
   id: ClothingShoesStorageBase
   components:
   - type: Storage
-    maxSlots: 1
+    capacity: 10
   - type: ContainerContainer
     containers:
       storagebase: !type:Container
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
index eae044f8dd..7b864e806e 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
@@ -181,7 +181,7 @@
       - state: equipped-FEET
         offset: "0, -0.02"
   - type: Item
-    size: Small
+    size: 10
     sprite: Clothing/Shoes/Specific/large_clown.rsi
   - type: ClothingSpeedModifier
     walkModifier: 0.85
diff --git a/Resources/Prototypes/Entities/Clothing/base_clothing.yml b/Resources/Prototypes/Entities/Clothing/base_clothing.yml
index 7e9d6e9568..60a94fe291 100644
--- a/Resources/Prototypes/Entities/Clothing/base_clothing.yml
+++ b/Resources/Prototypes/Entities/Clothing/base_clothing.yml
@@ -3,8 +3,6 @@
   parent: BaseItem
   id: Clothing
   components:
-  - type: Item
-    size: Normal
   - type: Sprite
   - type: Tag
     tags:
diff --git a/Resources/Prototypes/Entities/Debugging/debug_sweps.yml b/Resources/Prototypes/Entities/Debugging/debug_sweps.yml
index e3289569a2..2d374b8e12 100644
--- a/Resources/Prototypes/Entities/Debugging/debug_sweps.yml
+++ b/Resources/Prototypes/Entities/Debugging/debug_sweps.yml
@@ -101,7 +101,7 @@
       types:
         Blunt: 20000
   - type: Item
-    size: Tiny
+    size: 1
     sprite: Objects/Weapons/Melee/debug.rsi
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index c94d5983e1..adba78141c 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -959,7 +959,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: mouse-0
   - type: Item
-    size: Tiny
+    size: 5
   - type: Clothing
     quickEquip: false
     sprite: Mobs/Animals/mouse.rsi
@@ -1424,7 +1424,7 @@
       groups:
         Brute: 5
   - type: Item
-    size: Normal
+    size: 80
   - type: OnUseTimerTrigger
     delay: 10
     beepSound:
@@ -2329,7 +2329,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: hamster-0
   - type: Item
-    size: Tiny
+    size: 5
   - type: Physics
   - type: Fixtures
     fixtures:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
index 13719f111a..aaeeaf0bf6 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -172,9 +172,7 @@
     graph: SupplyBot
     node: bot
   - type: Storage
-    maxSlots: 15
-    maxItemSize: Large
-    maxTotalWeight: 60
+    capacity: 250
   - type: UserInterface
     interfaces:
     - key: enum.StorageUiKey.Key
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
index 11228d0ed6..118b242136 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
@@ -370,9 +370,9 @@
         map: ["6pack6"]
         visible: false
   - type: Item
-    size: Normal
+    size: 6
   - type: Storage
-    maxSlots: 6
+    capacity: 30
     whitelist:
       tags:
         - Cola
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
index e4ebcc4c00..a4cb797129 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
@@ -28,7 +28,7 @@
   abstract: true
   components:
   - type: Item
-    size: Tiny
+    size: 1
   - type: FlavorProfile
     flavors:
       - bread
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
index 7db9015295..09f5ce27ff 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
@@ -21,7 +21,7 @@
         - ReagentId: Vitamin
           Quantity: 5
   - type: Item
-    size: Normal
+    size: 25
 
 - type: entity
   parent: FoodCakeBase
@@ -43,7 +43,7 @@
         - ReagentId: Vitamin
           Quantity: 1
   - type: Item
-    size: Tiny
+    size: 5
 
 # Custom Cake Example
 
@@ -574,7 +574,7 @@
   - type: Food
     transferAmount: 12
   - type: Item
-    size: Normal
+    size: 40
   - type: PointLight
     color: "#FFFF00"
     radius: 2
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml
index b0be8011aa..061852f561 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml
@@ -16,7 +16,7 @@
         - ReagentId: Nutriment
           Quantity: 3
   - type: Item
-    size: Tiny
+    size: 1
   - type: Tag
     tags:
     - DonkPocket
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml
index 9cf32f30b4..bd007d87cb 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml
@@ -21,7 +21,7 @@
           Quantity: 3
   - type: Item
     sprite: Objects/Consumable/Food/Baked/donut.rsi
-    size: Tiny
+    size: 1
 # Tastes like donut.
 
 # The sprinkles are now an overlay, so you can put them on any donut! If we really
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
index 1296bc4752..54fc4d6553 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
@@ -16,7 +16,7 @@
         - ReagentId: Nutriment
           Quantity: 5
   - type: Item
-    size: Tiny
+    size: 1
 
 # Muffins/Buns
 
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
index 01f93ccced..1f6a307f4e 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
@@ -24,7 +24,7 @@
   - type: SliceableFood
     count: 8
   - type: Item
-    size: Normal
+    size: 8
   - type: Tag
     tags:
     - Pizza
@@ -53,7 +53,7 @@
         - ReagentId: Vitamin
           Quantity: 0.8
   - type: Item
-    size: Tiny
+    size: 1
   - type: Tag
     tags:
     - Pizza
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
index 5cf48d3c9b..5130b9d7e2 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
@@ -38,14 +38,13 @@
       map: ["pink-box6"]
       visible: false
   - type: Storage
-    maxSlots: 6
-    maxTotalWeight: 12
+    capacity: 6
     whitelist:
       tags:
       - Donut
   - type: Item
     sprite: Objects/Consumable/Food/Baked/donut.rsi
-    size: Small
+    size: 6
     heldPrefix: box
   - type: StorageFill
     contents:
@@ -119,13 +118,13 @@
       map: ["box12"]
       visible: false
   - type: Storage
-    maxSlots: 12
+    capacity: 12
     whitelist:
       tags:
       - Egg
   - type: Item
     sprite: Objects/Consumable/Food/egg.rsi
-    size: Small
+    size: 12
   - type: StorageFill
     contents:
     - id: FoodEgg
@@ -176,9 +175,6 @@
   id: EggBoxBroken
   suffix: Broken
   components:
-  - type: Storage
-    maxSlots: 12
-    maxItemSize: Small
   - type: StorageFill
     contents:
     - id: Eggshells
@@ -210,8 +206,7 @@
       map: ["enum.StorageVisualLayers.Door"]
   # TODO make these entitystorage again + placeablesurface after entity storage ECS gets merged.
   - type: Storage
-    maxSlots: 1
-    maxItemSize: Normal
+    capacity: 8
     whitelist:
       tags:
       - Pizza
@@ -301,10 +296,10 @@
       map: ["box6"]
       visible: false
   - type: Storage
-    maxSlots: 6
+    capacity: 6
   - type: Item
     sprite: Objects/Consumable/Food/Baked/nuggets.rsi
-    size: Small
+    size: 6
     heldPrefix: box
   - type: StorageFill
     contents:
@@ -338,10 +333,10 @@
     whitelist:
       tags:
       - DonkPocket
-    maxSlots: 6
+    capacity: 6
   - type: Item
     sprite: Objects/Consumable/Food/Baked/donkpocket.rsi
-    size: Small
+    size: 6
   - type: StorageFill
     contents:
     - id: FoodDonkpocket
@@ -463,6 +458,8 @@
   - type: Item
     sprite: Objects/Storage/Happyhonk/clown.rsi
     heldPrefix: box
+  - type: Storage
+    capacity: 30
   - type: Tag
     tags:
     - Trash
@@ -586,8 +583,10 @@
   suffix: Toy Unsafe, Snacks
   name: syndicate snack box
   components:
+  - type: Item
+    size: 64
   - type: Storage
-    maxSlots: 9
+    capacity: 64 # need more room for goodies
   - type: StorageFill
     contents:
     # toy
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml
index 89ec5a8c27..4e63ca5012 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml
@@ -37,7 +37,7 @@
   - type: Item
     sprite: Objects/Consumable/Food/snacks.rsi
     heldPrefix: packet
-    size: Tiny
+    size: 3
   - type: DamageOnLand
     damage:
       types:
@@ -63,7 +63,7 @@
   - type: Item
     sprite: Objects/Consumable/Food/snacks.rsi
     heldPrefix: packet
-    size: Tiny
+    size: 3
   - type: PhysicalComposition
     materialComposition:
       Steel: 100
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
index 3eb2b96684..4f6d10d98f 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
@@ -16,7 +16,7 @@
     sprite: Objects/Consumable/Food/egg.rsi
   - type: Item
     sprite: Objects/Consumable/Food/egg.rsi
-    size: Tiny
+    size: 1
   - type: SolutionContainerManager
     solutions:
       food:
@@ -69,7 +69,7 @@
     sprite: Objects/Consumable/Food/egg.rsi
     state: eggshells
   - type: Item
-    size: Tiny
+    size: 1
   - type: SolutionContainerManager
     solutions:
       food:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
index 2b7c9d6e16..35057aeacd 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
@@ -24,7 +24,7 @@
         - ReagentId: Fat
           Quantity: 5
   - type: Item
-    size: Tiny
+    size: 5
   - type: Fixtures
     fixtures:
       fix1:
@@ -209,7 +209,7 @@
     graph: BearSteak
     node: start
     defaultTarget: filet migrawr
-
+    
 
 - type: entity
   name: raw penguin meat
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index 0fb8afc6d7..6439b2eb6c 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -136,7 +136,7 @@
   - type: Sprite
     sprite: Objects/Specific/Hydroponics/nettle.rsi
   - type: Item
-    size: Small
+    size: 10
     sprite: Objects/Specific/Hydroponics/nettle.rsi
   - type: MeleeWeapon
     damage:
@@ -166,7 +166,7 @@
   - type: Sprite
     sprite: Objects/Specific/Hydroponics/death_nettle.rsi
   - type: Item
-    size: Small
+    size: 10
     sprite: Objects/Specific/Hydroponics/death_nettle.rsi
   - type: MeleeWeapon
     damage:
@@ -184,7 +184,7 @@
   - type: Produce
     seedId: deathNettle
   - type: MeleeChemicalInjector
-    transferAmount: 6
+    transferAmount: 6 
     solution: food
     pierceArmor: true # We do a little trolling
   - type: Extractable
@@ -222,7 +222,7 @@
   - type: Tag
     tags:
     - Fruit
-
+    
 - type: entity
   name: mimana
   parent: FoodProduceBase
@@ -314,7 +314,7 @@
     state: peel
   - type: Item
     sprite: Objects/Specific/Hydroponics/mimana.rsi
-    heldPrefix: peel
+    heldPrefix: peel  
   - type: Slippery
     slipSound:
       path: /Audio/Effects/slip.ogg
@@ -836,7 +836,7 @@
     sprite: Objects/Specific/Hydroponics/corn.rsi
     state: cob
   - type: Item
-    size: Tiny
+    size: 1
   - type: Tag
     tags:
       - Trash
@@ -1237,7 +1237,7 @@
   - type: Tag
     tags:
     - Galaxythistle
-    - Fruit # Probably?
+    - Fruit # Probably? 
 
 - type: entity
   name: fly amanita
@@ -1365,7 +1365,7 @@
   description: Round green object that you can slice and eat.
   components:
   - type: Item
-    size: Small
+    size: 10
   - type: FlavorProfile
     flavors:
       - watermelon
@@ -1427,7 +1427,7 @@
   description: Juicy green and red slice.
   components:
   - type: Item
-    size: Tiny
+    size: 2
   - type: FlavorProfile
     flavors:
       - watermelon
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
index 8c8f55f804..0b32de1ce5 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
@@ -17,7 +17,7 @@
         - ReagentId: Nutriment
           Quantity: 8
   - type: Item
-    size: Small
+    size: 5
 
 # Kebabs
 
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
index 82c31a01c5..c2274aef6d 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
@@ -21,7 +21,7 @@
   - type: Item
     sprite: Objects/Consumable/Food/snacks.rsi
     heldPrefix: packet
-    size: Tiny
+    size: 3
 # Snacks
 
 # "Snacks" means food in a packet. Down the line this stuff can have multiple
@@ -101,7 +101,7 @@
     state: chocolatebar
   - type: Item
     heldPrefix: chocolatebar
-    size: Tiny
+    size: 3
   - type: Tag
     tags:
       - FoodSnack
@@ -346,7 +346,7 @@
   - type: Item
     sprite: Objects/Consumable/Food/snacks.rsi
     heldPrefix: packet
-    size: Tiny
+    size: 1
   - type: Food
     trash: FoodCookieFortune
 
@@ -357,7 +357,7 @@
   description: A carefully synthesized brick designed to contain the highest ratio of nutriment to volume. Tastes like shit.
   components:
   - type: Item
-    size: Small
+    size: 10
   - type: Tag
     tags:
       - FoodSnack
@@ -381,7 +381,7 @@
     flavors:
       - nutribrick
   - type: Item
-    size: Small
+    size: 10
   - type: Sprite
     state: nutribrick-open
   - type: Food
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
index eff790cdd1..4d0b442c46 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
@@ -10,9 +10,11 @@
       - state: closed
       - state: open
         map: ["openLayer"]
+  - type: Storage
+    capacity: 36
   - type: Item
     sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi
-    size: Normal
+    size: 36
   - type: StorageFill
     contents:
       - id: CigPackGreen
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
index 3543db2ed1..09ac79b141 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
@@ -17,7 +17,7 @@
     slots: [ mask ]
     equippedPrefix: unlit
   - type: Item
-    size: Tiny
+    size: 1
   - type: Construction
     graph: smokeableCigarette
     node: cigarette
@@ -41,7 +41,7 @@
     slots: [ mask ]
     equippedPrefix: unlit
   - type: Item
-    size: Tiny
+    size: 1
   - type: Construction
     graph: smokeableCigarette
     node: cigarette
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/joints.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/joints.yml
index e3ae06ec9f..402dcd80f5 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/joints.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/joints.yml
@@ -17,7 +17,7 @@
     slots: [ mask ]
     equippedPrefix: unlit
   - type: Item
-    size: Tiny
+    size: 1
   - type: Construction
     graph: smokeableJoint
     node: joint
@@ -48,7 +48,7 @@
     slots: [ mask ]
     equippedPrefix: unlit
   - type: Item
-    size: Tiny
+    size: 1
   - type: Construction
     graph: smokeableBlunt
     node: blunt
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
index 6bc14cfb77..1d161b160a 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
@@ -43,9 +43,9 @@
       Steel: 50
   - type: SpaceGarbage
   - type: Storage
-    maxSlots: 5
+    capacity: 5
   - type: Item
-    size: Small
+    size: 5
   - type: StorageFill
     contents:
     - id: Cigarette
@@ -108,10 +108,9 @@
       Steel: 50
   - type: SpaceGarbage
   - type: Storage
-    maxSlots: 10
-    maxTotalWeight: 20
+    capacity: 10
   - type: Item
-    size: Small
+    size: 10
   - type: StorageFill
     contents:
     - id: CigaretteRandom
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml
index 324a28caca..e1005bf113 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml
@@ -9,7 +9,7 @@
       tags:
       - RollingPaper
       - CigFilter
-    maxSlots: 20
+    capacity: 20
   - type: StorageFill
     contents:
       - id: PaperRolling
@@ -31,6 +31,7 @@
       tags:
       - RollingPaper
       - CigFilter
+    capacity: 32
   - type: StorageFill
     contents:
       - id: PaperRolling
@@ -53,7 +54,7 @@
     state: cigpaper
   - type: Item
     sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi
-    size: Tiny
+    size: 5
   - type: Tag
     tags:
     - RollingPaper
@@ -67,6 +68,8 @@
   components:
     - type: Stack
       count: 1
+    - type: Item
+      size: 1
 
 - type: entity
   id: CigaretteFilter
@@ -83,7 +86,7 @@
     state: cigfilter
   - type: Item
     sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi
-    size: Tiny
+    size: 10
   - type: Tag
     tags:
     - CigFilter
@@ -96,3 +99,5 @@
   components:
     - type: Stack
       count: 1
+    - type: Item
+      size: 2
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/case.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/case.yml
index eede84cd4b..6034df179a 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/case.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/case.yml
@@ -35,10 +35,10 @@
       map: ["cigar8"]
       visible: false
   - type: Storage
-    maxSlots: 8
+    capacity: 8
   - type: Item
     sprite: Objects/Consumable/Smokeables/Cigars/case.rsi
-    size: Small
+    size: 8
   - type: StorageFill
     contents:
     - id: Cigar
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml
index 3495ae26f9..4ed5912fc5 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml
@@ -19,7 +19,7 @@
     slots: [ mask ]
     equippedPrefix: unlit
   - type: Item
-    size: Tiny
+    size: 1
 
 - type: entity
   id: CigarSpent
@@ -49,7 +49,7 @@
     slots: [ mask ]
     equippedPrefix: unlit
   - type: Item
-    size: Tiny
+    size: 1
 
 - type: entity
   id: CigarGoldSpent
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Pipes/pipe.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Pipes/pipe.yml
index 7d2b234a58..21017465bc 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Pipes/pipe.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Pipes/pipe.yml
@@ -12,7 +12,7 @@
     slots: [ mask ]
     equippedPrefix: unlit
   - type: Item
-    size: Tiny
+    size: 3
     sprite: Objects/Consumable/Smokeables/Pipes/pipe.rsi
   - type: Appearance
   - type: BurnStateVisuals
diff --git a/Resources/Prototypes/Entities/Objects/Decoration/lidsalami.yml b/Resources/Prototypes/Entities/Objects/Decoration/lidsalami.yml
index 65141af36f..dfff087e22 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: 1001
   - type: StaticPrice
     price: 0
diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
index a7fd1cd1de..14a1dfbb5e 100644
--- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
@@ -15,7 +15,9 @@
   suffix: Empty
   components:
   - type: Item
-    size: Normal
+    size: 30
+  - type: Storage
+    capacity: 30
 
 - type: entity
   id: PresentRandomUnsafe
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml
index c462a3cb03..4bb13bdd93 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml
@@ -17,7 +17,7 @@
     sprite: Objects/Devices/timer.rsi
     state: timer
   - type: Item
-    size: Small
+    size: 5
   - type: PayloadTrigger
     components:
     - type: OnUseTimerTrigger
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/chimp_upgrade_kit.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/chimp_upgrade_kit.yml
index fc6c2ac787..aed09fe70b 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/chimp_upgrade_kit.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/chimp_upgrade_kit.yml
@@ -6,9 +6,9 @@
   components:
   - type: Sprite
     sprite: Objects/Misc/module.rsi
-    state: abductor_mod
+    state: abductor_mod  
   - type: Item
-    size: Small
+    size: 10
   - type: Tag
     tags:
-    - WeaponPistolCHIMPUpgradeKit
+    - WeaponPistolCHIMPUpgradeKit
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml b/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml
index 21943bfaff..ad05777cfa 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml
@@ -8,7 +8,7 @@
     sprite: Objects/Devices/forensic_scanner.rsi
     state: forensicnew
   - type: Item
-    size: Small
+    size: 5
   - type: Clothing
     sprite: Objects/Devices/forensic_scanner.rsi
     quickEquip: false
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index 91becb5251..f44f1aa998 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -37,7 +37,7 @@
         components:
         - IdCard
   - type: Item
-    size: Tiny
+    size: 10
   - type: ContainerContainer
     containers:
       PDA-id: !type:ContainerSlot {}
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml
index 07d918b576..06b2301262 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml
@@ -16,7 +16,7 @@
     - key: enum.InstrumentUiKey.Key
       type: InstrumentBoundUserInterface
   - type: Item
-    size: Normal
+    size: 24
   - type: StaticPrice
     price: 200
 
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_brass.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_brass.yml
index 260490ccad..e8ac6f7ce5 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_brass.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_brass.yml
@@ -14,7 +14,7 @@
     sprite: Objects/Fun/Instruments/trumpet.rsi
     state: icon
   - type: Item
-    size: Normal
+    size: 24
     sprite: Objects/Fun/Instruments/trumpet.rsi
   - type: Tag
     tags:
@@ -32,7 +32,7 @@
     sprite: Objects/Fun/Instruments/trombone.rsi
     state: icon
   - type: Item
-    size: Normal
+    size: 48
     sprite: Objects/Fun/Instruments/trombone.rsi
   - type: Tag
     tags:
@@ -50,7 +50,7 @@
     sprite: Objects/Fun/Instruments/frenchhorn.rsi
     state: icon
   - type: Item
-    size: Normal
+    size: 48
     sprite: Objects/Fun/Instruments/frenchhorn.rsi
   - type: Tag
     tags:
@@ -69,7 +69,7 @@
     sprite: Objects/Fun/Instruments/euphonium.rsi
     state: icon
   - type: Item
-    size: Normal
+    size: 48
     sprite: Objects/Fun/Instruments/euphonium.rsi
   - type: Tag
     tags:
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
index 47ea5ab2f6..15581cbd8d 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
@@ -10,7 +10,7 @@
   - type: Instrument
     program: 121
   - type: Item
-    size: Small
+    size: 10
 
 - type: entity
   parent: BaseHandheldInstrument
@@ -24,7 +24,7 @@
   - type: Instrument
     program: 122
   - type: Item
-    size: Small
+    size: 10
 
 - type: entity
   parent: BaseHandheldInstrument
@@ -38,7 +38,7 @@
   - type: Instrument
     program: 123
   - type: Item
-    size: Tiny
+    size: 5
 
 - type: entity
   parent: BaseHandheldInstrument
@@ -55,7 +55,7 @@
   - type: Instrument
     program: 124
   - type: Item
-    size: Small
+    size: 10
   - type: Prayable
     sentMessage: prayer-popup-notify-centcom-sent
     notifiactionPrefix: prayer-chat-notify-centcom
@@ -74,7 +74,7 @@
   - type: Instrument
     program: 125
   - type: Item
-    size: Small
+    size: 10
 
 - type: entity
   parent: BaseHandheldInstrument
@@ -88,7 +88,7 @@
   - type: Instrument
     program: 126
   - type: Item
-    size: Tiny
+    size: 5
 
 - type: entity
   parent: BaseHandheldInstrument
@@ -102,7 +102,7 @@
     sprite: Objects/Fun/Instruments/gunpet.rsi
     state: icon
   - type: Item
-    size: Normal
+    size: 15
     sprite: Objects/Fun/Instruments/gunpet.rsi
   - type: Tag
     tags:
@@ -125,7 +125,7 @@
     - BrassInstrument #Go figure.
   - type: Item
     sprite: Objects/Fun/Instruments/bike_horn.rsi
-    size: Small
+    size: 10
   - type: Clothing
     sprite: Objects/Fun/Instruments/bike_horn.rsi
     slots: [Belt]
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
index d79b354df4..1ab803c5e2 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
@@ -9,7 +9,7 @@
     sprite: Objects/Fun/Instruments/glockenspiel.rsi
     state: icon
   - type: Item
-    size: Normal
+    size: 24
     sprite: Objects/Fun/Instruments/glockenspiel.rsi
   - type: Tag
     tags:
@@ -58,7 +58,7 @@
     sprite: Objects/Fun/Instruments/microphone.rsi
     state: icon
   - type: Item
-    size: Small
+    size: 10
     sprite: Objects/Fun/Instruments/microphone.rsi
 
 - type: entity
@@ -76,7 +76,7 @@
     sprite: Objects/Fun/Instruments/h_synthesizer.rsi
     state: icon
   - type: Item
-    size: Normal
+    size: 24
     sprite: Objects/Fun/Instruments/h_synthesizer.rsi
   - type: Tag
     tags:
@@ -135,5 +135,5 @@
     sprite: Objects/Fun/Instruments/h_synthesizer.rsi
     state: icon
   - type: Item
-    size: Normal
-    sprite: Objects/Fun/Instruments/h_synthesizer.rsi
+    size: 24
+    sprite: Objects/Fun/Instruments/h_synthesizer.rsi
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml
index 70d1444bc4..c71fecd91b 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml
@@ -15,7 +15,7 @@
     sprite: Objects/Fun/Instruments/eguitar.rsi
     state: icon
   - type: Item
-    size: Normal
+    size: 24
     sprite: Objects/Fun/Instruments/eguitar.rsi
   - type: Clothing
     quickEquip: false
@@ -44,7 +44,7 @@
     sprite: Objects/Fun/Instruments/bassguitar.rsi
     state: icon
   - type: Item
-    size: Normal
+    size: 24
     sprite: Objects/Fun/Instruments/bassguitar.rsi
   - type: Clothing
     quickEquip: false
@@ -72,7 +72,7 @@
     sprite: Objects/Fun/Instruments/rockguitar.rsi
     state: icon
   - type: Item
-    size: Normal
+    size: 24
     sprite: Objects/Fun/Instruments/rockguitar.rsi
   - type: Clothing
     quickEquip: false
@@ -115,7 +115,7 @@
     - StringInstrument
   - type: Item
     sprite: Objects/Fun/Instruments/guitar.rsi
-    size: Normal
+    size: 24
   - type: Clothing
     quickEquip: false
     slots:
@@ -178,7 +178,7 @@
     sprite: Objects/Fun/Instruments/banjo.rsi
     state: icon
   - type: Item
-    size: Normal
+    size: 24
     sprite: Objects/Fun/Instruments/banjo.rsi
   - type: Tag
     tags:
@@ -200,7 +200,7 @@
     sprite: Objects/Fun/Instruments/violin.rsi
     state: icon
   - type: Item
-    size: Normal
+    size: 24
     sprite: Objects/Fun/Instruments/violin.rsi
   - type: Tag
     tags:
@@ -218,7 +218,7 @@
     sprite: Objects/Fun/Instruments/viola.rsi
     state: icon
   - type: Item
-    size: Normal
+    size: 24
     sprite: Objects/Fun/Instruments/viola.rsi
   - type: Tag
     tags:
@@ -236,7 +236,7 @@
     sprite: Objects/Fun/Instruments/cello.rsi
     state: icon
   - type: Item
-    size: Normal
+    size: 48
     sprite: Objects/Fun/Instruments/cello.rsi
   - type: Tag
     tags:
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml
index afba6c2774..09db613313 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml
@@ -16,7 +16,7 @@
     sprite: Objects/Fun/Instruments/saxophone.rsi
     state: icon
   - type: Item
-    size: Normal
+    size: 24
     sprite: Objects/Fun/Instruments/saxophone.rsi
   - type: Tag
     tags:
@@ -45,7 +45,7 @@
     sprite: Objects/Fun/Instruments/accordion.rsi
     state: icon
   - type: Item
-    size: Normal
+    size: 24
     sprite: Objects/Fun/Instruments/accordion.rsi
   - type: Tag
     tags:
@@ -62,7 +62,7 @@
     sprite: Objects/Fun/Instruments/harmonica.rsi
     state: icon
   - type: Item
-    size: Small
+    size: 10
     sprite: Objects/Fun/Instruments/harmonica.rsi
   - type: Tag
     tags:
@@ -80,7 +80,7 @@
     sprite: Objects/Fun/Instruments/clarinet.rsi
     state: icon
   - type: Item
-    size: Normal
+    size: 20
     sprite: Objects/Fun/Instruments/clarinet.rsi
   - type: Tag
     tags:
@@ -98,7 +98,7 @@
     sprite: Objects/Fun/Instruments/flute.rsi
     state: icon
   - type: Item
-    size: Normal
+    size: 20
     sprite: Objects/Fun/Instruments/flute.rsi
   - type: Tag
     tags:
@@ -116,7 +116,7 @@
     sprite: Objects/Fun/Instruments/recorder.rsi
     state: icon
   - type: Item
-    size: Normal
+    size: 24
     sprite: Objects/Fun/Instruments/recorder.rsi
   - type: Tag
     tags:
@@ -134,7 +134,7 @@
     sprite: Objects/Fun/Instruments/panflute.rsi
     state: icon
   - type: Item
-    size: Normal
+    size: 15
     sprite: Objects/Fun/Instruments/panflute.rsi
   - type: Tag
     tags:
@@ -153,7 +153,7 @@
     sprite: Objects/Fun/Instruments/ocarina.rsi
     state: icon
   - type: Item
-    size: Normal
+    size: 15
     sprite: Objects/Fun/Instruments/ocarina.rsi
   - type: Tag
     tags:
@@ -171,8 +171,8 @@
     sprite: Objects/Fun/Instruments/bagpipes.rsi
     state: icon
   - type: Item
-    size: Normal
+    size: 48
     sprite: Objects/Fun/Instruments/bagpipes.rsi
   - type: Tag
     tags:
-    - WoodwindInstrument
+    - WoodwindInstrument
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
index 58b168e882..fc20f1a58d 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
@@ -9,7 +9,7 @@
     state: icon
   - type: Item
     sprite: Objects/Fun/bikehorn.rsi
-    size: Tiny
+    size: 5
   - type: Clothing
     sprite: Objects/Fun/bikehorn.rsi
     slots: [Belt]
@@ -58,7 +58,7 @@
     state: icon
   - type: Item
     sprite: Objects/Fun/cluwnehorn.rsi
-    size: Tiny
+    size: 5
   - type: Clothing
     sprite: Objects/Fun/cluwnehorn.rsi
     slots: [Belt]
@@ -100,7 +100,7 @@
     state: icon
   - type: Item
     sprite: Objects/Fun/goldbikehorn.rsi
-    size: Tiny
+    size: 5
   - type: Clothing
     sprite: Objects/Fun/goldbikehorn.rsi
     slots: [Belt]
@@ -119,7 +119,7 @@
     state: icon
   - type: Item
     sprite: Objects/Fun/bananiumhorn.rsi
-    size: Tiny
+    size: 5
   - type: Clothing
     sprite: Objects/Fun/bananiumhorn.rsi
     slots: [Belt]
diff --git a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
index 2ec93b9c9b..3ed188bd8e 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
@@ -9,7 +9,7 @@
     sprite: Objects/Fun/crayons.rsi
   - type: Item
     sprite: Objects/Fun/crayons.rsi
-    size: Tiny
+    size: 1
   - type: Tag
     tags:
     - Write
@@ -235,11 +235,10 @@
     sprite: Objects/Fun/crayons.rsi
     state: box
   - type: Storage
-    maxSlots: 7
-    maxTotalWeight: 7
+    capacity: 7
   - type: Item
     sprite: Objects/Fun/crayons.rsi
-    size: Small
+    size: 7
     heldPrefix: box
   - type: StorageFill
     contents:
diff --git a/Resources/Prototypes/Entities/Objects/Fun/darts.yml b/Resources/Prototypes/Entities/Objects/Fun/darts.yml
index 34486ac93e..bd4163d974 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/darts.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/darts.yml
@@ -40,7 +40,7 @@
       types:
         Piercing: 4
   - type: Item
-    size: Tiny
+    size: 2
     sprite: Objects/Fun/Darts/dart_red.rsi
   - type: ItemCooldown
   - type: SolutionContainerManager
@@ -86,7 +86,7 @@
   - type: SolutionContainerVisuals
     maxFillLevels: 1
     fillBaseName: dart
-
+    
 - type: entity
   parent: Dart
   id: DartBlue
@@ -95,7 +95,7 @@
     sprite: Objects/Fun/Darts/dart_blue.rsi
   - type: Item
     sprite: Objects/Fun/Darts/dart_blue.rsi
-
+     
 - type: entity
   parent: Dart
   id: DartPurple
@@ -104,7 +104,7 @@
     sprite: Objects/Fun/Darts/dart_purple.rsi
   - type: Item
     sprite: Objects/Fun/Darts/dart_purple.rsi
-
+     
 - type: entity
   parent: Dart
   id: DartYellow
diff --git a/Resources/Prototypes/Entities/Objects/Fun/dice.yml b/Resources/Prototypes/Entities/Objects/Fun/dice.yml
index d2c33b90f0..6903a0bcac 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/dice.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/dice.yml
@@ -13,7 +13,7 @@
     tags:
     - Dice
   - type: Item
-    size: Tiny
+    size: 2
 
 - type: entity
   parent: BaseDice
diff --git a/Resources/Prototypes/Entities/Objects/Fun/dice_bag.yml b/Resources/Prototypes/Entities/Objects/Fun/dice_bag.yml
index 20c3c12736..8c3b5aea8b 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/dice_bag.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/dice_bag.yml
@@ -17,11 +17,11 @@
     sprite: Objects/Fun/dice.rsi
     state: dicebag
   - type: Item
-    size: Small
   - type: Storage
+    capacity: 18
     whitelist:
       tags:
-      - Dice
+        - Dice
 
 - type: entity
   parent: DiceBag
@@ -32,5 +32,4 @@
     sprite: Objects/Fun/dice.rsi
     state: magicdicebag
   - type: Storage
-    maxSlots: 14
-    maxTotalWeight: 28
+    capacity: 30
diff --git a/Resources/Prototypes/Entities/Objects/Fun/puppet.yml b/Resources/Prototypes/Entities/Objects/Fun/puppet.yml
index 01a15d2e5b..c0649d0acf 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/puppet.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/puppet.yml
@@ -14,7 +14,7 @@
   - type: DoAfter
   - type: VentriloquistPuppet
   - type: Item
-    size: Normal
+    size: 30
   - type: Muted
   - type: TypingIndicator
     proto: robot
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index c326fc9707..491ae0037a 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -554,7 +554,7 @@
   components:
   - type: Sprite
   - type: Item
-    size: Normal
+    size: 24
 
 - type: entity
   parent: FoamWeaponBase
@@ -566,7 +566,7 @@
     sprite: Objects/Fun/toys.rsi
     state: foamcrossbow
   - type: Item
-    size: Normal
+    size: 24
     sprite: Objects/Fun/toys.rsi
     heldPrefix: foamcrossbow
   - type: Gun
@@ -672,7 +672,7 @@
       types:
         Blunt: 0
   - type: Item
-    size: Small
+    size: 20
     sprite: Objects/Fun/toys.rsi
     heldPrefix: foamblade
   - type: ItemCooldown
@@ -692,7 +692,7 @@
     sound:
       path: /Audio/Effects/Footsteps/bounce.ogg
   - type: Item
-    size: Normal
+    size: 24
     sprite: Objects/Fun/toys.rsi
     heldPrefix: bask
   - type: TileFrictionModifier
@@ -708,7 +708,7 @@
     sprite: Objects/Fun/toys.rsi
     state: football
   - type: Item
-    size: Small
+    size: 12
     sprite: Objects/Fun/toys.rsi
     heldPrefix: footb
 
@@ -725,7 +725,7 @@
     sound:
       path: /Audio/Effects/Footsteps/bounce.ogg
   - type: Item
-    size: Normal
+    size: 24
     sprite: Objects/Fun/toys.rsi
     heldPrefix: beachb
   - type: TileFrictionModifier
@@ -741,7 +741,7 @@
     sprite: Objects/Fun/toys.rsi
     state: synb
   - type: Item
-    size: Small
+    size: 24
     sprite: Objects/Fun/toys.rsi
     heldPrefix: synb
   - type: Damageable
@@ -760,7 +760,7 @@
     sprite: Objects/Fun/toys.rsi
     state: corgib
   - type: Item
-    size: Normal
+    size: 24
     sprite: Objects/Fun/toys.rsi
     heldPrefix: corgib
   - type: Damageable
@@ -785,7 +785,7 @@
     intensity: 2000
     falloffPower: 2.6
   - type: Item
-    size: Small
+    size: 12
     sprite: Objects/Fun/toys.rsi
     heldPrefix: singularitytoy
 
@@ -803,7 +803,7 @@
     radius: 2
     color: "#00CCFF"
   - type: Item
-    size: Normal
+    size: 24
     sprite: Objects/Fun/toys.rsi
     heldPrefix: orb
   - type: TileFrictionModifier
@@ -828,7 +828,7 @@
           shader: unshaded
           map: [ "blade" ]
     - type: Item
-      size: Small
+      size: 5
       sprite: Objects/Weapons/Melee/e_sword.rsi
     - type: UseDelay
       delay: 1.0
@@ -892,7 +892,7 @@
       types:
         Blunt: 0
   - type: Item
-    size: Normal
+    size: 15
     sprite: Objects/Weapons/Melee/cutlass.rsi
 
 - type: entity
@@ -934,7 +934,7 @@
     - type: StaminaDamageOnHit
       damage: 8
     - type: Item
-      size: Small
+      size: 5
       sprite: Objects/Fun/rubber_hammer.rsi
     - type: Appearance
     - type: DisarmMalus
diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
index 898d2c37c1..2c1a8e628d 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
@@ -9,7 +9,7 @@
     sprite: Objects/Materials/Sheets/glass.rsi
   - type: Item
     sprite: Objects/Materials/Sheets/glass.rsi
-    size: Normal
+    size: 30
   - type: StaticPrice
     price: 0
   - type: Tag
@@ -83,6 +83,8 @@
   - type: Stack
     stackType: Glass
     count: 10
+  - type: Item
+    size: 10
 
 - type: entity
   parent: SheetGlass
@@ -94,12 +96,16 @@
   - type: Stack
     stackType: Glass
     count: 1
+  - type: Item
+    size: 1
 
 - type: entity
   parent: SheetGlass
   id: SheetGlassLingering0
   suffix: Lingering, 0
   components:
+  - type: Item
+    size: 0
   - type: Stack
     lingering: true
     count: 0
@@ -168,6 +174,8 @@
   - type: Stack
     stackType: ReinforcedGlass
     count: 1
+  - type: Item
+    size: 1
 
 - type: entity
   parent: SheetGlassBase
@@ -193,6 +201,7 @@
       map: ["base"]
   - type: Item
     heldPrefix: pglass
+    size: 30
   - type: Construction
     graph: Glass
     node: SheetPGlass
@@ -230,6 +239,8 @@
   - type: Stack
     stackType: PlasmaGlass
     count: 1
+  - type: Item
+    size: 1
 
 - type: entity
   parent: SheetPGlass
@@ -270,6 +281,8 @@
   - type: Stack
     stackType: ReinforcedPlasmaGlass
     count: 1
+  - type: Item
+    size: 1
 
 - type: entity
   parent: SheetGlassBase
@@ -332,6 +345,8 @@
   - type: Stack
     stackType: UraniumGlass
     count: 1
+  - type: Item
+    size: 1
 
 - type: entity
   parent: SheetUGlass
@@ -371,3 +386,5 @@
   - type: Stack
     stackType: ReinforcedUraniumGlass
     count: 1
+  - type: Item
+    size: 1
diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
index 99c7ae0e11..69b7f83ddb 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
@@ -8,7 +8,7 @@
     sprite: Objects/Materials/Sheets/metal.rsi
   - type: Item
     sprite: Objects/Materials/Sheets/metal.rsi
-    size: Normal
+    size: 30
   - type: StaticPrice
     price: 0
   - type: Tag
@@ -75,6 +75,8 @@
   name: steel
   suffix: 10
   components:
+  - type: Item
+    size: 10
   - type: Sprite
     state: steel
   - type: Stack
@@ -87,6 +89,8 @@
   name: steel
   suffix: Single
   components:
+  - type: Item
+    size: 1
   - type: Sprite
     state: steel
   - type: Stack
@@ -98,6 +102,8 @@
   id: SheetSteelLingering0
   suffix: Lingering, 0
   components:
+  - type: Item
+    size: 0
   - type: Stack
     lingering: true
     count: 0
@@ -139,6 +145,8 @@
   - type: Stack
     stackType: Plasteel
     count: 10
+  - type: Item
+    size: 10
 
 - type: entity
   parent: SheetPlasteel
@@ -151,3 +159,5 @@
   - type: Stack
     stackType: Plasteel
     count: 1
+  - type: Item
+    size: 1
diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
index ed1a1e3da0..3cb6f027a9 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
@@ -8,7 +8,7 @@
     sprite: Objects/Materials/Sheets/other.rsi
   - type: Item
     sprite: Objects/Materials/Sheets/other.rsi
-    size: Normal
+    size: 30
   - type: Tag
     tags:
     - Sheet
@@ -56,6 +56,8 @@
     state: paper
   - type: Stack
     count: 1
+  - type: Item
+    size: 1
 
 - type: entity
   parent: SheetOtherBase
@@ -104,6 +106,8 @@
     state: plasma
   - type: Stack
     count: 1
+  - type: Item
+    size: 1
 
 - type: entity
   parent: SheetOtherBase
@@ -134,6 +138,7 @@
       map: ["base"]
   - type: Item
     heldPrefix: plastic
+    size: 30
   - type: Appearance
 
 - type: entity
@@ -144,6 +149,8 @@
   components:
   - type: Sprite
     state: plastic
+  - type: Item
+    size: 10
   - type: Stack
     count: 10
 
@@ -155,6 +162,8 @@
   components:
   - type: Sprite
     state: plastic
+  - type: Item
+    size: 1
   - type: Stack
     count: 1
 
@@ -203,6 +212,8 @@
   components:
   - type: Stack
     count: 1
+  - type: Item
+    size: 1
 
 - type: entity
   parent: SheetOtherBase
@@ -244,3 +255,5 @@
       state: meat
     - type: Stack
       count: 1
+    - type: Item
+      size: 1
diff --git a/Resources/Prototypes/Entities/Objects/Materials/ingots.yml b/Resources/Prototypes/Entities/Objects/Materials/ingots.yml
index d383a7266d..61aefee332 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/ingots.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/ingots.yml
@@ -8,7 +8,7 @@
     sprite: Objects/Materials/ingots.rsi
   - type: Item
     sprite: Objects/Materials/ingots.rsi
-    size: Normal
+    size: 30
   - type: StaticPrice
     price: 0
   - type: Tag
@@ -62,6 +62,8 @@
     state: gold
   - type: Stack
     count: 1
+  - type: Item
+    size: 1
 
 - type: entity
   parent: IngotBase
@@ -97,3 +99,7 @@
   components:
   - type: Sprite
     state: silver
+  - type: Stack
+    count: 1
+  - type: Item
+    size: 1
diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
index 4af2886c24..7386eaee4d 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -8,7 +8,7 @@
     sprite: Objects/Materials/materials.rsi
   - type: Item
     sprite: Objects/Materials/materials.rsi
-    size: Normal
+    size: 30
   - type: Tag
     tags:
       - DroneUsable
@@ -47,6 +47,8 @@
     - state: cardboard_3
       map: ["base"]
   - type: Appearance
+  - type: Item
+    size: 30
 
 - type: entity
   parent: MaterialCardboard
@@ -57,6 +59,8 @@
     state: cardboard
   - type: Stack
     count: 10
+  - type: Item
+    size: 10
 
 - type: entity
   parent: MaterialCardboard
@@ -67,6 +71,8 @@
     state: cardboard
   - type: Stack
     count: 1
+  - type: Item
+    size: 1
 
 - type: entity
   parent: MaterialBase
@@ -108,6 +114,8 @@
     - state: cloth_3
       map: ["base"]
   - type: Appearance
+  - type: Item
+    size: 30
   - type: Food
     requiresSpecialDigestion: true
   - type: SolutionContainerManager
@@ -136,6 +144,8 @@
     state: cloth
   - type: Stack
     count: 10
+  - type: Item
+    size: 10
 
 - type: entity
   parent: MaterialCloth
@@ -146,6 +156,8 @@
     state: cloth
   - type: Stack
     count: 1
+  - type: Item
+    size: 1
 
 - type: entity
   parent: MaterialBase
@@ -197,6 +209,8 @@
     state: durathread
   - type: Stack
     count: 1
+  - type: Item
+    size: 1
 
 - type: entity
   parent: MaterialBase
@@ -231,6 +245,8 @@
   components:
   - type: Stack
     count: 10
+  - type: Item
+    size: 10
 
 - type: entity
   parent: MaterialWoodPlank
@@ -239,6 +255,8 @@
   components:
   - type: Stack
     count: 1
+  - type: Item
+    size: 1
 
 - type: entity
   parent: MaterialBase
@@ -260,6 +278,8 @@
   - type: GuideHelp
     guides:
     - Cloning
+  - type: Item
+    size: 100
 
 - type: entity
   parent: MaterialBiomass
@@ -268,6 +288,8 @@
   components:
   - type: Stack
     count: 1
+  - type: Item
+    size: 1
 
 # Following not used currently
 - type: entity
@@ -330,6 +352,7 @@
     state: diamond
   - type: Item
     heldPrefix: diamond
+    size: 60
 
 - type: entity
   parent: MaterialDiamond
@@ -338,6 +361,8 @@
   components:
   - type: Stack
     count: 1
+  - type: Item
+    size: 2
 
 - type: entity
   parent: MaterialBase
@@ -358,6 +383,8 @@
     - state: cotton_3
       map: ["base"]
   - type: Appearance
+  - type: Item
+    size: 30
   - type: Food
     requiresSpecialDigestion: true
   - type: SolutionContainerManager
@@ -383,6 +410,8 @@
     state: cotton
   - type: Stack
     count: 1
+  - type: Item
+    size: 1
 
 - type: entity
   parent: MaterialBase
@@ -433,6 +462,8 @@
       - ReagentId: Honk
         Quantity: 5
   - type: Appearance
+  - type: Item
+    size: 20
 
 - type: entity
   parent: MaterialBananium
@@ -443,6 +474,8 @@
     state: bananium
   - type: Stack
     count: 1
+  - type: Item
+    size: 2
 
 - type: entity
   parent: MaterialBase
@@ -460,6 +493,8 @@
   - type: Stack
     count: 50
     stackType: WebSilk
+  - type: Item
+    size: 50
   - type: Food
     requiresSpecialDigestion: true
   - type: FlavorProfile
@@ -487,6 +522,8 @@
   components:
   - type: Stack
     count: 25
+  - type: Item
+    size: 25
 
 - type: entity
   parent: MaterialWebSilk
@@ -495,6 +532,8 @@
   components:
   - type: Stack
     count: 1
+  - type: Item
+    size: 1
 
 - type: entity
   parent: MaterialBase
@@ -515,6 +554,8 @@
     - state: cotton_3
       map: ["base"]
   - type: Appearance
+  - type: Item
+    size: 30
   - type: Food
   - type: BadFood
   - type: SolutionContainerManager
@@ -532,3 +573,5 @@
   components:
   - type: Stack
     count: 1
+  - type: Item
+    size: 1
diff --git a/Resources/Prototypes/Entities/Objects/Materials/ore.yml b/Resources/Prototypes/Entities/Objects/Materials/ore.yml
index 2b6fec873b..f27d1b770e 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/ore.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/ore.yml
@@ -8,7 +8,7 @@
     sprite: Objects/Materials/ore.rsi
   - type: Item
     sprite: Objects/Materials/ore.rsi
-    size: Normal
+    size: 60
   - type: Tag
     tags:
     - Ore
@@ -57,6 +57,8 @@
   components:
   - type: Stack
     count: 1
+  - type: Item
+    size: 2
 
 - type: entity
   parent: OreBase
@@ -80,6 +82,8 @@
   components:
     - type: Stack
       count: 1
+    - type: Item
+      size: 2
 
 - type: entity
   parent: OreBase
@@ -103,6 +107,8 @@
   components:
     - type: Stack
       count: 1
+    - type: Item
+      size: 2
 
 - type: entity
   parent: OreBase
@@ -126,6 +132,8 @@
   components:
   - type: Stack
     count: 1
+  - type: Item
+    size: 2
 
 - type: entity
   parent: OreBase
@@ -149,6 +157,8 @@
   components:
   - type: Stack
     count: 1
+  - type: Item
+    size: 2
 
 - type: entity
   parent: OreBase
@@ -172,6 +182,9 @@
   components:
   - type: Stack
     count: 1
+  - type: Item
+    size: 2
+
 
 - type: entity
   parent: OreBase
@@ -195,3 +208,5 @@
   components:
   - type: Stack
     count: 1
+  - type: Item
+    size: 2
diff --git a/Resources/Prototypes/Entities/Objects/Materials/parts.yml b/Resources/Prototypes/Entities/Objects/Materials/parts.yml
index 7529bdee04..e75704c2a4 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/parts.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/parts.yml
@@ -44,7 +44,7 @@
     - state: rods_5
       map: ["base"]
   - type: Item
-    size: Normal
+    size: 30
 #    heldPrefix: rods
   - type: Construction
     graph: MetalRod
@@ -73,6 +73,8 @@
     state: rods
   - type: Stack
     count: 10
+  - type: Item
+    size: 10
 
 - type: entity
   parent: PartRodMetal
@@ -88,12 +90,16 @@
     state: rods
   - type: Stack
     count: 1
+  - type: Item
+    size: 1
 
 - type: entity
   parent: PartRodMetal
   id: PartRodMetalLingering0
   suffix: Lingering, 0
   components:
+  - type: Item
+    size: 0
   - type: Stack
     lingering: true
     count: 0
diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
index 8129ab2116..affd08edb1 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -26,7 +26,7 @@
         Slash: 3.5
   - type: Item
     sprite: Objects/Materials/Shards/shard.rsi
-    size: Tiny
+    size: 4
   - type: CollisionWake
     enabled: false
   - type: Fixtures
diff --git a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
index 2945c4f68e..6c6f2d484e 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
@@ -13,7 +13,7 @@
     sprite: Objects/Misc/bedsheets.rsi
     noRot: true
   - type: Item
-    size: Small
+    size: 10
   - type: Clothing
     quickEquip: true
     slots:
diff --git a/Resources/Prototypes/Entities/Objects/Misc/box.yml b/Resources/Prototypes/Entities/Objects/Misc/box.yml
index fa54570d27..59a2abd566 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/box.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/box.yml
@@ -7,9 +7,9 @@
     sprite: Objects/Storage/boxes.rsi
   - type: Item
     sprite: Objects/Storage/boxes.rsi
-    size: Normal
+    size: 30
   - type: Storage
-    maxSlots: 7
+    capacity: 30
   - 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 ebf776a7b1..1866d3513e 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: 60
   - type: Storage
-    maxSlots: 4
-    maxTotalWeight: 16
+    capacity: 60
   - type: Tag
     tags:
     - Briefcase
@@ -26,17 +25,16 @@
     sprite: Objects/Storage/Briefcases/briefcase_brown.rsi
 
 - type: entity
-  parent: BriefcaseBase
+  parent: BaseStorageItem
   abstract: true
   id: BriefcaseSyndieBase
   suffix: Syndicate, Empty
   description: Useful for carrying items in your hands.
   components:
   - type: Item
-    size: Large
+    size: 80
   - type: Storage
-    maxSlots: 6
-    maxTotalWeight: 24
+    capacity: 80
   - type: Tag
     tags:
     - Briefcase
diff --git a/Resources/Prototypes/Entities/Objects/Misc/eggspider.yml b/Resources/Prototypes/Entities/Objects/Misc/eggspider.yml
index c2357ed3c8..f53e39e364 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/eggspider.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/eggspider.yml
@@ -14,7 +14,7 @@
         Structural: 2
     animation: WeaponArcPunch
   - type: Item
-    size: Small
+    size: 5
   - type: PointLight
     radius: 1.5
     energy: 3
diff --git a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
index 0697281a0f..a90f598a5d 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: 10
   - type: SolutionContainerManager
     solutions:
       spray:
diff --git a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
index 1b925b5cb0..77b321f951 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
@@ -38,7 +38,7 @@
     sprite: Objects/Misc/Lights/lights.rsi
   - type: Item
     sprite: Objects/Misc/Lights/lights.rsi
-    size: Normal
+    size: 20
     heldPrefix: off
   - type: PointLight
     enabled: false
@@ -158,7 +158,7 @@
   description: A pole with powerful mounted lights on it.
   components:
   - type: Item
-    size: Normal
+    size: 50
   - type: Sprite
     layers:
       - state: floodlight
diff --git a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
index 4f2199bfa8..befd24f36e 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
@@ -5,7 +5,7 @@
   parent: BaseItem
   components:
   - type: Item
-    size: Small
+    size: 3
   - type: Handcuff
     cuffedRSI: Objects/Misc/handcuffs.rsi
     bodyIconState: body-overlay
@@ -31,6 +31,8 @@
   id: Cablecuffs
   parent: Handcuffs
   components:
+  - type: Item
+    size: 5
   - type: Handcuff
     breakoutTime: 15
     cuffedRSI: Objects/Misc/cablecuffs.rsi
@@ -63,7 +65,7 @@
   parent: Handcuffs
   components:
   - type: Item
-    size: Tiny
+    size: 2
   - type: Handcuff
     breakoutTime: 20  # halfway between improvised cablecuffs and metal ones
     cuffedRSI: Objects/Misc/cablecuffs.rsi  # cablecuffs will look fine
@@ -90,7 +92,7 @@
   abstract: true
   components:
   - type: Item
-    size: Tiny
+    size: 2
   - type: Tag
     tags:
     - Trash
@@ -126,7 +128,7 @@
   description: Used to restrain those who may cause harm to themselves or others.
   components:
   - type: Item
-    size: Normal
+    size: 20
   - type: Handcuff
     cuffedRSI: Clothing/OuterClothing/Misc/straight_jacket.rsi
     breakoutTime: 100
diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
index df8a007576..24462d5113 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -12,7 +12,6 @@
     - idcard
     sprite: Objects/Misc/id_cards.rsi
   - type: Item
-    size: Small
     heldPrefix: default
   - type: Access
   - type: IdCard
diff --git a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml
index dd609dee6c..41966ab93f 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml
@@ -81,7 +81,7 @@
   components:
     - type: Item
       sprite: Objects/Specific/Medical/syndi_implanter.rsi
-      size: Tiny
+      size: 3
     - type: Sprite
       sprite: Objects/Specific/Medical/syndi_implanter.rsi
       state: implanter1
diff --git a/Resources/Prototypes/Entities/Objects/Misc/improvised_gun_parts.yml b/Resources/Prototypes/Entities/Objects/Misc/improvised_gun_parts.yml
index abf4e0974a..d94193e49a 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/improvised_gun_parts.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/improvised_gun_parts.yml
@@ -2,12 +2,12 @@
 #TODO: Assimilate these into the same RSI.
 - type: entity
   parent: BaseItem
-  id: ModularReceiver
-  name: modular receiver
+  id: ModularReceiver 
+  name: modular receiver 
   description: A vital part used in the creation of firearms. #Could use a better description, but I'm not a gun nut so I can't really do that.
   components:
 #    - type: Item
-#      size: Normal
+#      size: 15
     - type: Sprite
       sprite: Objects/Misc/modular_receiver.rsi
       state: icon
@@ -23,7 +23,7 @@
   description: A robust wooden stock, used in the creation of firearms. #Same as above
   components:
 #    - type: Item
-#      size: Normal
+#      size: 25
     - type: Sprite
       sprite: Objects/Misc/rifle_stock.rsi
       state: icon
diff --git a/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml b/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
index c38239a08d..be1f4f65ee 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
@@ -8,7 +8,7 @@
     - type: Sprite
       sprite: Objects/Misc/stock_parts.rsi
     - type: Item
-      size: Tiny
+      size: 1
     - type: GuideHelp
       guides:
       - MachineUpgrading
diff --git a/Resources/Prototypes/Entities/Objects/Misc/medalcase.yml b/Resources/Prototypes/Entities/Objects/Misc/medalcase.yml
index d1ceae2c60..64c11d5a2f 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/medalcase.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/medalcase.yml
@@ -9,10 +9,9 @@
     state: icon
   - type: Item
     sprite: Objects/Storage/medalcase.rsi
-    size: Normal
+    size: 80
   - type: Storage
-    maxSlots: 8
-    maxTotalWeight: 16
+    capacity: 80
   - type: StorageFill
     contents:
     - id: ClothingNeckGoldmedal
diff --git a/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml b/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml
index fcf47d713d..32ad0552c0 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml
@@ -8,6 +8,7 @@
     whitelist:
       tags:
       - MonkeyCube
+    capacity: 30
   - type: StorageFill
     contents:
       - id: MonkeyCubeWrapped
@@ -46,6 +47,7 @@
     whitelist:
       tags:
       - MonkeyCube
+    capacity: 30
   - type: StorageFill
     contents:
       - id: SyndicateSpongeWrapped
diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
index 99dc9c07c6..132d6b7aff 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -23,7 +23,7 @@
     - key: enum.PaperUiKey.Key
       type: PaperBoundUserInterface
   - type: Item
-    size: Tiny
+    size: 1
   - type: Tag
     tags:
     - Document
@@ -245,7 +245,7 @@
   - type: Item
     sprite: Objects/Misc/bureaucracy.rsi
     heldPrefix: pen
-    size: Tiny
+    size: 2
   - type: PhysicalComposition
     materialComposition:
       Steel: 25
@@ -277,7 +277,7 @@
   - type: Item
     sprite: Objects/Misc/bureaucracy.rsi
     heldPrefix: overpriced_pen
-    size: Tiny
+    size: 2
 
 - type: entity
   name: captain's fountain pen
@@ -336,11 +336,9 @@
 #      black: "#3f3f3f"
   - type: Item
     sprite: Objects/Misc/bureaucracy.rsi
-    size: Small
+    size: 5
   - type: Storage
-    maxSlots: 10
-    maxItemSize: Small
-    maxTotalWeight: 20
+    capacity: 10
     whitelist:
       tags:
         - Document
@@ -470,14 +468,13 @@
         insertOnInteract: false
   - type: Item
     sprite: Objects/Misc/clipboard.rsi
-    size: Small
+    size: 10
   - type: Clothing
     slots: [belt]
     quickEquip: false
     sprite: Objects/Misc/clipboard.rsi
   - type: Storage
-    maxSlots: 15
-    maxTotalWeight: 30
+    capacity: 20
     whitelist:
       tags:
         - Document
@@ -529,13 +526,13 @@
         insertOnInteract: true
   - type: Item
     sprite: Objects/Misc/qm_clipboard.rsi
-    size: Normal
+    size: 30
   - type: Clothing
     slots: [belt]
     quickEquip: false
     sprite: Objects/Misc/qm_clipboard.rsi
   - type: Storage
-    maxSlots: 20
+    capacity: 90
     quickInsert: true
     whitelist:
       tags:
@@ -588,7 +585,7 @@
     sprite: Objects/Misc/bureaucracy.rsi
     state: stamp-mime
   - type: Item
-    size: Tiny
+    size: 3
 
 - type: entity
   name: alternate rubber stamp
diff --git a/Resources/Prototypes/Entities/Objects/Misc/potatoai_chip.yml b/Resources/Prototypes/Entities/Objects/Misc/potatoai_chip.yml
index 0f871831e2..528aa30a14 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/potatoai_chip.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/potatoai_chip.yml
@@ -8,10 +8,10 @@
       sprite: Objects/Misc/potatoai_chip.rsi
       state: icon
     - type: Item
-      size: Tiny
+      size: 3
     - type: Tag
       tags:
         - SmallAIChip
     - type: Construction
       graph: PotatoAIChip
-      node: potatoaichip
+      node: potatoaichip
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
index 4335461660..6632010a79 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
@@ -110,10 +110,9 @@
     - type: SubdermalImplant
       implantAction: ActionOpenStorageImplant
     - type: Item
-      size: Huge
+      size: 9999
     - type: Storage
-      maxSlots: 4
-      maxItemSize: Small
+      capacity: 20 #10-20 should be more than enough for this
     - type: ContainerContainer
       containers:
         storagebase: !type:Container
diff --git a/Resources/Prototypes/Entities/Objects/Power/antimatter_jar.yml b/Resources/Prototypes/Entities/Objects/Power/antimatter_jar.yml
index 22e5b9bb3c..8267903dbb 100644
--- a/Resources/Prototypes/Entities/Objects/Power/antimatter_jar.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/antimatter_jar.yml
@@ -5,7 +5,7 @@
   description: A hermetically sealed jar containing antimatter for use in an antimatter reactor.
   components:
   - type: Item
-    size: Normal
+    size: 5
     sprite: Objects/Power/AME/ame_jar.rsi
   - type: Sprite
     sprite: Objects/Power/AME/ame_jar.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Power/antimatter_part.yml b/Resources/Prototypes/Entities/Objects/Power/antimatter_part.yml
index 7d428bcc5a..a393cad617 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: 5
     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 c8684323a9..9317dd741f 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: 150
     - 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 5b3f5e90ce..ff333b93c2 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: 10
   - 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 76a8e576a5..8afe40bfe7 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: 100
       heldPrefix: riot
     - type: Blocking
       passiveBlockModifier:
@@ -308,7 +308,7 @@
         path: /Audio/Weapons/ebladeon.ogg
       deActivateSound:
         path: /Audio/Weapons/ebladeoff.ogg
-      offSize: Small
+      offSize: 5
     - type: Sprite
       sprite: Objects/Weapons/Melee/e_shield.rsi
       layers:
@@ -319,7 +319,7 @@
           shader: unshaded
           map: [ "shield" ]
     - type: Item
-      size: Small
+      size: 5
       sprite: Objects/Weapons/Melee/e_shield.rsi
       heldPrefix: eshield
     - type: UseDelay
@@ -398,7 +398,7 @@
       state: eshield-icon
     - type: Item
       sprite: Objects/Weapons/Melee/e_shield.rsi
-      size: Small
+      size: 5
       heldPrefix: eshield
 
 - type: entity
@@ -417,7 +417,7 @@
         path: /Audio/Weapons/telescopicoff.ogg
         params:
           volume: -5
-      offSize: Small
+      offSize: 10
     - type: Sprite
       sprite: Objects/Weapons/Melee/teleriot_shield.rsi
       layers:
@@ -426,7 +426,7 @@
           visible: false
           map: [ "shield" ]
     - type: Item
-      size: Small
+      size: 10
       sprite: Objects/Weapons/Melee/teleriot_shield.rsi
       heldPrefix: teleriot
     - type: UseDelay
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
index 3e72257d5c..19414d0997 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
@@ -31,13 +31,13 @@
     sprite: Objects/Specific/Chapel/bible.rsi
     state: icon
   - type: Item
-    size: Normal
+    size: 15
     sprite: Objects/Specific/Chapel/bible.rsi
   - type: Clothing
     slots:
     - Belt
   - type: Storage
-    maxSlots: 1
+    capacity: 10
   - type: UserInterface
     interfaces:
     - key: enum.StorageUiKey.Key
@@ -74,7 +74,7 @@
     sprite: Objects/Specific/Chapel/necronomicon.rsi
     state: icon
   - type: Item
-    size: Normal
+    size: 15
     sprite: Objects/Specific/Chapel/necronomicon.rsi
   - type: Clothing
     slots:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chem_bag.yml b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chem_bag.yml
index 597f48744c..8be5fecb4f 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chem_bag.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chem_bag.yml
@@ -13,9 +13,9 @@
     slots:
     - belt
   - type: Item
-    size: Normal
+    size: 46
   - type: Storage
-    maxSlots: 40
+    capacity: 45
     quickInsert: true
     areaInsert: true
     whitelist:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Forensics/forensics.yml b/Resources/Prototypes/Entities/Objects/Specific/Forensics/forensics.yml
index b7627e1016..a3abd4f1e3 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: 3
   - type: ForensicPad
   - type: Sprite
     sprite: Objects/Misc/bureaucracy.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml
index 8e26898daa..6da11b53fb 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml
@@ -63,7 +63,7 @@
     tags:
       - Smokable
   - type: Item
-    size: Tiny
+    size: 1
 
 - type: entity
   name: tobacco leaves
@@ -121,4 +121,4 @@
     tags:
       - Smokable
   - type: Item
-    size: Tiny
+    size: 1
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
index af66e528c9..16d9fd1a64 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
@@ -8,7 +8,7 @@
       sprite: Objects/Specific/Hydroponics/seeds.rsi
       state: seed
     - type: Item
-      size: Tiny
+      size: 2
     - type: StaticPrice
       price: 20
 
@@ -457,7 +457,7 @@
       seedId: watermelon
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/watermelon.rsi
-
+      
 - type: entity
   parent: SeedBase
   name: packet of grape seeds
@@ -497,4 +497,4 @@
     - type: Seed
       seedId: bungo
     - type: Sprite
-      sprite: Objects/Specific/Hydroponics/bungo.rsi
+      sprite: Objects/Specific/Hydroponics/bungo.rsi
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
index 026c47f176..c939cc9ca1 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
@@ -59,7 +59,7 @@
       types:
         Slash: 10
   - type: Item
-    size: Normal
+    size: 20
   - type: Clothing
     sprite: Objects/Tools/Hydroponics/scythe.rsi
     slots:
@@ -123,13 +123,13 @@
   - type: Sprite
     sprite: Objects/Specific/Hydroponics/Equipment/plant_bag.rsi
     state: icon
+  - type: Item
   - type: Clothing
     quickEquip: false
     slots:
     - belt
   - type: Storage
-    maxSlots: 40
-    maxItemSize: Small
+    capacity: 200
     quickInsert: true
     areaInsert: true
     whitelist:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index d865dd172f..333c17b217 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -20,7 +20,7 @@
       types:
         Blunt: 5
   - type: Item
-    size: Normal
+    size: 15
     sprite: Objects/Specific/Janitorial/mop.rsi
   - type: Absorbent
   - type: SolutionContainerManager
@@ -59,7 +59,7 @@
         types:
           Blunt: 5
     - type: Item
-      size: Normal
+      size: 15
       sprite: Objects/Specific/Janitorial/advmop.rsi
     - type: Absorbent
       pickupAmount: 100
@@ -203,7 +203,7 @@
     sprite: Objects/Specific/Janitorial/wet_floor_sign.rsi
   - type: Item
     sprite: Objects/Specific/Janitorial/wet_floor_sign.rsi
-    size: Normal
+    size: 15
   - type: Armor
     modifiers:
       coefficients:
@@ -544,7 +544,7 @@
         types:
           Blunt: 0
     - type: Item
-      size: Small
+      size: 10
       sprite: Objects/Specific/Janitorial/rag.rsi
     - type: Absorbent
       pickupAmount: 15
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml
index da12222595..80aace05e7 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml
@@ -9,8 +9,7 @@
       - state: icon-0
         map: ["enum.StorageFillLayers.Fill"]
   - type: Storage
-    maxSlots: 20
-    maxItemSize: Small
+    capacity: 125
     quickInsert: true
     areaInsert: true
     storageOpenSound:
@@ -34,7 +33,7 @@
     slots: [belt]
     sprite: Objects/Specific/Janitorial/trashbag.rsi
   - type: Item
-    size: Normal
+    size: 125
 
 - type: entity
   name: trash bag
@@ -56,9 +55,7 @@
   parent: TrashBagBlue
   components:
   - type: Storage
-    maxSlots: 100
-    maxItemSize: Huge
-    maxTotalWeight: 200
+    capacity: 125000
     quickInsert: true
     areaInsert: true
     areaInsertRadius: 1000
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Kitchen/foodcarts.yml b/Resources/Prototypes/Entities/Objects/Specific/Kitchen/foodcarts.yml
index 20ec7354fb..22faf499f1 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Kitchen/foodcarts.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Kitchen/foodcarts.yml
@@ -47,9 +47,10 @@
       - key: enum.StorageUiKey.Key
         type: StorageBoundUserInterface
     - type: Storage
+      capacity: 30
     - type: TileFrictionModifier
-      modifier: 0.4 # makes it slide
-
+      modifier: 0.4 # makes it slide 
+    
 # Add this if freezing/heating container/objects thermodynamics becomes a thing
 
     #- type: PowerCellSlot
@@ -62,7 +63,7 @@
     #    cell_slot:
     #      name: power-cell-slot-component-slot-name-default
     #      startingItem: PowerCellMedium
-
+  
 - type: entity
   name: Hot Food Cart
   id: FoodCartHot
@@ -72,11 +73,11 @@
     - type: Sprite
       netSync: false
       noRot: true
-      sprite: Objects/Specific/Kitchen/food_carts.rsi
+      sprite: Objects/Specific/Kitchen/food_carts.rsi 
       layers:
         - state: stand-food
     - type: Storage
-      blacklist:
+      blacklist: 
         tags:
           - Coldsauce
           - Hotsauce
@@ -99,7 +100,7 @@
           whitelist:
             tags:
               - Hotsauce
-          priority: 5
+          priority: 5 
         bbqsauce_slot:
           name: BBQ Sauce
           insertSound: /Audio/Items/bottle_clunk.ogg
@@ -107,7 +108,7 @@
           whitelist:
             tags:
               - BBQsauce
-          priority: 4
+          priority: 4  
         ketchup_slot:
           name: Ketchup
           insertSound: /Audio/Items/bottle_clunk.ogg
@@ -115,7 +116,7 @@
           whitelist:
             tags:
               - Ketchup
-          priority: 3
+          priority: 3 
     - type: ItemMapper
       mapLayers:
         cart_hotsauce:
@@ -153,7 +154,7 @@
     - type: Sprite
       netSync: false
       noRot: true
-      sprite: Objects/Specific/Kitchen/food_carts.rsi
+      sprite: Objects/Specific/Kitchen/food_carts.rsi 
       layers:
         - state: stand-ice
     - type: ContainerContainer
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Librarian/books_bag.yml b/Resources/Prototypes/Entities/Objects/Specific/Librarian/books_bag.yml
index a2675ffaaf..2ad28399a6 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Librarian/books_bag.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Librarian/books_bag.yml
@@ -13,9 +13,9 @@
       slots:
         - belt
     - type: Item
-      size: Huge
+      size: 151
     - type: Storage
-      maxSlots: 15
+      capacity: 150
       quickInsert: true
       areaInsert: true
       whitelist:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mech_construction.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mech_construction.yml
index a79e6e9037..678cd5ea12 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: 50
 
 - type: entity
   parent: BaseRipleyPart
@@ -172,7 +172,7 @@
   abstract: true
   components:
   - type: Item
-    size: Huge
+    size: 50
 
 - type: entity
   parent: BaseHonkerPart
@@ -300,7 +300,7 @@
   abstract: true
   components:
   - type: Item
-    size: Large
+    size: 50
 
 - type: entity
   parent: BaseHamtrPart
@@ -428,7 +428,7 @@
   abstract: true
   components:
   - type: Item
-    size: Small
+    size: 10
 
 - type: entity
   parent: BaseVimPartItem
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_equipment.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_equipment.yml
index ac550b8e61..8539c473b9 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: 50
   - type: MechEquipment
   - type: GuideHelp
     guides:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml
index 74b0cbb0d9..a69147b610 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml
@@ -28,7 +28,7 @@
             True: { visible: true }
             False: { visible: false }
     - type: Item
-      size: Normal
+      size: 50
     - type: ItemCooldown
     - type: Speech
       speechVerb: Robotic
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/disease.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/disease.yml
index b85f708777..9c67cbb28c 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/disease.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/disease.yml
@@ -5,7 +5,7 @@
   description: Used for taking and transfering samples. Sterile until open. Single use only.
   components:
   - type: Item
-    size: Tiny
+    size: 1
   - type: Sprite
     sprite: Objects/Specific/Medical/mouth_swab.rsi
     state: icon
@@ -26,7 +26,7 @@
   description: Prevents people who DON'T already have a disease from catching it.
   components:
   - type: Item
-    size: Tiny
+    size: 3
   - type: Sprite
     sprite: Objects/Specific/Medical/medipen.rsi
     state: salpen
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
index 88b7401f74..5083ae4a44 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
@@ -6,7 +6,7 @@
   - type: Sprite
     sprite: Objects/Specific/Medical/medical.rsi
   - type: Item
-    size: Small
+    size: 10
     sprite: Objects/Specific/Medical/medical.rsi
     heldPrefix: ointment
   # Inherited
@@ -54,6 +54,8 @@
   - type: Stack
     stackType: Ointment
     count: 1
+  - type: Item
+    size: 1
 
 - type: entity
   id: Ointment10Lingering
@@ -103,6 +105,8 @@
   - type: Stack
     stackType: RegenerativeMesh
     count: 1
+  - type: Item
+    size: 1
 
 - type: entity
   name: bruise pack
@@ -140,6 +144,8 @@
   - type: Stack
     stackType: Brutepack
     count: 1
+  - type: Item
+    size: 1
 
 - type: entity
   id: Brutepack10Lingering
@@ -187,6 +193,8 @@
   - type: Stack
     stackType: MedicatedSuture
     count: 1
+  - type: Item
+    size: 1
 
 - type: entity
   name: blood pack
@@ -265,6 +273,8 @@
   components:
   - type: Stack
     count: 1
+  - type: Item
+    size: 1
 
 - type: entity
   id: Gauze10Lingering
@@ -328,16 +338,6 @@
         - ReagentId: Dexalin
           Quantity: 10
 
-- type: entity
-  parent: PillCanister
-  id: PillCanisterDexalin
-  suffix: Dexalin, 7
-  components:
-  - type: StorageFill
-    contents:
-    - id: PillDexalin
-      amount: 7
-
 - type: entity
   name: dylovene pill (10u)
   parent: Pill
@@ -351,16 +351,6 @@
         - ReagentId: Dylovene
           Quantity: 10
 
-- type: entity
-  parent: PillCanister
-  id: PillCanisterDylovene
-  suffix: Dylovene, 5
-  components:
-  - type: StorageFill
-    contents:
-    - id: PillDylovene
-      amount: 5
-
 - type: entity
   name: hyronalin pill (10u)
   parent: Pill
@@ -374,16 +364,6 @@
         - ReagentId: Hyronalin
           Quantity: 10
 
-- type: entity
-  parent: PillCanister
-  id: PillCanisterHyronalin
-  suffix: Hyronalin, 5
-  components:
-  - type: StorageFill
-    contents:
-    - id: PillHyronalin
-      amount: 5
-
 - type: entity
   name: iron pill (10u)
   parent: Pill
@@ -397,16 +377,6 @@
         - ReagentId: Iron
           Quantity: 10
 
-- type: entity
-  parent: PillCanister
-  id: PillCanisterIron
-  suffix: Iron, 5
-  components:
-  - type: StorageFill
-    contents:
-    - id: PillIron
-      amount: 5
-
 - type: entity
   name: kelotane pill (10u)
   parent: Pill
@@ -420,16 +390,6 @@
         - ReagentId: Kelotane
           Quantity: 10
 
-- type: entity
-  parent: PillCanister
-  id: PillCanisterKelotane
-  suffix: Kelotane, 5
-  components:
-  - type: StorageFill
-    contents:
-    - id: PillKelotane
-      amount: 5
-
 - type: entity
   name: dermaline pill (10u)
   parent: Pill
@@ -443,16 +403,6 @@
         - ReagentId: Dermaline
           Quantity: 10
 
-- type: entity
-  parent: PillCanister
-  id: PillCanisterDermaline
-  suffix: Dermaline, 5
-  components:
-  - type: StorageFill
-    contents:
-    - id: PillDermaline
-      amount: 5
-
 - type: entity
   name: space drugs
   parent: Pill
@@ -479,16 +429,6 @@
         - ReagentId: Tricordrazine
           Quantity: 10
 
-- type: entity
-  parent: PillCanister
-  id: PillCanisterTricordrazine
-  suffix: Tricordrazine, 5
-  components:
-  - type: StorageFill
-    contents:
-    - id: PillTricordrazine
-      amount: 5
-
 - type: entity
   name: bicaridine pill (10u)
   parent: Pill
@@ -502,16 +442,6 @@
         - ReagentId: Bicaridine
           Quantity: 10
 
-- type: entity
-  parent: PillCanister
-  id: PillCanisterBicaridine
-  suffix: Bicaridine, 5
-  components:
-  - type: StorageFill
-    contents:
-    - id: PillBicaridine
-      amount: 5
-
 - type: entity
   name: charcoal pill (10u)
   parent: Pill
@@ -528,16 +458,6 @@
         - ReagentId: Charcoal
           Quantity: 10
 
-- type: entity
-  parent: PillCanister
-  id: PillCanisterCharcoal
-  suffix: Charcoal, 3
-  components:
-  - type: StorageFill
-    contents:
-    - id: PillCharcoal
-      amount: 3
-
 - type: entity
   name: romerol pill
   parent: Pill
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
index 709bc751a4..dccbbc7328 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -101,7 +101,7 @@
       map: ["enum.SolutionContainerLayers.Fill"]
   - type: Item
     sprite: Objects/Specific/Medical/medipen.rsi
-    size: Tiny
+    size: 3
   - type: SolutionContainerManager
     solutions:
       pen:
@@ -291,7 +291,7 @@
       map: ["enum.SolutionContainerLayers.Fill"]
   - type: Item
     sprite: Objects/Specific/Medical/medipen.rsi
-    size: Small
+    size: 10
   - type: SolutionContainerManager
     solutions:
       pen:
@@ -320,7 +320,7 @@
       map: ["enum.SolutionContainerLayers.Fill"]
   - type: Item
     sprite: Objects/Specific/Medical/medipen.rsi
-    size: Tiny
+    size: 5
   - type: SolutionContainerManager
     solutions:
       pen:
@@ -346,7 +346,7 @@
       map: ["enum.SolutionContainerLayers.Fill"]
   - type: Item
     sprite: Objects/Specific/Medical/medipen.rsi
-    size: Tiny
+    size: 5
   - 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 3328316112..400f6670ab 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml
@@ -8,8 +8,9 @@
     sprite: Objects/Specific/Medical/firstaidkits.rsi
     state: firstaid
   - type: Storage
+    capacity: 60
   - type: Item
-    size: Normal
+    size: 60
     sprite: Objects/Specific/Medical/firstaidkits.rsi
     heldPrefix: firstaid
   - type: Tag
@@ -92,5 +93,7 @@
     state: blackkit
   - type: Item
     heldPrefix: blackkit
-    size: Normal
+    size: 50
+  - type: Storage
+    capacity: 50
 
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
index 1ef73f2396..18e502ccdf 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
@@ -5,7 +5,7 @@
   description: A plastic bag designed for the storage and transportation of cadavers.
   components:
   - type: Item
-    size: Small
+    size: 6
   - type: Sprite
     drawdepth: SmallObjects # I guess body bags need appear above a coroner's table?
     sprite: Objects/Specific/Medical/Morgue/bodybags.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Research/rped.yml b/Resources/Prototypes/Entities/Objects/Specific/Research/rped.yml
index dd9d771ebe..268a91c8de 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Research/rped.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Research/rped.yml
@@ -9,13 +9,13 @@
     state: icon
   - type: Item
     sprite: Objects/Specific/Research/rped.rsi
-    size: Normal
+    size: 50
   - type: GuideHelp
     guides:
     - MachineUpgrading
   - type: PartExchanger
   - type: Storage
-    maxSlots: 30
+    capacity: 150
     quickInsert: true
     areaInsert: true
     whitelist:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml b/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml
index 814ddb30da..583aef374a 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml
@@ -14,10 +14,9 @@
     slots:
     - belt
   - type: Item
-    size: Huge
+    size: 176
   - type: Storage
-    maxSlots: 5
-    maxItemSize: Normal
+    capacity: 175
     quickInsert: true
     areaInsert: true
     whitelist:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml
index 6abdd790c9..6ada51176c 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml
@@ -22,7 +22,7 @@
     soundSwing:
       path: /Audio/Weapons/punchmiss.ogg
   - type: Item
-    size: Normal
+    size: 50
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Metallic
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_artifacts.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_artifacts.yml
index 6c49fd7a5e..465e1a458c 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_artifacts.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_artifacts.yml
@@ -55,7 +55,7 @@
       type: IntercomBoundUserInterface
   - type: Appearance
   - type: Item
-    size: Normal
+    size: 40
     sprite: Objects/Specific/Xenoarchaeology/item_artifacts.rsi
     heldPrefix: ano01
   - type: Actions
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
index 51d705f617..0e679c7096 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
@@ -17,7 +17,7 @@
           map: [ "enum.SolutionContainerLayers.Fill" ]
           visible: false
     - type: Item
-      size: Normal
+      size: 20
       sprite: Objects/Specific/Chemistry/jug.rsi
     - type: RefillableSolution
       solution: beaker
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
index b869a2008f..da1a15e238 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
@@ -46,7 +46,7 @@
     - key: enum.TransferAmountUiKey.Key
       type: TransferAmountBoundUserInterface
   - type: Item
-    size: Tiny
+    size: 3
     sprite: Objects/Specific/Chemistry/beaker.rsi
   - type: Spillable
     solution: drink
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
index 6ccb29f1cc..bf323067ac 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -187,7 +187,7 @@
         map: ["enum.SolutionContainerLayers.Fill"]
         visible: false
   - type: Item
-    size: Small
+    size: 10
     sprite: Objects/Specific/Chemistry/beaker_large.rsi
   - type: SolutionContainerManager
     solutions:
@@ -317,7 +317,7 @@
     sprite: Objects/Specific/Chemistry/syringe.rsi
     state: "syringe_base0"
   - type: Item
-    size: Tiny
+    size: 3
     sprite: Objects/Specific/Chemistry/syringe.rsi
     heldPrefix: 0
   - type: SolutionContainerManager
@@ -393,7 +393,7 @@
     sprite: Objects/Specific/Chemistry/pills.rsi
     state: pill
   - type: Item
-    size: Tiny
+    size: 1
     sprite: Objects/Specific/Chemistry/pills.rsi
   - type: Pill
   - type: Food
@@ -436,20 +436,18 @@
   name: pill canister
   id: PillCanister
   parent: BaseStorageItem
-  description: Holds up to 10 pills.
+  description: Holds up to 9 pills.
   components:
   - type: Sprite
     sprite: Objects/Specific/Chemistry/pills_canister.rsi
     state: pill_canister
   - type: Item
     sprite: Objects/Specific/Chemistry/pills_canister.rsi
-    size: Small
   - type: Tag
     tags:
       - PillCanister
   - type: Storage
-    maxSlots: 10
-    maxTotalWeight: 10
+    capacity: 9
     quickInsert: true
     areaInsert: true
     areaInsertRadius: 1
diff --git a/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml b/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml
index aa6a64789e..81836f9c6c 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml
@@ -10,7 +10,7 @@
     state: telecrystal
   - type: Item
     sprite: Objects/Specific/Syndicate/telecrystal.rsi
-    size: Tiny
+    size: 20
   - type: Stack
     count: 20
     stackType: Telecrystal
@@ -29,6 +29,8 @@
   components:
   - type: Stack
     count: 1
+  - type: Item
+    size: 1
 
 - type: entity
   parent: Telecrystal
@@ -37,6 +39,8 @@
   components:
   - type: Stack
     count: 5
+  - type: Item
+    size: 5
 
 - type: entity
   parent: Telecrystal
@@ -45,6 +49,8 @@
   components:
   - type: Stack
     count: 10
+  - type: Item
+    size: 10
 
 # Uplinks
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
index 7863cf8c09..c8b05c6959 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
@@ -11,7 +11,7 @@
       sprite: Objects/Tools/access_configurator.rsi
       state: icon
     - type: Item
-      size: Small
+      size: 5
     - type: Clothing
       sprite: Objects/Tools/access_configurator.rsi
       quickEquip: false
@@ -62,12 +62,12 @@
     - type: UserInterface
       interfaces:
         - key: enum.AccessOverriderUiKey.Key
-          type: AccessOverriderBoundUserInterface
-    - type: ActivatableUI
+          type: AccessOverriderBoundUserInterface        
+    - type: ActivatableUI  
       key: enum.AccessOverriderUiKey.Key
-      requireHands: true
-      closeOnHandDeselect: false
-      singleUser: true
+      requireHands: true      
+      closeOnHandDeselect: false  
+      singleUser: true      
     - type: ItemSlots
     - type: ContainerContainer
       containers:
diff --git a/Resources/Prototypes/Entities/Objects/Tools/bucket.yml b/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
index c7d62d759b..2a5870908f 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
@@ -16,7 +16,7 @@
       state: fill-1
       visible: false
   - type: Item
-    size: Normal
+    size: 100
   - type: Clothing
     sprite: Objects/Tools/bucket.rsi
     slots:
diff --git a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
index e8d95ff9cb..e73d80f83b 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
@@ -19,7 +19,7 @@
     sprite: Objects/Tools/cable-coils.rsi
   - type: Item
     sprite: Objects/Tools/cable-coils.rsi
-    size: Small
+    size: 30
   - type: CablePlacer
   - type: Clickable
   - type: StaticPrice
@@ -62,6 +62,8 @@
     state: coilhv-10
   - type: Stack
     count: 10
+  - type: Item
+    size: 10
 
 - type: entity
   parent: CableHVStack10
@@ -81,6 +83,8 @@
     state: coilhv-10
   - type: Stack
     count: 1
+  - type: Item
+    size: 1
 
 - type: entity
   parent: CableStack
@@ -117,6 +121,8 @@
     state: coilmv-10
   - type: Stack
     count: 10
+  - type: Item
+    size: 10
 
 - type: entity
   parent: CableMVStack10
@@ -136,6 +142,8 @@
     state: coilmv-10
   - type: Stack
     count: 1
+  - type: Item
+    size: 1
 
 - type: entity
   parent: CableStack
@@ -171,6 +179,8 @@
       state: coillv-10
     - type: Stack
       count: 10
+    - type: Item
+      size: 10
 
 - type: entity
   parent: CableApcStack10
@@ -190,3 +200,5 @@
     state: coillv-10
   - type: Stack
     count: 1
+  - type: Item
+    size: 1
diff --git a/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml b/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml
index e6a7a43fa4..24eb0b02b2 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml
@@ -127,7 +127,7 @@
   - type: Sprite
     sprite: Objects/Tools/Cowtools/cowelder.rsi
   - type: Item
-    size: Small
+    size: 10
     sprite: Objects/Tools/Cowtools/cowelder.rsi
   - type: Tool
     speed: 0.05
diff --git a/Resources/Prototypes/Entities/Objects/Tools/fulton.yml b/Resources/Prototypes/Entities/Objects/Tools/fulton.yml
index 612c8b93b9..8e54b4277f 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/fulton.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/fulton.yml
@@ -28,7 +28,7 @@
           mask:
             - Impassable
     - type: Item
-      size: Normal
+      size: 30
     - type: Foldable
       folded: true
     - type: Clickable
@@ -58,7 +58,7 @@
   components:
   - type: Fulton
   - type: Item
-    size: Normal
+    size: 20
   - type: Stack
     stackType: Fulton
     count: 10
@@ -84,7 +84,7 @@
   suffix: One
   components:
   - type: Item
-    size: Small
+    size: 2
   - type: Stack
     count: 1
 
diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
index 9887d8cdc0..09d9945213 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
@@ -7,7 +7,7 @@
     sprite: Objects/Tanks/generic.rsi
     state: icon
   - type: Item
-    size: Normal
+    size: 15
     sprite: Objects/Tanks/generic.rsi
   - type: Clothing
     sprite: Objects/Tanks/generic.rsi
@@ -100,7 +100,7 @@
   - type: Sprite
     sprite: Objects/Tanks/emergency.rsi
   - type: Item
-    size: Small
+    size: 10
     sprite: Objects/Tanks/emergency.rsi
   - type: GasTank
     outputPressure: 21.3
diff --git a/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml b/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml
index 5c30cfdea3..b3d117dced 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml
@@ -13,7 +13,7 @@
       state: item_wall
     - type: Item
       sprite: Objects/Misc/inflatable_wall.rsi
-      size: Small
+      size: 10
     - type: SpawnAfterInteract
       prototype: InflatableWall
       doAfter: 1
@@ -39,7 +39,7 @@
       state: item_door
     - type: Item
       sprite: Objects/Misc/inflatable_door.rsi
-      size: Small
+      size: 4
     - type: SpawnAfterInteract
       prototype: InflatableDoor
       doAfter: 1
@@ -57,6 +57,8 @@
   components:
     - type: Sprite
       state: item_wall
+    - type: Item
+      size: 5
     - type: Stack
       count: 5
 
@@ -67,6 +69,8 @@
   components:
     - type: Sprite
       state: item_wall
+    - type: Item
+      size: 1
     - type: Stack
       count: 1
 
@@ -77,5 +81,7 @@
   components:
     - type: Sprite
       state: item_door
+    - type: Item
+      size: 1
     - type: Stack
       count: 1
diff --git a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
index 31d852354b..36f96f61af 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
@@ -11,7 +11,7 @@
     sprite: Objects/Tools/jaws_of_life.rsi
     state: jaws_pry
   - type: Item
-    size: Normal
+    size: 50
   - type: Clothing
     sprite: Objects/Tools/jaws_of_life.rsi
     quickEquip: false
@@ -61,7 +61,7 @@
     sprite: Objects/Tools/jaws_of_life.rsi
     state: syn_jaws_pry
   - type: Item
-    size: Normal
+    size: 35
   - type: Tool
     qualities:
       - Prying
diff --git a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
index d63225b2bd..b87bbae0d8 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: 100
     - type: UserInterface
       interfaces:
         - key: enum.SharedGasTankUiKey.Key
@@ -153,7 +153,7 @@
       - Back
   - type: Item
     sprite: Objects/Tanks/Jetpacks/captain.rsi
-    size: Normal
+    size: 30
   - type: Tag
     tags:
     - HighRiskItem
diff --git a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
index a3b6b3fd6e..e3422f2a4a 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
@@ -40,7 +40,7 @@
       visible: false
     - state: basic_icon_top
   - type: Item
-    size: Tiny
+    size: 1
     sprite: Objects/Tools/lighters.rsi
     heldPrefix: off
   - type: ItemCooldown
diff --git a/Resources/Prototypes/Entities/Objects/Tools/matches.yml b/Resources/Prototypes/Entities/Objects/Tools/matches.yml
index 98affd271c..fd7e185cb0 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/matches.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/matches.yml
@@ -4,10 +4,9 @@
   abstract: true
   components:
   - type: Storage
-    maxSlots: 7
-    maxTotalWeight: 14
+    capacity: 10
   - type: Item
-    size: Small
+    size: 10
 
 - type: entity
   name: match stick
@@ -27,7 +26,7 @@
   - type: Item
     sprite: Objects/Tools/matches.rsi
     heldPrefix: unlit
-    size: Tiny
+    size: 1
   - type: Matchstick
     duration: 10
     igniteSound:
@@ -81,10 +80,9 @@
   - type: Item
     sprite: Objects/Tools/matches.rsi
     heldPrefix: matchbox
-    size: Small
+    size: 5
   - type: Storage
-    maxSlots: 5
-    maxTotalWeight: 5
+    capacity: 5
   - type: StorageFill
     contents:
       - id: Matchstick
diff --git a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
index 8a1c33df76..e9f0526796 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
@@ -8,11 +8,9 @@
     sound:
       path: /Audio/Items/toolbox_drop.ogg
   - type: Storage
-    maxSlots: 7
-    maxItemSize: Normal
-    maxTotalWeight: 14
+    capacity: 60
   - type: Item
-    size: Huge
+    size: 9999
   - type: ItemCooldown
   - type: MeleeWeapon
     damage:
@@ -116,8 +114,7 @@
   - type: Item
     sprite: Objects/Tools/Toolboxes/toolbox_syn.rsi
   - type: Storage
-    maxItemSize: Large
-    maxTotalWeight: 28
+    capacity: 170 # this seems silly high
   - type: MeleeWeapon
     damage:
       types:
diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
index 566c72dafd..12a6ede231 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -140,7 +140,7 @@
     state: icon
   - type: Item
     sprite: Objects/Tools/crowbar.rsi
-    size: Small
+    size: 10
   - type: ItemCooldown
   - type: MeleeWeapon
     wideAnimationRotation: -135
@@ -191,7 +191,7 @@
     - state: green-unlit
       shader: unshaded
   - type: Item
-    size: Small
+    size: 5
   - type: Clothing
     sprite: Objects/Tools/multitool.rsi
     quickEquip: false
@@ -240,7 +240,7 @@
           map: ["enum.NetworkConfiguratorLayers.ModeLight"]
           shader: unshaded
     - type: Item
-      size: Small
+      size: 5
     - type: Clothing
       sprite: Objects/Tools/network_configurator.rsi
       quickEquip: false
@@ -290,7 +290,7 @@
     state: drill_screw
   - type: Item
     sprite: Objects/Tools/drill.rsi
-    size: Small
+    size: 10
   - type: Tool
     qualities:
       - Screwing
@@ -346,7 +346,7 @@
     sprite: Objects/Tools/rcd.rsi
     state: icon
   - type: Item
-    size: Normal
+    size: 20
   - type: Clothing
     sprite: Objects/Tools/rcd.rsi
     quickEquip: false
@@ -422,7 +422,7 @@
     state: omnitool-screwing
   - type: Item
     sprite: Objects/Tools/omnitool.rsi
-    size: Normal
+    size: 20
   - type: Tag
     tags:
     - Multitool
@@ -497,7 +497,7 @@
       types:
         Blunt: 14
   - type: Item
-    size: Normal
+    size: 90
     sprite: Objects/Tools/shovel.rsi
   - type: PhysicalComposition
     materialComposition:
@@ -517,7 +517,7 @@
     state: icon
   - type: Item
     sprite: Objects/Tools/rolling_pin.rsi
-    size: Small
+    size: 10
   - type: Clothing
     sprite: Objects/Tools/rolling_pin.rsi
     quickEquip: false
diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
index caa0d4c208..7c3de82d0a 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
@@ -17,7 +17,7 @@
       shader: unshaded
       visible: false
   - type: Item
-    size: Small
+    size: 10
     sprite: Objects/Tools/welder.rsi
   - type: ToggleableLightVisuals
     spriteLayer: flame
@@ -142,7 +142,7 @@
   - type: Sprite
     sprite: Objects/Tools/welder_mini.rsi
   - type: Item
-    size: Tiny
+    size: 5
     sprite: Objects/Tools/welder_mini.rsi
   - type: RefillableSolution
     solution: Welder
diff --git a/Resources/Prototypes/Entities/Objects/Vehicles/keys.yml b/Resources/Prototypes/Entities/Objects/Vehicles/keys.yml
index 468f1aa3a5..f361c2b877 100644
--- a/Resources/Prototypes/Entities/Objects/Vehicles/keys.yml
+++ b/Resources/Prototypes/Entities/Objects/Vehicles/keys.yml
@@ -5,7 +5,7 @@
   description: Interesting design.
   components:
   - type: Item
-    size: Tiny
+    size: 2
   - type: Tag
     tags:
     - VehicleKey
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
index 84883c975d..c33c1f92c5 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
@@ -12,7 +12,7 @@
         map: ["base"]
     - type: Item
       sprite: Objects/Weapons/Bombs/hot_potato.rsi
-      size: Small
+      size: 5
     - type: AmbientSound
       enabled: false
       range: 8
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml
index e3581370f0..4d9fed1f91 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml
@@ -12,7 +12,7 @@
       map: ["base"]
   - type: Item
     sprite: Objects/Weapons/Bombs/c4.rsi
-    size: Small
+    size: 10
   - type: OnUseTimerTrigger
     delay: 10
     delayOptions: [10, 30, 60, 120, 300]
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/spider.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/spider.yml
index 8f997b7687..50a7ea8687 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/spider.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/spider.yml
@@ -10,7 +10,7 @@
     state: icon
   - type: Item
     sprite: Objects/Weapons/Bombs/spidercharge.rsi
-    size: Small
+    size: 10
   - type: SpiderCharge
   - type: OnUseTimerTrigger
     delay: 10
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml
index 28157ef345..c7980f845f 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml
@@ -12,7 +12,7 @@
     proto: CartridgeAntiMateriel
     capacity: 10
   - type: Item
-    size: Small
+    size: 5
   - type: ContainerContainer
     containers:
       ballistic-ammo: !type:Container
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml
index 063268d8b5..4a77bfcfc5 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml
@@ -12,7 +12,7 @@
     proto: CartridgeCaselessRifle
     capacity: 60
   - type: Item
-    size: Small
+    size: 5
   - type: ContainerContainer
     containers:
       ballistic-ammo: !type:Container
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
index 0751d3608c..1c8fbc26e1 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
@@ -12,7 +12,7 @@
     proto: CartridgeLightRifle
     capacity: 50
   - type: Item
-    size: Small
+    size: 5
   - type: ContainerContainer
     containers:
       ballistic-ammo: !type:Container
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml
index 1ff05558e5..5a9a850e9c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml
@@ -11,7 +11,7 @@
     proto: CartridgeMagnum
     capacity: 60
   - type: Item
-    size: Small
+    size: 5
   - type: ContainerContainer
     containers:
       ballistic-ammo: !type:Container
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml
index 867aa15a34..a9a78f399a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml
@@ -12,7 +12,7 @@
     proto: CartridgePistol
     capacity: 60
   - type: Item
-    size: Small
+    size: 5
   - type: ContainerContainer
     containers:
       ballistic-ammo: !type:Container
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
index 5ed2fcc63e..3725ad91af 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
@@ -11,7 +11,7 @@
     proto: CartridgeRifle
     capacity: 60
   - type: Item
-    size: Small
+    size: 5
   - type: ContainerContainer
     containers:
       ballistic-ammo: !type:Container
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml
index 1831db28e7..de6f9f92a5 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml
@@ -20,7 +20,7 @@
     tags:
     - Cartridge
   - type: Item
-    size: Tiny
+    size: 1
   - type: SpaceGarbage
   - type: EmitSoundOnLand
     sound:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
index 0d16f1e966..773ff01ed8 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
@@ -15,7 +15,7 @@
     proto: CartridgeCaselessRifle
     capacity: 30
   - type: Item
-    size: Small
+    size: 5
   - type: ContainerContainer
     containers:
       ballistic-ammo: !type:Container
@@ -42,7 +42,7 @@
     proto: CartridgeCaselessRifle
     capacity: 10
   - type: Item
-    size: Tiny
+    size: 3
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi
     layers:
@@ -67,7 +67,7 @@
     proto: CartridgeCaselessRifle
     capacity: 10
   - type: Item
-    size: Small
+    size: 5
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi
     layers:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml
index d8af7064a4..239533c940 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml
@@ -8,7 +8,7 @@
     tags:
       - MagazineHeavyRifle
   - type: Item
-    size: Small
+    size: 10
   - type: BallisticAmmoProvider
     mayTransfer: true
     capacity: 100
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
index 7ae4f32524..e586364369 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
@@ -16,7 +16,7 @@
     proto: CartridgeLightRifle
     capacity: 30
   - type: Item
-    size: Small
+    size: 5
   - type: ContainerContainer
     containers:
       ballistic-ammo: !type:Container
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
index b65dac5d15..6060898d49 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
@@ -14,7 +14,7 @@
         - CartridgeMagnum
     capacity: 25
   - type: Item
-    size: Small
+    size: 10
   - type: ContainerContainer
     containers:
       ballistic-ammo: !type:Container
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
index 8793a717e7..4ed38fdeb3 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
@@ -14,7 +14,7 @@
         - CartridgePistol
     capacity: 10
   - type: Item
-    size: Small
+    size: 5
   - type: ContainerContainer
     containers:
       ballistic-ammo: !type:Container
@@ -47,7 +47,7 @@
         - CartridgePistol
     capacity: 16
   - type: Item
-    size: Small
+    size: 5
   - type: ContainerContainer
     containers:
       ballistic-ammo: !type:Container
@@ -80,7 +80,7 @@
         - CartridgePistol
     capacity: 35
   - type: Item
-    size: Small
+    size: 10
   - type: ContainerContainer
     containers:
       ballistic-ammo: !type:Container
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
index 8e65cd992e..ca1f9b8de2 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
@@ -9,7 +9,7 @@
     tags:
       - MagazineRifle
   - type: Item
-    size: Small
+    size: 5
   - type: BallisticAmmoProvider
     mayTransfer: true
     whitelist:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml
index cbe9bbfbe9..b78825f3e1 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml
@@ -16,7 +16,7 @@
     soundRack:
       path: /Audio/Weapons/Guns/Cock/smg_cock.ogg
   - type: Item
-    size: Small
+    size: 5
   - type: ContainerContainer
     containers:
       ballistic-ammo: !type:Container
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml
index 86da8e6662..56d420cb33 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml
@@ -10,7 +10,7 @@
     tags:
       - CartridgeRocket
   - type: Item
-    size: Small
+    size: 5
   - type: CartridgeAmmo
     proto: BulletRocket
     deleteOnSpawn: true
@@ -30,7 +30,7 @@
       tags:
         - CartridgeRocket
     - type: Item
-      size: Small
+      size: 5
     - type: CartridgeAmmo
       proto: BulletWeakRocket
       deleteOnSpawn: true
@@ -52,7 +52,7 @@
     tags:
     - Grenade
   - type: Item
-    size: Small
+    size: 5
   - type: Sprite
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml
index f85e93b893..041cf446c1 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml
@@ -7,7 +7,7 @@
     sprite: Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi
   - type: Item
     sprite: Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi
-    size: Normal
+    size: 30
   - type: GunWieldBonus
     minAngle: -43
     maxAngle: -43
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml
index 9cab4cac25..76bd0b9e75 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml
@@ -7,7 +7,7 @@
     sprite: Objects/Weapons/Guns/Basic/staves.rsi
   - type: Item
     heldPrefix: staff
-    size: Normal
+    size: 60
   - type: Gun
     fireRate: 1
     selectedMode: SemiAuto
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wand.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wand.yml
index c4a937ee2c..3b97eac8ee 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wand.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wand.yml
@@ -7,7 +7,7 @@
     sprite: Objects/Weapons/Guns/Basic/wands.rsi
   - type: Item
     heldPrefix: wand
-    size: Normal
+    size: 30
   - type: Gun
     fireRate: 0.5
     selectedMode: SemiAuto
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/spraynozzle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/spraynozzle.yml
index f2e93a607e..d4d00252f5 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/spraynozzle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/spraynozzle.yml
@@ -9,7 +9,7 @@
     state: icon
   - type: Item
     sprite: Objects/Weapons/Guns/Basic/spraynozzle.rsi
-    size: Normal
+    size: 30
   - type: Gun
     cameraRecoilScalar: 0 #no recoil
     fireRate: 4
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/watergun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/watergun.yml
index e925bdab87..a815f9c0cd 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/watergun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/watergun.yml
@@ -10,7 +10,7 @@
     slots: BELT
   - type: Item
     sprite: Objects/Weapons/Guns/Pistols/water_pistol.rsi
-    size: Small
+    size: 10
   - type: Gun
     clumsyProof: true
     cameraRecoilScalar: 0 #no recoil
@@ -95,7 +95,7 @@
       map: [ "enum.DamageStateVisualLayers.Base" ]
   - type: Item
     sprite: Objects/Weapons/Guns/Pistols/soaker.rsi
-    size: Normal
+    size: 35
   - type: RandomSprite
     getAllGroups: true
     available:
@@ -132,7 +132,7 @@
       map: [ "enum.DamageStateVisualLayers.Base" ]
   - type: Item
     sprite: Objects/Weapons/Guns/Pistols/soaker.rsi
-    size: Normal
+    size: 35
   - type: RandomSprite
     getAllGroups: true
     available:
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 d4b9142504..461a6cc437 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: 50
   - type: Clothing
     sprite: Objects/Weapons/Guns/Battery/laser_retro.rsi
     quickEquip: false
@@ -37,7 +37,7 @@
   abstract: true
   components:
   - type: Item
-    size: Small
+    size: 10
   - type: Tag
     tags:
     - Sidearm
@@ -408,7 +408,7 @@
   description: An experimental high-energy laser pistol with a self-charging nuclear battery.
   components:
   - type: Item
-    size: Normal  # Intentionally larger than other pistols
+    size: 30  # Intentionally larger than other pistols
   - type: Sprite
     sprite: Objects/Weapons/Guns/Battery/advancedlasergun.rsi
     layers:
@@ -464,7 +464,7 @@
       path: /Audio/Weapons/Guns/Gunshots/taser2.ogg
   - type: ProjectileBatteryAmmoProvider
     proto: AnomalousParticleDeltaStrong
-    fireCost: 100
+    fireCost: 100 
   - type: BatteryWeaponFireModes
     fireModes:
     - proto: AnomalousParticleDeltaStrong
@@ -476,13 +476,13 @@
   - type: Construction
     graph: UpgradeWeaponPistolCHIMP
     node: start
-
+      
 - type: entity
   name: experimental C.H.I.M.P. handcannon
   parent: WeaponPistolCHIMP
   id: WeaponPistolCHIMPUpgraded
   description: This C.H.I.M.P. seems to have a greater punch than is usual...
-  components:
+  components: 
   - type: BatteryWeaponFireModes
     fireModes:
     - proto: AnomalousParticleDeltaStrong
@@ -490,7 +490,7 @@
     - proto: AnomalousParticleEpsilonStrong
       fireCost: 100
     - proto: AnomalousParticleOmegaStrong
-      fireCost: 100
+      fireCost: 100     
     - proto: AnomalousParticleZetaStrong
       fireCost: 100
 
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Bow/bow.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Bow/bow.yml
index 4b7125f571..88640f7812 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Bow/bow.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Bow/bow.yml
@@ -8,7 +8,7 @@
   - type: Sprite
     sprite: Objects/Weapons/Guns/Bow/bow.rsi
   - type: Item
-    size: Normal
+    size: 60
   - type: Clothing
     quickEquip: false
     slots:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
index 1b318beac8..785b36cc62 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
@@ -7,7 +7,6 @@
   components:
   - type: Sprite
   - type: Item
-    size: Huge
   - type: Gun
     fireRate: 20
     selectedMode: FullAuto
@@ -34,6 +33,7 @@
       map: ["enum.GunVisualLayers.Base"]
   - type: Item
     sprite: Objects/Weapons/Guns/HMGs/minigun.rsi
+    size: 90
   - type: Gun
     fireRate: 15
     soundGunshot:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
index 3d6cd680a0..62142519bf 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: 60
   - 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 2dbf71840c..3796ac92b8 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: 60
   - type: StaticPrice
     price: 500
   - type: ContainerContainer
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
index a6c6f1e677..7bfd914d94 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -12,7 +12,7 @@
       - state: mag-0
         map: ["enum.GunVisualLayers.Mag"]
   - type: Item
-    size: Small
+    size: 10
   - type: Tag
     tags:
     - Sidearm
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml
index 8dbcf2b303..32a2ea4623 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml
@@ -4,7 +4,7 @@
   abstract: true
   components:
   - type: Item
-    size: Small
+    size: 10
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/arrows.rsi
   - type: Fixtures
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
index c523fd2797..1851dcddf6 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
@@ -8,7 +8,7 @@
   - type: Sprite
     state: icon
   - type: Item
-    size: Small
+    size: 10
   - type: Tag
     tags:
     - Sidearm
@@ -122,7 +122,7 @@
       params:
         volume: 2.25
 
-- type: entity
+- type: entity 
   name: Python
   parent: WeaponRevolverPython
   id: WeaponRevolverPythonAP # For the uplink.
@@ -155,4 +155,4 @@
   - type: RevolverAmmoProvider
     capacity: 5
     chambers: [ True, True, True, True, True ]
-    ammoSlots: [ null, null, null, null, null ]
+    ammoSlots: [ null, null, null, null, null ]
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
index d460c0c8f0..114573c087 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: 50
   - 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 6bf6fcf695..e423c09841 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: 30
   - 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 5a08eb3636..4bee243d57 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -11,7 +11,7 @@
         map: [ "enum.GunVisualLayers.Base" ]
   - type: Item
     # If you update this also update the bulldog's size.
-    size: Large
+    size: 30
   - type: Clothing
     sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi
     quickEquip: false
@@ -57,6 +57,8 @@
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-0
       map: ["enum.GunVisualLayers.Mag"]
+  - type: Item
+    size: 30
   - type: Clothing
     sprite: Objects/Weapons/Guns/Shotguns/bulldog.rsi
     quickEquip: false
@@ -135,7 +137,7 @@
   - type: Clothing
     sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi
   - type: BallisticAmmoProvider
-
+  
 - type: entity
   name: Enforcer
   parent: BaseWeaponShotgun
@@ -149,7 +151,7 @@
     sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi
   - type: BallisticAmmoProvider
     proto: ShellShotgunBeanbag
-
+  
 - type: entity
   name: Kammerer
   parent: BaseWeaponShotgun
@@ -160,8 +162,6 @@
     sprite: Objects/Weapons/Guns/Shotguns/pump.rsi
   - type: Clothing
     sprite: Objects/Weapons/Guns/Shotguns/pump.rsi
-  - type: Item
-    size: Normal
   - type: BallisticAmmoProvider
     capacity: 4
 
@@ -176,7 +176,7 @@
   - type: Clothing
     sprite: Objects/Weapons/Guns/Shotguns/sawn.rsi
   - type: Item
-    size: Small
+    size: 10
   - type: Gun
     fireRate: 4
   - type: BallisticAmmoProvider
@@ -210,6 +210,8 @@
     sprite: Objects/Weapons/Guns/Shotguns/hm_pistol.rsi
   - type: Clothing
     sprite: Objects/Weapons/Guns/Shotguns/hm_pistol.rsi
+  - type: Item
+    size: 10
   - type: Gun
     fireRate: 4
   - type: BallisticAmmoProvider
@@ -243,6 +245,8 @@
     sprite: Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi
   - type: Clothing
     sprite: Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi
+  - type: Item
+    size: 75
   - type: Gun
     fireRate: 4 #No reason to stifle the firerate since you have to manually reload every time anyways.
   - type: BallisticAmmoProvider
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
index 4a16aadb65..68c494b888 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: 50
   - type: Clothing
     sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi
     quickEquip: false
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml
index cfcc0a01cd..d41346380c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml
@@ -10,7 +10,7 @@
       - state: icon
         map: ["enum.GunVisualLayers.Base"]
   - type: Item
-    size: Small
+    size: 10
     sprite: Objects/Weapons/Guns/Shotguns/flaregun.rsi
   - type: Gun
     fireRate: 8
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml
index fcd028a64e..9f3aec5c39 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: 50
   - type: Clothing
     quickEquip: false
     slots:
@@ -32,9 +32,7 @@
     container: storagebase
   - type: PneumaticCannon
   - type: Storage
-    maxSlots: 8
-    maxItemSize: Normal
-    maxTotalWeight: 32
+    capacity: 30
     blacklist:
       tags:
         - CannonRestrict
@@ -77,12 +75,10 @@
     layers:
     - state: piecannon
   - type: Storage
-    maxSlots: 8
-    maxItemSize: Normal
-    maxTotalWeight: 32
     whitelist:
       components:
       - CreamPie
+    capacity: 40
   - type: Gun
     fireRate: 1
     selectedMode: SemiAuto
@@ -97,7 +93,7 @@
   - type: ContainerAmmoProvider
     container: storagebase
   - type: Item
-    size: Normal
+    size: 50
   - type: Clothing
     sprite: Objects/Weapons/Guns/Cannons/pie_cannon.rsi
     quickEquip: false
@@ -124,13 +120,9 @@
   suffix: Admeme
   components:
   - type: Item
-    size: Huge
+    size: 9999
   - type: Storage
-    maxSlots: 100
-    maxItemSize: Huge
-    maxTotalWeight: 1600
-    whitelist:
-      tags: [] #dodging a test fail like the IRS
+    capacity: 9999
   - type: PneumaticCannon
     gasUsage: 0
     throwItems: false
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml
index 497876f359..9e9288c8d4 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml
@@ -16,7 +16,7 @@
         Slash: 25
         Piercing: 15
   - type: Item
-    size: Normal
+    size: 15
     sprite: Objects/Weapons/Melee/armblade.rsi
   - type: Tool
     qualities:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
index a1a4f484fa..c1fc668d59 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
@@ -18,7 +18,7 @@
       types:
         Blunt: 8
   - type: Item
-    size: Normal
+    size: 80
   - type: Tool
     qualities:
     - Rolling
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml
index bfddd764ca..13f5191c10 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml
@@ -31,7 +31,7 @@
         Blunt: 5
         Structural: 20
   - type: Item
-    size: Normal
+    size: 50
     sprite: Objects/Weapons/Melee/chainsaw.rsi
   - type: DisarmMalus
   - type: RefillableSolution
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml
index ff80144f9f..661ee379b2 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml
@@ -15,7 +15,7 @@
       types:
         Slash: 12
   - type: Item
-    size: Normal
+    size: 20
   - type: Clothing
     sprite: Objects/Weapons/Melee/cult_dagger.rsi
     slots:
@@ -39,7 +39,7 @@
       types:
         Slash: 33
   - type: Item
-    size: Normal
+    size: 20
   - type: Clothing
     sprite: Objects/Weapons/Melee/cult_blade.rsi
     slots:
@@ -75,7 +75,7 @@
         Slash: 12
         Structural: 30
   - type: Item
-    size: Huge
+    size: 150
   - type: Clothing
     sprite: Objects/Weapons/Melee/cult_halberd.rsi
     quickEquip: false
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
index c00fd1ab86..47dfea9d86 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -30,7 +30,7 @@
       types:
         Blunt: 4.5
   - type: Item
-    size: Small
+    size: 5
     sprite: Objects/Weapons/Melee/e_sword.rsi
   - type: UseDelay
     delay: 1.0
@@ -95,7 +95,7 @@
       types:
         Blunt: 1
   - type: Item
-    size: Tiny
+    size: 2
     sprite: Objects/Weapons/Melee/e_dagger.rsi
   - type: UseDelay
     delay: 1.0
@@ -161,7 +161,7 @@
         shader: unshaded
         map: [ "blade" ]
   - type: Item
-    size: Small
+    size: 5
     sprite: Objects/Weapons/Melee/e_cutlass.rsi
 
 - type: entity
@@ -198,7 +198,7 @@
         shader: unshaded
         map: [ "blade" ]
   - type: Item
-    size: Small
+    size: 10
     sprite: Objects/Weapons/Melee/e_sword_double.rsi
   - type: Reflect
     enabled: true
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
index 1c786371b3..6d27e3e7d6 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: 150
   - type: Clothing
     sprite: Objects/Weapons/Melee/fireaxe.rsi
     quickEquip: false
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/gohei.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/gohei.yml
index ec9717ea22..9e673da49d 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/gohei.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/gohei.yml
@@ -13,5 +13,5 @@
       types:
         Blunt: 3 #You'd be better off punching people
   - type: Item
-    size: Small
+    size: 12
     sprite: Objects/Weapons/Melee/gohei.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
index 98ecaa28a6..bbd18927e1 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -37,9 +37,10 @@
     - Knife
   - type: Sprite
     sprite: Objects/Weapons/Melee/kitchen_knife.rsi
+    size: 2
     state: icon
   - type: Item
-    size: Small
+    size: 10
     sprite: Objects/Weapons/Melee/kitchen_knife.rsi
   - type: GuideHelp
     guides:
@@ -56,6 +57,7 @@
     - Knife
   - type: Sprite
     sprite: Objects/Weapons/Melee/cleaver.rsi
+    size: 4
     state: butch
   - type: MeleeWeapon
     wideAnimationRotation: -135
@@ -64,7 +66,7 @@
       types:
         Slash: 10
   - type: Item
-    size: Small
+    size: 10
     sprite: Objects/Weapons/Melee/cleaver.rsi
   - type: GuideHelp
     guides:
@@ -82,7 +84,7 @@
     - Knife
   - type: Sprite
     sprite: Objects/Weapons/Melee/combat_knife.rsi
-    size: Tiny
+    size: 2
     state: icon
   - type: MeleeWeapon
     wideAnimationRotation: -135
@@ -91,7 +93,7 @@
       types:
         Slash: 10
   - type: Item
-    size: Small
+    size: 10
     sprite: Objects/Weapons/Melee/combat_knife.rsi
   - type: DisarmMalus
     malus: 0.225
@@ -104,10 +106,10 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Melee/survival_knife.rsi
-    size: Tiny
+    size: 2
     state: icon
   - type: Item
-    size: Small
+    size: 10
     sprite: Objects/Weapons/Melee/survival_knife.rsi
 
 - type: entity
@@ -118,7 +120,7 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Melee/kukri_knife.rsi
-    size: Tiny
+    size: 2
     state: icon
   - type: MeleeWeapon
     attackRate: 1.0
@@ -126,7 +128,7 @@
       types:
         Slash: 15
   - type: Item
-    size: Small
+    size: 10
     sprite: Objects/Weapons/Melee/kukri_knife.rsi
 
 - type: entity
@@ -145,7 +147,7 @@
     node: icon
   - type: Sprite
     sprite: Objects/Weapons/Melee/shiv.rsi
-    size: Tiny
+    size: 2
     state: icon
   - type: MeleeWeapon
     attackRate: 1.5
@@ -153,7 +155,7 @@
       types:
         Slash: 5.5
   - type: Item
-    size: Tiny #as much as a regular glass shard
+    size: 4 #as much as a regular glass shard
     sprite: Objects/Weapons/Melee/shiv.rsi
   - type: DisarmMalus
     malus: 0.225
@@ -167,7 +169,7 @@
   - type: Construction
     graph: ReinforcedShiv
     node: icon
-    size: Tiny
+    size: 2
     state: icon
   - type: MeleeWeapon
     attackRate: 1.5
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
index e5046d5c1f..f3bb0ceec9 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: 150
   - type: DisarmMalus
   - type: Tool
     qualities:
@@ -80,7 +80,7 @@
       types:
         Slash: 6.5
   - type: Item
-    size: Small
+    size: 10
   - type: Tag
     tags:
     - Knife
@@ -112,4 +112,4 @@
     wideAnimationRotation: -135
     attackRate: 1.25
   - type: Item
-    size: Huge
+    size: 150
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/needle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/needle.yml
index 11efeba5f8..48b2d6ad2b 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/needle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/needle.yml
@@ -13,5 +13,5 @@
       types:
         Piercing: 1
   - type: Item
-    size: Tiny
+    size: 1
   - type: BalloonPopper
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
index 85f1e4a4c7..a0f497bd26 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
@@ -26,7 +26,7 @@
       types:
         Structural: 10
   - type: Item
-    size: Normal
+    size: 80
     sprite: Objects/Weapons/Melee/pickaxe.rsi
   - type: UseDelay
     delay: 1
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
index 037844507f..d34d29d5eb 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: 95
   - 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 87b7c468c3..25c9cf6125 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: 100
   - type: Clothing
     sprite: Objects/Weapons/Melee/stunprod.rsi
     quickEquip: false
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
index 9bd9d6c12f..23160f13ea 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
@@ -21,7 +21,7 @@
     reflectProb: .5
     spread: 90
   - type: Item
-    size: Normal
+    size: 15
     sprite: Objects/Weapons/Melee/captain_sabre.rsi
   - type: Tag
     tags:
@@ -49,7 +49,7 @@
     soundHit:
         path: /Audio/Weapons/bladeslice.ogg
   - type: Item
-    size: Normal
+    size: 15
     sprite: Objects/Weapons/Melee/katana.rsi
   - type: DisarmMalus
 
@@ -68,7 +68,7 @@
       types:
         Slash: 30
   - type: Item
-    size: Normal
+    size: 15
     sprite: Objects/Weapons/Melee/energykatana.rsi
   - type: EnergyKatana
   - type: DashAbility
@@ -105,7 +105,7 @@
     soundHit:
         path: /Audio/Weapons/bladeslice.ogg
   - type: Item
-    size: Normal
+    size: 15
     sprite: Objects/Weapons/Melee/machete.rsi
   - type: DisarmMalus
 
@@ -128,7 +128,7 @@
     soundHit:
         path: /Audio/Weapons/bladeslice.ogg
   - type: Item
-    size: Normal
+    size: 20
   - type: Clothing
     sprite: Objects/Weapons/Melee/claymore.rsi
     slots:
@@ -156,6 +156,6 @@
     soundHit:
         path: /Audio/Weapons/bladeslice.ogg
   - type: Item
-    size: Normal
+    size: 15
     sprite: Objects/Weapons/Melee/cutlass.rsi
   - type: DisarmMalus
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/weapon_toolbox.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/weapon_toolbox.yml
index e5a03d5136..b5f8590304 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: 150
     sprite: Objects/Tools/Toolboxes/toolbox_red.rsi
   - type: MeleeWeapon
     wideAnimationRotation: -135
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/white_cane.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/white_cane.yml
index 997c3771d5..c76ebf4d78 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/white_cane.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/white_cane.yml
@@ -8,7 +8,7 @@
     sprite: Objects/Weapons/Melee/white_cane.rsi
     state: icon
   - type: Item
-    size: Normal
+    size: 15
     sprite: Objects/Weapons/Melee/white_cane.rsi
   - type: MeleeWeapon
     wideAnimationRotation: 45
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
index f694762a09..1afb564036 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
@@ -5,7 +5,7 @@
   description: Linked together with some spare cuffs and metal.
   components:
   - type: Item
-    size: Normal
+    size: 20
   - type: Sprite
     sprite: Objects/Weapons/Throwable/bola.rsi
     state: icon
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
index ece4ec4ef4..9f18b94d2c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -9,7 +9,7 @@
     - state: icon
       map: ["enum.TriggerVisualLayers.Base"]
   - type: Item
-    size: Small
+    size: 5
   - type: Clothing
     quickEquip: false
     slots:
@@ -267,7 +267,7 @@
     - state: empty
       map: [ "enum.ConstructionVisuals.Layer" ]
   - type: Item
-    size: Small
+    size: 8
   - type: PayloadCase
   - type: Construction
     graph: ModularGrenadeGraph
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml
index bf4a155ee4..92e7dbd4c1 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml
@@ -31,7 +31,7 @@
   - type: ItemCooldown
   - type: Item
     heldPrefix: off
-    size: Normal
+    size: 20
   - type: Clothing
     sprite: Objects/Weapons/Melee/stunbaton.rsi
     quickEquip: false
@@ -81,7 +81,7 @@
         Blunt: 20
     bluntStaminaDamageFactor: 1.5
   - type: Item
-    size: Normal
+    size: 20
   - type: Clothing
     sprite: Objects\Weapons\Melee\truncheon.rsi
     quickEquip: false
@@ -122,7 +122,7 @@
           Blunt: 0 # melee weapon to allow flashing individual targets
       angle: 10
     - type: Item
-      size: Small
+      size: 5
       sprite: Objects/Weapons/Melee/flash.rsi
     - type: ItemCooldown
     - type: StaticPrice
diff --git a/Resources/Prototypes/Entities/Objects/base_item.yml b/Resources/Prototypes/Entities/Objects/base_item.yml
index bcc8e0dce4..32325603c1 100644
--- a/Resources/Prototypes/Entities/Objects/base_item.yml
+++ b/Resources/Prototypes/Entities/Objects/base_item.yml
@@ -4,7 +4,7 @@
   abstract: true
   components:
   - type: Item
-    size: Small
+    size: 5
   - type: Clickable
   - type: InteractionOutline
   - type: MovedByPressure
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml b/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml
index 6d5e0e3dcd..9f1de3ff39 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml
@@ -47,8 +47,7 @@
   - type: Pullable
   - type: Occluder
   - type: Storage
-    maxSlots: 32
-    maxItemSize: Normal
+    capacity: 200
     whitelist:
       tags:
         - Document
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
index 8d669ab6d2..aaff4e1e28 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: 50
   - type: Appearance
   - type: MeleeWeapon
     damage:
@@ -339,4 +339,4 @@
   - type: Rotatable
   - type: Sprite
     state: steel-bench
-
+ 
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
index 29061a06b1..da2b82270f 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
@@ -25,8 +25,7 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: Storage
-    maxSlots: 6
-    maxItemSize: Normal
+    capacity: 50
   - type: ContainerContainer
     containers:
       storagebase: !type:Container
@@ -68,7 +67,7 @@
       - id: ClothingUniformJumpskirtColorPink
         prob: 0.05
       - id: ClothingUniformJumpsuitLoungewear
-        prob: 0.05
+        prob: 0.05    
         orGroup: dressermainloot
       - id: Pen # It`s pen.
         prob: 0.03
@@ -98,7 +97,7 @@
         prob: 0.03
         orGroup: dressermainloot
       - id: ClothingUniformJumpsuitColorRed
-        prob: 0.03
+        prob: 0.03 
         orGroup: dressermainloot
       - id: ClothingUniformJumpskirtColorRed
         prob: 0.03
@@ -185,7 +184,7 @@
         prob: 0.03
         orGroup: dresserthirdloot
       - id: ClothingUnderSocksCoder
-        prob: 0.03
+        prob: 0.03 
         orGroup: dressermainloot
       - id: ClothingUnderSocksBee
         prob: 0.03
@@ -225,7 +224,7 @@
         orGroup: dresserthirdloot
       - id: PlushieLizard
         prob: 0.03
-        orGroup: dresserthirdloot
+        orGroup: dresserthirdloot 
       - id: ClothingOuterSuitShrineMaiden
         prob: 0.03
         orGroup: dressersecondloot
@@ -424,7 +423,7 @@
       - id: BrokenBottle
         prob: 0.001
         orGroup: dressersecondloot
-      - id: FoodMeatRotten
+      - id: FoodMeatRotten 
         prob: 0.001
         orGroup: dressersecondloot
       - id: ClothingOuterSkub
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml b/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml
index 406ff7fa48..695a529734 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml
@@ -7,7 +7,7 @@
     - type: Transform
       noRot: true
     - type: Item
-      size: Normal
+      size: 25
     - type: Sprite
       sprite: Structures/Furniture/rollerbeds.rsi
       noRot: true
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
index b84499d533..132da2f1a8 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
@@ -8,7 +8,7 @@
     mode: SnapgridCenter
   components:
   - type: Item
-    size: Small
+    size: 10
   - type: Transform
     anchored: true
   - type: Damageable
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml b/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml
index 4466b21b44..6fa085646a 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml
@@ -87,7 +87,7 @@
   description: Air sensor assembly. An assembly of air sensors?
   components:
     - type: Item
-      size: Small
+      size: 10
     - type: Anchorable
     - type: Construction
       graph: AirSensor
diff --git a/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml b/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml
index f0ce9c46d3..b79921815b 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml
@@ -6,8 +6,7 @@
   description: A cabinet for all your filing needs.
   components:
   - type: Storage
-    maxSlots: 12
-    maxItemSize: Normal
+    capacity: 80
     whitelist:
       tags:
         - Document
@@ -66,8 +65,7 @@
   description: A small drawer for all your filing needs, Now with wheels!
   components:
   - type: Storage
-    maxSlots: 8
-    maxItemSize: Normal
+    capacity: 50
     whitelist:
       tags:
         - Document
diff --git a/Resources/Prototypes/Entities/Structures/Storage/ore_box.yml b/Resources/Prototypes/Entities/Structures/Storage/ore_box.yml
index 6bad8c319f..7099e1b45d 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/ore_box.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/ore_box.yml
@@ -50,8 +50,7 @@
           True: { visible: false }
           False: { visible: true }
   - type: Storage
-    maxSlots: 60
-    maxItemSize: Normal
+    capacity: 525
     storageOpenSound: /Audio/Effects/closetopen.ogg
     storageCloseSound: /Audio/Effects/closetclose.ogg
     whitelist:
diff --git a/Resources/Prototypes/XenoArch/Effects/utility_effects.yml b/Resources/Prototypes/XenoArch/Effects/utility_effects.yml
index c9297d901b..f819946a4d 100644
--- a/Resources/Prototypes/XenoArch/Effects/utility_effects.yml
+++ b/Resources/Prototypes/XenoArch/Effects/utility_effects.yml
@@ -52,9 +52,7 @@
       storagebase: !type:Container
         ents: [ ]
   - type: Storage
-    maxSlots: 5
-    maxItemSize: Huge
-    maxTotalWeight: 40
+    capacity: 50
 
 - type: artifactEffect
   id: EffectPhasing