diff --git a/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs b/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs
index 0268b6759b..90b9f89f9e 100644
--- a/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs
+++ b/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs
@@ -40,7 +40,7 @@ namespace Content.IntegrationTests.Tests
                 uniform = entityMan.SpawnEntity("JanitorUniform", MapCoordinates.Nullspace);
                 idCard = entityMan.SpawnEntity("AssistantIDCard", MapCoordinates.Nullspace);
                 pocketItem = entityMan.SpawnEntity("FlashlightLantern", MapCoordinates.Nullspace);
-                var tooBigItem = entityMan.SpawnEntity("RedToolboxItem", MapCoordinates.Nullspace);
+                var tooBigItem = entityMan.SpawnEntity("ToolboxEmergency", MapCoordinates.Nullspace);
 
                 inventory = human.GetComponent<InventoryComponent>();
 
diff --git a/Resources/Maps/stationstation.yml b/Resources/Maps/stationstation.yml
index 204121b9d2..b6123deb37 100644
--- a/Resources/Maps/stationstation.yml
+++ b/Resources/Maps/stationstation.yml
@@ -1976,7 +1976,7 @@ entities:
     rot: -1.5707963267949 rad
     type: Transform
 - uid: 253
-  type: YellowToolboxItemFilled
+  type: ToolboxElectricalFilled
   components:
   - parent: 0
     pos: -0.8099712,-5.21454
@@ -1988,7 +1988,7 @@ entities:
         type: Robust.Server.GameObjects.Components.Container.Container
     type: ContainerContainer
 - uid: 254
-  type: YellowToolboxItemFilled
+  type: ToolboxElectricalFilled
   components:
   - parent: 0
     pos: -0.5597038,-5.679647
diff --git a/Resources/Prototypes/Entities/Items/toolbox.yml b/Resources/Prototypes/Entities/Items/toolbox.yml
index 71505b1445..1028efa5b1 100644
--- a/Resources/Prototypes/Entities/Items/toolbox.yml
+++ b/Resources/Prototypes/Entities/Items/toolbox.yml
@@ -14,7 +14,7 @@
 - type: entity
   name: Emergency Toolbox
   parent: ToolboxBase
-  id: RedToolboxItem
+  id: ToolboxEmergency
   description: A bright red toolbox, stocked with emergency tools
   components:
   - type: Sprite
@@ -23,6 +23,11 @@
   - type: Icon
     texture: Objects/Tools/toolbox_r.png
 
+- type: entity
+  id: ToolboxEmergencyFilled
+  parent: ToolboxEmergency
+  suffix: Filled
+
 - type: entity
   name: Mechanical Toolbox
   parent: ToolboxBase
@@ -37,7 +42,7 @@
 - type: entity
   name: Electrical Toolbox
   parent: ToolboxBase
-  id: YellowToolboxItem
+  id: ToolboxElectrical
   description: A toolbox typically stocked with electrical gear
   components:
   - type: Sprite
@@ -46,9 +51,9 @@
     texture: Objects/Tools/Toolbox_y.png
 
 - type: entity
-  id: YellowToolboxItemFilled
+  id: ToolboxElectricalFilled
   name: Electrical Toolbox
   suffix: Filled
-  parent: YellowToolboxItem
+  parent: ToolboxElectrical
   components:
   - type: ToolboxElectricalFill