diff --git a/Content.Client/GameObjects/Components/Kitchen/MicrowaveBoundUserInterface.cs b/Content.Client/GameObjects/Components/Kitchen/MicrowaveBoundUserInterface.cs
index 2a3205b95b..759db29e68 100644
--- a/Content.Client/GameObjects/Components/Kitchen/MicrowaveBoundUserInterface.cs
+++ b/Content.Client/GameObjects/Components/Kitchen/MicrowaveBoundUserInterface.cs
@@ -109,11 +109,11 @@ namespace Content.Client.GameObjects.Components.Kitchen
                 {
                     return;
                 }
-                if (entity.Deleted || !entity.TryGetComponent(out IconComponent icon))
+                if (entity.Deleted || !entity.TryGetComponent(out SpriteComponent spriteComponent))
                 {
                     continue;
                 }
-                var solidItem = _menu.IngredientsList.AddItem(entity.Name, icon.Icon.Default);
+                var solidItem = _menu.IngredientsList.AddItem(entity.Name, spriteComponent.Icon);
                 var solidIndex = _menu.IngredientsList.IndexOf(solidItem);
                 _solids.Add(solidIndex, containedSolids[j]);
 
diff --git a/Content.Client/VendingMachines/VendingMachineMenu.cs b/Content.Client/VendingMachines/VendingMachineMenu.cs
index 64052c39be..5f9e14aa53 100644
--- a/Content.Client/VendingMachines/VendingMachineMenu.cs
+++ b/Content.Client/VendingMachines/VendingMachineMenu.cs
@@ -50,7 +50,7 @@ namespace Content.Client.VendingMachines
                 Texture icon = null;
                 if(_prototypeManager.TryIndex(entry.ID, out EntityPrototype prototype))
                 {
-                    icon = IconComponent.GetPrototypeIcon(prototype, _resourceCache).TextureFor(Direction.South);
+                    icon = SpriteComponent.GetPrototypeIcon(prototype, _resourceCache);
                 }
                 _items.AddItem($"{itemName} ({entry.Amount} left)", icon);
             }
diff --git a/Resources/Prototypes/Body/Mechanisms/basic_human_organs.yml b/Resources/Prototypes/Body/Mechanisms/basic_human_organs.yml
index 49a4c025ce..d7ec211e93 100644
--- a/Resources/Prototypes/Body/Mechanisms/basic_human_organs.yml
+++ b/Resources/Prototypes/Body/Mechanisms/basic_human_organs.yml
@@ -6,9 +6,6 @@
   - type: Sprite
     sprite: Mobs/Species/Human/organs.rsi
     state: heart-on
-  - type: Icon
-    sprite: Mobs/Species/Human/organs.rsi
-    state: heart-on
   - type: DroppedMechanism
     debugLoadMechanismData: mechanism.Heart.BasicHuman
     behaviors:
diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
index fad96b4a63..53daf4f114 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -7,9 +7,6 @@
   - type: Sprite
     sprite: Clothing/Back/Backpacks/backpack.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Back/Backpacks/backpack.rsi
-    state: icon
   - type: Clothing
     size: 9999
     QuickEquip: false
@@ -28,9 +25,6 @@
   - type: Sprite
     sprite: Clothing/Back/Backpacks/clown.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Back/Backpacks/clown.rsi
-    state: icon
   - type: Clothing
     sprite: Clothing/Back/Backpacks/clown.rsi
 
@@ -43,9 +37,6 @@
   - type: Sprite
     sprite: Clothing/Back/Backpacks/security.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Back/Backpacks/security.rsi
-    state: icon
   - type: Clothing
     sprite: Clothing/Back/Backpacks/security.rsi
 
@@ -58,9 +49,6 @@
   - type: Sprite
     sprite: Clothing/Back/Backpacks/engineering.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Back/Backpacks/engineering.rsi
-    state: icon
   - type: Clothing
     sprite: Clothing/Back/Backpacks/engineering.rsi
 
@@ -73,9 +61,6 @@
   - type: Sprite
     sprite: Clothing/Back/Backpacks/medical.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Back/Backpacks/medical.rsi
-    state: icon
   - type: Clothing
     sprite: Clothing/Back/Backpacks/medical.rsi
 
@@ -88,9 +73,6 @@
   - type: Sprite
     sprite: Clothing/Back/Backpacks/captain.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Back/Backpacks/captain.rsi
-    state: icon
   - type: Clothing
     sprite: Clothing/Back/Backpacks/captain.rsi
 
@@ -105,9 +87,6 @@
   - type: Sprite
     sprite: Clothing/Back/Backpacks/mime.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Back/Backpacks/mime.rsi
-    state: icon
   - type: Clothing
     sprite: Clothing/Back/Backpacks/mime.rsi
 
@@ -120,9 +99,6 @@
   - type: Sprite
     sprite: Clothing/Back/Backpacks/chemistry.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Back/Backpacks/chemistry.rsi
-    state: icon
   - type: Clothing
     sprite: Clothing/Back/Backpacks/chemistry.rsi
 
@@ -135,9 +111,6 @@
   - type: Sprite
     sprite: Clothing/Back/Backpacks/botany.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Back/Backpacks/botany.rsi
-    state: icon
   - type: Clothing
     sprite: Clothing/Back/Backpacks/botany.rsi
 
@@ -154,9 +127,6 @@
     - state: holding
     - state: holding-unlit
       shader: unshaded
-  - type: Icon
-    sprite: Clothing/Back/Backpacks/holding.rsi
-    state: holding
   - type: Clothing
     sprite: Clothing/Back/Backpacks/holding.rsi
     HeldPrefix: holding
diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
index 2ae7bce918..c6f5523d77 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
@@ -7,9 +7,6 @@
   - type: Sprite
     sprite: Clothing/Back/Duffels/duffel.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Back/Duffels/duffel.rsi
-    state: icon
   - type: Clothing
     sprite: Clothing/Back/Duffels/duffel.rsi
     size: 9999
@@ -28,9 +25,6 @@
   - type: Sprite
     sprite: Clothing/Back/Duffels/duffel_eng.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Back/Duffels/duffel_eng.rsi
-    state: icon
   - type: Clothing
     sprite: Clothing/Back/Duffels/duffel_eng.rsi
 
@@ -43,9 +37,6 @@
   - type: Sprite
     sprite: Clothing/Back/Duffels/duffel_med.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Back/Duffels/duffel_med.rsi
-    state: icon
   - type: Clothing
     sprite: Clothing/Back/Duffels/duffel_med.rsi
 
@@ -58,9 +49,6 @@
   - type: Sprite
     sprite: Clothing/Back/Duffels/duffel_cap.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Back/Duffels/duffel_cap.rsi
-    state: icon
   - type: Clothing
     sprite: Clothing/Back/Duffels/duffel_cap.rsi
 
@@ -73,9 +61,6 @@
   - type: Sprite
     sprite: Clothing/Back/Duffels/duffel_clown.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Back/Duffels/duffel_clown.rsi
-    state: icon
   - type: Clothing
     sprite: Clothing/Back/Duffels/duffel_clown.rsi
 
@@ -88,9 +73,6 @@
   - type: Sprite
     sprite: Clothing/Back/Duffels/duffel_sec.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Back/Duffels/duffel_sec.rsi
-    state: icon
   - type: Clothing
     sprite: Clothing/Back/Duffels/duffel_sec.rsi
 
@@ -103,9 +85,6 @@
   - type: Sprite
     sprite: Clothing/Back/Duffels/duffel_syn.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Back/Duffels/duffel_syn.rsi
-    state: icon
   - type: Clothing
     sprite: Clothing/Back/Duffels/duffel_syn.rsi
 
@@ -120,9 +99,6 @@
   - type: Sprite
     sprite: Clothing/Back/Duffels/duffel_med.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Back/Duffels/duffel_med.rsi
-    state: icon
   - type: Clothing
     sprite: Clothing/Back/Duffels/duffel_med.rsi
   - type: StorageFill
diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
index dfafbb49b3..c85dc950e4 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
@@ -7,9 +7,6 @@
   - type: Sprite
     sprite: Clothing/Back/Satchels/satchel.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Back/Satchels/satchel.rsi
-    state: icon
   - type: Clothing
     sprite: Clothing/Back/Satchels/satchel.rsi
   - type: Storage
@@ -24,9 +21,6 @@
   - type: Sprite
     sprite: Clothing/Back/Satchels/satchel_engineering.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Back/Satchels/satchel_engineering.rsi
-    state: icon
   - type: Clothing
     sprite: Clothing/Back/Satchels/satchel_engineering.rsi
 
@@ -39,9 +33,6 @@
   - type: Sprite
     sprite: Clothing/Back/Satchels/satchel_medical.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Back/Satchels/satchel_medical.rsi
-    state: icon
   - type: Clothing
     sprite: Clothing/Back/Satchels/satchel_medical.rsi
 
@@ -54,9 +45,6 @@
   - type: Sprite
     sprite: Clothing/Back/Satchels/satchel_chemistry.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Back/Satchels/satchel_chemistry.rsi
-    state: icon
   - type: Clothing
     sprite: Clothing/Back/Satchels/satchel_chemistry.rsi
 
@@ -69,9 +57,6 @@
   - type: Sprite
     sprite: Clothing/Back/Satchels/satchel_science.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Back/Satchels/satchel_science.rsi
-    state: icon
   - type: Clothing
     sprite: Clothing/Back/Satchels/satchel_science.rsi
 
@@ -84,9 +69,6 @@
   - type: Sprite
     sprite: Clothing/Back/Satchels/satchel_security.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Back/Satchels/satchel_security.rsi
-    state: icon
   - type: Clothing
     sprite: Clothing/Back/Satchels/satchel_security.rsi
 
@@ -99,9 +81,6 @@
   - type: Sprite
     sprite: Clothing/Back/Satchels/satchel_captain.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Back/Satchels/satchel_captain.rsi
-    state: icon
   - type: Clothing
     sprite: Clothing/Back/Satchels/satchel_captain.rsi
 
@@ -114,8 +93,5 @@
   - type: Sprite
     sprite: Clothing/Back/Satchels/satchel_hydroponics.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Back/Satchels/satchel_hydroponics.rsi
-    state: icon
   - type: Clothing
     sprite: Clothing/Back/Satchels/satchel_hydroponics.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index 878bfa26d8..f7f4cbd9e1 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -15,9 +15,6 @@
   - type: Sprite
     sprite: Clothing/Belt/belt_utility.rsi
     state: utilitybelt
-  - type: Icon
-    sprite: Clothing/Belt/belt_utility.rsi
-    state: utilitybelt
   - type: Clothing
     size: 50
     QuickEquip: false
@@ -34,9 +31,6 @@
   - type: Sprite
     sprite: Clothing/Belt/suspenders.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Belt/suspenders.rsi
-    state: icon
   - type: Clothing
     size: 50
     QuickEquip: false
diff --git a/Resources/Prototypes/Entities/Clothing/Earpieces/ears.yml b/Resources/Prototypes/Entities/Clothing/Earpieces/ears.yml
index 2ff3acadea..8f1342e934 100644
--- a/Resources/Prototypes/Entities/Clothing/Earpieces/ears.yml
+++ b/Resources/Prototypes/Entities/Clothing/Earpieces/ears.yml
@@ -7,9 +7,7 @@
   - type: Sprite
     sprite: Clothing/Earpieces/headset.rsi
     state: headset
-  - type: Icon
-    sprite: Clothing/Earpieces/headset.rsi
-    state: headset
+
   - type: Clothing
     Slots:
     - ears
diff --git a/Resources/Prototypes/Entities/Clothing/Glasses/eyes.yml b/Resources/Prototypes/Entities/Clothing/Glasses/eyes.yml
index 1d1436d996..a1c8326d53 100644
--- a/Resources/Prototypes/Entities/Clothing/Glasses/eyes.yml
+++ b/Resources/Prototypes/Entities/Clothing/Glasses/eyes.yml
@@ -15,9 +15,7 @@
   - type: Sprite
     sprite: Clothing/Glasses/meson_scanners.rsi
     state: meson
-  - type: Icon
-    sprite: Clothing/Glasses/meson_scanners.rsi
-    state: meson
+
   - type: Clothing
     sprite: Clothing/Glasses/meson_scanners.rsi
 
@@ -30,9 +28,7 @@
   - type: Sprite
     sprite: Clothing/Glasses/sunglasses.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Glasses/sunglasses.rsi
-    state: icon
+
   - type: Clothing
     sprite: Clothing/Glasses/sunglasses.rsi
 
@@ -45,8 +41,6 @@
   - type: Sprite
     sprite: Clothing/Glasses/sunglasses_sec.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Glasses/sunglasses_sec.rsi
-    state: icon
+
   - type: Clothing
     sprite: Clothing/Glasses/sunglasses_sec.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Gloves/gloves.yml b/Resources/Prototypes/Entities/Clothing/Gloves/gloves.yml
index dcfea05baf..4943dda629 100644
--- a/Resources/Prototypes/Entities/Clothing/Gloves/gloves.yml
+++ b/Resources/Prototypes/Entities/Clothing/Gloves/gloves.yml
@@ -5,8 +5,7 @@
   components:
   - type: Sprite
     state: icon
-  - type: Icon
-    state: icon
+
   - type: Clothing
     Slots:
     - gloves
@@ -19,8 +18,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Gloves/black.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/black.rsi
+
   - type: Clothing
     sprite: Clothing/Gloves/black.rsi
 
@@ -32,8 +30,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Gloves/blue.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/blue.rsi
+
   - type: Clothing
     sprite: Clothing/Gloves/blue.rsi
 
@@ -45,8 +42,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Gloves/boxing.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/boxing.rsi
+
   - type: Clothing
     sprite: Clothing/Gloves/boxing.rsi
 
@@ -58,8 +54,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Gloves/boxingblue.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/boxingblue.rsi
+
   - type: Clothing
     sprite: Clothing/Gloves/boxingblue.rsi
 
@@ -71,8 +66,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Gloves/boxinggreen.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/boxinggreen.rsi
+
   - type: Clothing
     sprite: Clothing/Gloves/boxinggreen.rsi
 
@@ -84,8 +78,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Gloves/boxingyellow.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/boxingyellow.rsi
+
   - type: Clothing
     sprite: Clothing/Gloves/boxingyellow.rsi
 
@@ -97,8 +90,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Gloves/brown.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/brown.rsi
+
   - type: Clothing
     sprite: Clothing/Gloves/brown.rsi
 
@@ -110,8 +102,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Gloves/captain.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/captain.rsi
+
   - type: Clothing
     sprite: Clothing/Gloves/captain.rsi
 
@@ -123,8 +114,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Gloves/gray.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/gray.rsi
+
   - type: Clothing
     sprite: Clothing/Gloves/gray.rsi
 
@@ -136,8 +126,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Gloves/green.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/green.rsi
+
   - type: Clothing
     sprite: Clothing/Gloves/green.rsi
 
@@ -149,8 +138,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Gloves/ihscombat.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/ihscombat.rsi
+
   - type: Clothing
     sprite: Clothing/Gloves/ihscombat.rsi
 
@@ -162,8 +150,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Gloves/latex.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/latex.rsi
+
   - type: Clothing
     sprite: Clothing/Gloves/latex.rsi
 
@@ -175,8 +162,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Gloves/leather.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/leather.rsi
+
   - type: Clothing
     sprite: Clothing/Gloves/leather.rsi
     HeatResistance: 1400
@@ -189,8 +175,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Gloves/lightbrown.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/lightbrown.rsi
+
   - type: Clothing
     sprite: Clothing/Gloves/lightbrown.rsi
 
@@ -202,8 +187,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Gloves/orange.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/orange.rsi
+
   - type: Clothing
     sprite: Clothing/Gloves/orange.rsi
 
@@ -215,8 +199,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Gloves/powerglove.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/powerglove.rsi
+
   - type: Clothing
     sprite: Clothing/Gloves/powerglove.rsi
 
@@ -228,8 +211,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Gloves/powerglove_active.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/powerglove_active.rsi
+
   - type: Clothing
     sprite: Clothing/Gloves/powerglove_active.rsi
 
@@ -241,8 +223,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Gloves/purple.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/purple.rsi
+
   - type: Clothing
     sprite: Clothing/Gloves/purple.rsi
 
@@ -254,8 +235,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Gloves/rainbow.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/rainbow.rsi
+
   - type: Clothing
     sprite: Clothing/Gloves/rainbow.rsi
 
@@ -267,8 +247,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Gloves/red.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/red.rsi
+
   - type: Clothing
     sprite: Clothing/Gloves/red.rsi
 
@@ -280,8 +259,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Gloves/robohands.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/robohands.rsi
+
   - type: Clothing
     sprite: Clothing/Gloves/robohands.rsi
 
@@ -293,8 +271,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Gloves/s_ninja.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/s_ninja.rsi
+
   - type: Clothing
     sprite: Clothing/Gloves/s_ninja.rsi
 
@@ -306,8 +283,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Gloves/s_ninjak.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/s_ninjak.rsi
+
   - type: Clothing
     sprite: Clothing/Gloves/s_ninjak.rsi
 
@@ -319,8 +295,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Gloves/s_ninjan.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/s_ninjan.rsi
+
   - type: Clothing
     sprite: Clothing/Gloves/s_ninjan.rsi
 
@@ -332,8 +307,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Gloves/white.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/white.rsi
+
   - type: Clothing
     sprite: Clothing/Gloves/white.rsi
 
@@ -345,7 +319,6 @@
   components:
   - type: Sprite
     sprite: Clothing/Gloves/yellow.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/yellow.rsi
+
   - type: Clothing
     sprite: Clothing/Gloves/yellow.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Head/animals.yml b/Resources/Prototypes/Entities/Clothing/Head/animals.yml
index ebbfd9698e..a0b8b35713 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/animals.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/animals.yml
@@ -6,8 +6,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/monkey.rsi
-  - type: Icon
-    sprite: Clothing/Head/monkey.rsi
+
   - type: Clothing
     sprite: Clothing/Head/monkey.rsi
 
@@ -19,8 +18,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/mouse_brown.rsi
-  - type: Icon
-    sprite: Clothing/Head/mouse_brown.rsi
+
   - type: Clothing
     sprite: Clothing/Head/mouse_brown.rsi
 
@@ -32,8 +30,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/mouse_gray.rsi
-  - type: Icon
-    sprite: Clothing/Head/mouse_gray.rsi
+
   - type: Clothing
     sprite: Clothing/Head/mouse_gray.rsi
 
@@ -45,8 +42,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/mouse_white.rsi
-  - type: Icon
-    sprite: Clothing/Head/mouse_white.rsi
+
   - type: Clothing
     sprite: Clothing/Head/mouse_white.rsi
 
@@ -58,8 +54,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/nymph.rsi
-  - type: Icon
-    sprite: Clothing/Head/nymph.rsi
+
   - type: Clothing
     sprite: Clothing/Head/nymph.rsi
 
@@ -71,8 +66,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/pai-cat.rsi
-  - type: Icon
-    sprite: Clothing/Head/pai-cat.rsi
+
   - type: Clothing
     sprite: Clothing/Head/pai-cat.rsi
 
@@ -84,8 +78,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/pai-monkey.rsi
-  - type: Icon
-    sprite: Clothing/Head/pai-monkey.rsi
+
   - type: Clothing
     sprite: Clothing/Head/pai-monkey.rsi
 
@@ -97,8 +90,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/pai-mouse.rsi
-  - type: Icon
-    sprite: Clothing/Head/pai-mouse.rsi
+
   - type: Clothing
     sprite: Clothing/Head/pai-mouse.rsi
 
@@ -110,8 +102,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/cat.rsi
-  - type: Icon
-    sprite: Clothing/Head/cat.rsi
+
   - type: Clothing
     sprite: Clothing/Head/cat.rsi
 
@@ -123,8 +114,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/cat2.rsi
-  - type: Icon
-    sprite: Clothing/Head/cat2.rsi
+
   - type: Clothing
     sprite: Clothing/Head/cat2.rsi
 
@@ -136,7 +126,6 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/cat3.rsi
-  - type: Icon
-    sprite: Clothing/Head/cat3.rsi
+
   - type: Clothing
     sprite: Clothing/Head/cat3.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
index 810982fc66..80968bc20a 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -16,8 +16,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/hardsuit-old.rsi
-  - type: Icon
-    sprite: Clothing/Head/hardsuit-old.rsi
+
   - type: Clothing
     sprite: Clothing/Head/hardsuit-old.rsi
   - type: PressureProtection
@@ -33,8 +32,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/hardsuit-atmos.rsi
-  - type: Icon
-    sprite: Clothing/Head/hardsuit-atmos.rsi
+
   - type: Clothing
     sprite: Clothing/Head/hardsuit-atmos.rsi
   - type: PressureProtection
@@ -49,8 +47,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/hardsuit-engineering.rsi
-  - type: Icon
-    sprite: Clothing/Head/hardsuit-engineering.rsi
+
   - type: Clothing
     sprite: Clothing/Head/hardsuit-engineering.rsi
   - type: PressureProtection
@@ -65,8 +62,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/hardsuit-hazardhardsuit.rsi
-  - type: Icon
-    sprite: Clothing/Head/hardsuit-hazardhardsuit.rsi
+
   - type: Clothing
     sprite: Clothing/Head/hardsuit-hazardhardsuit.rsi
 
@@ -78,8 +74,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/hardsuit-medical.rsi
-  - type: Icon
-    sprite: Clothing/Head/hardsuit-medical.rsi
+
   - type: Clothing
     sprite: Clothing/Head/hardsuit-medical.rsi
   - type: PressureProtection
@@ -94,8 +89,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/hardsuit-mining.rsi
-  - type: Icon
-    sprite: Clothing/Head/hardsuit-mining.rsi
+
   - type: Clothing
     sprite: Clothing/Head/hardsuit-mining.rsi
   - type: PressureProtection
@@ -110,8 +104,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/hardsuit-sectg.rsi
-  - type: Icon
-    sprite: Clothing/Head/hardsuit-sectg.rsi
+
   - type: Clothing
     sprite: Clothing/Head/hardsuit-sectg.rsi
   - type: PressureProtection
@@ -127,9 +120,7 @@
   - type: Sprite
     sprite: Clothing/Head/hardsuit-syndie.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Head/hardsuit-syndie.rsi
-    state: icon
+
   - type: Clothing
     sprite: Clothing/Head/hardsuit-syndie.rsi
   - type: PressureProtection
@@ -144,8 +135,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/hardsuit-white.rsi
-  - type: Icon
-    sprite: Clothing/Head/hardsuit-white.rsi
+
   - type: Clothing
     sprite: Clothing/Head/hardsuit-white.rsi
   - type: PressureProtection
@@ -160,8 +150,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/hardsuit-wiz.rsi
-  - type: Icon
-    sprite: Clothing/Head/hardsuit-wiz.rsi
+
   - type: Clothing
     sprite: Clothing/Head/hardsuit-wiz.rsi
   - type: PressureProtection
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index d4ae2beaeb..7a113fc033 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -8,8 +8,7 @@
     - Helmet
   - type: Sprite
     state: icon
-  - type: Icon
-    state: icon
+
 
 - type: entity
   parent: HatBase
@@ -19,8 +18,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/bandana.rsi
-  - type: Icon
-    sprite: Clothing/Head/bandana.rsi
+
   - type: Clothing
     sprite: Clothing/Head/bandana.rsi
 
@@ -32,8 +30,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/bandblack.rsi
-  - type: Icon
-    sprite: Clothing/Head/bandblack.rsi
+
   - type: Clothing
     sprite: Clothing/Head/bandblack.rsi
 
@@ -45,8 +42,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/bandblue.rsi
-  - type: Icon
-    sprite: Clothing/Head/bandblue.rsi
+
   - type: Clothing
     sprite: Clothing/Head/bandblue.rsi
 
@@ -58,8 +54,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/bandbotany.rsi
-  - type: Icon
-    sprite: Clothing/Head/bandbotany.rsi
+
   - type: Clothing
     sprite: Clothing/Head/bandbotany.rsi
 
@@ -71,8 +66,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/bandcamo.rsi
-  - type: Icon
-    sprite: Clothing/Head/bandcamo.rsi
+
   - type: Clothing
     sprite: Clothing/Head/bandcamo.rsi
 
@@ -84,8 +78,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/bandgold.rsi
-  - type: Icon
-    sprite: Clothing/Head/bandgold.rsi
+
   - type: Clothing
     sprite: Clothing/Head/bandgold.rsi
 
@@ -97,8 +90,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/bandgreen.rsi
-  - type: Icon
-    sprite: Clothing/Head/bandgreen.rsi
+
   - type: Clothing
     sprite: Clothing/Head/bandgreen.rsi
 
@@ -110,8 +102,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/bandorange.rsi
-  - type: Icon
-    sprite: Clothing/Head/bandorange.rsi
+
   - type: Clothing
     sprite: Clothing/Head/bandorange.rsi
 
@@ -123,8 +114,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/bandpurple.rsi
-  - type: Icon
-    sprite: Clothing/Head/bandpurple.rsi
+
   - type: Clothing
     sprite: Clothing/Head/bandpurple.rsi
 
@@ -136,8 +126,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/bandred.rsi
-  - type: Icon
-    sprite: Clothing/Head/bandred.rsi
+
   - type: Clothing
     sprite: Clothing/Head/bandred.rsi
 
@@ -149,8 +138,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/bandskull.rsi
-  - type: Icon
-    sprite: Clothing/Head/bandskull.rsi
+
   - type: Clothing
     sprite: Clothing/Head/bandskull.rsi
 
@@ -162,8 +150,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/bearpelt.rsi
-  - type: Icon
-    sprite: Clothing/Head/bearpelt.rsi
+
   - type: Clothing
     sprite: Clothing/Head/bearpelt.rsi
 
@@ -175,8 +162,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/beaver_hat.rsi
-  - type: Icon
-    sprite: Clothing/Head/beaver_hat.rsi
+
   - type: Clothing
     sprite: Clothing/Head/beaver_hat.rsi
 
@@ -188,8 +174,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/beret.rsi
-  - type: Icon
-    sprite: Clothing/Head/beret.rsi
+
   - type: Clothing
     sprite: Clothing/Head/beret.rsi
 
@@ -201,8 +186,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/beret_engineering.rsi
-  - type: Icon
-    sprite: Clothing/Head/beret_engineering.rsi
+
   - type: Clothing
     sprite: Clothing/Head/beret_engineering.rsi
 
@@ -215,9 +199,7 @@
   - type: Sprite
     sprite: Clothing/Head/beret_hos.rsi
     state: beret_hos
-  - type: Icon
-    sprite: Clothing/Head/beret_hos.rsi
-    state: beret_hos
+
   - type: Clothing
     sprite: Clothing/Head/beret_hos.rsi
 
@@ -229,8 +211,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/beret_warden.rsi
-  - type: Icon
-    sprite: Clothing/Head/beret_warden.rsi
+
   - type: Clothing
     sprite: Clothing/Head/beret_warden.rsi
 
@@ -242,8 +223,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/bluesoft.rsi
-  - type: Icon
-    sprite: Clothing/Head/bluesoft.rsi
+
   - type: Clothing
     sprite: Clothing/Head/bluesoft.rsi
 
@@ -255,8 +235,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/bluesoft_flipped.rsi
-  - type: Icon
-    sprite: Clothing/Head/bluesoft_flipped.rsi
+
   - type: Clothing
     sprite: Clothing/Head/bluesoft_flipped.rsi
 
@@ -268,8 +247,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/boater_hat.rsi
-  - type: Icon
-    sprite: Clothing/Head/boater_hat.rsi
+
   - type: Clothing
     sprite: Clothing/Head/boater_hat.rsi
 
@@ -281,8 +259,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/bowler.rsi
-  - type: Icon
-    sprite: Clothing/Head/bowler.rsi
+
   - type: Clothing
     sprite: Clothing/Head/bowler.rsi
 
@@ -294,8 +271,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/bowler_hat.rsi
-  - type: Icon
-    sprite: Clothing/Head/bowler_hat.rsi
+
   - type: Clothing
     sprite: Clothing/Head/bowler_hat.rsi
 
@@ -307,8 +283,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/bunny.rsi
-  - type: Icon
-    sprite: Clothing/Head/bunny.rsi
+
   - type: Clothing
     sprite: Clothing/Head/bunny.rsi
 
@@ -320,8 +295,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/cake0.rsi
-  - type: Icon
-    sprite: Clothing/Head/cake0.rsi
+
   - type: Clothing
     sprite: Clothing/Head/cake0.rsi
 
@@ -333,8 +307,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/cake1.rsi
-  - type: Icon
-    sprite: Clothing/Head/cake1.rsi
+
   - type: Clothing
     sprite: Clothing/Head/cake1.rsi
 
@@ -346,8 +319,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/capcap.rsi
-  - type: Icon
-    sprite: Clothing/Head/capcap.rsi
+
   - type: Clothing
     sprite: Clothing/Head/capcap.rsi
 
@@ -359,8 +331,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/capspace.rsi
-  - type: Icon
-    sprite: Clothing/Head/capspace.rsi
+
   - type: Clothing
     sprite: Clothing/Head/capspace.rsi
 
@@ -372,8 +343,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/captain.rsi
-  - type: Icon
-    sprite: Clothing/Head/captain.rsi
+
   - type: Clothing
     sprite: Clothing/Head/captain.rsi
 
@@ -385,8 +355,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/cardborg_h.rsi
-  - type: Icon
-    sprite: Clothing/Head/cardborg_h.rsi
+
   - type: Clothing
     sprite: Clothing/Head/cardborg_h.rsi
 
@@ -398,8 +367,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/cargosoft.rsi
-  - type: Icon
-    sprite: Clothing/Head/cargosoft.rsi
+
   - type: Clothing
     sprite: Clothing/Head/cargosoft.rsi
 
@@ -411,8 +379,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/cargosoft_flipped.rsi
-  - type: Icon
-    sprite: Clothing/Head/cargosoft_flipped.rsi
+
   - type: Clothing
     sprite: Clothing/Head/cargosoft_flipped.rsi
 
@@ -424,8 +391,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/centcom.rsi
-  - type: Icon
-    sprite: Clothing/Head/centcom.rsi
+
   - type: Clothing
     sprite: Clothing/Head/centcom.rsi
 
@@ -437,8 +403,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/chefhat.rsi
-  - type: Icon
-    sprite: Clothing/Head/chefhat.rsi
+
   - type: Clothing
     sprite: Clothing/Head/chefhat.rsi
 
@@ -450,8 +415,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/chickenhead.rsi
-  - type: Icon
-    sprite: Clothing/Head/chickenhead.rsi
+
   - type: Clothing
     sprite: Clothing/Head/chickenhead.rsi
 
@@ -463,8 +427,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/corpsoft.rsi
-  - type: Icon
-    sprite: Clothing/Head/corpsoft.rsi
+
   - type: Clothing
     sprite: Clothing/Head/corpsoft.rsi
 
@@ -476,8 +439,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/corpsoft_flipped.rsi
-  - type: Icon
-    sprite: Clothing/Head/corpsoft_flipped.rsi
+
   - type: Clothing
     sprite: Clothing/Head/corpsoft_flipped.rsi
 
@@ -489,8 +451,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/cosmonaut.rsi
-  - type: Icon
-    sprite: Clothing/Head/cosmonaut.rsi
+
   - type: Clothing
     sprite: Clothing/Head/cosmonaut.rsi
 
@@ -502,8 +463,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/cowboy.rsi
-  - type: Icon
-    sprite: Clothing/Head/cowboy.rsi
+
   - type: Clothing
     sprite: Clothing/Head/cowboy.rsi
 
@@ -515,8 +475,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/deathsquad.rsi
-  - type: Icon
-    sprite: Clothing/Head/deathsquad.rsi
+
   - type: Clothing
     sprite: Clothing/Head/deathsquad.rsi
 
@@ -528,8 +487,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/brownfedora.rsi
-  - type: Icon
-    sprite: Clothing/Head/brownfedora.rsi
+
   - type: Clothing
     sprite: Clothing/Head/brownfedora.rsi
 
@@ -541,8 +499,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/greyfedora.rsi
-  - type: Icon
-    sprite: Clothing/Head/greyfedora.rsi
+
   - type: Clothing
     sprite: Clothing/Head/greyfedora.rsi
 
@@ -554,8 +511,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/fez.rsi
-  - type: Icon
-    sprite: Clothing/Head/fez.rsi
+
   - type: Clothing
     sprite: Clothing/Head/fez.rsi
 
@@ -567,8 +523,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/gladiator.rsi
-  - type: Icon
-    sprite: Clothing/Head/gladiator.rsi
+
   - type: Clothing
     sprite: Clothing/Head/gladiator.rsi
 
@@ -580,8 +535,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/greenbandana.rsi
-  - type: Icon
-    sprite: Clothing/Head/greenbandana.rsi
+
   - type: Clothing
     sprite: Clothing/Head/greenbandana.rsi
 
@@ -593,8 +547,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/greensoft.rsi
-  - type: Icon
-    sprite: Clothing/Head/greensoft.rsi
+
   - type: Clothing
     sprite: Clothing/Head/greensoft.rsi
 
@@ -606,8 +559,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/greensoft_flipped.rsi
-  - type: Icon
-    sprite: Clothing/Head/greensoft_flipped.rsi
+
   - type: Clothing
     sprite: Clothing/Head/greensoft_flipped.rsi
 
@@ -619,8 +571,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/greysoft.rsi
-  - type: Icon
-    sprite: Clothing/Head/greysoft.rsi
+
   - type: Clothing
     sprite: Clothing/Head/greysoft.rsi
 
@@ -632,8 +583,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/greysoft_flipped.rsi
-  - type: Icon
-    sprite: Clothing/Head/greysoft_flipped.rsi
+
   - type: Clothing
     sprite: Clothing/Head/greysoft_flipped.rsi
 
@@ -645,8 +595,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/hairflower.rsi
-  - type: Icon
-    sprite: Clothing/Head/hairflower.rsi
+
   - type: Clothing
     sprite: Clothing/Head/hairflower.rsi
 
@@ -658,8 +607,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/headslime.rsi
-  - type: Icon
-    sprite: Clothing/Head/headslime.rsi
+
   - type: Clothing
     sprite: Clothing/Head/headslime.rsi
 
@@ -671,8 +619,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/helmet.rsi
-  - type: Icon
-    sprite: Clothing/Head/helmet.rsi
+
   - type: Clothing
     sprite: Clothing/Head/helmet.rsi
 
@@ -684,8 +631,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/helmetold.rsi
-  - type: Icon
-    sprite: Clothing/Head/helmetold.rsi
+
   - type: Clothing
     sprite: Clothing/Head/helmetold.rsi
 
@@ -697,8 +643,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/hopcap.rsi
-  - type: Icon
-    sprite: Clothing/Head/hopcap.rsi
+
   - type: Clothing
     sprite: Clothing/Head/hopcap.rsi
 
@@ -710,8 +655,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/hoshat.rsi
-  - type: Icon
-    sprite: Clothing/Head/hoshat.rsi
+
   - type: Clothing
     sprite: Clothing/Head/hoshat.rsi
 
@@ -723,8 +667,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/ihsvoidhelm.rsi
-  - type: Icon
-    sprite: Clothing/Head/ihsvoidhelm.rsi
+
   - type: Clothing
     sprite: Clothing/Head/ihsvoidhelm.rsi
 
@@ -736,8 +679,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/ihsvoidhelm_on.rsi
-  - type: Icon
-    sprite: Clothing/Head/ihsvoidhelm_on.rsi
+
   - type: Clothing
     sprite: Clothing/Head/ihsvoidhelm_on.rsi
 
@@ -749,8 +691,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/witchhat.rsi
-  - type: Icon
-    sprite: Clothing/Head/witchhat.rsi
+
   - type: Clothing
     sprite: Clothing/Head/witchhat.rsi
 
@@ -762,8 +703,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/wizardhelm.rsi
-  - type: Icon
-    sprite: Clothing/Head/wizardhelm.rsi
+
   - type: Clothing
     sprite: Clothing/Head/wizardhelm.rsi
 
@@ -775,8 +715,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/mimesoft.rsi
-  - type: Icon
-    sprite: Clothing/Head/mimesoft.rsi
+
   - type: Clothing
     sprite: Clothing/Head/mimesoft.rsi
 
@@ -788,8 +727,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/mimesoft_flipped.rsi
-  - type: Icon
-    sprite: Clothing/Head/mimesoft_flipped.rsi
+
   - type: Clothing
     sprite: Clothing/Head/mimesoft_flipped.rsi
 
@@ -801,8 +739,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/nursehat.rsi
-  - type: Icon
-    sprite: Clothing/Head/nursehat.rsi
+
   - type: Clothing
     sprite: Clothing/Head/nursehat.rsi
 
@@ -814,8 +751,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/orangesoft.rsi
-  - type: Icon
-    sprite: Clothing/Head/orangesoft.rsi
+
   - type: Clothing
     sprite: Clothing/Head/orangesoft.rsi
 
@@ -827,8 +763,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/orangesoft_flipped.rsi
-  - type: Icon
-    sprite: Clothing/Head/orangesoft_flipped.rsi
+
   - type: Clothing
     sprite: Clothing/Head/orangesoft_flipped.rsi
 
@@ -840,8 +775,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/orange_bandana.rsi
-  - type: Icon
-    sprite: Clothing/Head/orange_bandana.rsi
+
   - type: Clothing
     sprite: Clothing/Head/orange_bandana.rsi
 
@@ -853,8 +787,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/paper.rsi
-  - type: Icon
-    sprite: Clothing/Head/paper.rsi
+
   - type: Clothing
     sprite: Clothing/Head/paper.rsi
 - type: entity
@@ -865,8 +798,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/philosopher_wig.rsi
-  - type: Icon
-    sprite: Clothing/Head/philosopher_wig.rsi
+
   - type: Clothing
     sprite: Clothing/Head/philosopher_wig.rsi
 
@@ -878,8 +810,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/pirate.rsi
-  - type: Icon
-    sprite: Clothing/Head/pirate.rsi
+
   - type: Clothing
     sprite: Clothing/Head/pirate.rsi
 
@@ -891,8 +822,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/plaguedoctor.rsi
-  - type: Icon
-    sprite: Clothing/Head/plaguedoctor.rsi
+
   - type: Clothing
     sprite: Clothing/Head/plaguedoctor.rsi
 
@@ -904,8 +834,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/purplesoft.rsi
-  - type: Icon
-    sprite: Clothing/Head/purplesoft.rsi
+
   - type: Clothing
     sprite: Clothing/Head/purplesoft.rsi
 
@@ -917,8 +846,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/purplesoft_flipped.rsi
-  - type: Icon
-    sprite: Clothing/Head/purplesoft_flipped.rsi
+
   - type: Clothing
     sprite: Clothing/Head/purplesoft_flipped.rsi
 
@@ -930,8 +858,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/pwig.rsi
-  - type: Icon
-    sprite: Clothing/Head/pwig.rsi
+
   - type: Clothing
     sprite: Clothing/Head/pwig.rsi
 
@@ -943,8 +870,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/rainbowsoft.rsi
-  - type: Icon
-    sprite: Clothing/Head/rainbowsoft.rsi
+
   - type: Clothing
     sprite: Clothing/Head/rainbowsoft.rsi
 
@@ -956,8 +882,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/rainbowsoft_flipped.rsi
-  - type: Icon
-    sprite: Clothing/Head/rainbowsoft_flipped.rsi
+
   - type: Clothing
     sprite: Clothing/Head/rainbowsoft_flipped.rsi
 
@@ -969,8 +894,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/redsoft.rsi
-  - type: Icon
-    sprite: Clothing/Head/redsoft.rsi
+
   - type: Clothing
     sprite: Clothing/Head/redsoft.rsi
 
@@ -982,8 +906,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/redsoft_flipped.rsi
-  - type: Icon
-    sprite: Clothing/Head/redsoft_flipped.rsi
+
   - type: Clothing
     sprite: Clothing/Head/redsoft_flipped.rsi
 
@@ -995,8 +918,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/redwizard.rsi
-  - type: Icon
-    sprite: Clothing/Head/redwizard.rsi
+
   - type: Clothing
     sprite: Clothing/Head/redwizard.rsi
 
@@ -1008,8 +930,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/richard.rsi
-  - type: Icon
-    sprite: Clothing/Head/richard.rsi
+
   - type: Clothing
     sprite: Clothing/Head/richard.rsi
 
@@ -1021,8 +942,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/s-ninja.rsi
-  - type: Icon
-    sprite: Clothing/Head/s-ninja.rsi
+
   - type: Clothing
     sprite: Clothing/Head/s-ninja.rsi
 
@@ -1034,8 +954,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/santahat.rsi
-  - type: Icon
-    sprite: Clothing/Head/santahat.rsi
+
   - type: Clothing
     sprite: Clothing/Head/santahat.rsi
 
@@ -1047,8 +966,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/secsoft.rsi
-  - type: Icon
-    sprite: Clothing/Head/secsoft.rsi
+
   - type: Clothing
     sprite: Clothing/Head/secsoft.rsi
 
@@ -1060,8 +978,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/secsoft_flipped.rsi
-  - type: Icon
-    sprite: Clothing/Head/secsoft_flipped.rsi
+
   - type: Clothing
     sprite: Clothing/Head/secsoft_flipped.rsi
 
@@ -1073,8 +990,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/sombrero.rsi
-  - type: Icon
-    sprite: Clothing/Head/sombrero.rsi
+
   - type: Clothing
     sprite: Clothing/Head/sombrero.rsi
 
@@ -1086,8 +1002,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/surgcap_blue.rsi
-  - type: Icon
-    sprite: Clothing/Head/surgcap_blue.rsi
+
   - type: Clothing
     sprite: Clothing/Head/surgcap_blue.rsi
 
@@ -1099,8 +1014,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/surgcap_green.rsi
-  - type: Icon
-    sprite: Clothing/Head/surgcap_green.rsi
+
   - type: Clothing
     sprite: Clothing/Head/surgcap_green.rsi
 
@@ -1112,8 +1026,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/surgcap_purple.rsi
-  - type: Icon
-    sprite: Clothing/Head/surgcap_purple.rsi
+
   - type: Clothing
     sprite: Clothing/Head/surgcap_purple.rsi
 
@@ -1125,8 +1038,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/syndicate.rsi
-  - type: Icon
-    sprite: Clothing/Head/syndicate.rsi
+
   - type: Clothing
     sprite: Clothing/Head/syndicate.rsi
 
@@ -1138,8 +1050,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/thunderdome.rsi
-  - type: Icon
-    sprite: Clothing/Head/thunderdome.rsi
+
   - type: Clothing
     sprite: Clothing/Head/thunderdome.rsi
 
@@ -1151,8 +1062,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/tophat.rsi
-  - type: Icon
-    sprite: Clothing/Head/tophat.rsi
+
   - type: Clothing
     sprite: Clothing/Head/tophat.rsi
 
@@ -1164,8 +1074,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/ushankadown.rsi
-  - type: Icon
-    sprite: Clothing/Head/ushankadown.rsi
+
   - type: Clothing
     sprite: Clothing/Head/ushankadown.rsi
 
@@ -1177,8 +1086,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/ushankaup.rsi
-  - type: Icon
-    sprite: Clothing/Head/ushankaup.rsi
+
   - type: Clothing
     sprite: Clothing/Head/ushankaup.rsi
 
@@ -1190,8 +1098,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/nightvis.rsi
-  - type: Icon
-    sprite: Clothing/Head/nightvis.rsi
+
   - type: Clothing
     sprite: Clothing/Head/nightvis.rsi
 
@@ -1203,8 +1110,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/violetwizard.rsi
-  - type: Icon
-    sprite: Clothing/Head/violetwizard.rsi
+
   - type: Clothing
     sprite: Clothing/Head/violetwizard.rsi
 
@@ -1216,8 +1122,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/void.rsi
-  - type: Icon
-    sprite: Clothing/Head/void.rsi
+
   - type: Clothing
     sprite: Clothing/Head/void.rsi
 
@@ -1229,8 +1134,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/witch.rsi
-  - type: Icon
-    sprite: Clothing/Head/witch.rsi
+
   - type: Clothing
     sprite: Clothing/Head/witch.rsi
 
@@ -1242,8 +1146,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/wizard-fake.rsi
-  - type: Icon
-    sprite: Clothing/Head/wizard-fake.rsi
+
   - type: Clothing
     sprite: Clothing/Head/wizard-fake.rsi
 
@@ -1255,8 +1158,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/wizardhat.rsi
-  - type: Icon
-    sprite: Clothing/Head/wizardhat.rsi
+
   - type: Clothing
     sprite: Clothing/Head/wizardhat.rsi
 
@@ -1268,8 +1170,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/xenom.rsi
-  - type: Icon
-    sprite: Clothing/Head/xenom.rsi
+
   - type: Clothing
     sprite: Clothing/Head/xenom.rsi
 
@@ -1281,8 +1182,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/xenos.rsi
-  - type: Icon
-    sprite: Clothing/Head/xenos.rsi
+
   - type: Clothing
     sprite: Clothing/Head/xenos.rsi
 
@@ -1294,8 +1194,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/xmashat.rsi
-  - type: Icon
-    sprite: Clothing/Head/xmashat.rsi
+
   - type: Clothing
     sprite: Clothing/Head/xmashat.rsi
 
@@ -1307,8 +1206,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/yellowsoft.rsi
-  - type: Icon
-    sprite: Clothing/Head/yellowsoft.rsi
+
   - type: Clothing
     sprite: Clothing/Head/yellowsoft.rsi
 
@@ -1320,7 +1218,6 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/yellowsoft_flipped.rsi
-  - type: Icon
-    sprite: Clothing/Head/yellowsoft_flipped.rsi
+
   - type: Clothing
     sprite: Clothing/Head/yellowsoft_flipped.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
index 9750a4ed41..f0152fc182 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
@@ -6,8 +6,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/atmos_helm.rsi
-  - type: Icon
-    sprite: Clothing/Head/atmos_helm.rsi
+
   - type: Clothing
     sprite: Clothing/Head/atmos_helm.rsi
 
@@ -19,8 +18,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/cult_helmet.rsi
-  - type: Icon
-    sprite: Clothing/Head/cult_helmet.rsi
+
   - type: Clothing
     sprite: Clothing/Head/cult_helmet.rsi
 
@@ -32,8 +30,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/hardhat0_dblue.rsi
-  - type: Icon
-    sprite: Clothing/Head/hardhat0_dblue.rsi
+
   - type: Clothing
     sprite: Clothing/Head/hardhat0_dblue.rsi
 
@@ -45,8 +42,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/hardhat0_orange.rsi
-  - type: Icon
-    sprite: Clothing/Head/hardhat0_orange.rsi
+
   - type: Clothing
     sprite: Clothing/Head/hardhat0_orange.rsi
 
@@ -58,8 +54,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/hardhat0_pumpkin.rsi
-  - type: Icon
-    sprite: Clothing/Head/hardhat0_pumpkin.rsi
+
   - type: Clothing
     sprite: Clothing/Head/hardhat0_pumpkin.rsi
 
@@ -71,8 +66,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/hardhat0_red.rsi
-  - type: Icon
-    sprite: Clothing/Head/hardhat0_red.rsi
+
   - type: Clothing
     sprite: Clothing/Head/hardhat0_red.rsi
 
@@ -84,8 +78,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/hardhat0_white.rsi
-  - type: Icon
-    sprite: Clothing/Head/hardhat0_white.rsi
+
   - type: Clothing
     sprite: Clothing/Head/hardhat0_white.rsi
 
@@ -97,8 +90,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/hardhat0_yellow.rsi
-  - type: Icon
-    sprite: Clothing/Head/hardhat0_yellow.rsi
+
   - type: Clothing
     sprite: Clothing/Head/hardhat0_yellow.rsi
 
@@ -110,8 +102,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/hardhat1_pumpkin.rsi
-  - type: Icon
-    sprite: Clothing/Head/hardhat1_pumpkin.rsi
+
   - type: Clothing
     sprite: Clothing/Head/hardhat1_pumpkin.rsi
 
@@ -124,8 +115,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/light_riot.rsi
-  - type: Icon
-    sprite: Clothing/Head/light_riot.rsi
+
   - type: Clothing
     sprite: Clothing/Head/light_riot.rsi
 
@@ -137,8 +127,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/light_riot_on.rsi
-  - type: Icon
-    sprite: Clothing/Head/light_riot_on.rsi
+
   - type: Clothing
     sprite: Clothing/Head/light_riot_on.rsi
 
@@ -150,8 +139,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/scaf.rsi
-  - type: Icon
-    sprite: Clothing/Head/scaf.rsi
+
   - type: Clothing
     sprite: Clothing/Head/scaf.rsi
 
@@ -163,7 +151,6 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/security.rsi
-  - type: Icon
-    sprite: Clothing/Head/security.rsi
+
   - type: Clothing
     sprite: Clothing/Head/security.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
index 2d44e63a92..11478a352b 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
@@ -6,8 +6,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/bio_cmo.rsi
-  - type: Icon
-    sprite: Clothing/Head/bio_cmo.rsi
+
   - type: Clothing
     sprite: Clothing/Head/bio_cmo.rsi
 
@@ -19,8 +18,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/bio_general.rsi
-  - type: Icon
-    sprite: Clothing/Head/bio_general.rsi
+
   - type: Clothing
     sprite: Clothing/Head/bio_general.rsi
 
@@ -32,8 +30,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/bio_janitor.rsi
-  - type: Icon
-    sprite: Clothing/Head/bio_janitor.rsi
+
   - type: Clothing
     sprite: Clothing/Head/bio_janitor.rsi
 
@@ -45,8 +42,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/bio_scientist.rsi
-  - type: Icon
-    sprite: Clothing/Head/bio_scientist.rsi
+
   - type: Clothing
     sprite: Clothing/Head/bio_scientist.rsi
 
@@ -58,8 +54,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/bio_security.rsi
-  - type: Icon
-    sprite: Clothing/Head/bio_security.rsi
+
   - type: Clothing
     sprite: Clothing/Head/bio_security.rsi
 
@@ -71,8 +66,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/bio_virology.rsi
-  - type: Icon
-    sprite: Clothing/Head/bio_virology.rsi
+
   - type: Clothing
     sprite: Clothing/Head/bio_virology.rsi
 
@@ -84,8 +78,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/bombsuit.rsi
-  - type: Icon
-    sprite: Clothing/Head/bombsuit.rsi
+
   - type: Clothing
     sprite: Clothing/Head/bombsuit.rsi
 
@@ -97,8 +90,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/bombsuitsec.rsi
-  - type: Icon
-    sprite: Clothing/Head/bombsuitsec.rsi
+
   - type: Clothing
     sprite: Clothing/Head/bombsuitsec.rsi
 
@@ -110,8 +102,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/bombsuit_white.rsi
-  - type: Icon
-    sprite: Clothing/Head/bombsuit_white.rsi
+
   - type: Clothing
     sprite: Clothing/Head/bombsuit_white.rsi
 
@@ -123,8 +114,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/chaplain_hood.rsi
-  - type: Icon
-    sprite: Clothing/Head/chaplain_hood.rsi
+
   - type: Clothing
     sprite: Clothing/Head/chaplain_hood.rsi
 
@@ -136,8 +126,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/culthood.rsi
-  - type: Icon
-    sprite: Clothing/Head/culthood.rsi
+
   - type: Clothing
     sprite: Clothing/Head/culthood.rsi
 
@@ -149,8 +138,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/nun_hood.rsi
-  - type: Icon
-    sprite: Clothing/Head/nun_hood.rsi
+
   - type: Clothing
     sprite: Clothing/Head/nun_hood.rsi
 
@@ -162,7 +150,6 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/rad.rsi
-  - type: Icon
-    sprite: Clothing/Head/rad.rsi
+
   - type: Clothing
     sprite: Clothing/Head/rad.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
index af5042874d..a0fd49fdad 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
@@ -6,7 +6,6 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/skubhead.rsi
-  - type: Icon
-    sprite: Clothing/Head/skubhead.rsi
+
   - type: Clothing
     sprite: Clothing/Head/skubhead.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Head/welding-masks.yml b/Resources/Prototypes/Entities/Clothing/Head/welding-masks.yml
index f50fd30ce8..3643783710 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/welding-masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/welding-masks.yml
@@ -6,8 +6,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/welding.rsi
-  - type: Icon
-    sprite: Clothing/Head/welding.rsi
+
   - type: Clothing
     sprite: Clothing/Head/welding.rsi
 
@@ -19,8 +18,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/weldingup.rsi
-  - type: Icon
-    sprite: Clothing/Head/weldingup.rsi
+
   - type: Clothing
     sprite: Clothing/Head/weldingup.rsi
 
@@ -32,8 +30,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/fire_welding_mask_1.rsi
-  - type: Icon
-    sprite: Clothing/Head/fire_welding_mask_1.rsi
+
   - type: Clothing
     sprite: Clothing/Head/fire_welding_mask_1.rsi
 
@@ -45,8 +42,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/fire_welding_mask_1up.rsi
-  - type: Icon
-    sprite: Clothing/Head/fire_welding_mask_1up.rsi
+
   - type: Clothing
     sprite: Clothing/Head/fire_welding_mask_1up.rsi
 
@@ -58,8 +54,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/blue_flame_welding_mask_1.rsi
-  - type: Icon
-    sprite: Clothing/Head/blue_flame_welding_mask_1.rsi
+
   - type: Clothing
     sprite: Clothing/Head/blue_flame_welding_mask_1.rsi
 
@@ -71,8 +66,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/blue_flame_welding_mask_1up.rsi
-  - type: Icon
-    sprite: Clothing/Head/blue_flame_welding_mask_1up.rsi
+
   - type: Clothing
     sprite: Clothing/Head/blue_flame_welding_mask_1up.rsi
 
@@ -84,8 +78,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/paintedwelding.rsi
-  - type: Icon
-    sprite: Clothing/Head/paintedwelding.rsi
+
   - type: Clothing
     sprite: Clothing/Head/paintedwelding.rsi
 
@@ -97,7 +90,6 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/paintedweldingup.rsi
-  - type: Icon
-    sprite: Clothing/Head/paintedweldingup.rsi
+
   - type: Clothing
     sprite: Clothing/Head/paintedweldingup.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
index 3249afeb54..43ef5543e5 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -15,9 +15,7 @@
   - type: Sprite
     sprite: Clothing/Masks/mask_gasalt.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Masks/mask_gasalt.rsi
-    state: icon
+
   - type: Clothing
     sprite: Clothing/Masks/mask_gasalt.rsi
 
@@ -30,9 +28,7 @@
   - type: Sprite
     sprite: Clothing/Masks/mask_gas.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Masks/mask_gas.rsi
-    state: icon
+
   - type: Clothing
     sprite: Clothing/Masks/mask_gas.rsi
 
@@ -45,9 +41,7 @@
   - type: Sprite
     sprite: Clothing/Masks/mask_breath.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Masks/mask_breath.rsi
-    state: icon
+
   - type: Clothing
     sprite: Clothing/Masks/mask_breath.rsi
 
@@ -60,9 +54,7 @@
   - type: Sprite
     sprite: Clothing/Masks/mask_clown.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Masks/mask_clown.rsi
-    state: icon
+
   - type: Clothing
     sprite: Clothing/Masks/mask_clown.rsi
 
@@ -75,9 +67,7 @@
   - type: Sprite
     sprite: Clothing/Masks/mask_joy.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Masks/mask_joy.rsi
-    state: icon
+
   - type: Clothing
     sprite: Clothing/Masks/mask_joy.rsi
 
@@ -90,9 +80,7 @@
   - type: Sprite
     sprite: Clothing/Masks/mask_mime.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Masks/mask_mime.rsi
-    state: icon
+
   - type: Clothing
     sprite: Clothing/Masks/mask_mime.rsi
 
@@ -105,8 +93,6 @@
   - type: Sprite
     sprite: Clothing/Masks/mask_sterile.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Masks/mask_sterile.rsi
-    state: icon
+
   - type: Clothing
     sprite: Clothing/Masks/mask_sterile.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
index 791e2823b9..0f890c0334 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
@@ -20,9 +20,7 @@
   - type: Sprite
     sprite: Clothing/Neck/Cloaks/cap_cloak.rsi
     state: capcloak
-  - type: Icon
-    sprite: Clothing/Neck/Cloaks/cap_cloak.rsi
-    state: capcloak
+
   - type: Clothing
     sprite: Clothing/Neck/Cloaks/cap_cloak.rsi
     HeldPrefix: capcloak
@@ -36,9 +34,7 @@
   - type: Sprite
     sprite: Clothing/Neck/Cloaks/hos_cloak.rsi
     state: hoscloak
-  - type: Icon
-    sprite: Clothing/Neck/Cloaks/hos_cloak.rsi
-    state: hoscloak
+
   - type: Clothing
     sprite: Clothing/Neck/Cloaks/hos_cloak.rsi
     HeldPrefix: hoscloak
@@ -52,9 +48,7 @@
   - type: Sprite
     sprite: Clothing/Neck/Cloaks/ce_cloak.rsi
     state: cecloak
-  - type: Icon
-    sprite: Clothing/Neck/Cloaks/ce_cloak.rsi
-    state: cecloak
+
   - type: Clothing
     sprite: Clothing/Neck/Cloaks/ce_cloak.rsi
     HeldPrefix: cecloak
@@ -68,9 +62,7 @@
   - type: Sprite
     sprite: Clothing/Neck/Cloaks/cmo_cloak.rsi
     state: cmocloak
-  - type: Icon
-    sprite: Clothing/Neck/Cloaks/cmo_cloak.rsi
-    state: cmocloak
+
   - type: Clothing
     sprite: Clothing/Neck/Cloaks/cmo_cloak.rsi
     HeldPrefix: cmocloak
@@ -84,9 +76,7 @@
   - type: Sprite
     sprite: Clothing/Neck/Cloaks/rd_cloak.rsi
     state: rdcloak
-  - type: Icon
-    sprite: Clothing/Neck/Cloaks/rd_cloak.rsi
-    state: rdcloak
+
   - type: Clothing
     sprite: Clothing/Neck/Cloaks/rd_cloak.rsi
     HeldPrefix: rdcloak
@@ -100,9 +90,7 @@
   - type: Sprite
     sprite: Clothing/Neck/Cloaks/qm_cloak.rsi
     state: qmcloak
-  - type: Icon
-    sprite: Clothing/Neck/Cloaks/qm_cloak.rsi
-    state: qmcloak
+
   - type: Clothing
     sprite: Clothing/Neck/Cloaks/qm_cloak.rsi
     HeldPrefix: qmcloak
@@ -116,9 +104,7 @@
   - type: Sprite
     sprite: Clothing/Neck/Cloaks/hop_cloak.rsi
     state: hopcloak
-  - type: Icon
-    sprite: Clothing/Neck/Cloaks/hop_cloak.rsi
-    state: hopcloak
+
   - type: Clothing
     sprite: Clothing/Neck/Cloaks/hop_cloak.rsi
     HeldPrefix: hopcloak
@@ -132,9 +118,7 @@
   - type: Sprite
     sprite: Clothing/Neck/Cloaks/herald_cloak.rsi
     state: heraldcloak
-  - type: Icon
-    sprite: Clothing/Neck/Cloaks/herald_cloak.rsi
-    state: heraldcloak
+
   - type: Clothing
     sprite: Clothing/Neck/Cloaks/herald_cloak.rsi
     HeldPrefix: heraldcloak
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/neck.yml b/Resources/Prototypes/Entities/Clothing/Neck/neck.yml
index 95db537e56..3da1e52a96 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/neck.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/neck.yml
@@ -20,9 +20,7 @@
   - type: Sprite
     sprite: Clothing/Neck/headphones.rsi
     state: headphones_on
-  - type: Icon
-    sprite: Clothing/Neck/headphones.rsi
-    state: headphones_on
+
   - type: Clothing
     sprite: Clothing/Neck/headphones.rsi
     HeldPrefix: headphones_on
@@ -36,9 +34,7 @@
   - type: Sprite
     sprite: Clothing/Neck/redtie.rsi
     state: redtie
-  - type: Icon
-    sprite: Clothing/Neck/redtie.rsi
-    state: redtie
+
   - type: Clothing
     sprite: Clothing/Neck/redtie.rsi
     HeldPrefix: redtie
@@ -52,9 +48,7 @@
   - type: Sprite
     sprite: Clothing/Neck/dettie.rsi
     state: dettie
-  - type: Icon
-    sprite: Clothing/Neck/dettie.rsi
-    state: dettie
+
   - type: Clothing
     sprite: Clothing/Neck/dettie.rsi
     HeldPrefix: dettie
@@ -68,9 +62,7 @@
   - type: Sprite
     sprite: Clothing/Neck/stethoscope.rsi
     state: stethoscope
-  - type: Icon
-    sprite: Clothing/Neck/stethoscope.rsi
-    state: stethoscope
+
   - type: Clothing
     sprite: Clothing/Neck/stethoscope.rsi
     HeldPrefix: stethoscope
@@ -84,9 +76,7 @@
   - type: Sprite
     sprite: Clothing/Neck/Scarfs/red_scarf.rsi
     state: stripedredscarf
-  - type: Icon
-    sprite: Clothing/Neck/Scarfs/red_scarf.rsi
-    state: stripedredscarf
+
   - type: Clothing
     sprite: Clothing/Neck/Scarfs/red_scarf.rsi
     HeldPrefix: stripedredscarf
@@ -100,9 +90,7 @@
   - type: Sprite
     sprite: Clothing/Neck/Scarfs/blue_scarf.rsi
     state: stripedbluescarf
-  - type: Icon
-    sprite: Clothing/Neck/Scarfs/blue_scarf.rsi
-    state: stripedbluescarf
+
   - type: Clothing
     sprite: Clothing/Neck/Scarfs/blue_scarf.rsi
     HeldPrefix: stripedbluescarf
@@ -116,9 +104,7 @@
   - type: Sprite
     sprite: Clothing/Neck/Scarfs/green_scarf.rsi
     state: stripedgreenscarf
-  - type: Icon
-    sprite: Clothing/Neck/Scarfs/green_scarf.rsi
-    state: stripedgreenscarf
+
   - type: Clothing
     sprite: Clothing/Neck/Scarfs/green_scarf.rsi
     HeldPrefix: stripedgreenscarf
@@ -132,9 +118,7 @@
   - type: Sprite
     sprite: Clothing/Neck/Scarfs/zebra_scarf.rsi
     state: zebrascarf
-  - type: Icon
-    sprite: Clothing/Neck/Scarfs/zebra_scarf.rsi
-    state: zebrascarf
+
   - type: Clothing
     sprite: Clothing/Neck/Scarfs/zebra_scarf.rsi
     HeldPrefix: zebrascarf
@@ -148,9 +132,7 @@
   - type: Sprite
     sprite: Clothing/Neck/bling.rsi
     state: bling
-  - type: Icon
-    sprite: Clothing/Neck/bling.rsi
-    state: bling
+
   - type: Clothing
     sprite: Clothing/Neck/bling.rsi
     HeldPrefix: bling
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
index d2e209bd11..c40f9b6504 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
@@ -8,8 +8,7 @@
     - outerclothing
   - type: Sprite
     state: icon
-  - type: Icon
-    state: icon
+
 
 - type: entity
   parent: OuterclothingBase
@@ -20,9 +19,7 @@
   - type: Sprite
     sprite: Clothing/OuterClothing/armor.rsi
     state: armor
-  - type: Icon
-    sprite: Clothing/OuterClothing/armor.rsi
-    state: armor
+
   - type: Clothing
     sprite: Clothing/OuterClothing/armor.rsi
     ClothingPrefix: armor
@@ -35,8 +32,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/armor_reflec.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/armor_reflec.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/armor_reflec.rsi
 
@@ -48,8 +44,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/bulletproof.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/bulletproof.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/bulletproof.rsi
 
@@ -61,8 +56,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/caparmor.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/caparmor.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/caparmor.rsi
 
@@ -74,8 +68,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/acolyte.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/acolyte.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/acolyte.rsi
 
@@ -87,8 +80,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/cult_armour.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/cult_armour.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/cult_armour.rsi
 
@@ -100,8 +92,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/custodian.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/custodian.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/custodian.rsi
 
@@ -113,8 +104,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/heavy.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/heavy.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/heavy.rsi
 
@@ -126,8 +116,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/hm_armorvest.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/hm_armorvest.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/hm_armorvest.rsi
 
@@ -139,8 +128,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/hos.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/hos.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/hos.rsi
 
@@ -152,8 +140,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/kvest.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/kvest.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/kvest.rsi
 
@@ -165,8 +152,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/magusblue.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/magusblue.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/magusblue.rsi
 
@@ -178,8 +164,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/magusred.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/magusred.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/magusred.rsi
 
@@ -191,8 +176,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/mercwebvest.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/mercwebvest.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/mercwebvest.rsi
 
@@ -204,8 +188,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/reactive.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/reactive.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/reactive.rsi
 
@@ -217,8 +200,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/reactiveoff.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/reactiveoff.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/reactiveoff.rsi
 
@@ -230,8 +212,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/riot.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/riot.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/riot.rsi
 
@@ -243,8 +224,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/scaf.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/scaf.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/scaf.rsi
 
@@ -256,8 +236,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/swat.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/swat.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/swat.rsi
 
@@ -269,8 +248,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/s_ninja.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/s_ninja.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/s_ninja.rsi
 
@@ -282,7 +260,6 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/webvest.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/webvest.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/webvest.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
index ddf67aa62d..b73740564b 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
@@ -6,8 +6,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/bomber.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/bomber.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/bomber.rsi
 
@@ -19,8 +18,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/bomber_open.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/bomber_open.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/bomber_open.rsi
 
@@ -32,8 +30,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/cargo_jacket.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/cargo_jacket.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/cargo_jacket.rsi
 
@@ -45,8 +42,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/church_coat.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/church_coat.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/church_coat.rsi
 
@@ -58,8 +54,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/detective.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/detective.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/detective.rsi
 
@@ -71,8 +66,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/gentlecoat.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/gentlecoat.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/gentlecoat.rsi
 
@@ -84,8 +78,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/grey_hoodie.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/grey_hoodie.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/grey_hoodie.rsi
 
@@ -97,8 +90,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/grey_hoodie_open.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/grey_hoodie_open.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/grey_hoodie_open.rsi
 
@@ -110,8 +102,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/insp_coat.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/insp_coat.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/insp_coat.rsi
 
@@ -123,8 +114,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/jensencoat.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/jensencoat.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/jensencoat.rsi
 
@@ -136,8 +126,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/labcoat.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/labcoat.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/labcoat.rsi
 
@@ -149,8 +138,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/labcoat_open.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/labcoat_open.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/labcoat_open.rsi
 
@@ -162,8 +150,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/labcoat_chem.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/labcoat_chem.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/labcoat_chem.rsi
 
@@ -175,8 +162,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/labcoat_chem_open.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/labcoat_chem_open.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/labcoat_chem_open.rsi
 
@@ -188,8 +174,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/labcoat_cmo.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/labcoat_cmo.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/labcoat_cmo.rsi
 
@@ -201,8 +186,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/labcoat_cmo_open.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/labcoat_cmo_open.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/labcoat_cmo_open.rsi
 
@@ -214,8 +198,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/labcoat_medspec.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/labcoat_medspec.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/labcoat_medspec.rsi
 
@@ -227,8 +210,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/labcoat_medspec_open.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/labcoat_medspec_open.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/labcoat_medspec_open.rsi
 
@@ -240,8 +222,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/leather_jacket.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/leather_jacket.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/leather_jacket.rsi
 
@@ -253,8 +234,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/pirate.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/pirate.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/pirate.rsi
 
@@ -266,8 +246,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/qm_coat.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/qm_coat.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/qm_coat.rsi
 
@@ -279,8 +258,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/redwizard.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/redwizard.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/redwizard.rsi
 
@@ -293,8 +271,6 @@
   - type: Sprite
     sprite: Clothing/OuterClothing/hos_trenchcoat.rsi
     state: hos_trenchcoat
-  - type: Icon
-    sprite: Clothing/OuterClothing/hos_trenchcoat.rsi
-    state: hos_trenchcoat
+
   - type: Clothing
     sprite: Clothing/OuterClothing/hos_trenchcoat.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
index 062b66d91f..a1b661628a 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -16,8 +16,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/deathsquad.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/deathsquad.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/deathsquad.rsi
   - type: PressureProtection
@@ -32,8 +31,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/ihvoidsuit.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/ihvoidsuit.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/ihvoidsuit.rsi
   - type: PressureProtection
@@ -48,8 +46,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/hardsuit_atmos.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/hardsuit_atmos.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/hardsuit_atmos.rsi
   - type: PressureProtection
@@ -64,8 +61,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/hardsuit_engineering.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/hardsuit_engineering.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/hardsuit_engineering.rsi
   - type: PressureProtection
@@ -80,8 +76,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/hardsuit_hazardhardsuit.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/hardsuit_hazardhardsuit.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/hardsuit_hazardhardsuit.rsi
   - type: PressureProtection
@@ -96,8 +91,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/hardsuit_medical.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/hardsuit_medical.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/hardsuit_medical.rsi
   - type: PressureProtection
@@ -112,8 +106,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/hardsuit_mining.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/hardsuit_mining.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/hardsuit_mining.rsi
   - type: PressureProtection
@@ -128,8 +121,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/hardsuit_sectg.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/hardsuit_sectg.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/hardsuit_sectg.rsi
   - type: PressureProtection
@@ -144,8 +136,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/hardsuit_syndie.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/hardsuit_syndie.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/hardsuit_syndie.rsi
   - type: PressureProtection
@@ -161,8 +152,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/hardsuit_ce.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/hardsuit_ce.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/hardsuit_ce.rsi
   - type: PressureProtection
@@ -177,8 +167,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/hardsuit_wiz.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/hardsuit_wiz.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/hardsuit_wiz.rsi
   - type: PressureProtection
@@ -194,8 +183,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/tdgreen.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/tdgreen.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/tdgreen.rsi
   - type: PressureProtection
@@ -210,8 +198,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/tdred.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/tdred.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/tdred.rsi
   - type: PressureProtection
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
index 3f78fcef60..2738b0a09b 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
@@ -6,8 +6,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/apron.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/apron.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/apron.rsi
 
@@ -19,8 +18,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/apronchef.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/apronchef.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/apronchef.rsi
 
@@ -32,8 +30,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/ass_jacket.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/ass_jacket.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/ass_jacket.rsi
 
@@ -45,8 +42,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/bedsheet.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/bedsheet.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/bedsheet.rsi
 
@@ -58,8 +54,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/black_hoodie.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/black_hoodie.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/black_hoodie.rsi
 
@@ -71,8 +66,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/black_hoodie_open.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/black_hoodie_open.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/black_hoodie_open.rsi
 
@@ -84,8 +78,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/cardborg.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/cardborg.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/cardborg.rsi
 
@@ -97,8 +90,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/chaplain_hoodie.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/chaplain_hoodie.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/chaplain_hoodie.rsi
 
@@ -110,8 +102,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/chef.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/chef.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/chef.rsi
 
@@ -123,8 +114,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/chickensuit.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/chickensuit.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/chickensuit.rsi
 
@@ -136,8 +126,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/classicponcho.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/classicponcho.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/classicponcho.rsi
 
@@ -149,8 +138,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/cultrobes.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/cultrobes.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/cultrobes.rsi
 
@@ -162,8 +150,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/detvest.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/detvest.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/detvest.rsi
 
@@ -175,8 +162,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/hazard.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/hazard.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/hazard.rsi
 
@@ -188,8 +174,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/judge.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/judge.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/judge.rsi
 
@@ -201,8 +186,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/monkeysuit.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/monkeysuit.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/monkeysuit.rsi
 
@@ -214,8 +198,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/poncho.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/poncho.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/poncho.rsi
 
@@ -227,8 +210,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/santa.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/santa.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/santa.rsi
 
@@ -240,8 +222,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/straight_jacket.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/straight_jacket.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/straight_jacket.rsi
 
@@ -254,8 +235,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/surgeon.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/surgeon.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/surgeon.rsi
 
@@ -267,8 +247,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/vest.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/vest.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/vest.rsi
 
@@ -281,8 +260,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/violetwizard.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/violetwizard.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/violetwizard.rsi
 
@@ -294,8 +272,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/wizard.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/wizard.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/wizard.rsi
 
@@ -307,7 +284,6 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/xenos.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/xenos.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/xenos.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
index e631969db5..aa300446c9 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
@@ -6,8 +6,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/bio.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/bio.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/bio.rsi
 
@@ -19,21 +18,19 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/bio_cmo.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/bio_cmo.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/bio_cmo.rsi
 
 - type: entity
   parent: OuterclothingBase
   id: OuterclothingBiogeneral
-  name: bio suit 
+  name: bio suit
   description: A suit that protects against biological contamination.
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/bio_general.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/bio_general.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/bio_general.rsi
 
@@ -45,8 +42,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/bio_janitor.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/bio_janitor.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/bio_janitor.rsi
 
@@ -58,8 +54,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/bio_scientist.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/bio_scientist.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/bio_scientist.rsi
 
@@ -71,8 +66,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/bio_security.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/bio_security.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/bio_security.rsi
 
@@ -84,8 +78,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/bio_virology.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/bio_virology.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/bio_virology.rsi
 
@@ -97,8 +90,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/bombsuit.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/bombsuit.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/bombsuit.rsi
 
@@ -110,8 +102,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/bombsuitsec.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/bombsuitsec.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/bombsuitsec.rsi
 
@@ -123,8 +114,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/bombsuit_white.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/bombsuit_white.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/bombsuit_white.rsi
 
@@ -136,8 +126,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/anomaly_suit.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/anomaly_suit.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/anomaly_suit.rsi
 
@@ -149,8 +138,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/emergency_suit.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/emergency_suit.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/emergency_suit.rsi
 
@@ -162,8 +150,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/firesuit.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/firesuit.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/firesuit.rsi
 
@@ -175,8 +162,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/radsuit.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/radsuit.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/radsuit.rsi
 
@@ -188,8 +174,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/skubbody.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/skubbody.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/skubbody.rsi
 
@@ -202,8 +187,7 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/syndicate.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/syndicate.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/syndicate.rsi
 
@@ -215,7 +199,6 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/void.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/void.rsi
+
   - type: Clothing
     sprite: Clothing/OuterClothing/void.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/clown.yml b/Resources/Prototypes/Entities/Clothing/Shoes/clown.yml
index 055f779684..4d094a5bc9 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/clown.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/clown.yml
@@ -6,8 +6,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Shoes/clown.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/clown.rsi
+
   - type: Clothing
     sprite: Clothing/Shoes/clown.rsi
   - type: LoopingSound
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/shoes.yml b/Resources/Prototypes/Entities/Clothing/Shoes/shoes.yml
index 4b27dcff72..2fa0504a38 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/shoes.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/shoes.yml
@@ -8,8 +8,6 @@
     - shoes
   - type: Sprite
     state: icon
-  - type: Icon
-    state: icon
 
 - type: entity
   parent: ShoesBase
@@ -19,8 +17,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Shoes/black.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/black.rsi
+
   - type: Clothing
     sprite: Clothing/Shoes/black.rsi
 
@@ -32,8 +29,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Shoes/blue.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/blue.rsi
+
   - type: Clothing
     sprite: Clothing/Shoes/blue.rsi
 
@@ -45,8 +41,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Shoes/boots.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/boots.rsi
+
   - type: Clothing
     sprite: Clothing/Shoes/boots.rsi
 
@@ -58,8 +53,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Shoes/brown.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/brown.rsi
+
   - type: Clothing
     sprite: Clothing/Shoes/brown.rsi
 
@@ -71,8 +65,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Shoes/chef.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/chef.rsi
+
   - type: Clothing
     sprite: Clothing/Shoes/chef.rsi
 
@@ -84,8 +77,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Shoes/cowboy.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/cowboy.rsi
+
   - type: Clothing
     sprite: Clothing/Shoes/cowboy.rsi
 
@@ -97,8 +89,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Shoes/cult.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/cult.rsi
+
   - type: Clothing
     sprite: Clothing/Shoes/cult.rsi
 
@@ -110,8 +101,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Shoes/detective.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/detective.rsi
+
   - type: Clothing
     sprite: Clothing/Shoes/detective.rsi
 
@@ -123,8 +113,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Shoes/flippers.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/flippers.rsi
+
   - type: Clothing
     sprite: Clothing/Shoes/flippers.rsi
 
@@ -136,8 +125,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Shoes/galoshes.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/galoshes.rsi
+
   - type: Clothing
     sprite: Clothing/Shoes/galoshes.rsi
   - type: NoSlip
@@ -150,8 +138,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Shoes/green.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/green.rsi
+
   - type: Clothing
     sprite: Clothing/Shoes/green.rsi
 
@@ -163,8 +150,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Shoes/leather.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/leather.rsi
+
   - type: Clothing
     sprite: Clothing/Shoes/leather.rsi
 
@@ -175,9 +161,8 @@
   description: Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle.
   components:
   - type: Sprite
-    sprite: Clothing/Shoes/magboots.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/magboots.rsi
+    sprite: Clothing/Shoes/magboots0.rsi
+
   - type: Clothing
     sprite: Clothing/Shoes/magboots.rsi
 
@@ -189,8 +174,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Shoes/mime.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/mime.rsi
+
   - type: Clothing
     sprite: Clothing/Shoes/mime.rsi
 
@@ -202,8 +186,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Shoes/orange.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/orange.rsi
+
   - type: Clothing
     sprite: Clothing/Shoes/orange.rsi
 
@@ -215,8 +198,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Shoes/purple.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/purple.rsi
+
   - type: Clothing
     sprite: Clothing/Shoes/purple.rsi
 
@@ -227,9 +209,8 @@
   description: A pair of rainbow shoes.
   components:
   - type: Sprite
-    sprite: Clothing/Shoes/rainbow.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/rainbow.rsi
+    sprite: Clothing/Shoes/rain_bow.rsi
+
   - type: Clothing
     sprite: Clothing/Shoes/rainbow.rsi
 
@@ -241,8 +222,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Shoes/red.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/red.rsi
+
   - type: Clothing
     sprite: Clothing/Shoes/red.rsi
 
@@ -254,8 +234,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Shoes/slippers.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/slippers.rsi
+
   - type: Clothing
     sprite: Clothing/Shoes/slippers.rsi
 
@@ -267,8 +246,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Shoes/springjacks.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/springjacks.rsi
+
   - type: Clothing
     sprite: Clothing/Shoes/springjacks.rsi
 
@@ -280,8 +258,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Shoes/swat.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/swat.rsi
+
   - type: Clothing
     sprite: Clothing/Shoes/swat.rsi
 
@@ -293,8 +270,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Shoes/s_ninja.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/s_ninja.rsi
+
   - type: Clothing
     sprite: Clothing/Shoes/s_ninja.rsi
 
@@ -306,8 +282,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Shoes/tourist.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/tourist.rsi
+
   - type: Clothing
     sprite: Clothing/Shoes/tourist.rsi
 
@@ -319,8 +294,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Shoes/white.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/white.rsi
+
   - type: Clothing
     sprite: Clothing/Shoes/white.rsi
 
@@ -332,8 +306,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Shoes/wizard.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/wizard.rsi
+
   - type: Clothing
     sprite: Clothing/Shoes/wizard.rsi
 
@@ -345,8 +318,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Shoes/workboots.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/workboots.rsi
+
   - type: Clothing
     sprite: Clothing/Shoes/workboots.rsi
 
@@ -358,8 +330,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Shoes/yellow.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/yellow.rsi
+
   - type: Clothing
     sprite: Clothing/Shoes/yellow.rsi
 
@@ -371,8 +342,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Shoes/beesocks.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/beesocks.rsi
+
   - type: Clothing
     sprite: Clothing/Shoes/beesocks.rsi
 
@@ -384,8 +354,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Shoes/codersocks.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/codersocks.rsi
+
   - type: Clothing
     sprite: Clothing/Shoes/codersocks.rsi
 
@@ -397,7 +366,5 @@
   components:
   - type: Sprite
     sprite: Clothing/Shoes/jackboots.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/jackboots.rsi
   - type: Clothing
     sprite: Clothing/Shoes/jackboots.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/color.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/color.yml
index a2c8246709..66492af484 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/color.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/color.yml
@@ -7,8 +7,7 @@
   - type: Sprite
     sprite: Clothing/Uniforms/color.rsi
 
-  - type: Icon
-    sprite: Clothing/Uniforms/color.rsi
+
 
   - type: Clothing
     sprite: Clothing/Uniforms/color.rsi
@@ -22,8 +21,7 @@
   components:
   - type: Sprite
     state: grey
-  - type: Icon
-    state: grey
+
   - type: Clothing
     HeldPrefix: grey
 
@@ -35,8 +33,7 @@
   components:
   - type: Sprite
     state: grey_skirt
-  - type: Icon
-    state: grey_skirt
+
   - type: Clothing
     ClothingPrefix: grey_skirt
     femaleMask: UniformTop
@@ -51,8 +48,7 @@
   components:
   - type: Sprite
     state: black
-  - type: Icon
-    state: black
+
   - type: Clothing
     HeldPrefix: black
 
@@ -64,8 +60,7 @@
   components:
   - type: Sprite
     state: black_skirt
-  - type: Icon
-    state: black_skirt
+
   - type: Clothing
     ClothingPrefix: black_skirt
     femaleMask: UniformTop
@@ -80,8 +75,7 @@
   components:
   - type: Sprite
     state: blue
-  - type: Icon
-    state: blue
+
   - type: Clothing
     HeldPrefix: blue
 
@@ -93,8 +87,7 @@
   components:
   - type: Sprite
     state: blue_skirt
-  - type: Icon
-    state: blue_skirt
+
   - type: Clothing
     ClothingPrefix: blue_skirt
     femaleMask: UniformTop
@@ -109,8 +102,7 @@
   components:
   - type: Sprite
     state: green
-  - type: Icon
-    state: green
+
   - type: Clothing
     HeldPrefix: green
 
@@ -122,8 +114,7 @@
   components:
   - type: Sprite
     state: green_skirt
-  - type: Icon
-    state: green_skirt
+
   - type: Clothing
     ClothingPrefix: green_skirt
     femaleMask: UniformTop
@@ -138,8 +129,7 @@
   components:
   - type: Sprite
     state: orange
-  - type: Icon
-    state: orange
+
   - type: Clothing
     HeldPrefix: orange
 
@@ -151,8 +141,7 @@
   components:
   - type: Sprite
     state: orange_skirt
-  - type: Icon
-    state: orange_skirt
+
   - type: Clothing
     ClothingPrefix: orange_skirt
     femaleMask: UniformTop
@@ -167,8 +156,7 @@
   components:
   - type: Sprite
     state: pink
-  - type: Icon
-    state: pink
+
   - type: Clothing
     ClothingPrefix: pink
     HeldPrefix: pink
@@ -181,8 +169,7 @@
   components:
   - type: Sprite
     state: pink_skirt
-  - type: Icon
-    state: pink_skirt
+
   - type: Clothing
     ClothingPrefix: pink_skirt
     femaleMask: UniformTop
@@ -195,8 +182,7 @@
   components:
   - type: Sprite
     state: s
-  - type: Icon
-    state: s
+
   - type: Clothing
     HeldPrefix: s
 
@@ -209,8 +195,7 @@
   components:
   - type: Sprite
     state: red
-  - type: Icon
-    state: red
+
   - type: Clothing
     HeldPrefix: red
 
@@ -222,8 +207,7 @@
   components:
   - type: Sprite
     state: red_skirt
-  - type: Icon
-    state: red_skirt
+
   - type: Clothing
     ClothingPrefix: red_skirt
     femaleMask: UniformTop
@@ -238,8 +222,7 @@
   components:
   - type: Sprite
     state: white
-  - type: Icon
-    state: white
+
   - type: Clothing
     HeldPrefix: white
 
@@ -251,8 +234,7 @@
   components:
   - type: Sprite
     state: white_skirt
-  - type: Icon
-    state: white_skirt
+
   - type: Clothing
     ClothingPrefix: white_skirt
     femaleMask: UniformTop
@@ -267,8 +249,7 @@
   components:
   - type: Sprite
     state: yellow
-  - type: Icon
-    state: yellow
+
   - type: Clothing
     HeldPrefix: yellow
 
@@ -280,8 +261,7 @@
   components:
   - type: Sprite
     state: yellow_skirt
-  - type: Icon
-    state: yellow_skirt
+
   - type: Clothing
     ClothingPrefix: yellow_skirt
     femaleMask: UniformTop
@@ -296,8 +276,7 @@
   components:
   - type: Sprite
     state: darkblue
-  - type: Icon
-    state: darkblue
+
   - type: Clothing
     ClothingPrefix: darkblue
     HeldPrefix: darkblue
@@ -310,8 +289,7 @@
   components:
   - type: Sprite
     state: darkblue_skirt
-  - type: Icon
-    state: darkblue_skirt
+
   - type: Clothing
     ClothingPrefix: darkblue_skirt
     femaleMask: UniformTop
@@ -326,8 +304,7 @@
   components:
   - type: Sprite
     state: teal
-  - type: Icon
-    state: teal
+
   - type: Clothing
     ClothingPrefix: teal
     HeldPrefix: teal
@@ -340,8 +317,7 @@
   components:
   - type: Sprite
     state: teal_skirt
-  - type: Icon
-    state: teal_skirt
+
   - type: Clothing
     ClothingPrefix: teal_skirt
     femaleMask: UniformTop
@@ -356,8 +332,7 @@
   components:
   - type: Sprite
     state: lightpurple
-  - type: Icon
-    state: lightpurple
+
   - type: Clothing
     ClothingPrefix: lightpurple
     HeldPrefix: lightpurple
@@ -370,8 +345,7 @@
   components:
   - type: Sprite
     state: lightpurple_skirt
-  - type: Icon
-    state: lightpurple_skirt
+
   - type: Clothing
     ClothingPrefix: lightpurple_skirt
     femaleMask: UniformTop
@@ -386,8 +360,7 @@
   components:
   - type: Sprite
     state: darkgreen
-  - type: Icon
-    state: darkgreen
+
   - type: Clothing
     ClothingPrefix: darkgreen
     HeldPrefix: green
@@ -400,8 +373,7 @@
   components:
   - type: Sprite
     state: darkgreen_skirt
-  - type: Icon
-    state: darkgreen_skirt
+
   - type: Clothing
     ClothingPrefix: darkgreen_skirt
     femaleMask: UniformTop
@@ -416,8 +388,7 @@
   components:
   - type: Sprite
     state: lightbrown
-  - type: Icon
-    state: lightbrown
+
   - type: Clothing
     HeldPrefix: lightbrown
 
@@ -429,8 +400,7 @@
   components:
   - type: Sprite
     state: lightbrown_skirt
-  - type: Icon
-    state: lightbrown_skirt
+
   - type: Clothing
     ClothingPrefix: lightbrown_skirt
     femaleMask: UniformTop
@@ -445,8 +415,7 @@
   components:
   - type: Sprite
     state: brown
-  - type: Icon
-    state: brown
+
   - type: Clothing
     ClothingPrefix: brown
     HeldPrefix: lightbrown
@@ -459,8 +428,7 @@
   components:
   - type: Sprite
     state: brown_skirt
-  - type: Icon
-    state: brown_skirt
+
   - type: Clothing
     ClothingPrefix: brown_skirt
     femaleMask: UniformTop
@@ -474,8 +442,7 @@
   components:
   - type: Sprite
     state: maroon
-  - type: Icon
-    state: maroon
+
   - type: Clothing
     ClothingPrefix: maroon
     HeldPrefix: maroon
@@ -488,8 +455,7 @@
   components:
   - type: Sprite
     state: maroon_skirt
-  - type: Icon
-    state: maroon_skirt
+
   - type: Clothing
     ClothingPrefix: maroon_skirt
     femaleMask: UniformTop
@@ -504,8 +470,7 @@
   components:
   - type: Sprite
     state: rainbow
-  - type: Icon
-    state: rainbow
+
   - type: Clothing
     HeldPrefix: rainbow
 
@@ -517,8 +482,7 @@
   components:
   - type: Sprite
     state: rainbow_skirt
-  - type: Icon
-    state: rainbow_skirt
+
   - type: Clothing
     ClothingPrefix: rainbow_skirt
     femaleMask: UniformTop
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/uniforms.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/uniforms.yml
index 689a854638..48ad507f70 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/uniforms.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/uniforms.yml
@@ -15,9 +15,7 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_janitor.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Uniforms/uniform_janitor.rsi
-    state: icon
+
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_janitor.rsi
 
@@ -29,8 +27,7 @@
   components:
   - type: Sprite
     state: jan_skirt
-  - type: Icon
-    state: jan_skirt
+
   - type: Clothing
     ClothingPrefix: jan_skirt
     femaleMask: UniformTop
@@ -44,9 +41,7 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_engineering.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Uniforms/uniform_engineering.rsi
-    state: icon
+
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_engineering.rsi
 
@@ -58,8 +53,7 @@
   components:
   - type: Sprite
     state: engine_skirt
-  - type: Icon
-    state: engine_skirt
+
   - type: Clothing
     ClothingPrefix: engine_skirt
     femaleMask: UniformTop
@@ -73,9 +67,7 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_assistant.rsi
     state: assistant
-  - type: Icon
-    sprite: Clothing/Uniforms/uniform_assistant.rsi
-    state: assistant
+
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_assistant.rsi
 
@@ -88,9 +80,7 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_medical.rsi
     state: chemistry
-  - type: Icon
-    sprite: Clothing/Uniforms/uniform_medical.rsi
-    state: chemistry
+
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_medical.rsi
     ClothingPrefix: chemistry
@@ -103,8 +93,7 @@
   components:
   - type: Sprite
     state: chemistry_skirt
-  - type: Icon
-    state: chemistry_skirt
+
   - type: Clothing
     ClothingPrefix: chemistry_skirt
     femaleMask: UniformTop
@@ -118,9 +107,7 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_medical.rsi
     state: paramedic
-  - type: Icon
-    sprite: Clothing/Uniforms/uniform_medical.rsi
-    state: paramedic
+
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_medical.rsi
     ClothingPrefix: paramedic
@@ -133,8 +120,7 @@
   components:
   - type: Sprite
     state: paramedic_skirt
-  - type: Icon
-    state: paramedic_skirt
+
   - type: Clothing
     ClothingPrefix: paramedic_skirt
     femaleMask: UniformTop
@@ -148,9 +134,7 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_medical.rsi
     state: scrubspurple
-  - type: Icon
-    sprite: Clothing/Uniforms/uniform_medical.rsi
-    state: scrubspurple
+
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_medical.rsi
     ClothingPrefix: scrubspurple
@@ -164,9 +148,7 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_medical.rsi
     state: scrubsgreen
-  - type: Icon
-    sprite: Clothing/Uniforms/uniform_medical.rsi
-    state: scrubsgreen
+
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_medical.rsi
     ClothingPrefix: scrubsgreen
@@ -180,9 +162,7 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_medical.rsi
     state: scrubsblue
-  - type: Icon
-    sprite: Clothing/Uniforms/uniform_medical.rsi
-    state: scrubsblue
+
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_medical.rsi
     ClothingPrefix: scrubsblue
@@ -196,9 +176,7 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_clown.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Uniforms/uniform_clown.rsi
-    state: icon
+
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_clown.rsi
     femaleMask: UniformTop
@@ -212,9 +190,7 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_sec.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Uniforms/uniform_sec.rsi
-    state: icon
+
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_sec.rsi
 
@@ -226,8 +202,7 @@
   components:
   - type: Sprite
     state: sec_skirt
-  - type: Icon
-    state: sec_skirt
+
   - type: Clothing
     ClothingPrefix: sec_skirt
     femaleMask: UniformTop
@@ -240,8 +215,7 @@
   components:
     - type: Sprite
       state: blueshift
-    - type: Icon
-      state: blueshift
+
     - type: Clothing
       ClothingPrefix: blueshift
 
@@ -253,8 +227,7 @@
   components:
     - type: Sprite
       state: constable
-    - type: Icon
-      state: constable
+
     - type: Clothing
       ClothingPrefix: constable
 
@@ -266,8 +239,7 @@
   components:
     - type: Sprite
       state: officerblueclothes
-    - type: Icon
-      state: officerblueclothes
+
     - type: Clothing
       ClothingPrefix: officerblueclothes
 
@@ -279,8 +251,7 @@
   components:
     - type: Sprite
       state: officertanclothes
-    - type: Icon
-      state: officertanclothes
+
     - type: Clothing
       ClothingPrefix: officertanclothes
 
@@ -292,8 +263,7 @@
   components:
     - type: Sprite
       state: security_grey
-    - type: Icon
-      state: security_grey
+
     - type: Clothing
       ClothingPrefix: security_grey
       HeldPrefix: gy_suit
@@ -306,8 +276,7 @@
   components:
     - type: Sprite
       state: spacepol
-    - type: Icon
-      state: spacepol
+
     - type: Clothing
       ClothingPrefix: spacepol
 
@@ -319,8 +288,7 @@
   components:
     - type: Sprite
       state: spacepolice_families
-    - type: Icon
-      state: spacepolice_families
+
     - type: Clothing
       ClothingPrefix: spacepolice_families
 
@@ -333,9 +301,7 @@
     - type: Sprite
       sprite: Clothing/Uniforms/uniform_detective.rsi
       state: detective
-    - type: Icon
-      sprite: Clothing/Uniforms/uniform_detective.rsi
-      state: detective
+
     - type: Clothing
       sprite: Clothing/Uniforms/uniform_detective.rsi
       ClothingPrefix: detective
@@ -349,8 +315,7 @@
   components:
     - type: Sprite
       state: detective_skirt
-    - type: Icon
-      state: detective_skirt
+
     - type: Clothing
       ClothingPrefix: detective_skirt
       femaleMask: UniformTop
@@ -363,8 +328,7 @@
   components:
     - type: Sprite
       state: greydetective
-    - type: Icon
-      state: greydetective
+
     - type: Clothing
       ClothingPrefix: greydetective
 
@@ -376,8 +340,7 @@
   components:
     - type: Sprite
       state: greydetective_skirt
-    - type: Icon
-      state: greydetective_skirt
+
     - type: Clothing
       ClothingPrefix: greydetective_skirt
       femaleMask: UniformTop
@@ -391,9 +354,7 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_cargotech.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Uniforms/uniform_cargotech.rsi
-    state: icon
+
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_cargotech.rsi
 
@@ -405,8 +366,7 @@
   components:
   - type: Sprite
     state: cargo_skirt
-  - type: Icon
-    state: cargo_skirt
+
   - type: Clothing
     ClothingPrefix: cargo_skirt
     femaleMask: UniformTop
@@ -420,9 +380,7 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_cargotech.rsi
     state: qm
-  - type: Icon
-    sprite: Clothing/Uniforms/uniform_cargotech.rsi
-    state: qm
+
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_cargotech.rsi
 
@@ -434,8 +392,7 @@
   components:
   - type: Sprite
     state: qm_skirt
-  - type: Icon
-    state: qm_skirt
+
   - type: Clothing
     ClothingPrefix: qm_skirt
     femaleMask: UniformTop
@@ -449,9 +406,7 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_chef.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Uniforms/uniform_chef.rsi
-    state: icon
+
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_chef.rsi
 
@@ -463,8 +418,7 @@
   components:
   - type: Sprite
     state: chef_skirt
-  - type: Icon
-    state: chef_skirt
+
   - type: Clothing
     ClothingPrefix: chef_skirt
     femaleMask: UniformTop
@@ -478,9 +432,7 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_captain.rsi
     state: captain
-  - type: Icon
-    sprite: Clothing/Uniforms/uniform_captain.rsi
-    state: captain
+
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_captain.rsi
 
@@ -493,9 +445,7 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_ce.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Uniforms/uniform_ce.rsi
-    state: icon
+
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_ce.rsi
 
@@ -507,8 +457,7 @@
   components:
   - type: Sprite
     state: chief_skirt
-  - type: Icon
-    state: chief_skirt
+
   - type: Clothing
     ClothingPrefix: chief_skirt
     femaleMask: UniformTop
@@ -522,9 +471,7 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_cmo.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Uniforms/uniform_cmo.rsi
-    state: icon
+
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_cmo.rsi
 
@@ -536,8 +483,7 @@
   components:
   - type: Sprite
     state: cmo_skirt
-  - type: Icon
-    state: cmo_skirt
+
   - type: Clothing
     ClothingPrefix: cmo_skirt
     femaleMask: UniformTop
@@ -551,9 +497,7 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_medical.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Uniforms/uniform_medical.rsi
-    state: icon
+
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_medical.rsi
 
@@ -565,8 +509,7 @@
   components:
   - type: Sprite
     state: medical_skirt
-  - type: Icon
-    state: medical_skirt
+
   - type: Clothing
     ClothingPrefix: medical_skirt
     femaleMask: UniformTop
@@ -580,9 +523,7 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_scientist.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Uniforms/uniform_scientist.rsi
-    state: icon
+
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_scientist.rsi
 
@@ -594,8 +535,7 @@
   components:
   - type: Sprite
     state: sci_skirt
-  - type: Icon
-    state: sci_skirt
+
   - type: Clothing
     ClothingPrefix: sci_skirt
     femaleMask: UniformTop
@@ -609,9 +549,7 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_rnd.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Uniforms/uniform_rnd.rsi
-    state: icon
+
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_rnd.rsi
 
@@ -623,8 +561,7 @@
   components:
   - type: Sprite
     state: rnd_skirt
-  - type: Icon
-    state: rnd_skirt
+
   - type: Clothing
     ClothingPrefix: rnd_skirt
     femaleMask: UniformTop
@@ -638,9 +575,7 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_mime.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Uniforms/uniform_mime.rsi
-    state: icon
+
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_mime.rsi
 
@@ -652,8 +587,7 @@
   components:
   - type: Sprite
     state: mime_skirt
-  - type: Icon
-    state: mime_skirt
+
   - type: Clothing
     ClothingPrefix: mime_skirt
     femaleMask: UniformTop
@@ -667,9 +601,7 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_hos.rsi
     state: hosalt
-  - type: Icon
-    sprite: Clothing/Uniforms/uniform_hos.rsi
-    state: hosalt
+
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_hos.rsi
     HeldPrefix: hosalt
@@ -682,8 +614,7 @@
   components:
   - type: Sprite
     state: hosalt_skirt
-  - type: Icon
-    state: hosalt_skirt
+
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_hos.rsi
     ClothingPrefix: hosalt_skirt
@@ -699,9 +630,7 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_hos.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Uniforms/uniform_hos.rsi
-    state: icon
+
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_hos.rsi
 
@@ -713,8 +642,7 @@
   components:
   - type: Sprite
     state: hos_skirt
-  - type: Icon
-    state: hos_skirt
+
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_hos.rsi
     ClothingPrefix: hos_skirt
@@ -728,8 +656,7 @@
   components:
     - type: Sprite
       state: hos_grey
-    - type: Icon
-      state: hos_grey
+
     - type: Clothing
       ClothingPrefix: hos_grey
       HeldPrefix: gy_suit
@@ -742,8 +669,7 @@
   components:
     - type: Sprite
       state: hos_parade_male
-    - type: Icon
-      state: hos_parade_male
+
     - type: Clothing
       ClothingPrefix: hos_parade_male
 
@@ -755,8 +681,7 @@
   components:
     - type: Sprite
       state: hos_parade_fem
-    - type: Icon
-      state: hos_parade_fem
+
     - type: Clothing
       ClothingPrefix: hos_parade_fem
       femaleMask: UniformTop
@@ -769,8 +694,7 @@
   components:
     - type: Sprite
       state: hosblueclothes
-    - type: Icon
-      state: hosblueclothes
+
     - type: Clothing
       ClothingPrefix: hosblueclothes
 
@@ -782,8 +706,7 @@
   components:
     - type: Sprite
       state: hostanclothes
-    - type: Icon
-      state: hostanclothes
+
     - type: Clothing
       ClothingPrefix: hostanclothes
 
@@ -796,9 +719,7 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_warden.rsi
     state: rwarden
-  - type: Icon
-    sprite: Clothing/Uniforms/uniform_warden.rsi
-    state: rwarden
+
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_warden.rsi
     ClothingPrefix: rwarden
@@ -812,8 +733,7 @@
   components:
     - type: Sprite
       state: rwarden_skirt
-    - type: Icon
-      state: rwarden
+
     - type: Clothing
       femaleMask: UniformTop
       ClothingPrefix: rwarden_skirt
@@ -826,8 +746,7 @@
   components:
     - type: Sprite
       state: warden
-    - type: Icon
-      state: warden
+
     - type: Clothing
       ClothingPrefix: warden
       HeldPrefix: gy_suit
@@ -840,8 +759,7 @@
   components:
     - type: Sprite
       state: wardenblueclothes
-    - type: Icon
-      state: wardenblueclothes
+
     - type: Clothing
       ClothingPrefix: wardenblueclothes
 
@@ -853,8 +771,7 @@
   components:
     - type: Sprite
       state: wardentanclothes
-    - type: Icon
-      state: wardentanclothes
+
     - type: Clothing
       ClothingPrefix: wardentanclothes
 
@@ -867,9 +784,7 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_prisoner.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Uniforms/uniform_prisoner.rsi
-    state: icon
+
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_prisoner.rsi
 
@@ -881,8 +796,7 @@
   components:
   - type: Sprite
     state: prisoner_skirt
-  - type: Icon
-    state: prisoner_skirt
+
   - type: Clothing
     ClothingPrefix: prisoner_skirt
     femaleMask: UniformTop
@@ -896,9 +810,7 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_hop.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Uniforms/uniform_hop.rsi
-    state: icon
+
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_hop.rsi
 
@@ -910,8 +822,7 @@
   components:
   - type: Sprite
     state: hop_skirt
-  - type: Icon
-    state: hop_skirt
+
   - type: Clothing
     ClothingPrefix: hop_skirt
     femaleMask: UniformTop
@@ -925,9 +836,7 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_hydro.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Uniforms/uniform_hydro.rsi
-    state: icon
+
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_hydro.rsi
 
@@ -939,8 +848,7 @@
   components:
   - type: Sprite
     state: hydro_skirt
-  - type: Icon
-    state: hydro_skirt
+
   - type: Clothing
     ClothingPrefix: hydro_skirt
     femaleMask: UniformTop
@@ -954,9 +862,7 @@
   - type: Sprite
     sprite: Clothing/Uniforms/bartender.rsi
     state: icon
-  - type: Icon
-    sprite: Clothing/Uniforms/bartender.rsi
-    state: icon
+
   - type: Clothing
     sprite: Clothing/Uniforms/bartender.rsi
 
@@ -968,8 +874,7 @@
   components:
   - type: Sprite
     state: skirt
-  - type: Icon
-    state: skirt
+
   - type: Clothing
     ClothingPrefix: skirt
     femaleMask: UniformTop
@@ -982,7 +887,6 @@
   components:
   - type: Sprite
     state: purple
-  - type: Icon
-    state: purple
+
   - type: Clothing
     ClothingPrefix: purple
diff --git a/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml b/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml
index fd0df24642..6ea909588f 100644
--- a/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml
+++ b/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml
@@ -10,6 +10,7 @@
     netsync: false
     drawdepth: Mobs # They're on the same layer as mobs, perspective.
     sprite: Constructible/Structures/Doors/airlock_basic.rsi
+    preview_state: closed
     layers:
     - state: closed
       map: ["enum.DoorVisualLayers.Base"]
@@ -23,9 +24,7 @@
       map: ["enum.DoorVisualLayers.BaseBolted"]
     - state: panel_open
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
-  - type: Icon
-    sprite: Constructible/Structures/Doors/airlock_basic.rsi
-    state: closed
+
   - type: Collidable
     shapes:
     - !type:PhysShapeAabb
@@ -76,8 +75,7 @@
     enabled: false
   - type: Sprite
     sprite: Constructible/Structures/Doors/airlock_glass.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Doors/airlock_glass.rsi
+
 
 - type: entity
   parent: Airlock
@@ -86,5 +84,4 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Doors/airlock_maint.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Doors/airlock_maint.rsi
+
diff --git a/Resources/Prototypes/Entities/Constructible/Doors/airlock_types.yml b/Resources/Prototypes/Entities/Constructible/Doors/airlock_types.yml
index 77af217d4a..4130fe5fd5 100644
--- a/Resources/Prototypes/Entities/Constructible/Doors/airlock_types.yml
+++ b/Resources/Prototypes/Entities/Constructible/Doors/airlock_types.yml
@@ -6,8 +6,7 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Doors/airlock_external.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Doors/airlock_external.rsi
+
   - type: Appearance
     visuals:
     - type: AirlockVisualizer
@@ -23,8 +22,7 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Doors/airlock_freezer.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Doors/airlock_freezer.rsi
+
 
 - type: entity
   parent: Airlock
@@ -33,8 +31,7 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Doors/airlock_engineering.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Doors/airlock_engineering.rsi
+
 
 - type: entity
   parent: Airlock
@@ -43,8 +40,7 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Doors/airlock_cargo.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Doors/airlock_cargo.rsi
+
 
 - type: entity
   parent: Airlock
@@ -53,8 +49,7 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Doors/airlock_medical.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Doors/airlock_medical.rsi
+
 
 - type: entity
   parent: Airlock
@@ -63,8 +58,7 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Doors/airlock_science.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Doors/airlock_science.rsi
+
 
 - type: entity
   parent: Airlock
@@ -73,8 +67,7 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Doors/airlock_command.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Doors/airlock_command.rsi
+
 
 - type: entity
   parent: Airlock
@@ -83,8 +76,7 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Doors/airlock_security.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Doors/airlock_security.rsi
+
 
 # Glass Airlocks
 - type: entity
@@ -94,8 +86,7 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Doors/airlock_engineering_glass.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Doors/airlock_engineering_glass.rsi
+
 
 - type: entity
   parent: AirlockGlass
@@ -104,8 +95,7 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Doors/airlock_cargo_glass.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Doors/airlock_cargo_glass.rsi
+
 
 - type: entity
   parent: AirlockGlass
@@ -114,8 +104,7 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Doors/airlock_medical_glass.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Doors/airlock_medical_glass.rsi
+
 
 - type: entity
   parent: AirlockGlass
@@ -124,8 +113,7 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Doors/airlock_science_glass.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Doors/airlock_science_glass.rsi
+
 
 - type: entity
   parent: AirlockGlass
@@ -134,8 +122,7 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Doors/airlock_command_glass.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Doors/airlock_command_glass.rsi
+
 
 - type: entity
   parent: AirlockGlass
@@ -144,8 +131,7 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Doors/airlock_security_glass.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Doors/airlock_security_glass.rsi
+
 
 # Maintenance Hatchs
 - type: entity
@@ -155,8 +141,7 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Doors/airlock_maint_cargo.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Doors/airlock_maint_cargo.rsi
+
 
 - type: entity
   parent: AirlockMaint
@@ -165,8 +150,7 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Doors/airlock_maint_command.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Doors/airlock_maint_command.rsi
+
 
 - type: entity
   parent: AirlockMaint
@@ -175,8 +159,7 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Doors/airlock_maint_common.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Doors/airlock_maint_common.rsi
+
 
 - type: entity
   parent: AirlockMaint
@@ -185,8 +168,7 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Doors/airlock_maint_engi.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Doors/airlock_maint_engi.rsi
+
 
 - type: entity
   parent: AirlockMaint
@@ -195,8 +177,7 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Doors/airlock_maint_int.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Doors/airlock_maint_int.rsi
+
 
 - type: entity
   parent: AirlockMaint
@@ -205,8 +186,7 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Doors/airlock_maint_med.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Doors/airlock_maint_med.rsi
+
 
 - type: entity
   parent: AirlockMaint
@@ -215,8 +195,7 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Doors/airlock_maint_rnd.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Doors/airlock_maint_rnd.rsi
+
 
 - type: entity
   parent: AirlockMaint
@@ -225,5 +204,4 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Doors/airlock_maint_sec.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Doors/airlock_maint_sec.rsi
+
diff --git a/Resources/Prototypes/Entities/Constructible/Doors/firelock.yml b/Resources/Prototypes/Entities/Constructible/Doors/firelock.yml
index e7bf98f41c..b458d5385f 100644
--- a/Resources/Prototypes/Entities/Constructible/Doors/firelock.yml
+++ b/Resources/Prototypes/Entities/Constructible/Doors/firelock.yml
@@ -22,9 +22,7 @@
           map: ["enum.DoorVisualLayers.BaseBolted"]
         - state: panel_open
           map: ["enum.WiresVisualLayers.MaintenancePanel"]
-    - type: Icon
-      sprite: Constructible/Structures/Doors/firelock.rsi
-      state: closed
+
     - type: Collidable
       shapes:
         - !type:PhysShapeAabb
@@ -72,8 +70,7 @@
       enabled: false
     - type: Sprite
       sprite: Constructible/Structures/Doors/firelock_glass.rsi
-    - type: Icon
-      sprite: Constructible/Structures/Doors/firelock_glass.rsi
+
 
 - type: entity
   id: FirelockEdge
@@ -88,8 +85,7 @@
       enabled: false
     - type: Sprite
       sprite: Constructible/Structures/Doors/edge_door_hazard.rsi
-    - type: Icon
-      sprite: Constructible/Structures/Doors/edge_door_hazard.rsi
+
     - type: Airtight
       fixVacuum: true
       airBlockedDirection:
diff --git a/Resources/Prototypes/Entities/Constructible/Ground/catwalk.yml b/Resources/Prototypes/Entities/Constructible/Ground/catwalk.yml
index 70f932672b..3a67fefe2e 100644
--- a/Resources/Prototypes/Entities/Constructible/Ground/catwalk.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/catwalk.yml
@@ -9,10 +9,9 @@
   - type: Sprite
     netsync: false
     sprite: Constructible/Tiles/catwalk.rsi
+    preview_state: catwalk_preview
     drawdepth: FloorTiles
-  - type: Icon
-    sprite: Constructible/Tiles/catwalk.rsi
-    state: catwalk_preview
+
   - type: SnapGrid
     offset: Center
   - type: IconSmooth
diff --git a/Resources/Prototypes/Entities/Constructible/Ground/furniture.yml b/Resources/Prototypes/Entities/Constructible/Ground/furniture.yml
index c22cd6a79b..9a0afd88ec 100644
--- a/Resources/Prototypes/Entities/Constructible/Ground/furniture.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/furniture.yml
@@ -10,9 +10,7 @@
     sprite: Constructible/Misc/furniture.rsi
     state: stool_base
     color: "#8e9799"
-  - type: Icon
-    sprite: Constructible/Misc/furniture.rsi
-    state: stool_base
+
   - type: Strap
     position: Stand
   - type: Anchorable
@@ -29,8 +27,7 @@
   - type: Sprite
     state: bar_stool
     color: "white"
-  - type: Icon
-    state: bar_stool
+
 
 - type: entity
   name: white office chair
@@ -44,9 +41,7 @@
   - type: Sprite
     sprite: Constructible/Misc/furniture.rsi
     state: officechair_white
-  - type: Icon
-    sprite: Constructible/Misc/furniture.rsi
-    state: officechair_white
+
   - type: Strap
     position: Stand
   - type: Anchorable
@@ -63,9 +58,7 @@
   - type: Sprite
     sprite: Constructible/Misc/furniture.rsi
     state: officechair_dark
-  - type: Icon
-    sprite: Constructible/Misc/furniture.rsi
-    state: officechair_dark
+
 
 
 - type: entity
@@ -80,9 +73,7 @@
     sprite: Constructible/Misc/furniture.rsi
     state: chair
     color: "#8e9799"
-  - type: Icon
-    sprite: Constructible/Misc/furniture.rsi
-    state: chair
+
   - type: Strap
     position: Stand
   - type: Anchorable
@@ -100,9 +91,7 @@
   - type: Sprite
     sprite: Constructible/Misc/furniture.rsi
     state: comfychair_preview
-  - type: Icon
-    sprite: Constructible/Misc/furniture.rsi
-    state: comfychair_preview
+
 
 
 
@@ -114,8 +103,7 @@
   - type: Sprite
     state: wooden_chair
     color: "white"
-  - type: Icon
-    state: wooden_chair
+
   - type: Anchorable
   - type: Pullable
 
@@ -130,9 +118,7 @@
   - type: Sprite
     sprite: Constructible/Misc/furniture.rsi
     state: bed
-  - type: Icon
-    sprite: Constructible/Misc/furniture.rsi
-    state: bed
+
   - type: Strap
     position: Down
     rotation: -90
diff --git a/Resources/Prototypes/Entities/Constructible/Ground/instruments.yml b/Resources/Prototypes/Entities/Constructible/Ground/instruments.yml
index bd2bfa43dd..0692442c73 100644
--- a/Resources/Prototypes/Entities/Constructible/Ground/instruments.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/instruments.yml
@@ -36,9 +36,7 @@
    - type: Sprite
      sprite: Objects/Fun/Instruments/otherinstruments.rsi
      state: piano
-   - type: Icon
-     sprite: Objects/Fun/Instruments/otherinstruments.rsi
-     state: piano
+
 
  - type: entity
    name: minimoog
@@ -51,9 +49,7 @@
    - type: Sprite
      sprite: Objects/Fun/Instruments/otherinstruments.rsi
      state: minimoog
-   - type: Icon
-     sprite: Objects/Fun/Instruments/otherinstruments.rsi
-     state: minimoog
+
 
  - type: entity
    name: church organ
@@ -66,9 +62,7 @@
    - type: Sprite
      sprite: Objects/Fun/Instruments/otherinstruments.rsi
      state: church_organ
-   - type: Icon
-     sprite: Objects/Fun/Instruments/otherinstruments.rsi
-     state: church_organ
+
 
  - type: entity
    name: xylophone
@@ -82,6 +76,4 @@
    - type: Sprite
      sprite: Objects/Fun/Instruments/otherinstruments.rsi
      state: xylophone
-   - type: Icon
-     sprite: Objects/Fun/Instruments/otherinstruments.rsi
-     state: xylophone
+
diff --git a/Resources/Prototypes/Entities/Constructible/Ground/pilot_chair.yml b/Resources/Prototypes/Entities/Constructible/Ground/pilot_chair.yml
index 81fd31f6c2..c13cd44019 100644
--- a/Resources/Prototypes/Entities/Constructible/Ground/pilot_chair.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/pilot_chair.yml
@@ -7,9 +7,7 @@
     sprite: Constructible/Misc/furniture.rsi
     state: chair
     color: "#8e9799"
-  - type: Icon
-    sprite: Constructible/Misc/furniture.rsi
-    state: chair
+
   - type: Collidable
   - type: Clickable
   - type: InteractionOutline
diff --git a/Resources/Prototypes/Entities/Constructible/Ground/pipes.yml b/Resources/Prototypes/Entities/Constructible/Ground/pipes.yml
index 69344c3555..f1dca3b8e1 100644
--- a/Resources/Prototypes/Entities/Constructible/Ground/pipes.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/pipes.yml
@@ -9,10 +9,10 @@
   - type: Collidable
   - type: SnapGrid
     offset: Center
+
   - type: Sprite
   - type: Destructible
     thresholdvalue: 100
-    resistances: metallicResistances
   - type: Appearance
     visuals:
     - type: PipeVisualizer
@@ -23,8 +23,7 @@
   id: FourwayPipe
   name: Fourway Pipe
   components:
-  - type: Icon
-    texture: Constructible/Atmos/pipe.rsi/pipeFourway2.png
+
   - type: NodeContainer
     nodes:
     - !type:PipeNode
@@ -36,8 +35,7 @@
   id: LongitudinalPipe
   name: Longitudinal Pipe
   components:
-  - type: Icon
-    texture: Constructible/Atmos/pipe.rsi/pipeLongitudinal2.png
+
   - type: NodeContainer
     nodes:
     - !type:PipeNode
diff --git a/Resources/Prototypes/Entities/Constructible/Ground/potted_plants.yml b/Resources/Prototypes/Entities/Constructible/Ground/potted_plants.yml
index 76b48fd3e3..e771768013 100644
--- a/Resources/Prototypes/Entities/Constructible/Ground/potted_plants.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/potted_plants.yml
@@ -7,8 +7,7 @@
   - type: Collidable
   - type: Sprite
     sprite: Constructible/Misc/potted_plants.rsi
-  - type: Icon
-    sprite: Constructible/Misc/potted_plants.rsi
+
   - type: PottedPlantHide
   - type: Pullable
 
@@ -21,8 +20,7 @@
   - type: Sprite
     state: random
 
-  - type: Icon
-    state: random
+
 
   - type: RandomPottedPlant
 
@@ -36,8 +34,7 @@
   - type: Sprite
     state: plant-26
 
-  - type: Icon
-    state: plant-26
+
 
   - type: RandomPottedPlant
     plastic: true
@@ -51,8 +48,7 @@
   - type: Sprite
     state: plant-25
 
-  - type: Icon
-    state: plant-25
+
 
 
 - type: entity
@@ -64,8 +60,7 @@
   - type: Sprite
     state: plant-09
 
-  - type: Icon
-    state: plant-09
+
 
   - type: PointLight
     radius: 2
diff --git a/Resources/Prototypes/Entities/Constructible/Ground/pumps.yml b/Resources/Prototypes/Entities/Constructible/Ground/pumps.yml
index 75b7d97d77..b88d93b9d8 100644
--- a/Resources/Prototypes/Entities/Constructible/Ground/pumps.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/pumps.yml
@@ -9,9 +9,7 @@
   - type: Collidable
   - type: SnapGrid
     offset: Center
-  - type: Icon
-    sprite: Constructible/Atmos/pressurepump.rsi
-    state: pumpEnabledWest2East2
+
   - type: Sprite
   - type: Appearance
     visuals:
diff --git a/Resources/Prototypes/Entities/Constructible/Ground/scrubbers.yml b/Resources/Prototypes/Entities/Constructible/Ground/scrubbers.yml
index 5982e61853..aea08ba83a 100644
--- a/Resources/Prototypes/Entities/Constructible/Ground/scrubbers.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/scrubbers.yml
@@ -9,9 +9,7 @@
   - type: Collidable
   - type: SnapGrid
     offset: Center
-  - type: Icon
-    sprite: Constructible/Atmos/pipeitems.rsi
-    state: scrubber
+
   - type: Sprite
     sprite: Constructible/Atmos/pipeitems.rsi
     state: scrubber
diff --git a/Resources/Prototypes/Entities/Constructible/Ground/table.yml b/Resources/Prototypes/Entities/Constructible/Ground/table.yml
index f763addfe6..139173b503 100644
--- a/Resources/Prototypes/Entities/Constructible/Ground/table.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/table.yml
@@ -9,9 +9,7 @@
   - type: Sprite
     netsync: false
     sprite: Constructible/Structures/Tables/generic.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Tables/generic.rsi
-    state: plain_preview
+
   - type: Collidable
     shapes:
     - !type:PhysShapeAabb
@@ -39,9 +37,7 @@
   - type: Sprite
     netsync: false
     sprite: Constructible/Structures/Tables/wood.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Tables/wood.rsi
-    state: icon
+    preview_state: icon
   - type: Collidable
     shapes:
     - !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Constructible/Ground/vents.yml b/Resources/Prototypes/Entities/Constructible/Ground/vents.yml
index ceb386d991..618dbc21b6 100644
--- a/Resources/Prototypes/Entities/Constructible/Ground/vents.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/vents.yml
@@ -9,9 +9,7 @@
   - type: Collidable
   - type: SnapGrid
     offset: Center
-  - type: Icon
-    sprite: Constructible/Atmos/pipeitems.rsi
-    state: vent
+
   - type: Sprite
     sprite: Constructible/Atmos/pipeitems.rsi
     state: vent
diff --git a/Resources/Prototypes/Entities/Constructible/Ground/wires.yml b/Resources/Prototypes/Entities/Constructible/Ground/wires.yml
index 8ac83f86d4..debdded41d 100644
--- a/Resources/Prototypes/Entities/Constructible/Ground/wires.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/wires.yml
@@ -10,8 +10,7 @@
   - type: Collidable
   - type: SnapGrid
     offset: Center
-  - type: Icon
-    texture: Constructible/Power/eightdirwire.png
+
   - type: Sprite
     drawdepth: BelowFloor
   - type: IconSmooth
diff --git a/Resources/Prototypes/Entities/Constructible/Power/AME/ame_controller.yml b/Resources/Prototypes/Entities/Constructible/Power/AME/ame_controller.yml
index 6fc8346eda..185f858a54 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/AME/ame_controller.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/AME/ame_controller.yml
@@ -5,9 +5,7 @@
     mode: SnapgridCenter
   components:
   - type: Clickable
-  - type: Icon
-    sprite: Constructible/Power/ame_controller.rsi
-    state: control
+
   - type: Sprite
     sprite: Constructible/Power/ame_controller.rsi
     state: control
diff --git a/Resources/Prototypes/Entities/Constructible/Power/AME/ame_structure.yml b/Resources/Prototypes/Entities/Constructible/Power/AME/ame_structure.yml
index cb44cf2c1e..99bce6560a 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/AME/ame_structure.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/AME/ame_structure.yml
@@ -10,8 +10,7 @@
     drawdepth: Walls
     sprite: Constructible/Power/ame_shielding.rsi
     state: shield_0
-  - type: Icon
-    texture: Constructible/Power/ame_shielding_base.png
+
   - type: Collidable
     shapes:
     - !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Constructible/Power/arcade.yml b/Resources/Prototypes/Entities/Constructible/Power/arcade.yml
index ac425213c2..533438391b 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/arcade.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/arcade.yml
@@ -3,8 +3,7 @@
   name: arcade
   parent: ComputerBase
   components:
-  - type: Icon
-    state: arcade
+
   - type: PowerReceiver
   - type: Sprite
     layers:
diff --git a/Resources/Prototypes/Entities/Constructible/Power/booze_dispenser.yml b/Resources/Prototypes/Entities/Constructible/Power/booze_dispenser.yml
index ec36a09fab..7baee4acff 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/booze_dispenser.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/booze_dispenser.yml
@@ -6,13 +6,12 @@
   components:
   - type: Sprite
     texture: Constructible/Power/dispensers.rsi/booze_dispenser.png
-  - type: Icon
-    texture: Constructible/Power/dispensers.rsi/booze_dispenser.png
+
   - type: ReagentDispenser
     pack: BoozeDispenserInventory
   - type: Anchorable
   - type: Pullable
-  
+
 - type: reagentDispenserInventory
   id: BoozeDispenserInventory
   inventory:
diff --git a/Resources/Prototypes/Entities/Constructible/Power/chem_dispenser.yml b/Resources/Prototypes/Entities/Constructible/Power/chem_dispenser.yml
index ecee11c9e4..ad9dccd8a4 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/chem_dispenser.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/chem_dispenser.yml
@@ -6,14 +6,13 @@
   components:
   - type: Sprite
     texture: Constructible/Power/industrial_dispenser.rsi/industrial_dispenser.png
-  - type: Icon
-    texture: Constructible/Power/industrial_dispenser.rsi/industrial_dispenser.png
+
   - type: ReagentDispenser
     pack: ChemDispenserStandardInventory
   - type: PowerReceiver
   - type: Anchorable
   - type: Pullable
-  
+
 - type: reagentDispenserInventory
   id: ChemDispenserStandardInventory
   inventory:
diff --git a/Resources/Prototypes/Entities/Constructible/Power/chem_master.yml b/Resources/Prototypes/Entities/Constructible/Power/chem_master.yml
index 21b654b516..3aa76a5f7b 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/chem_master.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/chem_master.yml
@@ -5,8 +5,7 @@
   components:
   - type: Sprite
     texture: Constructible/Power/mixer.rsi/mixer_loaded.png
-  - type: Icon
-    texture: Constructible/Power/mixer.rsi/mixer_loaded.png
+
   - type: ChemMaster
   - type: PowerReceiver
   - type: Clickable
diff --git a/Resources/Prototypes/Entities/Constructible/Power/cloning_machine.yml b/Resources/Prototypes/Entities/Constructible/Power/cloning_machine.yml
index 2b0fca52b8..23a7f6623d 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/cloning_machine.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/cloning_machine.yml
@@ -10,9 +10,7 @@
         - state: pod_0
           map: ["enum.CloningPodVisualLayers.Machine"]
     - type: PowerReceiver
-    - type: Icon
-      sprite: Objects/Specific/Medical/cloning.rsi
-      state: pod_0
+
     - type: Anchorable
     - type: Clickable
     - type: InteractionOutline
diff --git a/Resources/Prototypes/Entities/Constructible/Power/computers.yml b/Resources/Prototypes/Entities/Constructible/Power/computers.yml
index e63f0bc0db..de8e629ee4 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/computers.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/computers.yml
@@ -22,9 +22,7 @@
       - Impassable
       - MobImpassable
       - VaultImpassable
-  - type: Icon
-    sprite: Constructible/Power/computers.rsi
-    state: computer
+
   - type: Computer
   - type: PowerReceiver
   - type: Anchorable
diff --git a/Resources/Prototypes/Entities/Constructible/Power/debug_power.yml b/Resources/Prototypes/Entities/Constructible/Power/debug_power.yml
index edba665ee5..0741b94f67 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/debug_power.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/debug_power.yml
@@ -20,8 +20,7 @@
     offset: Center
   - type: Sprite
     texture: Constructible/Power/wiredmachine.png
-  - type: Icon
-    texture: Constructible/Power/wiredmachine.png
+
   - type: NodeContainer
     nodes:
     - !type:AdjacentNode
@@ -50,8 +49,7 @@
     offset: Center
   - type: Sprite
     texture: Constructible/Power/provider.png
-  - type: Icon
-    texture: Constructible/Power/provider.png
+
   - type: Battery
   - type: NodeContainer
     nodes:
@@ -78,8 +76,7 @@
     offset: Center
   - type: Sprite
     texture: Constructible/Power/provider.png
-  - type: Icon
-    texture: Constructible/Power/provider.png
+
   - type: Battery
   - type: NodeContainer
     nodes:
@@ -121,7 +118,6 @@
     offset: Center
   - type: Sprite
     texture: Constructible/Power/wirelessmachine.png
-  - type: Icon
-    texture: Constructible/Power/wirelessmachine.png
+
   - type: PowerReceiver
   - type: Anchorable
diff --git a/Resources/Prototypes/Entities/Constructible/Power/gravity_generator.yml b/Resources/Prototypes/Entities/Constructible/Power/gravity_generator.yml
index a8f7fa6a26..5b9ca5bf54 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/gravity_generator.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/gravity_generator.yml
@@ -10,9 +10,7 @@
       - sprite: Constructible/Power/gravity_generator_core.rsi
         state: activated
         shader: unshaded
-  - type: Icon
-    sprite: Constructible/Power/gravity_generator.rsi
-    state: on
+
   - type: SnapGrid
     offset: Center
   - type: PowerReceiver
diff --git a/Resources/Prototypes/Entities/Constructible/Power/lathe.yml b/Resources/Prototypes/Entities/Constructible/Power/lathe.yml
index 87acb38582..1d2323705b 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/lathe.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/lathe.yml
@@ -43,9 +43,7 @@
     - state: autolathe_unlit
       shader: unshaded
       map: ["enum.AutolatheVisualLayers.BaseUnlit"]
-  - type: Icon
-    sprite: Constructible/Power/autolathe.rsi
-    state: autolathe
+
   - type: Collidable
     shapes:
     - !type:PhysShapeAabb
@@ -93,9 +91,7 @@
       map: ["enum.ProtolatheVisualLayers.BaseUnlit"]
     - state: protolathe
       map: ["enum.ProtolatheVisualLayers.AnimationLayer"]
-  - type: Icon
-    sprite: Constructible/Power/protolathe.rsi
-    state: protolathe
+
   - type: Collidable
     shapes:
     - !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Constructible/Power/medical_scanner.yml b/Resources/Prototypes/Entities/Constructible/Power/medical_scanner.yml
index 07986f40df..2445b86910 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/medical_scanner.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/medical_scanner.yml
@@ -12,8 +12,7 @@
     - state: scanner_terminal_blue
       map: ["enum.MedicalScannerVisualLayers.Terminal"]
   - type: PowerReceiver
-  - type: Icon
-    texture: Constructible/Power/medical_scanner.rsi/scanner_icon.png
+
   - type: Anchorable
   - type: Clickable
   - type: InteractionOutline
diff --git a/Resources/Prototypes/Entities/Constructible/Power/microwave.yml b/Resources/Prototypes/Entities/Constructible/Power/microwave.yml
index 9dc60af17e..d378acd7f9 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/microwave.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/microwave.yml
@@ -42,6 +42,4 @@
       shader: unshaded
       map: ["enum.MicrowaveVisualizerLayers.BaseUnlit"]
   - type: PowerReceiver
-  - type: Icon
-    sprite: Constructible/Power/microwave.rsi
-    state: mw0
+
diff --git a/Resources/Prototypes/Entities/Constructible/Power/power_base.yml b/Resources/Prototypes/Entities/Constructible/Power/power_base.yml
index fb48f858ba..cca6d3da53 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/power_base.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/power_base.yml
@@ -16,8 +16,7 @@
     offset: Center
   - type: Sprite
     texture: Constructible/Power/generator.png
-  - type: Icon
-    texture: Constructible/Power/generator.png
+
   - type: NodeContainer
     nodes:
     - !type:AdjacentNode
@@ -49,9 +48,7 @@
     layers:
     - state: smes-display
       shader: unshaded
-  - type: Icon
-    sprite: Constructible/Power/smes.rsi
-    state: smes
+
   - type: Smes
   - type: Appearance
     visuals:
@@ -89,8 +86,7 @@
     offset: Center
   - type: Sprite
     texture: Constructible/Power/storage.png
-  - type: Icon
-    texture: Constructible/Power/storage.png
+
     state: smes
   - type: Battery
     maxCharge: 1000
@@ -131,8 +127,7 @@
     texture: ""
     sprite: "Constructible/Power/apc.rsi"
     state: apc0
-  - type: Icon
-    texture: Constructible/Power/apc.rsi/apc0.png
+
   - type: Appearance
     visuals:
     - type: ApcVisualizer
@@ -174,9 +169,7 @@
   - type: Sprite
     sprite: Constructible/Power/solar_panel.rsi
     state: normal
-  - type: Icon
-    sprite: Constructible/Power/solar_panel.rsi
-    state: normal
+
   - type: NodeContainer
     nodes:
     - !type:AdjacentNode
diff --git a/Resources/Prototypes/Entities/Constructible/Power/research.yml b/Resources/Prototypes/Entities/Constructible/Power/research.yml
index 7f49dad766..60d0a1657f 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/research.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/research.yml
@@ -6,9 +6,7 @@
   - type: Sprite
     sprite: Constructible/Power/server.rsi
     state: server
-  - type: Icon
-    sprite: Constructible/Power/server.rsi
-    state: server
+
   - type: Clickable
   - type: InteractionOutline
   - type: Collidable
@@ -32,9 +30,7 @@
     - state: rndpointsource
       shader: unshaded
       map: ["enum.PowerDeviceVisualLayers.Powered"]
-  - type: Icon
-    sprite: Constructible/Power/rndpointsource.rsi
-    state: rndpointsource-icon
+
   - type: Clickable
   - type: InteractionOutline
   - type: Collidable
diff --git a/Resources/Prototypes/Entities/Constructible/Power/soda_dispenser.yml b/Resources/Prototypes/Entities/Constructible/Power/soda_dispenser.yml
index e5b971023d..aa90e01949 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/soda_dispenser.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/soda_dispenser.yml
@@ -6,8 +6,7 @@
   components:
   - type: Sprite
     texture: Constructible/Power/dispensers.rsi/soda_dispenser.png
-  - type: Icon
-    texture: Constructible/Power/dispensers.rsi/soda_dispenser.png
+
   - type: ReagentDispenser
     pack: SodaDispenserInventory
 - type: reagentDispenserInventory
diff --git a/Resources/Prototypes/Entities/Constructible/Power/turret.yml b/Resources/Prototypes/Entities/Constructible/Power/turret.yml
index 33be165066..f5b1ce459a 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/turret.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/turret.yml
@@ -9,8 +9,7 @@
   - type: Collidable
   - type: Sprite
     texture: Constructible/Misc/TurrBase.png
-  - type: Icon
-    texture: Constructible/Misc/TurrBase.png
+
 
 - type: entity
   id: TurretTopGun
@@ -25,8 +24,7 @@
     drawdepth: WallMountedItems
     texture: Constructible/Misc/TurrTop.png
     directional: false
-  - type: Icon
-    texture: Constructible/Misc/TurrTop.png
+
 
 - type: entity
   id: TurretTopLight
@@ -39,8 +37,7 @@
     drawdepth: WallMountedItems
     texture: Constructible/Misc/TurrLamp.png
     directional: false
-  - type: Icon
-    texture: Constructible/Misc/TurrLamp.png
+
   - type: PointLight
     radius: 512
     mask: flashlight_mask
diff --git a/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml b/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml
index f1b7790560..2fc5f56df0 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml
@@ -10,9 +10,6 @@
   - type: Sprite
     sprite: Constructible/Power/VendingMachines/empty.rsi
     netsync: false
-  - type: Icon
-    sprite: Constructible/Power/VendingMachines/empty.rsi
-    state: "off"
   - type: Collidable
     shapes:
     - !type:PhysShapeAabb
@@ -53,8 +50,6 @@
   components:
   - type: VendingMachine
     pack: Booze-O-Mat
-  - type: Icon
-    sprite: Constructible/Power/VendingMachines/boozeomat.rsi
   - type: Sprite
     sprite: Constructible/Power/VendingMachines/boozeomat.rsi
     layers:
@@ -79,8 +74,6 @@
   components:
   - type: VendingMachine
     pack: PTech
-  - type: Icon
-    sprite: Constructible/Power/VendingMachines/cart.rsi
   - type: Sprite
     sprite: Constructible/Power/VendingMachines/cart.rsi
     layers:
@@ -107,8 +100,6 @@
   components:
   - type: VendingMachine
     pack: PietyVend
-  - type: Icon
-    sprite: Constructible/Power/VendingMachines/chapel.rsi
   - type: Sprite
     sprite: Constructible/Power/VendingMachines/chapel.rsi
     layers:
@@ -134,8 +125,6 @@
   components:
   - type: VendingMachine
     pack: Cigarette machine
-  - type: Icon
-    sprite: Constructible/Power/VendingMachines/cigs.rsi
   - type: Sprite
     sprite: Constructible/Power/VendingMachines/cigs.rsi
     layers:
@@ -162,8 +151,6 @@
   components:
   - type: VendingMachine
     pack: Hot Drinks machine
-  - type: Icon
-    sprite: Constructible/Power/VendingMachines/coffee.rsi
   - type: Sprite
     sprite: Constructible/Power/VendingMachines/coffee.rsi
     layers:
@@ -194,8 +181,6 @@
   components:
   - type: VendingMachine
     pack: Robust Softdrinks
-  - type: Icon
-    sprite: Constructible/Power/VendingMachines/cola.rsi
   - type: Sprite
     sprite: Constructible/Power/VendingMachines/cola.rsi
     layers:
@@ -222,8 +207,6 @@
   components:
   - type: VendingMachine
     pack: Dinnerware
-  - type: Icon
-    sprite: Constructible/Power/VendingMachines/dinnerware.rsi
   - type: Sprite
     sprite: Constructible/Power/VendingMachines/dinnerware.rsi
     layers:
@@ -249,8 +232,6 @@
   components:
   - type: VendingMachine
     pack: Discount Dan's
-  - type: Icon
-    sprite: Constructible/Power/VendingMachines/discount.rsi
   - type: Sprite
     sprite: Constructible/Power/VendingMachines/discount.rsi
     layers:
@@ -275,8 +256,6 @@
   components:
   - type: VendingMachine
     pack: Engi-Vend
-  - type: Icon
-    sprite: Constructible/Power/VendingMachines/engivend.rsi
   - type: Sprite
     sprite: Constructible/Power/VendingMachines/engivend.rsi
     layers:
@@ -303,8 +282,6 @@
   components:
   - type: VendingMachine
     pack: Hatlord 9000
-  - type: Icon
-    sprite: Constructible/Power/VendingMachines/hats.rsi
   - type: Sprite
     sprite: Constructible/Power/VendingMachines/hats.rsi
     layers:
@@ -329,8 +306,6 @@
   components:
   - type: VendingMachine
     pack: MagiVend
-  - type: Icon
-    sprite: Constructible/Power/VendingMachines/magivend.rsi
   - type: Sprite
     sprite: Constructible/Power/VendingMachines/magivend.rsi
     layers:
@@ -355,8 +330,6 @@
   components:
   - type: VendingMachine
     pack: NanoMed Plus
-  - type: Icon
-    sprite: Constructible/Power/VendingMachines/medical.rsi
   - type: Sprite
     sprite: Constructible/Power/VendingMachines/medical.rsi
     layers:
@@ -383,8 +356,6 @@
   components:
   - type: VendingMachine
     pack: Dwarven Mining Equipment
-  - type: Icon
-    sprite: Constructible/Power/VendingMachines/mining.rsi
   - type: Sprite
     sprite: Constructible/Power/VendingMachines/mining.rsi
     layers:
@@ -410,8 +381,6 @@
   components:
   - type: VendingMachine
     pack: NutriMax
-  - type: Icon
-    sprite: Constructible/Power/VendingMachines/nutri.rsi
   - type: Sprite
     sprite: Constructible/Power/VendingMachines/nutri.rsi
     layers:
@@ -438,8 +407,6 @@
   components:
   - type: VendingMachine
     pack: Robotech Deluxe
-  - type: Icon
-    sprite: Constructible/Power/VendingMachines/robotics.rsi
   - type: Sprite
     sprite: Constructible/Power/VendingMachines/robotics.rsi
     layers:
@@ -465,8 +432,6 @@
   components:
   - type: VendingMachine
     pack: Sales
-  - type: Icon
-    sprite: Constructible/Power/VendingMachines/sale.rsi
   - type: Sprite
     sprite: Constructible/Power/VendingMachines/sale.rsi
     layers:
@@ -492,8 +457,6 @@
   components:
   - type: VendingMachine
     pack: SecTech
-  - type: Icon
-    sprite: Constructible/Power/VendingMachines/sec.rsi
   - type: Sprite
     sprite: Constructible/Power/VendingMachines/sec.rsi
     layers:
@@ -520,8 +483,7 @@
   components:
   - type: VendingMachine
     pack: MegaSeed Servitor
-  - type: Icon
-    sprite: Constructible/Power/VendingMachines/seeds.rsi
+
   - type: Sprite
     sprite: Constructible/Power/VendingMachines/seeds.rsi
     layers:
@@ -547,8 +509,7 @@
   components:
   - type: VendingMachine
     pack: Shoelord 9000
-  - type: Icon
-    sprite: Constructible/Power/VendingMachines/shoes.rsi
+
   - type: Sprite
     sprite: Constructible/Power/VendingMachines/shoes.rsi
     layers:
@@ -573,8 +534,7 @@
   components:
   - type: VendingMachine
     pack: SmartFridge
-  - type: Icon
-    sprite: Constructible/Power/VendingMachines/smartfridge.rsi
+
   - type: Sprite
     sprite: Constructible/Power/VendingMachines/smartfridge.rsi
     layers:
@@ -599,8 +559,7 @@
   components:
   - type: VendingMachine
     pack: Getmore Chocolate Corp
-  - type: Icon
-    sprite: Constructible/Power/VendingMachines/snack.rsi
+
   - type: Sprite
     sprite: Constructible/Power/VendingMachines/snack.rsi
     layers:
@@ -627,8 +586,7 @@
   components:
   - type: VendingMachine
     pack: BODA
-  - type: Icon
-    sprite: Constructible/Power/VendingMachines/sovietsoda.rsi
+
   - type: Sprite
     sprite: Constructible/Power/VendingMachines/sovietsoda.rsi
     layers:
@@ -655,8 +613,7 @@
   components:
   - type: VendingMachine
     pack: Suitlord 9000
-  - type: Icon
-    sprite: Constructible/Power/VendingMachines/suits.rsi
+
   - type: Sprite
     sprite: Constructible/Power/VendingMachines/suits.rsi
     layers:
@@ -681,8 +638,7 @@
   components:
   - type: VendingMachine
     pack: AutoDrobe
-  - type: Icon
-    sprite: Constructible/Power/VendingMachines/theater.rsi
+
   - type: Sprite
     sprite: Constructible/Power/VendingMachines/theater.rsi
     layers:
@@ -713,8 +669,7 @@
   components:
   - type: VendingMachine
     pack: Vendomat
-  - type: Icon
-    sprite: Constructible/Power/VendingMachines/vendomat.rsi
+
   - type: Sprite
     sprite: Constructible/Power/VendingMachines/vendomat.rsi
     layers:
@@ -742,8 +697,7 @@
   components:
   - type: VendingMachine
     pack: Trader Supply
-  - type: Icon
-    sprite: Constructible/Power/VendingMachines/vox.rsi
+
   - type: Sprite
     sprite: Constructible/Power/VendingMachines/vox.rsi
     layers:
@@ -768,8 +722,7 @@
   components:
   - type: VendingMachine
     pack: NanoMed
-  - type: Icon
-    sprite: Constructible/Power/VendingMachines/wallmed.rsi
+
   - type: Sprite
     sprite: Constructible/Power/VendingMachines/wallmed.rsi
     layers:
@@ -795,8 +748,7 @@
   components:
   - type: VendingMachine
     pack: YouTool
-  - type: Icon
-    sprite: Constructible/Power/VendingMachines/youtool.rsi
+
   - type: Sprite
     sprite: Constructible/Power/VendingMachines/youtool.rsi
     layers:
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/bar.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/bar.yml
index 69bd42bdbe..424ed00c75 100644
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/bar.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/bar.yml
@@ -7,5 +7,4 @@
     visuals:
     - type: StorageVisualizer
       state: cabinet
-  - type: Icon
-    state: cabinet_icon
+
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/cargo.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/cargo.yml
index 6d3bb414dd..356fd3fd03 100644
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/cargo.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/cargo.yml
@@ -7,5 +7,4 @@
     visuals:
     - type: StorageVisualizer
       state: qm
-  - type: Icon
-    state: qm_icon
+
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/command.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/command.yml
index 4a6be65ba7..8a9bb45747 100644
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/command.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/command.yml
@@ -7,8 +7,7 @@
     visuals:
     - type: StorageVisualizer
       state: cap
-  - type: Icon
-    state: cap_icon
+
 
 - type: entity
   id: LockerHeadOfPersonnel
@@ -19,5 +18,4 @@
     visuals:
     - type: StorageVisualizer
       state: hop
-  - type: Icon
-    state: hop_icon
+
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/engineering.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/engineering.yml
index 12b0a0eda8..047ba05779 100644
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/engineering.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/engineering.yml
@@ -8,8 +8,7 @@
     visuals:
     - type: StorageVisualizer
       state: ce
-  - type: Icon
-    state: ce_icon
+
 
 # Electrical supplies
 - type: entity
@@ -22,8 +21,7 @@
     - type: StorageVisualizer
       state: eng
       state_closed: eng_elec_door
-  - type: Icon
-    state: eng_elec_icon
+
 
 # Welding supplies
 - type: entity
@@ -36,8 +34,7 @@
     - type: StorageVisualizer
       state: eng
       state_closed: eng_weld_door
-  - type: Icon
-    state: eng_weld_icon
+
 
 # Atmos tech
 - type: entity
@@ -49,8 +46,7 @@
     visuals:
     - type: StorageVisualizer
       state: atmos
-  - type: Icon
-    state: atmos_icon
+
 
 # Engineer
 - type: entity
@@ -62,5 +58,4 @@
     visuals:
     - type: StorageVisualizer
       state: eng_secure
-  - type: Icon
-    state: eng_secure_icon
+
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/freezer.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/freezer.yml
index d5439e4cde..6f2cd1941d 100644
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/freezer.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/freezer.yml
@@ -7,5 +7,4 @@
     visuals:
     - type: StorageVisualizer
       state: freezer
-  - type: Icon
-    state: freezer_icon
+
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/hydroponics.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/hydroponics.yml
index b38660866a..9531342bf8 100644
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/hydroponics.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/hydroponics.yml
@@ -7,5 +7,4 @@
     visuals:
     - type: StorageVisualizer
       state: hydro
-  - type: Icon
-    state: hydro_icon
+
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/medical.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/medical.yml
index 8630b35e7a..a6a9aa7937 100644
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/medical.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/medical.yml
@@ -9,8 +9,7 @@
     visuals:
     - type: StorageVisualizer
       state: med
-  - type: Icon
-    state: med_icon
+
 
 # Medical doctor
 - type: entity
@@ -22,8 +21,7 @@
     visuals:
     - type: StorageVisualizer
       state: med_secure
-  - type: Icon
-    state: med_secure_icon
+
 
 # Chemical
 - type: entity
@@ -36,8 +34,7 @@
     - type: StorageVisualizer
       state: med
       state_closed: chemical_door
-  - type: Icon
-    state: chemical_icon
+
 
 # CMO
 - type: entity
@@ -49,5 +46,4 @@
     visuals:
     - type: StorageVisualizer
       state: cmo
-  - type: Icon
-    state: cmo_icon
+
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/scientist.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/scientist.yml
index 103869171a..83066ecf0b 100644
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/scientist.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/scientist.yml
@@ -7,5 +7,4 @@
     visuals:
     - type: StorageVisualizer
       state: rd
-  - type: Icon
-    state: rd_icon
+
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/security.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/security.yml
index ab20830578..7f3f66f21d 100644
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/security.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/security.yml
@@ -8,8 +8,7 @@
     visuals:
     - type: StorageVisualizer
       state: hos
-  - type: Icon
-    state: hos_icon
+
 
 # Warden
 - type: entity
@@ -21,8 +20,7 @@
     visuals:
     - type: StorageVisualizer
       state: warden
-  - type: Icon
-    state: warden_icon
+
 
 # Security Officer
 - type: entity
@@ -34,8 +32,7 @@
     visuals:
     - type: StorageVisualizer
       state: sec
-  - type: Icon
-    state: sec_icon
+
 
 # Detective
 - type: entity
@@ -47,5 +44,4 @@
       visuals:
         - type: StorageVisualizer
           state: cabinet
-    - type: Icon
-      state: cabinet_icon
+
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml
index d79d933646..db66f57b5a 100644
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml
@@ -13,9 +13,7 @@
     - state: welded
       visible: false
       map: ["enum.StorageVisualLayers.Welded"]
-  - type: Icon
-    sprite: Constructible/Structures/closet.rsi
-    state: generic_icon
+
   - type: Clickable
   - type: MovedByPressure
   - type: DamageOnHighSpeedImpact
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/job_closests.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/job_closests.yml
index 99c2b55c41..36fd1896b5 100644
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/job_closests.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/job_closests.yml
@@ -9,8 +9,7 @@
     - type: StorageVisualizer
       state: generic
       state_closed: red_door
-  - type: Icon
-    state: red_icon
+
 
 # Atmospherics wardrobe
 - type: entity
@@ -23,5 +22,4 @@
     - type: StorageVisualizer
       state: generic
       state_closed: atmos_wardrobe_door
-  - type: Icon
-    state: atmos_icon
+
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/l3closet.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/l3closet.yml
index 47805193ef..ee16541fc8 100644
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/l3closet.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/l3closet.yml
@@ -9,8 +9,7 @@
     visuals:
     - type: StorageVisualizer
       state: bio
-  - type: Icon
-    state: bio_icon
+
 
 # Virology variant
 - type: entity
@@ -21,8 +20,7 @@
     visuals:
     - type: StorageVisualizer
       state: bio_viro
-  - type: Icon
-    state: bio_viro_icon
+
 
 # Security variant
 - type: entity
@@ -33,8 +31,7 @@
     visuals:
     - type: StorageVisualizer
       state: bio_sec
-  - type: Icon
-    state: bio_sec_icon
+
 
 # Janitor variant
 - type: entity
@@ -45,5 +42,4 @@
     visuals:
     - type: StorageVisualizer
       state: bio_jan
-  - type: Icon
-    state: bio_jan_icon
+
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/syndicate.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/syndicate.yml
index 211746bf67..4156d064d7 100644
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/syndicate.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/syndicate.yml
@@ -9,5 +9,4 @@
     visuals:
     - type: StorageVisualizer
       state: syndicate
-  - type: Icon
-    state: syndicate_icon
+
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/utility_closets.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/utility_closets.yml
index 0926c28e7c..f186cd979b 100644
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/utility_closets.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/utility_closets.yml
@@ -10,8 +10,7 @@
     - type: StorageVisualizer
       state: eng
       state_closed: eng_tool_door
-  - type: Icon
-    state: eng_tool_icon
+
 
 # Radiation suit closet
 - type: entity
@@ -25,8 +24,7 @@
     - type: StorageVisualizer
       state: eng
       state_closed: eng_rad_door
-  - type: Icon
-    state: eng_rad_icon
+
 
 # Emergency closet
 - type: entity
@@ -39,8 +37,7 @@
     visuals:
     - type: StorageVisualizer
       state: emergency
-  - type: Icon
-    state: emergency_icon
+
 
 # Fire safety closet
 - type: entity
@@ -53,8 +50,7 @@
     visuals:
     - type: StorageVisualizer
       state: fire
-  - type: Icon
-    state: fire_icon
+
 
 # EOD closet
 - type: entity
@@ -67,5 +63,4 @@
     visuals:
     - type: StorageVisualizer
       state: bomb
-  - type: Icon
-    state: bomb_icon
+
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/wardrobe.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/wardrobe.yml
index f75bf90730..6228a45135 100644
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/wardrobe.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/wardrobe.yml
@@ -15,8 +15,7 @@
     - type: StorageVisualizer
       state: generic
       state_closed: blue_door
-  - type: Icon
-    state: blue_icon
+
 
 # Pink wardrobe
 - type: entity
@@ -29,8 +28,7 @@
     - type: StorageVisualizer
       state: generic
       state_closed: pink_door
-  - type: Icon
-    state: pink_icon
+
 
 # Black wardrobe
 - type: entity
@@ -43,8 +41,7 @@
     - type: StorageVisualizer
       state: generic
       state_closed: black_door
-  - type: Icon
-    state: black_icon
+
 
 # Green wardrobe
 - type: entity
@@ -57,8 +54,7 @@
     - type: StorageVisualizer
       state: generic
       state_closed: green_door
-  - type: Icon
-    state: green_icon
+
 
 # Prison wardrobe
 - type: entity
@@ -71,8 +67,7 @@
     - type: StorageVisualizer
       state: generic
       state_closed: orange_door
-  - type: Icon
-    state: orange_icon
+
 
 # Yellow wardrobe
 - type: entity
@@ -85,8 +80,7 @@
     - type: StorageVisualizer
       state: generic
       state_closed: yellow_door
-  - type: Icon
-    state: yellow_icon
+
 
 # White wardrobe
 - type: entity
@@ -99,8 +93,7 @@
     - type: StorageVisualizer
       state: generic
       state_closed: white_door
-  - type: Icon
-    state: white_icon
+
 
 # Grey wardrobe
 - type: entity
@@ -113,8 +106,7 @@
     - type: StorageVisualizer
       state: generic
       state_closed: grey_door
-  - type: Icon
-    state: grey_icon
+
 
 # Mixed wardrobe
 - type: entity
@@ -127,5 +119,4 @@
     - type: StorageVisualizer
       state: generic
       state_closed: mixed_door
-  - type: Icon
-    state: mixed_icon
+
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/fuel_tank.yml b/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/fuel_tank.yml
index 5778b28f9a..509071906b 100644
--- a/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/fuel_tank.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/fuel_tank.yml
@@ -6,8 +6,7 @@
   components:
   - type: Sprite
     texture: Constructible/Misc/weldtank.png
-  - type: Icon
-    texture: Constructible/Misc/weldtank.png
+
   - type: Explosive
     devastationRange: 0
     heavyImpactRange: 2
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/water_tank.yml b/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/water_tank.yml
index a8c7490fe3..2e441a29f8 100644
--- a/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/water_tank.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/water_tank.yml
@@ -7,8 +7,7 @@
   components:
   - type: Sprite
     texture: Constructible/Misc/watertank.png
-  - type: Icon
-    texture: Constructible/Misc/watertank.png
+
   - type: Anchorable
   - type: Pullable
 
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/crate_base.yml b/Resources/Prototypes/Entities/Constructible/Storage/crate_base.yml
index d68b84905e..9c17746086 100644
--- a/Resources/Prototypes/Entities/Constructible/Storage/crate_base.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/crate_base.yml
@@ -10,9 +10,7 @@
     - state: crate
     - state: crate_door
       map: ["enum.StorageVisualLayers.Door"]
-  - type: Icon
-    sprite: Constructible/Structures/Crates/generic.rsi
-    state: crate
+
   - type: Clickable
   - type: InteractionOutline
   - type: Collidable
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/crate_types.yml b/Resources/Prototypes/Entities/Constructible/Storage/crate_types.yml
index 8aa94093a3..ddb6d28cb5 100644
--- a/Resources/Prototypes/Entities/Constructible/Storage/crate_types.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/crate_types.yml
@@ -14,9 +14,7 @@
     - type: StorageVisualizer
       state_open: plasticcrate_open
       state_closed: plasticcrate_door
-  - type: Icon
-    sprite: Constructible/Structures/Crates/plastic.rsi
-    state: plasticcrate
+
 
 - type: entity
   id: CrateFreezer
@@ -34,9 +32,7 @@
     - type: StorageVisualizer
       state_open: freezer_open
       state_closed: freezer_door
-  - type: Icon
-    sprite: Constructible/Structures/Crates/freezer.rsi
-    state: freezer
+
 
 - type: entity
   id: CrateHydroponics
@@ -54,9 +50,7 @@
     - type: StorageVisualizer
       state_open: hydrocrate_open
       state_closed: hydrocrate_door
-  - type: Icon
-    sprite: Constructible/Structures/Crates/hydro.rsi
-    state: hydrocrate
+
 
 - type: entity
   id: CrateMedical
@@ -74,9 +68,7 @@
     - type: StorageVisualizer
       state_open: medicalcrate_open
       state_closed: medicalcrate_door
-  - type: Icon
-    sprite: Constructible/Structures/Crates/medical.rsi
-    state: medicalcrate
+
 
 - type: entity
   id: CrateRadiation
@@ -95,9 +87,7 @@
     - type: StorageVisualizer
       state_open: radiationcrate_open
       state_closed: radiationcrate_door
-  - type: Icon
-    sprite: Constructible/Structures/Crates/radiation.rsi
-    state: radiationcrate
+
 
 - type: entity
   id: CrateInternals
@@ -115,6 +105,4 @@
     - type: StorageVisualizer
       state_open: o2crate_open
       state_closed: o2crate_door
-  - type: Icon
-    sprite: Constructible/Structures/Crates/o2.rsi
-    state: o2crate
+
diff --git a/Resources/Prototypes/Entities/Constructible/Walls/asteroid.yml b/Resources/Prototypes/Entities/Constructible/Walls/asteroid.yml
index f77642ec22..f4ea130c84 100644
--- a/Resources/Prototypes/Entities/Constructible/Walls/asteroid.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/asteroid.yml
@@ -9,9 +9,7 @@
   - type: Sprite
     sprite: Constructible/Structures/Walls/asteroid_rock.rsi
     state: 0
-  - type: Icon
-    sprite: Constructible/Structures/Walls/asteroid_rock.rsi
-    state: 0
+
   - type: Collidable
     shapes:
     - !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Constructible/Walls/atmos_plaque.yml b/Resources/Prototypes/Entities/Constructible/Walls/atmos_plaque.yml
index 499f0ca0b0..3146f114e6 100644
--- a/Resources/Prototypes/Entities/Constructible/Walls/atmos_plaque.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/atmos_plaque.yml
@@ -15,8 +15,7 @@
       - SmallImpassable
       - Clickable
 
-  - type: Icon
-    state: atmosplaque
+
   - type: Sprite
     state: atmosplaque
   - type: AtmosPlaque
diff --git a/Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml b/Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml
index 85b1ad4e66..d533fe5a56 100644
--- a/Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml
@@ -9,9 +9,7 @@
     drawdepth: WallTops
     sprite: Constructible/Misc/barsign.rsi
     state: empty
-  - type: Icon
-    sprite: Constructible/Misc/barsign.rsi
-    state: empty
+
   - type: PowerReceiver
   - type: BarSign
 
@@ -27,9 +25,7 @@
     drawdepth: WallTops
     sprite: Constructible/Misc/sylphs.rsi
     state: sylph
-  - type: Icon
-    sprite: Constructible/Misc/sylphs.rsi
-    state: sylph
+
   - type: PowerReceiver
   - type: BarSign
 
diff --git a/Resources/Prototypes/Entities/Constructible/Walls/emergency_light.yml b/Resources/Prototypes/Entities/Constructible/Walls/emergency_light.yml
index 548a2d370a..843c3db87d 100644
--- a/Resources/Prototypes/Entities/Constructible/Walls/emergency_light.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/emergency_light.yml
@@ -19,9 +19,6 @@
   - type: Sprite
     sprite: Constructible/Lighting/emergency_light.rsi
     state: emergency_light_off
-  - type: Icon
-    sprite: Constructible/Lighting/emergency_light.rsi
-    state: emergency_light_off
   placement:
     snap:
     - Wallmount
diff --git a/Resources/Prototypes/Entities/Constructible/Walls/extinguisher_cabinet.yml b/Resources/Prototypes/Entities/Constructible/Walls/extinguisher_cabinet.yml
index 243d5eb565..cf823b50a3 100644
--- a/Resources/Prototypes/Entities/Constructible/Walls/extinguisher_cabinet.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/extinguisher_cabinet.yml
@@ -9,9 +9,6 @@
     - type: Sprite
       sprite: Constructible/Misc/extinguisher_cabinet.rsi
       state: extinguisher_closed
-    - type: Icon
-      sprite: Constructible/Misc/extinguisher_cabinet.rsi
-      state: extinguisher_closed
     - type: ExtinguisherCabinet
     - type: Appearance
       visuals:
diff --git a/Resources/Prototypes/Entities/Constructible/Walls/girder.yml b/Resources/Prototypes/Entities/Constructible/Walls/girder.yml
index d37fd8804c..75f86154b5 100644
--- a/Resources/Prototypes/Entities/Constructible/Walls/girder.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/girder.yml
@@ -7,8 +7,6 @@
   - type: InteractionOutline
   - type: Sprite
     texture: Constructible/Structures/Walls/wall_girder.png
-  - type: Icon
-    texture: Constructible/Structures/Walls/wall_girder.png
 
   - type: Collidable
     shapes:
diff --git a/Resources/Prototypes/Entities/Constructible/Walls/lighting.yml b/Resources/Prototypes/Entities/Constructible/Walls/lighting.yml
index 9f5735e716..5de373d28e 100644
--- a/Resources/Prototypes/Entities/Constructible/Walls/lighting.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/lighting.yml
@@ -9,9 +9,6 @@
   - type: Sprite
     sprite: Constructible/Lighting/light_tube.rsi
     state: on
-  - type: Icon
-    sprite: Constructible/Lighting/light_tube.rsi
-    state: off
   - type: PointLight
     radius: 8
     energy: 1.2
@@ -30,9 +27,6 @@
   - type: Sprite
     sprite: Constructible/Lighting/light_tube.rsi
     state: off
-  - type: Icon
-    sprite: Constructible/Lighting/light_tube.rsi
-    state: on
   - type: PointLight
     enabled: false
   - type: PoweredLight
@@ -50,9 +44,6 @@
   - type: Sprite
     sprite: Constructible/Lighting/light_small.rsi
     state: off
-  - type: Icon
-    sprite: Constructible/Lighting/light_small.rsi
-    state: off
   - type: PointLight
     energy: 1.0
     enabled: false
diff --git a/Resources/Prototypes/Entities/Constructible/Walls/linking.yml b/Resources/Prototypes/Entities/Constructible/Walls/linking.yml
index 176945ebfa..88112d33c0 100644
--- a/Resources/Prototypes/Entities/Constructible/Walls/linking.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/linking.yml
@@ -8,9 +8,6 @@
   - type: Sprite
     sprite: Constructible/Linking/switch.rsi
     state: on
-  - type: Icon
-    sprite: Constructible/Linking/switch.rsi
-    state: on
   - type: SignalSwitch
   - type: SignalTransmitter
   placement:
@@ -27,9 +24,6 @@
   - type: Sprite
     sprite: Constructible/Linking/switch.rsi
     state: dead
-  - type: Icon
-    sprite: Constructible/Linking/switch.rsi
-    state: dead
   - type: SignalButton
   - type: SignalTransmitter
   placement:
diff --git a/Resources/Prototypes/Entities/Constructible/Walls/low_wall.yml b/Resources/Prototypes/Entities/Constructible/Walls/low_wall.yml
index 43e8df9870..ac0f27c25e 100644
--- a/Resources/Prototypes/Entities/Constructible/Walls/low_wall.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/low_wall.yml
@@ -15,9 +15,6 @@
     color: "#889192"
     drawdepth: Walls
     sprite: Constructible/Structures/Walls/low_wall.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Walls/low_wall.rsi
-    state: metal
   - type: Collidable
     shapes:
     - !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Constructible/Walls/mirror.yml b/Resources/Prototypes/Entities/Constructible/Walls/mirror.yml
index cede1e0c40..2e2bd2dadc 100644
--- a/Resources/Prototypes/Entities/Constructible/Walls/mirror.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/mirror.yml
@@ -6,9 +6,6 @@
   - type: Sprite
     sprite: Constructible/Misc/mirror.rsi
     state: mirror
-  - type: Icon
-    sprite: Constructible/Misc/mirror.rsi
-    state: mirror
   - type: Collidable
     shapes:
     - !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Constructible/Walls/signs.yml b/Resources/Prototypes/Entities/Constructible/Walls/signs.yml
index 09cb992ea0..723abbe221 100644
--- a/Resources/Prototypes/Entities/Constructible/Walls/signs.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/signs.yml
@@ -14,8 +14,6 @@
   - type: Sprite
     drawdepth: WallTops
     sprite: Constructible/Misc/decals.rsi
-  - type: Icon
-    sprite: Constructible/Misc/decals.rsi
 
 # These signs would not have collision otherwise, they simply
 # need collision in order for them to be destructible. Once the
@@ -41,8 +39,6 @@
       - Clickable
   - type: Sprite
     state: monkey_painting
-  - type: Icon
-    state: monkey_painting
 
 # Directional Station Guide Signs
 
@@ -66,8 +62,6 @@
       - Clickable
   - type: Sprite
     state: direction_sec
-  - type: Icon
-    state: direction_sec
 
 - type: entity
   parent: BaseSign
@@ -89,8 +83,7 @@
       - Clickable
   - type: Sprite
     state: direction_evac
-  - type: Icon
-    state: direction_evac
+
 
 - type: entity
   parent: BaseSign
@@ -112,8 +105,7 @@
       - Clickable
   - type: Sprite
     state: direction_bridge
-  - type: Icon
-    state: direction_bridge
+
 
 - type: entity
   parent: BaseSign
@@ -135,8 +127,7 @@
       - Clickable
   - type: Sprite
     state: direction_med
-  - type: Icon
-    state: direction_med
+
 
 - type: entity
   parent: BaseSign
@@ -158,8 +149,6 @@
       - Clickable
   - type: Sprite
     state: direction_eng
-  - type: Icon
-    state: direction_eng
 
 - type: entity
   parent: BaseSign
@@ -181,8 +170,6 @@
       - Clickable
   - type: Sprite
     state: direction_sci
-  - type: Icon
-    state: direction_sci
 
 - type: entity
   parent: BaseSign
@@ -204,8 +191,6 @@
       - Clickable
   - type: Sprite
     state: direction_supply
-  - type: Icon
-    state: direction_supply
 
 # Regular Signs
 
@@ -227,8 +212,7 @@
       - Clickable
   - type: Sprite
     state: armory
-  - type: Icon
-    state: armory
+
 
 - type: entity
   parent: BaseSign
@@ -248,8 +232,7 @@
       - Clickable
   - type: Sprite
     state: ass
-  - type: Icon
-    state: ass
+
 
 - type: entity
   parent: BaseSign
@@ -269,8 +252,7 @@
       - Clickable
   - type: Sprite
     state: anomaly
-  - type: Icon
-    state: anomaly
+
 
 - type: entity
   parent: BaseSign
@@ -290,8 +272,7 @@
       - Clickable
   - type: Sprite
     state: atmos
-  - type: Icon
-    state: atmos
+
 
 - type: entity
   parent: BaseSign
@@ -311,8 +292,7 @@
       - Clickable
   - type: Sprite
     state: bar
-  - type: Icon
-    state: bar
+
 
 - type: entity
   parent: BaseSign
@@ -332,8 +312,7 @@
       - Clickable
   - type: Sprite
     state: biblio
-  - type: Icon
-    state: biblio
+
 
 - type: entity
   parent: BaseSign
@@ -353,8 +332,7 @@
       - Clickable
   - type: Sprite
     state: chapel
-  - type: Icon
-    state: chapel
+
 
 - type: entity
   parent: BaseSign
@@ -374,8 +352,7 @@
       - Clickable
   - type: Sprite
     state: commander
-  - type: Icon
-    state: commander
+
 
 - type: entity
   parent: BaseSign
@@ -395,8 +372,7 @@
       - Clickable
   - type: Sprite
     state: conference_room
-  - type: Icon
-    state: conference_room
+
 
 - type: entity
   parent: BaseSign
@@ -416,8 +392,7 @@
       - Clickable
   - type: Sprite
     state: drones
-  - type: Icon
-    state: drones
+
 
 - type: entity
   parent: BaseSign
@@ -437,8 +412,7 @@
       - Clickable
   - type: Sprite
     state: engine
-  - type: Icon
-    state: engine
+
 
 - type: entity
   parent: BaseSign
@@ -458,8 +432,7 @@
       - Clickable
   - type: Sprite
     state: cloning
-  - type: Icon
-    state: cloning
+
 
 - type: entity
   parent: BaseSign
@@ -479,8 +452,7 @@
       - Clickable
   - type: Sprite
     state: interrogation
-  - type: Icon
-    state: interrogation
+
 
 - type: entity
   parent: BaseSign
@@ -500,8 +472,7 @@
       - Clickable
   - type: Sprite
     state: surgery
-  - type: Icon
-    state: surgery
+
 
 - type: entity
   parent: BaseSign
@@ -521,8 +492,7 @@
       - Clickable
   - type: Sprite
     state: telecoms
-  - type: Icon
-    state: telecoms
+
 
 - type: entity
   parent: BaseSign
@@ -542,8 +512,7 @@
       - Clickable
   - type: Sprite
     state: cargo
-  - type: Icon
-    state: cargo
+
 
 - type: entity
   parent: BaseSign
@@ -563,8 +532,7 @@
       - Clickable
   - type: Sprite
     state: cargo_dock
-  - type: Icon
-    state: cargo_dock
+
 
 - type: entity
   parent: BaseSign
@@ -584,8 +552,7 @@
       - Clickable
   - type: Sprite
     state: chem
-  - type: Icon
-    state: chem
+
 
 - type: entity
   parent: BaseSign
@@ -605,8 +572,7 @@
       - Clickable
   - type: Sprite
     state: dock
-  - type: Icon
-    state: dock
+
 
 - type: entity
   parent: BaseSign
@@ -626,8 +592,7 @@
       - Clickable
   - type: Sprite
     state: eng
-  - type: Icon
-    state: eng
+
 
 - type: entity
   parent: BaseSign
@@ -647,8 +612,7 @@
       - Clickable
   - type: Sprite
     state: eva
-  - type: Icon
-    state: eva
+
 
 - type: entity
   parent: BaseSign
@@ -668,8 +632,7 @@
       - Clickable
   - type: Sprite
     state: gravi
-  - type: Icon
-    state: gravi
+
 
 - type: entity
   parent: BaseSign
@@ -689,8 +652,7 @@
       - Clickable
   - type: Sprite
     state: medbay
-  - type: Icon
-    state: medbay
+
 
 - type: entity
   parent: BaseSign
@@ -710,8 +672,7 @@
       - Clickable
   - type: Sprite
     state: morgue
-  - type: Icon
-    state: morgue
+
 
 - type: entity
   parent: BaseSign
@@ -732,8 +693,7 @@
       - Clickable
   - type: Sprite
     state: prison
-  - type: Icon
-    state: prison
+
 
 - type: entity
   parent: BaseSign
@@ -753,8 +713,7 @@
       - Clickable
   - type: Sprite
     state: rnd
-  - type: Icon
-    state: rnd
+
 
 - type: entity
   parent: BaseSign
@@ -774,8 +733,7 @@
       - Clickable
   - type: Sprite
     state: sci
-  - type: Icon
-    state: sci
+
 
 - type: entity
   parent: BaseSign
@@ -795,8 +753,7 @@
       - Clickable
   - type: Sprite
     state: toxins
-  - type: Icon
-    state: toxins
+
 
 - type: entity
   parent: BaseSign
@@ -816,8 +773,7 @@
       - Clickable
   - type: Sprite
     state: bridge
-  - type: Icon
-    state: bridge
+
 
 # Atmos Warnings
 
@@ -840,8 +796,7 @@
       - Clickable
   - type: Sprite
     state: atmos_air
-  - type: Icon
-    state: atmos_air
+
 
 - type: entity
   parent: BaseSign
@@ -862,8 +817,7 @@
       - Clickable
   - type: Sprite
     state: atmos_co2
-  - type: Icon
-    state: atmos_co2
+
 
 - type: entity
   parent: BaseSign
@@ -884,8 +838,7 @@
       - Clickable
   - type: Sprite
     state: atmos_n2
-  - type: Icon
-    state: atmos_n2
+
 
 - type: entity
   parent: BaseSign
@@ -906,8 +859,7 @@
       - Clickable
   - type: Sprite
     state: atmos_n2o
-  - type: Icon
-    state: atmos_n2o
+
 
 - type: entity
   parent: BaseSign
@@ -928,8 +880,7 @@
       - Clickable
   - type: Sprite
     state: atmos_o2
-  - type: Icon
-    state: atmos_o2
+
 
 - type: entity
   parent: BaseSign
@@ -950,8 +901,7 @@
       - Clickable
   - type: Sprite
     state: atmos_phoron
-  - type: Icon
-    state: atmos_phoron
+
 
 - type: entity
   parent: BaseSign
@@ -972,8 +922,7 @@
       - Clickable
   - type: Sprite
     state: atmos_waste
-  - type: Icon
-    state: atmos_waste
+
 
 - type: entity
   parent: BaseSign
@@ -994,8 +943,7 @@
       - Clickable
   - type: Sprite
     state: nosmoking2
-  - type: Icon
-    state: nosmoking2
+
 
 - type: entity
   parent: BaseSign
@@ -1016,8 +964,7 @@
       - Clickable
   - type: Sprite
     state: something-old1
-  - type: Icon
-    state: something-old1
+
 
 - type: entity
   parent: BaseSign
@@ -1038,5 +985,4 @@
       - Clickable
   - type: Sprite
     state: something-old2
-  - type: Icon
-    state: something-old2
+
diff --git a/Resources/Prototypes/Entities/Constructible/Walls/walls.yml b/Resources/Prototypes/Entities/Constructible/Walls/walls.yml
index 24ae9830d7..ffe1e0f3a1 100644
--- a/Resources/Prototypes/Entities/Constructible/Walls/walls.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/walls.yml
@@ -14,8 +14,7 @@
   - type: Sprite
     netsync: false
     drawdepth: Walls
-  - type: Icon
-    state: full
+
   - type: Collidable
     shapes:
     - !type:PhysShapeAabb
@@ -47,8 +46,7 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Walls/brick.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Walls/brick.rsi
+
   - type: Destructible
     deadThreshold: 300
     spawnOnDestroy: Girder
@@ -64,8 +62,7 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Walls/clock.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Walls/clock.rsi
+
   - type: Destructible
     deadThreshold: 300
     spawnOnDestroy: Girder
@@ -81,8 +78,7 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Walls/clown.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Walls/clown.rsi
+
   - type: Destructible
     deadThreshold: 300
     spawnOnDestroy: Girder
@@ -99,8 +95,7 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Walls/cult.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Walls/cult.rsi
+
   - type: Destructible
     deadThreshold: 300
     spawnOnDestroy: Girder
@@ -116,8 +111,7 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Walls/debug.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Walls/debug.rsi
+
   - type: Destructible
     deadThreshold: 300
     spawnOnDestroy: Girder
@@ -133,8 +127,7 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Walls/diamond.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Walls/diamond.rsi
+
   - type: Destructible
     deadThreshold: 300
     spawnOnDestroy: Girder
@@ -151,8 +144,7 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Walls/gold.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Walls/gold.rsi
+
   - type: Destructible
     deadThreshold: 300
     spawnOnDestroy: Girder
@@ -168,8 +160,7 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Walls/ice.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Walls/ice.rsi
+
   - type: Destructible
     deadThreshold: 300
     spawnOnDestroy: Girder
@@ -185,8 +176,7 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Walls/metal.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Walls/metal.rsi
+
   - type: Destructible
     deadThreshold: 300
     spawnOnDestroy: Girder
@@ -202,8 +192,7 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Walls/plasma.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Walls/plasma.rsi
+
   - type: Destructible
     deadThreshold: 300
     spawnOnDestroy: Girder
@@ -219,8 +208,7 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Walls/plastic.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Walls/plastic.rsi
+
   - type: Destructible
     deadThreshold: 300
     spawnOnDestroy: Girder
@@ -237,9 +225,7 @@
   - type: Sprite
     color: "#889192"
     sprite: Constructible/Structures/Walls/solid.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Walls/solid.rsi
-    state: rgeneric
+
   - type: Destructible
     deadThreshold: 600
     spawnOnDestroy: Girder
@@ -257,8 +243,7 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Walls/riveted.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Walls/riveted.rsi
+
   - type: Destructible
     deadThreshold: 1000
     spawnOnDestroy: Girder
@@ -274,8 +259,7 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Walls/sandstone.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Walls/sandstone.rsi
+
   - type: Destructible
     deadThreshold: 300
     spawnOnDestroy: Girder
@@ -291,8 +275,7 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Walls/silver.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Walls/silver.rsi
+
   - type: Destructible
     deadThreshold: 300
     spawnOnDestroy: Girder
@@ -309,8 +292,7 @@
   - type: Sprite
     color: "#889192"
     sprite: Constructible/Structures/Walls/solid.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Walls/solid.rsi
+
   - type: Destructible
     deadThreshold: 300
     spawnOnDestroy: Girder
@@ -327,8 +309,7 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Walls/uranium.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Walls/uranium.rsi
+
   - type: Destructible
     deadThreshold: 300
     spawnOnDestroy: Girder
@@ -344,8 +325,7 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Walls/wood.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Walls/wood.rsi
+
   - type: Destructible
     deadThreshold: 300
     spawnOnDestroy: Girder
diff --git a/Resources/Prototypes/Entities/Constructible/Walls/windows.yml b/Resources/Prototypes/Entities/Constructible/Walls/windows.yml
index 2e025a1fc2..6ae5007b1b 100644
--- a/Resources/Prototypes/Entities/Constructible/Walls/windows.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/windows.yml
@@ -15,9 +15,7 @@
     netsync: false
     drawdepth: WallTops
     sprite: Constructible/Structures/Windows/window.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Windows/window.rsi
-    state: full
+
   - type: Collidable
     shapes:
     - !type:PhysShapeAabb
@@ -46,6 +44,4 @@
     sprite: Constructible/Structures/Windows/reinforced_window.rsi
   - type: Window
     base: rwindow
-  - type: Icon
-    sprite: Constructible/Structures/Windows/reinforced_window.rsi
-    state: full
+
diff --git a/Resources/Prototypes/Entities/Constructible/conveyor.yml b/Resources/Prototypes/Entities/Constructible/conveyor.yml
index 135cae7bec..c618be2cef 100644
--- a/Resources/Prototypes/Entities/Constructible/conveyor.yml
+++ b/Resources/Prototypes/Entities/Constructible/conveyor.yml
@@ -24,9 +24,7 @@
     sprite: Constructible/Power/conveyor.rsi
     state: conveyor_started_cw
     drawdepth: FloorObjects
-  - type: Icon
-    sprite: Constructible/Power/conveyor.rsi
-    state: conveyor_started_cw
+
   - type: Conveyor
   - type: Appearance
     visuals:
@@ -48,9 +46,7 @@
     netsync: false
     sprite: Constructible/Power/conveyor.rsi
     state: switch-off
-  - type: Icon
-    sprite: Constructible/Power/conveyor.rsi
-    state: switch-off
+
   - type: ConveyorSwitch
   - type: Appearance
     visuals:
diff --git a/Resources/Prototypes/Entities/Constructible/disposal.yml b/Resources/Prototypes/Entities/Constructible/disposal.yml
index 53e7f615cb..4beb3ca654 100644
--- a/Resources/Prototypes/Entities/Constructible/disposal.yml
+++ b/Resources/Prototypes/Entities/Constructible/disposal.yml
@@ -35,9 +35,7 @@
     drawdepth: BelowFloor
     sprite: Constructible/Power/disposal.rsi
     state: conpipe-s
-  - type: Icon
-    sprite: Constructible/Power/disposal.rsi
-    state: conpipe-s
+
   - type: DisposalTransit
   - type: Appearance
     visuals:
@@ -56,9 +54,7 @@
     drawdepth: BelowFloor
     sprite: Constructible/Power/disposal.rsi
     state: conpipe-tagger
-  - type: Icon
-    sprite: Constructible/Power/disposal.rsi
-    state: conpipe-tagger
+
   - type: DisposalTagger
   - type: Appearance
     visuals:
@@ -81,9 +77,7 @@
     drawdepth: BelowFloor
     sprite: Constructible/Power/disposal.rsi
     state: conpipe-t
-  - type: Icon
-    sprite: Constructible/Power/disposal.rsi
-    state: conpipe-t
+
   - type: DisposalEntry
   - type: Appearance
     visuals:
@@ -111,9 +105,7 @@
       map: ["enum.DisposalUnitVisualLayers.Handle"]
     - state: dispover-ready
       map: ["enum.DisposalUnitVisualLayers.Light"]
-  - type: Icon
-    sprite: Constructible/Power/disposal.rsi
-    state: disposal
+
   - type: PowerReceiver
   - type: DisposalUnit
     flushTime: 2
@@ -170,9 +162,7 @@
     drawdepth: BelowFloor
     sprite: Constructible/Power/disposal.rsi
     state: conpipe-j1s
-  - type: Icon
-    sprite: Constructible/Power/disposal.rsi
-    state: conpipe-j1s
+
   - type: DisposalRouter
     degrees:
     - 0
@@ -200,9 +190,7 @@
     drawdepth: BelowFloor
     sprite: Constructible/Power/disposal.rsi
     state: conpipe-j2s
-  - type: Icon
-    sprite: Constructible/Power/disposal.rsi
-    state: conpipe-j2s
+
   - type: DisposalRouter
     degrees:
     - 0
@@ -227,9 +215,7 @@
     drawdepth: BelowFloor
     sprite: Constructible/Power/disposal.rsi
     state: conpipe-j1
-  - type: Icon
-    sprite: Constructible/Power/disposal.rsi
-    state: conpipe-j1
+
   - type: DisposalJunction
     degrees:
     - 0
@@ -253,9 +239,7 @@
     drawdepth: BelowFloor
     sprite: Constructible/Power/disposal.rsi
     state: conpipe-j2
-  - type: Icon
-    sprite: Constructible/Power/disposal.rsi
-    state: conpipe-j2
+
   - type: DisposalJunction
     degrees:
     - 0
@@ -280,9 +264,7 @@
     drawdepth: BelowFloor
     sprite: Constructible/Power/disposal.rsi
     state: conpipe-y
-  - type: Icon
-    sprite: Constructible/Power/disposal.rsi
-    state: conpipe-y
+
   - type: DisposalJunction
     degrees:
     - 0
@@ -305,9 +287,7 @@
     drawdepth: BelowFloor
     sprite: Constructible/Power/disposal.rsi
     state: conpipe-c
-  - type: Icon
-    sprite: Constructible/Power/disposal.rsi
-    state: conpipe-c
+
   - type: DisposalBend
   - type: Appearance
     visuals:
diff --git a/Resources/Prototypes/Entities/Constructible/recycler.yml b/Resources/Prototypes/Entities/Constructible/recycler.yml
index e93749de34..8d4b281de7 100644
--- a/Resources/Prototypes/Entities/Constructible/recycler.yml
+++ b/Resources/Prototypes/Entities/Constructible/recycler.yml
@@ -25,9 +25,7 @@
     layers:
     - state: grinder-o1
       map: ["enum.RecyclerVisualLayers.Bloody"]
-  - type: Icon
-    sprite: Constructible/Power/recycling.rsi
-    state: grinder-o0
+
   - type: Appearance
     visuals:
     - type: RecyclerVisualizer
diff --git a/Resources/Prototypes/Entities/Effects/Markers/gamemode_conditional_spawners.yml b/Resources/Prototypes/Entities/Effects/Markers/gamemode_conditional_spawners.yml
index e6586b1a44..18f56d2501 100644
--- a/Resources/Prototypes/Entities/Effects/Markers/gamemode_conditional_spawners.yml
+++ b/Resources/Prototypes/Entities/Effects/Markers/gamemode_conditional_spawners.yml
@@ -8,9 +8,7 @@
       visible: false
       sprite: Interface/Misc/markers.rsi
       state: cross_blue
-    - type: Icon
-      sprite: Interface/Misc/markers.rsi
-      state: cross_blue
+
     - type: Marker
     - type: Clickable
     - type: InteractionOutline
@@ -29,9 +27,7 @@
       visible: false
       sprite: Interface/Misc/markers.rsi
       state: spawner_rifle
-    - type: Icon
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_rifle
+
     - type: ConditionalSpawner
       prototypes:
         - RifleAk
@@ -56,9 +52,7 @@
       visible: false
       sprite: Interface/Misc/markers.rsi
       state: spawner_pistol
-    - type: Icon
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_pistol
+
     - type: ConditionalSpawner
       prototypes:
         - PistolClarissa
@@ -86,9 +80,7 @@
       visible: false
       sprite: Interface/Misc/markers.rsi
       state: spawner_melee
-    - type: Icon
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_melee
+
     - type: ConditionalSpawner
       prototypes:
         - ButchCleaver
@@ -111,9 +103,7 @@
       visible: false
       sprite: Interface/Misc/markers.rsi
       state: spawner_revolver
-    - type: Icon
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_revolver
+
     - type: ConditionalSpawner
       prototypes:
         - RevolverDeckard
@@ -133,9 +123,7 @@
       visible: false
       sprite: Interface/Misc/markers.rsi
       state: spawner_shotgun
-    - type: Icon
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_shotgun
+
     - type: ConditionalSpawner
       prototypes:
         - ShotgunBojevic
@@ -159,9 +147,7 @@
       visible: false
       sprite: Interface/Misc/markers.rsi
       state: spawner_smg
-    - type: Icon
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_smg
+
     - type: ConditionalSpawner
       prototypes:
         - SmgAtreides
@@ -183,9 +169,7 @@
       visible: false
       sprite: Interface/Misc/markers.rsi
       state: spawner_sniper
-    - type: Icon
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_sniper
+
     - type: ConditionalSpawner
       prototypes:
         - SniperBoltGun
@@ -205,9 +189,7 @@
       visible: false
       sprite: Interface/Misc/markers.rsi
       state: spawner_hitscan
-    - type: Icon
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_hitscan
+
     - type: ConditionalSpawner
       prototypes:
         - RedLaser
@@ -231,9 +213,7 @@
       visible: false
       sprite: Interface/Misc/markers.rsi
       state: spawner_launcher
-    - type: Icon
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_launcher
+
     - type: ConditionalSpawner
       prototypes:
         - LauncherChinaLake
@@ -252,9 +232,7 @@
       visible: false
       sprite: Interface/Misc/markers.rsi
       state: spawner_grenade
-    - type: Icon
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_grenade
+
     - type: ConditionalSpawner
       prototypes:
         - ExGrenade
@@ -279,9 +257,7 @@
       visible: false
       sprite: Interface/Misc/markers.rsi
       state: spawner_rifle_ammo
-    - type: Icon
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_rifle_ammo
+
     - type: ConditionalSpawner
       prototypes:
         - MagazineSRifle
@@ -304,9 +280,7 @@
       visible: false
       sprite: Interface/Misc/markers.rsi
       state: spawner_shotgun_ammo
-    - type: Icon
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_shotgun_ammo
+
     - type: ConditionalSpawner
       prototypes:
         - MagazineShotgun
@@ -324,9 +298,7 @@
       visible: false
       sprite: Interface/Misc/markers.rsi
       state: spawner_pistol_ammo
-    - type: Icon
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_pistol_ammo
+
     - type: ConditionalSpawner
       prototypes:
         - MagazinePistol
@@ -345,9 +317,7 @@
       visible: false
       sprite: Interface/Misc/markers.rsi
       state: spawner_magnum_ammo
-    - type: Icon
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_magnum_ammo
+
     - type: ConditionalSpawner
       prototypes:
         - MagazineMagnum
@@ -366,9 +336,7 @@
       visible: false
       sprite: Interface/Misc/markers.rsi
       state: spawner_launcher_ammo
-    - type: Icon
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_launcher_ammo
+
     - type: ConditionalSpawner
       prototypes:
         - RocketAmmo
diff --git a/Resources/Prototypes/Entities/Effects/Markers/marker_base.yml b/Resources/Prototypes/Entities/Effects/Markers/marker_base.yml
index 582199bbf4..ad74ee4f86 100644
--- a/Resources/Prototypes/Entities/Effects/Markers/marker_base.yml
+++ b/Resources/Prototypes/Entities/Effects/Markers/marker_base.yml
@@ -12,7 +12,5 @@
     sprite: Interface/Misc/markers.rsi
     state: cross_blue
 
-  - type: Icon
-    sprite: Interface/Misc/markers.rsi
-    state: cross_blue
+
 
diff --git a/Resources/Prototypes/Entities/Effects/Markers/pointing.yml b/Resources/Prototypes/Entities/Effects/Markers/pointing.yml
index 2d21b2804c..0af772fcf4 100644
--- a/Resources/Prototypes/Entities/Effects/Markers/pointing.yml
+++ b/Resources/Prototypes/Entities/Effects/Markers/pointing.yml
@@ -6,9 +6,7 @@
     netsync: false
     sprite: Interface/Misc/pointing.rsi
     state: pointing
-  - type: Icon
-    sprite: Interface/Misc/pointing.rsi
-    state: pointing
+
   - type: PointingArrow
     duration: 4
     step: 0.5
diff --git a/Resources/Prototypes/Entities/Effects/Markers/spawn_points.yml b/Resources/Prototypes/Entities/Effects/Markers/spawn_points.yml
index bc1030a8ba..18543063af 100644
--- a/Resources/Prototypes/Entities/Effects/Markers/spawn_points.yml
+++ b/Resources/Prototypes/Entities/Effects/Markers/spawn_points.yml
@@ -8,8 +8,7 @@
     visible: false
     sprite: Interface/Misc/markers.rsi
     state: cross_blue
-  - type: Icon
-    sprite: Interface/Misc/markers.rsi
+
   - type: SpawnPoint
   - type: Marker
   - type: Clickable
@@ -27,8 +26,7 @@
     state: cross_red
   - type: SpawnPoint
     spawn_type: LateJoin
-  - type: Icon
-    state: cross_red
+
 
 - type: entity
   name: observer spawn point
@@ -39,5 +37,4 @@
     state: observer_start
   - type: SpawnPoint
     spawn_type: Observer
-  - type: Icon
-    state: observer_start
+
diff --git a/Resources/Prototypes/Entities/Effects/Markers/spawn_points_jobs.yml b/Resources/Prototypes/Entities/Effects/Markers/spawn_points_jobs.yml
index 78e10568b3..aae9082344 100644
--- a/Resources/Prototypes/Entities/Effects/Markers/spawn_points_jobs.yml
+++ b/Resources/Prototypes/Entities/Effects/Markers/spawn_points_jobs.yml
@@ -17,8 +17,7 @@
     job_id: Assistant
   - type: Sprite
     state: Assistant
-  - type: Icon
-    state: Assistant
+
 
 # Cargo tech
 - type: entity
@@ -30,8 +29,7 @@
     job_id: CargoTechnician
   - type: Sprite
     state: Cargo Technician
-  - type: Icon
-    state: Cargo Technician
+
 
 # Bartender
 - type: entity
@@ -43,8 +41,7 @@
     job_id: Bartender
   - type: Sprite
     state: Bartender
-  - type: Icon
-    state: Bartender
+
 
 # Bartender
 - type: entity
@@ -56,8 +53,7 @@
     job_id: Chef
   - type: Sprite
     state: Cook
-  - type: Icon
-    state: Cook
+
 
 # Clown
 - type: entity
@@ -69,8 +65,7 @@
     job_id: Clown
   - type: Sprite
     state: Clown
-  - type: Icon
-    state: Clown
+
 
 # Mime
 - type: entity
@@ -82,8 +77,7 @@
     job_id: Mime
   - type: Sprite
     state: Mime
-  - type: Icon
-    state: Mime
+
 
 # Janitor
 - type: entity
@@ -95,8 +89,7 @@
     job_id: Janitor
   - type: Sprite
     state: Janitor
-  - type: Icon
-    state: Janitor
+
 
 # Captain
 - type: entity
@@ -108,8 +101,7 @@
     job_id: Captain
   - type: Sprite
     state: Captain
-  - type: Icon
-    state: Captain
+
 
 # Head of Personnel
 - type: entity
@@ -121,8 +113,7 @@
     job_id: HeadOfPersonnel
   - type: Sprite
     state: Head of Personnel
-  - type: Icon
-    state: Head of Personnel
+
 
 # ChiefEngineer
 - type: entity
@@ -134,8 +125,7 @@
     job_id: ChiefEngineer
   - type: Sprite
     state: Chief Engineer
-  - type: Icon
-    state: Chief Engineer
+
 
 # StationEngineer
 - type: entity
@@ -147,8 +137,7 @@
     job_id: StationEngineer
   - type: Sprite
     state: Station Engineer
-  - type: Icon
-    state: Station Engineer
+
 
 # ChiefMedicalOfficer
 - type: entity
@@ -160,8 +149,7 @@
     job_id: ChiefMedicalOfficer
   - type: Sprite
     state: Chief Medical Officer
-  - type: Icon
-    state: Chief Medical Officer
+
 
 # MedicalDoctor
 - type: entity
@@ -173,8 +161,7 @@
     job_id: MedicalDoctor
   - type: Sprite
     state: Medical Doctor
-  - type: Icon
-    state: Medical Doctor
+
 
 # ResearchDirector
 - type: entity
@@ -186,8 +173,7 @@
     job_id: ResearchDirector
   - type: Sprite
     state: Research Director
-  - type: Icon
-    state: Research Director
+
 
 # Scientist
 - type: entity
@@ -199,8 +185,7 @@
     job_id: Scientist
   - type: Sprite
     state: Scientist
-  - type: Icon
-    state: Scientist
+
 
 # HeadOfSecurity
 - type: entity
@@ -212,8 +197,7 @@
     job_id: HeadOfSecurity
   - type: Sprite
     state: Head of Security
-  - type: Icon
-    state: Head of Security
+
 
 # SecurityOfficer
 - type: entity
@@ -225,5 +209,4 @@
     job_id: SecurityOfficer
   - type: Sprite
     state: Security Officer
-  - type: Icon
-    state: Security Officer
+
diff --git a/Resources/Prototypes/Entities/Effects/Markers/timed_spawners.yml b/Resources/Prototypes/Entities/Effects/Markers/timed_spawners.yml
index e9ff4e9f79..7972f70cc3 100644
--- a/Resources/Prototypes/Entities/Effects/Markers/timed_spawners.yml
+++ b/Resources/Prototypes/Entities/Effects/Markers/timed_spawners.yml
@@ -8,9 +8,7 @@
       visible: false
       sprite: Interface/Misc/markers.rsi
       state: cross_blue
-    - type: Icon
-      sprite: Interface/Misc/markers.rsi
-      state: cross_blue
+
     - type: Marker
     - type: Clickable
     - type: InteractionOutline
@@ -29,9 +27,7 @@
       visible: false
       sprite: Interface/Misc/markers.rsi
       state: spawner_ai
-    - type: Icon
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_ai
+
     - type: TimedSpawner
       prototypes:
         - HumanMob_Spirate
@@ -51,9 +47,7 @@
       visible: false
       sprite: Interface/Misc/markers.rsi
       state: spawner_xenoai
-    - type: Icon
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_xenoai
+
     - type: TimedSpawner
       prototypes:
         - XenoMob_Content
diff --git a/Resources/Prototypes/Entities/Effects/Markers/toy_spawner.yml b/Resources/Prototypes/Entities/Effects/Markers/toy_spawner.yml
index 3fb752e38c..f16fa7b6c1 100644
--- a/Resources/Prototypes/Entities/Effects/Markers/toy_spawner.yml
+++ b/Resources/Prototypes/Entities/Effects/Markers/toy_spawner.yml
@@ -7,9 +7,7 @@
       visible: false
       sprite: Interface/Misc/markers.rsi
       state: spawner_toy
-    - type: Icon
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_toy
+
     - type: Marker
     - type: Clickable
     - type: InteractionOutline
@@ -46,9 +44,7 @@
       visible: false
       sprite: Interface/Misc/markers.rsi
       state: spawner_figure
-    - type: Icon
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_figure
+
     - type: Marker
     - type: Clickable
     - type: InteractionOutline
diff --git a/Resources/Prototypes/Entities/Effects/Markers/trash_spawner.yml b/Resources/Prototypes/Entities/Effects/Markers/trash_spawner.yml
index f8012a17e2..c6b389d157 100644
--- a/Resources/Prototypes/Entities/Effects/Markers/trash_spawner.yml
+++ b/Resources/Prototypes/Entities/Effects/Markers/trash_spawner.yml
@@ -7,9 +7,7 @@
       visible: false
       sprite: Interface/Misc/markers.rsi
       state: spawner_trash
-    - type: Icon
-      sprite: Interface/Misc/markers.rsi
-      state: spawner_trash
+
     - type: Marker
     - type: Clickable
     - type: InteractionOutline
diff --git a/Resources/Prototypes/Entities/Effects/Markers/warp_point.yml b/Resources/Prototypes/Entities/Effects/Markers/warp_point.yml
index f961a54c78..1806459627 100644
--- a/Resources/Prototypes/Entities/Effects/Markers/warp_point.yml
+++ b/Resources/Prototypes/Entities/Effects/Markers/warp_point.yml
@@ -7,7 +7,6 @@
   - type: Sprite
     state: cross_pink
 
-  - type: Icon
-    state: cross_pink
+
 
 
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 70fba4d857..a4dd7a47b5 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -24,9 +24,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: monkey
       sprite: Mobs/Animals/monkey.rsi
-  - type: Icon
-    sprite: Mobs/Animals/monkey.rsi
-    state: monkey
+
   - type: Clickable
   - type: Physics
     mass: 50
@@ -78,9 +76,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: crawling
       sprite: Mobs/Animals/gorilla.rsi
-  - type: Icon
-    sprite: Mobs/Animals/gorilla.rsi
-    state: icon
+
   - type: Physics
     mass: 90
   - type: Collidable
@@ -116,9 +112,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: chicken-0
       sprite: Mobs/Animals/chicken.rsi
-  - type: Icon
-    sprite: Mobs/Animals/chicken.rsi
-    state: icon-0
+
   - type: Physics
     mass: 20
   - type: Collidable
@@ -157,9 +151,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: butterfly
       sprite: Mobs/Animals/butterfly.rsi
-  - type: Icon
-    sprite: Mobs/Animals/butterfly.rsi
-    state: butterfly
+
   - type: Physics
     mass: 5
   - type: Collidable
@@ -208,9 +200,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: bat
       sprite: Mobs/Animals/bat.rsi
-  - type: Icon
-    sprite: Mobs/Animals/bat.rsi
-    state: bat
+
   - type: Physics
     mass: 5
   - type: Collidable
@@ -250,9 +240,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: 0
       sprite: Mobs/Animals/bee.rsi
-  - type: Icon
-    sprite: Objects/Fun/toys.rsi
-    state: plushie_h
+
   - type: Physics
     mass: 5
   - type: Collidable
@@ -288,9 +276,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: goat
       sprite: Mobs/Animals/goat.rsi
-  - type: Icon
-    sprite: Mobs/Animals/goat.rsi
-    state: goat
+
   - type: Physics
     mass: 20
   - type: Collidable
@@ -327,9 +313,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: goose
       sprite: Mobs/Animals/goose.rsi
-  - type: Icon
-    sprite: Mobs/Animals/goose.rsi
-    state: goose
+
   - type: Physics
     mass: 20
   - type: Collidable
@@ -369,9 +353,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: parrot
       sprite: Mobs/Animals/parrot.rsi
-  - type: Icon
-    sprite: Mobs/Animals/parrot.rsi
-    state: icon
+
   - type: Physics
     mass: 20
   - type: Collidable
@@ -407,9 +389,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: snake
       sprite: Mobs/Animals/snake.rsi
-  - type: Icon
-    sprite: Mobs/Animals/snake.rsi
-    state: icon
+
   - type: Physics
     mass: 10
   - type: Collidable
@@ -448,9 +428,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: tarantula
       sprite: Mobs/Animals/spider.rsi
-  - type: Icon
-    sprite: Mobs/Animals/spider.rsi
-    state: tarantula
+
   - type: Physics
     mass: 10
   - type: Collidable
@@ -486,9 +464,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: crab
       sprite: Mobs/Animals/crab.rsi
-  - type: Icon
-    sprite: Mobs/Animals/crab.rsi
-    state: crab
+
   - type: Physics
     mass: 10
   - type: Collidable
@@ -524,9 +500,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: penguin
       sprite: Mobs/Animals/penguin.rsi
-  - type: Icon
-    sprite: Mobs/Animals/penguin.rsi
-    state: penguin
+
   - type: Physics
     mass: 10
   - type: Collidable
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
index 20f6b34c4f..23fdb0dd73 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -19,9 +19,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: carp
       sprite: Mobs/Aliens/Carps/carp_space.rsi
-  - type: Icon
-    sprite: Mobs/Aliens/Carps/carp_space.rsi
-    state: icon
+
   - type: Clickable
   - type: Physics
     mass: 50
@@ -72,9 +70,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: magicarp
       sprite: Mobs/Aliens/Carps/carp_magic.rsi
-  - type: Icon
-    sprite: Mobs/Aliens/Carps/carp_magic.rsi
-    state: icon
+
   - type: Physics
     mass: 60
   - type: Appearance
@@ -98,9 +94,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: holocarp
       sprite: Mobs/Aliens/Carps/carp_holo.rsi
-  - type: Icon
-    sprite: Mobs/Aliens/Carps/carp_holo.rsi
-    state: icon
+
   - type: Physics
     mass: 5
   - type: Appearance
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml b/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml
index 613ad6ec84..85e716146e 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml
@@ -20,9 +20,7 @@
     drawdepth: Mobs
     sprite: Constructible/Power/VendingMachines/cola.rsi
     state: normal
-  - type: Icon
-    sprite: Constructible/Power/VendingMachines/cola.rsi
-    state: off
+
   - type: Physics
     mass: 85
   - type: Collidable
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index b24b2d0d92..771d56d894 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -70,9 +70,7 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: corgi
-  - type: Icon
-    sprite: Mobs/Pets/corgi.rsi
-    state: corgi
+
   - type: Physics
     mass: 10
   - type: Collidable
@@ -108,9 +106,7 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: ian
-  - type: Icon
-    sprite: Mobs/Pets/corgi.rsi
-    state: ian
+
   - type: Physics
     mass: 10
   - type: Collidable
@@ -146,9 +142,7 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: cat
-  - type: Icon
-    sprite: Mobs/Pets/cat.rsi
-    state: cat
+
   - type: Physics
     mass: 10
   - type: Collidable
@@ -184,9 +178,7 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: cat2
-  - type: Icon
-    sprite: Mobs/Pets/cat.rsi
-    state: cat
+
   - type: Collidable
     shapes:
     - !type:PhysShapeAabb
@@ -223,9 +215,7 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: sloth
-  - type: Icon
-    sprite: Mobs/Pets/sloth.rsi
-    state: sloth
+
   - type: Physics
     mass: 10
   - type: Collidable
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
index 5100d62b5c..8924d0f9c6 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -21,9 +21,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: running
       sprite: Mobs/Aliens/Xenos/xeno_hunter.rsi
-  - type: Icon
-    sprite: Mobs/Aliens/Xenos/xeno_hunter.rsi
-    state: standing
+
   - type: Clickable
   - type: Physics
     mass: 85
diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml
index b85d25d8a9..eec6108039 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml
@@ -120,9 +120,7 @@
       sprite: Mobs/Effects/onfire.rsi
       state: Generic_mob_burning
       visible: false
-  - type: Icon
-    sprite: Mobs/Species/Human/parts.rsi
-    state: full
+
   - type: Physics
     mass: 85
   - type: Collidable
@@ -283,9 +281,7 @@
       - map: ["enum.Slots.HEAD"]
       - map: ["hand-left"]
       - map: ["hand-right"]
-    - type: Icon
-      sprite: Mobs/Species/Human/parts.rsi
-      state: full
+
     - type: Physics
       mass: 85
     - type: Collidable
diff --git a/Resources/Prototypes/Entities/Mobs/body_system_dropped_abstract.yml b/Resources/Prototypes/Entities/Mobs/body_system_dropped_abstract.yml
index 2ba5ab2934..c29258741e 100644
--- a/Resources/Prototypes/Entities/Mobs/body_system_dropped_abstract.yml
+++ b/Resources/Prototypes/Entities/Mobs/body_system_dropped_abstract.yml
@@ -7,7 +7,6 @@
   - type: DroppedBodyPart
   - type: Sprite
     texture: Mobs/Species/Human/parts.rsi/torso_m.png
-  - type: Icon
   - type: UserInterface
     interfaces:
     - key: enum.GenericSurgeryUiKey.Key
@@ -22,7 +21,6 @@
   - type: DroppedMechanism
   - type: Sprite
     texture: Mobs/Parts/Organs/eyeballs.png
-  - type: Icon
   - type: UserInterface
     interfaces:
     - key: enum.GenericSurgeryUiKey.Key
diff --git a/Resources/Prototypes/Entities/Objects/Boxes/boxbase.yml b/Resources/Prototypes/Entities/Objects/Boxes/boxbase.yml
index 0fadbb8698..d84d0f45a9 100644
--- a/Resources/Prototypes/Entities/Objects/Boxes/boxbase.yml
+++ b/Resources/Prototypes/Entities/Objects/Boxes/boxbase.yml
@@ -5,8 +5,6 @@
   components:
   - type: Sprite
     sprite: Objects/Storage/boxes.rsi
-  - type: Icon
-    sprite: Objects/Storage/boxicons.rsi
   - type: Item
     sprite: Objects/Storage/boxes.rsi
     size: 9999
diff --git a/Resources/Prototypes/Entities/Objects/Boxes/boxes_food.yml b/Resources/Prototypes/Entities/Objects/Boxes/boxes_food.yml
index 776d5e485b..63b1cad2e8 100644
--- a/Resources/Prototypes/Entities/Objects/Boxes/boxes_food.yml
+++ b/Resources/Prototypes/Entities/Objects/Boxes/boxes_food.yml
@@ -11,9 +11,6 @@
   - type: Sprite
     sprite: Objects/Storage/donkpocket.rsi
     state: icon
-  - type: Icon
-    sprite: Objects/Storage/donkpocket.rsi
-    state: icon
   - type: Item
     color: "#951710"
     sprite: Objects/Storage/donkpocket.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Boxes/boxes_general.yml b/Resources/Prototypes/Entities/Objects/Boxes/boxes_general.yml
index 8d8b0eba0b..11140bac18 100644
--- a/Resources/Prototypes/Entities/Objects/Boxes/boxes_general.yml
+++ b/Resources/Prototypes/Entities/Objects/Boxes/boxes_general.yml
@@ -12,8 +12,6 @@
     layers:
       - state: box
       - state: light
-  - type: Icon
-    state: light
   - type: Item
 
 - type: entity
@@ -30,8 +28,6 @@
     layers:
       - state: box
       - state: lighttube
-  - type: Icon
-    state: lighttube
   - type: Item
 
 - type: entity
@@ -48,8 +44,6 @@
     layers:
       - state: box
       - state: lightmixed
-  - type: Icon
-    state: lightmixed
   - type: Item
 
 - type: entity
@@ -66,8 +60,6 @@
     layers:
       - state: box
       - state: pda
-  - type: Icon
-    state: pda
   - type: Item
   - type: Storage
     capacity: 3
@@ -86,8 +78,6 @@
     layers:
       - state: box
       - state: meson
-  - type: Icon
-    state: meson
   - type: Item
   - type: Storage
     capacity: 20
@@ -107,8 +97,6 @@
     layers:
       - state: box
       - state: writing
-  - type: Icon
-    state: box
   - type: Item
     size: 15
   - type: Storage
diff --git a/Resources/Prototypes/Entities/Objects/Boxes/boxes_medical.yml b/Resources/Prototypes/Entities/Objects/Boxes/boxes_medical.yml
index 9ea6abe5c6..8588b3528b 100644
--- a/Resources/Prototypes/Entities/Objects/Boxes/boxes_medical.yml
+++ b/Resources/Prototypes/Entities/Objects/Boxes/boxes_medical.yml
@@ -12,8 +12,7 @@
     layers:
       - state: box
       - state: syringe
-  - type: Icon
-    state: syringe
+
   - type: Item
   - type: Storage
     capacity: 30
@@ -32,8 +31,7 @@
     layers:
       - state: box
       - state: sterile
-  - type: Icon
-    state: sterile
+
   - type: Item
   - type: Storage
     capacity: 20
@@ -52,8 +50,7 @@
     layers:
       - state: box
       - state: latex
-  - type: Icon
-    state: latex
+
   - type: Item
   - type: Storage
     capacity: 20
diff --git a/Resources/Prototypes/Entities/Objects/Boxes/boxes_science.yml b/Resources/Prototypes/Entities/Objects/Boxes/boxes_science.yml
index f40c51dd69..4ad4fb37b8 100644
--- a/Resources/Prototypes/Entities/Objects/Boxes/boxes_science.yml
+++ b/Resources/Prototypes/Entities/Objects/Boxes/boxes_science.yml
@@ -14,8 +14,7 @@
     layers:
       - state: box
       - state: beaker
-  - type: Icon
-    state: beaker
+
   - type: Item
   - type: Storage
     capacity: 30
diff --git a/Resources/Prototypes/Entities/Objects/Boxes/boxes_security.yml b/Resources/Prototypes/Entities/Objects/Boxes/boxes_security.yml
index 2ac2493050..f910882e37 100644
--- a/Resources/Prototypes/Entities/Objects/Boxes/boxes_security.yml
+++ b/Resources/Prototypes/Entities/Objects/Boxes/boxes_security.yml
@@ -12,8 +12,7 @@
     layers:
       - state: box_security
       - state: handcuff
-  - type: Icon
-    state: handcuff
+
   - type: Item
   - type: Storage
     capacity: 6
@@ -32,8 +31,7 @@
     layers:
       - state: box_security
       - state: flashbang
-  - type: Icon
-    state: flashbang
+
   - type: Item
   - type: Storage
     capacity: 20
@@ -52,8 +50,7 @@
     layers:
       - state: box_security
       - state: sechud
-  - type: Icon
-    state: sechud
+
   - type: Item
   - type: Storage
     capacity: 20
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml
index fcce80914c..d8255085c6 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml
@@ -14,8 +14,7 @@
   - type: Drink
   - type: Sprite
     state: icon
-  - type: Icon
-    state: icon
+
   - type: Spillable
 
 - type: entity
@@ -34,8 +33,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/glass_clear.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/glass_clear.rsi
+
   - type: SolutionContainer
     fillingState: glass
     maxVol: 50
@@ -58,8 +56,7 @@
         Quantity: 20
   - type: Sprite
     sprite: Objects/Consumable/Drinks/aleglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/aleglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -76,8 +73,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/antifreeze.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/antifreeze.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -94,8 +90,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/atomicbombglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/atomicbombglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -112,8 +107,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/b52glass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/b52glass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -124,8 +118,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/bananahonkglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/bananahonkglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -136,8 +129,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/beepskysmashglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/beepskysmashglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -153,8 +145,7 @@
         Quantity: 20
   - type: Sprite
     sprite: Objects/Consumable/Drinks/beer.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/beer.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -170,8 +161,7 @@
         Quantity: 20
   - type: Sprite
     sprite: Objects/Consumable/Drinks/beerglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/beerglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -182,8 +172,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/berryjuice.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/berryjuice.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -194,8 +183,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/blackrussianglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/blackrussianglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -206,8 +194,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/bloodymaryglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/bloodymaryglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -218,8 +205,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/booger.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/booger.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -230,8 +216,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/bravebullglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/bravebullglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -242,8 +227,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/brownstar.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/brownstar.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -255,9 +239,7 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/carafe.rsi
     state: icon-10
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/carafe.rsi
-    state: icon-10
+
   - type: Appearance
     visuals:
     - type: DrinkFoodVisualizer
@@ -272,8 +254,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/carrotjuice.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/carrotjuice.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -284,8 +265,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/chocolateglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/chocolateglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -296,8 +276,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/cafe_latte.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/cafe_latte.rsi
+
 
 
 - type: entity
@@ -314,8 +293,7 @@
         Quantity: 20
   - type: Sprite
     sprite: Objects/Consumable/Drinks/coffee.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/coffee.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -331,8 +309,7 @@
         Quantity: 20
   - type: Sprite
     sprite: Objects/Consumable/Drinks/cognacglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/cognacglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -348,8 +325,7 @@
         Quantity: 20
   - type: Sprite
     sprite: Objects/Consumable/Drinks/colabottle.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/colabottle.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -365,8 +341,7 @@
         Quantity: 20
   - type: Sprite
     sprite: Objects/Consumable/Drinks/cream.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/cream.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -382,8 +357,7 @@
         Quantity: 20
   - type: Sprite
     sprite: Objects/Consumable/Drinks/cubalibreglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/cubalibreglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -394,8 +368,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/curacaoglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/curacaoglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -406,8 +379,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/demonsblood.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/demonsblood.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -418,8 +390,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/detflask.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/detflask.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -430,8 +401,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/devilskiss.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/devilskiss.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -442,8 +412,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/doctorsdelightglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/doctorsdelightglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -454,8 +423,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/driestmartiniglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/driestmartiniglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -466,8 +434,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/dr_gibb_glass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/dr_gibb_glass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -478,8 +445,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/emeraldglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/emeraldglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -490,8 +456,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/erikasurprise.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/erikasurprise.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -502,8 +467,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/flask.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/flask.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -514,8 +478,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/flask_old.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/flask_old.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -526,8 +489,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/gargleblasterglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/gargleblasterglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -538,8 +500,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/ginfizzglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/ginfizzglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -550,8 +511,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/gintonicglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/gintonicglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -562,8 +522,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/ginvodkaglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/ginvodkaglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -574,8 +533,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/glass_brown.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/glass_brown.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -586,8 +544,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/glass_brown2.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/glass_brown2.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -598,8 +555,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/glass_clear.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/glass_clear.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -610,8 +566,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/glass_green.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/glass_green.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -622,8 +577,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/glass_orange.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/glass_orange.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -634,8 +588,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/glass_red.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/glass_red.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -651,8 +604,7 @@
         Quantity: 20
   - type: Sprite
     sprite: Objects/Consumable/Drinks/glass_white.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/glass_white.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -663,8 +615,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/glass_yellow.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/glass_yellow.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -675,8 +626,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/goldschlagerglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/goldschlagerglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -687,8 +637,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/grapejuice.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/grapejuice.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -700,8 +649,7 @@
     isOpen: true
   - type: Sprite
     sprite: Objects/Consumable/Drinks/grenadinebottle.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/grenadinebottle.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -712,8 +660,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/grenadineglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/grenadineglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -724,8 +671,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/grogglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/grogglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -736,8 +682,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/gsodaglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/gsodaglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -748,8 +693,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/hell.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/hell.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -760,8 +704,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/hippiesdelightglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/hippiesdelightglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -772,8 +715,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/icedcoffeeglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/icedcoffeeglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -784,8 +726,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/icedteaglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/icedteaglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -796,8 +737,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/iced_beerglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/iced_beerglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -813,8 +753,7 @@
         Quantity: 20
   - type: Sprite
     sprite: Objects/Consumable/Drinks/iceglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/iceglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -830,8 +769,7 @@
         Quantity: 20
   - type: Sprite
     sprite: Objects/Consumable/Drinks/irishcarbomb.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/irishcarbomb.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -847,8 +785,7 @@
         Quantity: 20
   - type: Sprite
     sprite: Objects/Consumable/Drinks/irishcoffeeglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/irishcoffeeglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -864,8 +801,7 @@
         Quantity: 20
   - type: Sprite
     sprite: Objects/Consumable/Drinks/irishcreamglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/irishcreamglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -876,8 +812,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/jar.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/jar.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -888,8 +823,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/jar_metroid.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/jar_metroid.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -900,8 +834,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/jar_what.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/jar_what.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -917,8 +850,7 @@
         Quantity: 20
   - type: Sprite
     sprite: Objects/Consumable/Drinks/kahluaglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/kahluaglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -929,8 +861,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/kiraspecial.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/kiraspecial.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -941,8 +872,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/lemonade.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/lemonade.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -953,8 +883,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/lemonadeglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/lemonadeglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -965,8 +894,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/lemonglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/lemonglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -977,8 +905,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/lemonjuice.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/lemonjuice.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -989,8 +916,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/lemonlime.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/lemonlime.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1001,8 +927,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/limejuice.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/limejuice.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1013,8 +938,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/lithiumflask.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/lithiumflask.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1025,8 +949,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/longislandicedteaglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/longislandicedteaglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1037,8 +960,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/manhattanglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/manhattanglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1054,8 +976,7 @@
         Quantity: 20
   - type: Sprite
     sprite: Objects/Consumable/Drinks/manlydorfglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/manlydorfglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1066,8 +987,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/margaritaglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/margaritaglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1078,8 +998,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/martiniglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/martiniglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1090,8 +1009,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/meadglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/meadglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1107,8 +1025,7 @@
         Quantity: 20
   - type: Sprite
     sprite: Objects/Consumable/Drinks/milk.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/milk.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1119,8 +1036,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/milkshake.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/milkshake.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1131,8 +1047,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/mojito.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/mojito.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1143,8 +1058,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/neurotoxinglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/neurotoxinglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1155,8 +1069,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/nothing.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/nothing.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1167,8 +1080,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/ntcahors.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/ntcahors.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1179,8 +1091,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/nuka_colaglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/nuka_colaglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1191,8 +1102,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/orangejuice.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/orangejuice.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1203,8 +1113,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/patronglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/patronglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1215,8 +1124,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/poisonberryjuice.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/poisonberryjuice.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1227,8 +1135,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/proj_manhattanglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/proj_manhattanglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1239,8 +1146,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/pwineglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/pwineglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1251,8 +1157,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/ramen.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/ramen.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1263,8 +1168,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/red_meadglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/red_meadglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1275,8 +1179,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/rewriter.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/rewriter.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1287,8 +1190,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/rumglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/rumglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1299,8 +1201,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/sbitenglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/sbitenglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1311,8 +1212,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/screwdriverglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/screwdriverglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1323,8 +1223,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/sdreamglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/sdreamglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1335,8 +1234,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/shake-blue.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/shake-blue.rsi
+
 
 # TODO: MOVE
 - type: entity
@@ -1348,8 +1246,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/shake-empty.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/shake-empty.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1360,8 +1257,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/shake-meat.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/shake-meat.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1372,8 +1268,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/shake-robo.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/shake-robo.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1384,8 +1279,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/shake-white.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/shake-white.rsi
+
 
 # TODO: Move to containers
 - type: entity
@@ -1397,8 +1291,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/shaker.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/shaker.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1409,8 +1302,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/shinyflask.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/shinyflask.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1421,8 +1313,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/shotglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/shotglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1433,8 +1324,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/silencerglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/silencerglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1445,8 +1335,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/singulo.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/singulo.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1457,8 +1346,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/snowwhite.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/snowwhite.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1469,8 +1357,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/sodawater.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/sodawater.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1481,8 +1368,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/soymilk.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/soymilk.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1493,8 +1379,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/soy_latte.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/soy_latte.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1505,8 +1390,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/space-up_bottle.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/space-up_bottle.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1517,8 +1401,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/space-up_glass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/space-up_glass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1529,8 +1412,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1541,8 +1423,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/space_mountain_wind_glass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/space_mountain_wind_glass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1558,8 +1439,7 @@
         Quantity: 20
   - type: Sprite
     sprite: Objects/Consumable/Drinks/syndicatebomb.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/syndicatebomb.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1575,8 +1455,7 @@
         Quantity: 20
   - type: Sprite
     sprite: Objects/Consumable/Drinks/teaglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/teaglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1592,8 +1471,7 @@
         Quantity: 20
   - type: Sprite
     sprite: Objects/Consumable/Drinks/teapot.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/teapot.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1604,8 +1482,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/tequillaglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/tequillaglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1616,8 +1493,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/tequillasunriseglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/tequillasunriseglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1628,8 +1504,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/thirteen_loko_glass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/thirteen_loko_glass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1640,8 +1515,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/threemileislandglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/threemileislandglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1652,8 +1526,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/tomatojuice.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/tomatojuice.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1664,8 +1537,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/tonic.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/tonic.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1676,8 +1548,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/toxinsspecialglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/toxinsspecialglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1688,8 +1559,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/vacuumflask.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/vacuumflask.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1700,8 +1570,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/vermouthglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/vermouthglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1712,8 +1581,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/vodkatonicglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/vodkatonicglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1724,8 +1592,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/water.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/water.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1736,8 +1603,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/waterbottle.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/waterbottle.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1748,8 +1614,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/watermelon.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/watermelon.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1761,9 +1626,7 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/water_cup.rsi
     state: icon-1
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/water_cup.rsi
-    state: icon-1
+
   - type: Appearance
     visuals:
     - type: DrinkFoodVisualizer
@@ -1783,8 +1646,7 @@
         Quantity: 20
   - type: Sprite
     sprite: Objects/Consumable/Drinks/whiskeycolaglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/whiskeycolaglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1800,8 +1662,7 @@
         Quantity: 20
   - type: Sprite
     sprite: Objects/Consumable/Drinks/whiskeyglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/whiskeyglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1812,8 +1673,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/whiskeysodaglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/whiskeysodaglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1824,8 +1684,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/whiskeysodaglass2.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/whiskeysodaglass2.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1836,8 +1695,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/whiterussianglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/whiterussianglass.rsi
+
 
 - type: entity
   parent: DrinkGlassBase
@@ -1853,5 +1711,4 @@
         Quantity: 20
   - type: Sprite
     sprite: Objects/Consumable/Drinks/wineglass.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/wineglass.rsi
+
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml
index e1eabe3746..e25378d2e0 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml
@@ -11,8 +11,7 @@
     transferAmount: 5
   - type: Sprite
     state: icon
-  - type: Icon
-    state: icon
+
   - type: Spillable
 
 - type: entity
@@ -24,8 +23,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/absinthebottle.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/absinthebottle.rsi
+
 
 - type: entity
   parent: DrinkBottleBaseFull
@@ -36,8 +34,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/alco-green.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/alco-green.rsi
+
 
 - type: entity
   parent: DrinkBottleBaseFull
@@ -53,8 +50,7 @@
         Quantity: 80
   - type: Sprite
     sprite: Objects/Consumable/Drinks/alebottle.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/alebottle.rsi
+
 
 - type: entity
   parent: DrinkBottleBaseFull
@@ -65,8 +61,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/bottleofnothing.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/bottleofnothing.rsi
+
 
 - type: entity
   parent: DrinkBottleBaseFull
@@ -82,8 +77,7 @@
         Quantity: 80
   - type: Sprite
     sprite: Objects/Consumable/Drinks/cognacbottle.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/cognacbottle.rsi
+
 
 - type: entity
   parent: DrinkBottleBaseFull
@@ -94,8 +88,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/ginbottle.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/ginbottle.rsi
+
 
 - type: entity
   parent: DrinkBottleBaseFull
@@ -106,8 +99,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/goldschlagerbottle.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/goldschlagerbottle.rsi
+
 
 - type: entity
   parent: DrinkBottleBaseFull
@@ -123,8 +115,7 @@
         Quantity: 80
   - type: Sprite
     sprite: Objects/Consumable/Drinks/kahluabottle.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/kahluabottle.rsi
+
 
 - type: entity
   parent: DrinkBottleBaseFull
@@ -135,8 +126,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/patronbottle.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/patronbottle.rsi
+
 
 - type: entity
   parent: DrinkBottleBaseFull
@@ -147,8 +137,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/pwinebottle.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/pwinebottle.rsi
+
 
 - type: entity
   parent: DrinkBottleBaseFull
@@ -159,8 +148,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/rumbottle.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/rumbottle.rsi
+
 
 - type: entity
   parent: DrinkBottleBaseFull
@@ -171,8 +159,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/tequillabottle.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/tequillabottle.rsi
+
 
 - type: entity
   parent: DrinkBottleBaseFull
@@ -183,8 +170,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/vermouthbottle.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/vermouthbottle.rsi
+
 
 - type: entity
   parent: DrinkBottleBaseFull
@@ -200,8 +186,7 @@
         Quantity: 80
   - type: Sprite
     sprite: Objects/Consumable/Drinks/vodkabottle.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/vodkabottle.rsi
+
 
 - type: entity
   parent: DrinkBottleBaseFull
@@ -217,8 +202,7 @@
         Quantity: 80
   - type: Sprite
     sprite: Objects/Consumable/Drinks/whiskeybottle.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/whiskeybottle.rsi
+
 
 - type: entity
   parent: DrinkBottleBaseFull
@@ -234,5 +218,4 @@
         Quantity: 80
   - type: Sprite
     sprite: Objects/Consumable/Drinks/winebottle.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/winebottle.rsi
+
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml
index 1e1223e8fd..a998d1efa8 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml
@@ -17,8 +17,7 @@
     transferAmount: 5
   - type: Sprite
     state: icon
-  - type: Icon
-    state: icon
+
   - type: Spillable
 
 - type: entity
@@ -30,8 +29,7 @@
   - type: SolutionContainer
   - type: Sprite
     sprite: Objects/Consumable/Drinks/cola.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/cola.rsi
+
   - type: Item
     sprite: Objects/Consumable/Drinks/cola.rsi
 
@@ -43,8 +41,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/ice_tea_can.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/ice_tea_can.rsi
+
   - type: Item
     sprite: Objects/Consumable/Drinks/ice_tea_can.rsi
 
@@ -56,8 +53,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/lemon-lime.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/lemon-lime.rsi
+
   - type: Item
     sprite: Objects/Consumable/Drinks/lemon-lime.rsi
 
@@ -69,8 +65,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/purple_can.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/purple_can.rsi
+
   - type: Item
     sprite: Objects/Consumable/Drinks/purple_can.rsi
 
@@ -82,8 +77,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/space_mountain_wind.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/space_mountain_wind.rsi
+
   - type: Item
     sprite: Objects/Consumable/Drinks/space_mountain_wind.rsi
 
@@ -95,8 +89,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/space-up.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/space-up.rsi
+
   - type: Item
     sprite: Objects/Consumable/Drinks/space-up.rsi
 
@@ -108,8 +101,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/starkist.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/starkist.rsi
+
   - type: Item
     sprite: Objects/Consumable/Drinks/starkist.rsi
 
@@ -121,8 +113,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/thirteen_loko.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/thirteen_loko.rsi
+
   - type: Item
     sprite: Objects/Consumable/Drinks/thirteen_loko.rsi
 
@@ -135,8 +126,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/changelingsting.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/changelingsting.rsi
+
   - type: Item
     sprite: Objects/Consumable/Drinks/changelingsting.rsi
 
@@ -149,8 +139,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/dr_gibb.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/dr_gibb.rsi
+
   - type: Item
     sprite: Objects/Consumable/Drinks/dr_gibb.rsi
 
@@ -163,7 +152,6 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/energy_drink.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/energy_drink.rsi
+
   - type: Item
     sprite: Objects/Consumable/Drinks/energy_drink.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cups.yml
index 257f1021fd..f0da336e14 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cups.yml
@@ -14,8 +14,7 @@
     isOpen: true
   - type: Sprite
     state: icon
-  - type: Icon
-    state: icon
+
   - type: Spillable
 
 - type: entity
@@ -28,8 +27,7 @@
     maxVol: 10
   - type: Sprite
     sprite: Objects/Consumable/Drinks/golden_cup.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/golden_cup.rsi
+
 
 - type: entity
   parent: DrinkBaseCup
@@ -42,9 +40,7 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/pitcher.rsi
     state: icon-6
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/pitcher.rsi
-    state: icon-6
+
   - type: Appearance
     visuals:
     - type: DrinkFoodVisualizer
@@ -61,9 +57,7 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/mug.rsi
     state: icon-3
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/mug.rsi
-    state: icon-3
+
   - type: Appearance
     visuals:
     - type: DrinkFoodVisualizer
@@ -80,9 +74,7 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/mug_black.rsi
     state: icon-3
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/mug_black.rsi
-    state: icon-3
+
   - type: Appearance
     visuals:
     - type: DrinkFoodVisualizer
@@ -99,9 +91,7 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/mug_blue.rsi
     state: icon-3
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/mug_blue.rsi
-    state: icon-3
+
   - type: Appearance
     visuals:
     - type: DrinkFoodVisualizer
@@ -118,9 +108,7 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/mug_green.rsi
     state: icon-3
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/mug_green.rsi
-    state: icon-3
+
   - type: Appearance
     visuals:
     - type: DrinkFoodVisualizer
@@ -137,9 +125,7 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/mug_heart.rsi
     state: icon-3
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/mug_heart.rsi
-    state: icon-3
+
   - type: Appearance
     visuals:
     - type: DrinkFoodVisualizer
@@ -156,9 +142,7 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/mug_metal.rsi
     state: icon-3
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/mug_metal.rsi
-    state: icon-3
+
   - type: Appearance
     visuals:
     - type: DrinkFoodVisualizer
@@ -175,9 +159,7 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/mug_moebius.rsi
     state: icon-3
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/mug_moebius.rsi
-    state: icon-3
+
   - type: Appearance
     visuals:
     - type: DrinkFoodVisualizer
@@ -194,9 +176,7 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/mug_one.rsi
     state: icon-3
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/mug_one.rsi
-    state: icon-3
+
   - type: Appearance
     visuals:
     - type: DrinkFoodVisualizer
@@ -213,9 +193,7 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/mug_rainbow.rsi
     state: icon-3
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/mug_rainbow.rsi
-    state: icon-3
+
   - type: Appearance
     visuals:
     - type: DrinkFoodVisualizer
@@ -232,9 +210,7 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/mug_red.rsi
     state: icon-3
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/mug_red.rsi
-    state: icon-3
+
   - type: Appearance
     visuals:
     - type: DrinkFoodVisualizer
@@ -249,8 +225,7 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/hot_coco.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/hot_coco.rsi
+
 
 - type: entity
   parent: DrinkBaseCup
@@ -266,8 +241,7 @@
         Quantity: 20
   - type: Sprite
     sprite: Objects/Consumable/Drinks/hot_coffee.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/hot_coffee.rsi
+
 
 - type: entity
   parent: DrinkBaseCup
@@ -284,9 +258,7 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/teacup.rsi
     state: icon-1
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/teacup.rsi
-    state: icon-1
+
   - type: Appearance
     visuals:
     - type: DrinkFoodVisualizer
@@ -307,8 +279,6 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/lean.rsi
     state: icon
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/lean.rsi
-    state: icon
+
   - type: Item
     sprite: Objects/Consumable/Drinks/lean.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/food.yml b/Resources/Prototypes/Entities/Objects/Consumable/food.yml
index 947092610f..a22396e796 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/food.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/food.yml
@@ -10,8 +10,7 @@
   - type: Sprite
     state: icon
     netsync: false
-  - type: Icon
-    state: icon
+
   # Only use visualizer if there's multiple steps available
 # - type: Appearance
 #     visuals:
@@ -36,8 +35,7 @@
         Quantity: 12
   - type: Sprite
     sprite: Objects/Consumable/Food/4no_raisins.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/4no_raisins.rsi
+
   - type: Item
     sprite: Objects/Consumable/Food/4no_raisins.rsi
 
@@ -55,8 +53,7 @@
     trash: TrashSnackBowl
   - type: Sprite
     sprite: Objects/Consumable/Food/aesirsalad.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/aesirsalad.rsi
+
 
 - type: entity
   name: amanita pie
@@ -71,8 +68,7 @@
         Quantity: 10
   - type: Sprite
     sprite: Objects/Consumable/Food/amanita_pie.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/amanita_pie.rsi
+
 
 - type: entity
   name: amanita jelly
@@ -89,8 +85,7 @@
         Quantity: 12
   - type: Sprite
     sprite: Objects/Consumable/Food/amanitajelly.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/amanitajelly.rsi
+
 
 #- type: entity
 #  name: ambrosia vulgar is crushed
@@ -103,8 +98,7 @@
 #    uses: 1
 #  - type: Sprite
 #    sprite: Objects/Consumable/Food/ambrosiavulgariscrushed.rsi
-#  - type: Icon
-#    sprite: Objects/Consumable/Food/ambrosiavulgariscrushed.rsi
+
 
 - type: entity
   name: apple cake (slice)
@@ -121,8 +115,7 @@
         Quantity: 6
   - type: Sprite
     sprite: Objects/Consumable/Food/apple_cake_slice.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/apple_cake_slice.rsi
+
 
 - type: entity
   name: apple pie
@@ -137,8 +130,7 @@
         Quantity: 8
   - type: Sprite
     sprite: Objects/Consumable/Food/apple_pie.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/apple_pie.rsi
+
 
 # TODO: BREADSLICE?
 #- type: entity
@@ -152,8 +144,7 @@
 #    uses: 1
 #  - type: Sprite
 #    sprite: Objects/Consumable/Food/bacon.rsi
-#  - type: Icon
-#    sprite: Objects/Consumable/Food/bacon.rsi
+
 
 - type: entity
   name: bad recipe
@@ -168,8 +159,7 @@
         Quantity: 2
   - type: Sprite
     sprite: Objects/Consumable/Food/badrecipe.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/badrecipe.rsi
+
 
 - type: entity
   name: baguette
@@ -184,8 +174,7 @@
         Quantity: 12
   - type: Sprite
     sprite: Objects/Consumable/Food/baguette.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/baguette.rsi
+
 
 - type: entity
   name: bread (slice)
@@ -202,8 +191,7 @@
         Quantity: 8
   - type: Sprite
     sprite: Objects/Consumable/Food/breadslice.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/breadslice.rsi
+
 
 - type: entity
   name: banana bread (slice)
@@ -220,8 +208,7 @@
         Quantity: 8
   - type: Sprite
     sprite: Objects/Consumable/Food/bananabreadslice.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/bananabreadslice.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -239,8 +226,7 @@
         Quantity: 8
   - type: Sprite
     sprite: Objects/Consumable/Food/pie.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/pie.rsi
+
 
 #- type: entity
 #  name: bear meat
@@ -253,8 +239,7 @@
 #    uses: 1
 #  - type: Sprite
 #    sprite: Objects/Consumable/Food/bearmeat.rsi
-#  - type: Icon
-#    sprite: Objects/Consumable/Food/bearmeat.rsi
+
 
 - type: entity
   name: beet soup
@@ -271,8 +256,7 @@
         Quantity: 16
   - type: Sprite
     sprite: Objects/Consumable/Food/beetsoup.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/beetsoup.rsi
+
 
 - type: entity
   name: berry clafoutis
@@ -289,8 +273,7 @@
         Quantity: 8
   - type: Sprite
     sprite: Objects/Consumable/Food/berryclafoutis.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/berryclafoutis.rsi
+
 
 - type: entity
   name: birthday cake (slice)
@@ -307,8 +290,7 @@
         Quantity: 8
   - type: Sprite
     sprite: Objects/Consumable/Food/birthday_cake_slice.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/birthday_cake_slice.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -325,8 +307,7 @@
         Quantity: 4
   - type: Sprite
     sprite: Objects/Consumable/Food/spaghettiboiled.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/spaghettiboiled.rsi
+
 
 - type: entity
   name: brain cake (slice)
@@ -343,8 +324,7 @@
         Quantity: 8
   - type: Sprite
     sprite: Objects/Consumable/Food/brain_cake_slice.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/brain_cake_slice.rsi
+
 
 - type: entity
   name: candy
@@ -361,8 +341,7 @@
         Quantity: 20
   - type: Sprite
     sprite: Objects/Consumable/Food/candy.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/candy.rsi
+
   - type: Item
     sprite: Objects/Consumable/Food/candy.rsi
 
@@ -379,8 +358,7 @@
         Quantity: 8
   - type: Sprite
     sprite: Objects/Consumable/Food/candy_corn.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/candy_corn.rsi
+
 
 - type: entity
   name: carrot cake (slice)
@@ -397,8 +375,7 @@
         Quantity: 10
   - type: Sprite
     sprite: Objects/Consumable/Food/carrotcake_slice.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/carrotcake_slice.rsi
+
 
 - type: entity
   name: carrot fries
@@ -415,8 +392,7 @@
         Quantity: 4
   - type: Sprite
     sprite: Objects/Consumable/Food/carrotfries.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/carrotfries.rsi
+
 
 - type: entity
   name: chawan mushi
@@ -433,8 +409,7 @@
         Quantity: 10
   - type: Sprite
     sprite: Objects/Consumable/Food/chawanmushi.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/chawanmushi.rsi
+
 
 - type: entity
   name: cheeseburger
@@ -449,8 +424,7 @@
         Quantity: 4
   - type: Sprite
     sprite: Objects/Consumable/Food/cheeseburger.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/cheeseburger.rsi
+
   - type: Item
     sprite: Objects/Consumable/Food/cheeseburger.rsi
 
@@ -469,8 +443,7 @@
         Quantity: 4
   - type: Sprite
     sprite: Objects/Consumable/Food/cheesecake_slice.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/cheesecake_slice.rsi
+
 
 - type: entity
   name: cheese wedge
@@ -485,8 +458,7 @@
         Quantity: 2
   - type: Sprite
     sprite: Objects/Consumable/Food/cheesewedge.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/cheesewedge.rsi
+
 
 - type: entity
   name: cheesie honkers
@@ -503,8 +475,7 @@
         Quantity: 8
   - type: Sprite
     sprite: Objects/Consumable/Food/cheesie_honkers.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/cheesie_honkers.rsi
+
 
 - type: entity
   name: cheesy fries
@@ -521,8 +492,7 @@
         Quantity: 8
   - type: Sprite
     sprite: Objects/Consumable/Food/cheesyfries.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/cheesyfries.rsi
+
 
 - type: entity
   name: cherry pie
@@ -537,8 +507,7 @@
         Quantity: 8
   - type: Sprite
     sprite: Objects/Consumable/Food/cherrypie.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/cherrypie.rsi
+
 
 - type: entity
   name: chips
@@ -555,8 +524,7 @@
         Quantity: 6
   - type: Sprite
     sprite: Objects/Consumable/Food/chips.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/chips.rsi
+
   - type: Item
     sprite: Objects/Consumable/Food/chips.rsi
 
@@ -575,8 +543,7 @@
         Quantity: 4
   - type: Sprite
     sprite: Objects/Consumable/Food/chocolatebar.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/chocolatebar.rsi
+
 
 - type: entity
   name: chocolate cake (slice)
@@ -593,8 +560,7 @@
         Quantity: 8
   - type: Sprite
     sprite: Objects/Consumable/Food/chocolatecake_slice.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/chocolatecake_slice.rsi
+
 
 - type: entity
   name: chocolate egg
@@ -609,8 +575,7 @@
         Quantity: 6
   - type: Sprite
     sprite: Objects/Consumable/Food/chocolateegg.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/chocolateegg.rsi
+
 
 - type: entity
   name: clown burger
@@ -625,8 +590,7 @@
         Quantity: 12
   - type: Sprite
     sprite: Objects/Consumable/Food/clownburger.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/clownburger.rsi
+
   - type: Item
     sprite: Objects/Consumable/Food/clownburger.rsi
 
@@ -643,8 +607,7 @@
         Quantity: 8
   - type: Sprite
     sprite: Objects/Consumable/Food/clownstears.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/clownstears.rsi
+
 
 #- type: entity
 #  name: cocoa
@@ -658,8 +621,7 @@
 #    restore_amount: 3
 #  - type: Sprite
 #    sprite: Objects/Consumable/Food/cocoa.rsi
-#  - type: Icon
-#    sprite: Objects/Consumable/Food/cocoa.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -676,8 +638,7 @@
         Quantity: 6
   - type: Sprite
     sprite: Objects/Consumable/Food/coldchili.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/coldchili.rsi
+
 
 #- type: entity
 #  parent: FoodBase
@@ -691,8 +652,7 @@
 #    restore_amount: 1
 #  - type: Sprite
 #    sprite: Objects/Consumable/Food/coldsauce.rsi
-#  - type: Icon
-#    sprite: Objects/Consumable/Food/coldsauce.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -707,8 +667,7 @@
         Quantity: 10
   - type: Sprite
     sprite: Objects/Consumable/Food/cookie!!!.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/cookie!!!.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -723,8 +682,7 @@
         Quantity: 2
   - type: Sprite
     sprite: Objects/Consumable/Food/cracker.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/cracker.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -741,8 +699,7 @@
         Quantity: 6
   - type: Sprite
     sprite: Objects/Consumable/Food/creamcheesebreadslice.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/creamcheesebreadslice.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -759,8 +716,7 @@
         Quantity: 6
   - type: Sprite
     sprite: Objects/Consumable/Food/cubancarp.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/cubancarp.rsi
+
 
 #- type: entity
 #  parent: FoodBase
@@ -774,8 +730,7 @@
 #    restore_amount: 1
 #  - type: Sprite
 #    sprite: Objects/Consumable/Food/dionaroast.rsi
-#  - type: Icon
-#    sprite: Objects/Consumable/Food/dionaroast.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -790,8 +745,7 @@
         Quantity: 4
   - type: Sprite
     sprite: Objects/Consumable/Food/donkpocket.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/donkpocket.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -806,8 +760,7 @@
         Quantity: 6
   - type: Sprite
     sprite: Objects/Consumable/Food/donut1.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/donut1.rsi
+
   - type: Item
     sprite: Objects/Consumable/Food/donut1.rsi
 
@@ -824,8 +777,7 @@
         Quantity: 6
   - type: Sprite
     sprite: Objects/Consumable/Food/donut2.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/donut2.rsi
+
   - type: Item
     sprite: Objects/Consumable/Food/donut2.rsi.rsi
 
@@ -842,8 +794,7 @@
         Quantity: 2
   - type: Sprite
     sprite: Objects/Consumable/Food/egg-blue.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/egg-blue.rsi
+
   - type: Item
     sprite: Objects/Consumable/Food/egg-blue.rsi.rsi
 
@@ -860,8 +811,7 @@
         Quantity: 2
   - type: Sprite
     sprite: Objects/Consumable/Food/egg-green.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/egg-green.rsi
+
   - type: Item
     sprite: Objects/Consumable/Food/egg-green.rsi.rsi
 
@@ -878,8 +828,7 @@
         Quantity: 2
   - type: Sprite
     sprite: Objects/Consumable/Food/egg-mime.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/egg-mime.rsi
+
   - type: Item
     sprite: Objects/Consumable/Food/egg-mime.rsi.rsi
 
@@ -896,8 +845,7 @@
         Quantity: 2
   - type: Sprite
     sprite: Objects/Consumable/Food/egg-orange.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/egg-orange.rsi
+
   - type: Item
     sprite: Objects/Consumable/Food/egg-orange.rsi.rsi
 
@@ -914,8 +862,7 @@
         Quantity: 2
   - type: Sprite
     sprite: Objects/Consumable/Food/egg-purple.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/egg-purple.rsi
+
   - type: Item
     sprite: Objects/Consumable/Food/egg-purple.rsi.rsi
 
@@ -932,8 +879,7 @@
         Quantity: 2
   - type: Sprite
     sprite: Objects/Consumable/Food/egg-rainbow.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/egg-rainbow.rsi
+
   - type: Item
     sprite: Objects/Consumable/Food/egg-rainbow.rsi.rsi
 
@@ -950,8 +896,7 @@
         Quantity: 2
   - type: Sprite
     sprite: Objects/Consumable/Food/egg-red.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/egg-red.rsi
+
   - type: Item
     sprite: Objects/Consumable/Food/egg-red.rsi.rsi
 
@@ -969,8 +914,7 @@
         Quantity: 2
   - type: Sprite
     sprite: Objects/Consumable/Food/egg-yellow.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/egg-yellow.rsi
+
   - type: Item
     sprite: Objects/Consumable/Food/egg-yellow.rsi
 
@@ -987,8 +931,7 @@
         Quantity: 2
   - type: Sprite
     sprite: Objects/Consumable/Food/egg.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/egg.rsi
+
   - type: Item
     sprite: Objects/Consumable/Food/egg.rsi
 
@@ -1007,8 +950,7 @@
         Quantity: 12
   - type: Sprite
     sprite: Objects/Consumable/Food/eggplantparm.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/eggplantparm.rsi
+
 
 #- type: entity
 #  parent: FoodBase
@@ -1022,8 +964,7 @@
 #    restore_amount: 1
 #  - type: Sprite
 #    sprite: Objects/Consumable/Food/emptycondiment.rsi
-#  - type: Icon
-#    sprite: Objects/Consumable/Food/emptycondiment.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1040,8 +981,7 @@
         Quantity: 16
   - type: Sprite
     sprite: Objects/Consumable/Food/enchiladas.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/enchiladas.rsi
+
 
 #- type: entity
 #  parent: FoodBase
@@ -1055,8 +995,7 @@
 #    restore_amount: 1
 #  - type: Sprite
 #    sprite: Objects/Consumable/Food/enchiladasold.rsi
-#  - type: Icon
-#    sprite: Objects/Consumable/Food/enchiladasold.rsi
+
 
 #- type: entity
 #  parent: FoodBase
@@ -1070,8 +1009,7 @@
 #    restore_amount: 1
 #  - type: Sprite
 #    sprite: Objects/Consumable/Food/enzyme.rsi
-#  - type: Icon
-#    sprite: Objects/Consumable/Food/enzyme.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1086,8 +1024,7 @@
         Quantity: 6
   - type: Sprite
     sprite: Objects/Consumable/Food/fishandchips.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/fishandchips.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1102,8 +1039,7 @@
         Quantity: 12
   - type: Sprite
     sprite: Objects/Consumable/Food/fishburger.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/fishburger.rsi
+
   - type: Item
     sprite: Objects/Consumable/Food/fishburger.rsi
 
@@ -1119,8 +1055,7 @@
 #    restore_amount: 1
 #  - type: Sprite
 #    sprite: Objects/Consumable/Food/fishfillet.rsi
-#  - type: Icon
-#    sprite: Objects/Consumable/Food/fishfillet.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1135,8 +1070,7 @@
         Quantity: 6
   - type: Sprite
     sprite: Objects/Consumable/Food/fishfingers.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/fishfingers.rsi
+
 
 #- type: entity
 #  parent: FoodBase
@@ -1150,8 +1084,7 @@
 #    restore_amount: 1
 #  - type: Sprite
 #    sprite: Objects/Consumable/Food/flour.rsi
-#  - type: Icon
-#    sprite: Objects/Consumable/Food/flour.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1166,8 +1099,7 @@
         Quantity: 6
   - type: Sprite
     sprite: Objects/Consumable/Food/fortune_cookie.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/fortune_cookie.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1182,8 +1114,7 @@
         Quantity: 6
   - type: Sprite
     sprite: Objects/Consumable/Food/friedegg.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/friedegg.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1200,8 +1131,7 @@
         Quantity: 8
   - type: Sprite
     sprite: Objects/Consumable/Food/fries.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/fries.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1218,8 +1148,7 @@
         Quantity: 16
   - type: Sprite
     sprite: Objects/Consumable/Food/gappletart.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/gappletart.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1236,8 +1165,7 @@
         Quantity: 6
   - type: Sprite
     sprite: Objects/Consumable/Food/toastedsandwich.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/toastedsandwich.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1252,8 +1180,7 @@
         Quantity: 12
   - type: Sprite
     sprite: Objects/Consumable/Food/hburger.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/hburger.rsi
+
   - type: Item
     sprite: Objects/Consumable/Food/hburger.rsi
 
@@ -1272,8 +1199,7 @@
         Quantity: 16
   - type: Sprite
     sprite: Objects/Consumable/Food/herbsalad.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/herbsalad.rsi
+
 
 #- type: entity
 #  parent: FoodBase
@@ -1287,8 +1213,7 @@
 #    restore_amount: 1
 #  - type: Sprite
 #    sprite: Objects/Consumable/Food/honeycomb.rsi
-#  - type: Icon
-#    sprite: Objects/Consumable/Food/honeycomb.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1305,8 +1230,7 @@
         Quantity: 6
   - type: Sprite
     sprite: Objects/Consumable/Food/hotchili.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/hotchili.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1321,8 +1245,7 @@
         Quantity: 12
   - type: Sprite
     sprite: Objects/Consumable/Food/hotdog.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/hotdog.rsi
+
 
 #- type: entity
 #  parent: FoodBase
@@ -1336,8 +1259,7 @@
 #    restore_amount: 1
 #  - type: Sprite
 #    sprite: Objects/Consumable/Food/hotsauce.rsi
-#  - type: Icon
-#    sprite: Objects/Consumable/Food/hotsauce.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1352,8 +1274,7 @@
         Quantity: 6
   - type: Sprite
     sprite: Objects/Consumable/Food/hugemushroomslice.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/hugemushroomslice.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1370,8 +1291,7 @@
         Quantity: 16
   - type: Sprite
     sprite: Objects/Consumable/Food/kabob.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/kabob.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1386,8 +1306,7 @@
         Quantity: 6
   - type: Sprite
     sprite: Objects/Consumable/Food/jdonut1.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/jdonut1.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1402,8 +1321,7 @@
         Quantity: 6
   - type: Sprite
     sprite: Objects/Consumable/Food/jdonut2.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/jdonut2.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1418,8 +1336,7 @@
         Quantity: 10
   - type: Sprite
     sprite: Objects/Consumable/Food/jellyburger.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/jellyburger.rsi
+
   - type: Item
     sprite: Objects/Consumable/Food/jellyburger.rsi
 
@@ -1438,8 +1355,7 @@
         Quantity: 4
   - type: Sprite
     sprite: Objects/Consumable/Food/jellysandwich.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/jellysandwich.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1456,8 +1372,7 @@
         Quantity: 2
   - type: Sprite
     sprite: Objects/Consumable/Food/jellytoast.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/jellytoast.rsi
+
 
 # TODO: Add more pies. Anything that shares a sprite
 - type: entity
@@ -1475,8 +1390,7 @@
         Quantity: 16
   - type: Sprite
     sprite: Objects/Consumable/Food/kabob.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/kabob.rsi
+
 
 #- type: entity
 #  parent: FoodBase
@@ -1490,8 +1404,7 @@
 #    restore_amount: 1
 #  - type: Sprite
 #    sprite: Objects/Consumable/Food/ketchup.rsi
-#  - type: Icon
-#    sprite: Objects/Consumable/Food/ketchup.rsi
+
 
 #- type: entity
 #  parent: FoodBase
@@ -1505,8 +1418,7 @@
 #    restore_amount: 1
 #  - type: Sprite
 #    sprite: Objects/Consumable/Food/ketchupold.rsi
-#  - type: Icon
-#    sprite: Objects/Consumable/Food/ketchupold.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1523,8 +1435,7 @@
         Quantity: 8
   - type: Sprite
     sprite: Objects/Consumable/Food/lemoncake_slice.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/lemoncake_slice.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1541,8 +1452,7 @@
         Quantity: 8
   - type: Sprite
     sprite: Objects/Consumable/Food/limecake_slice.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/limecake_slice.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1557,8 +1467,7 @@
         Quantity: 40
   - type: Sprite
     sprite: Objects/Consumable/Food/liquidfood.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/liquidfood.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1573,8 +1482,7 @@
         Quantity: 6
   - type: Sprite
     sprite: Objects/Consumable/Food/loadedbakedpotato.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/loadedbakedpotato.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1589,8 +1497,7 @@
         Quantity: 5
   - type: Sprite
     sprite: Objects/Consumable/Food/meat.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/meat.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1605,8 +1512,7 @@
         Quantity: 6
   - type: Sprite
     sprite: Objects/Consumable/Food/meatball.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/meatball.rsi
+
   - type: Item
     sprite: Objects/Consumable/Food/meatball.rsi
 
@@ -1625,8 +1531,7 @@
         Quantity: 16
   - type: Sprite
     sprite: Objects/Consumable/Food/meatballsoup.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/meatballsoup.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1643,8 +1548,7 @@
         Quantity: 8
   - type: Sprite
     sprite: Objects/Consumable/Food/meatballspaghetti.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/meatballspaghetti.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1661,8 +1565,7 @@
         Quantity: 12
   - type: Sprite
     sprite: Objects/Consumable/Food/meatbreadslice.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/meatbreadslice.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1679,8 +1582,7 @@
         Quantity: 20
   - type: Sprite
     sprite: Objects/Consumable/Food/meatpie.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/meatpie.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1695,8 +1597,7 @@
         Quantity: 16
   - type: Sprite
     sprite: Objects/Consumable/Food/meatpizzaslice.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/meatpizzaslice.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1713,8 +1614,7 @@
         Quantity: 6
   - type: Sprite
     sprite: Objects/Consumable/Food/meatsteak.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/meatsteak.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1731,8 +1631,7 @@
         Quantity: 16
   - type: Sprite
     sprite: Objects/Consumable/Food/milosoup.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/milosoup.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1747,8 +1646,7 @@
         Quantity: 12
   - type: Sprite
     sprite: Objects/Consumable/Food/mimeburger.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/mimeburger.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1763,8 +1661,7 @@
         Quantity: 2
   - type: Sprite
     sprite: Objects/Consumable/Food/mint.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/mint.rsi
+
 
 #- type: entity
 #  parent: FoodBase
@@ -1778,8 +1675,7 @@
 #    restore_amount: 1
 #  - type: Sprite
 #    sprite: Objects/Consumable/Food/mixedcondiments.rsi
-#  - type: Icon
-#    sprite: Objects/Consumable/Food/mixedcondiments.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1794,8 +1690,7 @@
         Quantity: 12
   - type: Sprite
     sprite: Objects/Consumable/Food/hburger.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/hburger.rsi
+
   - type: Item
     sprite: Objects/Consumable/Food/hburger.rsi
 
@@ -1812,8 +1707,7 @@
         Quantity: 10
   - type: Sprite
     sprite: Objects/Consumable/Food/monkeycube.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/monkeycube.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1830,8 +1724,7 @@
         Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Food/monkeysdelight.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/monkeysdelight.rsi
+
 
 #- type: entity
 #  parent: FoodBase
@@ -1845,8 +1738,7 @@
 #    restore_amount: 1
 #  - type: Sprite
 #    sprite: Objects/Consumable/Food/mtearp.rsi
-#  - type: Icon
-#    sprite: Objects/Consumable/Food/mtearp.rsi
+
 
 #- type: entity
 #  parent: FoodBase
@@ -1860,8 +1752,7 @@
 #    restore_amount: 1
 #  - type: Sprite
 #    sprite: Objects/Consumable/Food/muffin.rsi
-#  - type: Icon
-#    sprite: Objects/Consumable/Food/muffin.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1876,8 +1767,7 @@
         Quantity: 10
   - type: Sprite
     sprite: Objects/Consumable/Food/mushroompizzaslice.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/mushroompizzaslice.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1894,8 +1784,7 @@
         Quantity: 16
   - type: Sprite
     sprite: Objects/Consumable/Food/mushroomsoup.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/mushroomsoup.rsi
+
 
 # TODO: More in this one
 - type: entity
@@ -1913,8 +1802,7 @@
         Quantity: 1
   - type: Sprite
     sprite: Objects/Consumable/Food/mysterysoup.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/mysterysoup.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1931,8 +1819,7 @@
         Quantity: 16
   - type: Sprite
     sprite: Objects/Consumable/Food/nettlesoup.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/nettlesoup.rsi
+
 
 #- type: entity
 #  parent: FoodBase
@@ -1946,8 +1833,7 @@
 #    restore_amount: 1
 #  - type: Sprite
 #    sprite: Objects/Consumable/Food/oliveoil.rsi
-#  - type: Icon
-#    sprite: Objects/Consumable/Food/oliveoil.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1964,8 +1850,7 @@
         Quantity: 16
   - type: Sprite
     sprite: Objects/Consumable/Food/omelette.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/omelette.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -1982,8 +1867,7 @@
         Quantity: 8
   - type: Sprite
     sprite: Objects/Consumable/Food/orangecake_slice.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/orangecake_slice.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2000,8 +1884,7 @@
         Quantity: 12
   - type: Sprite
     sprite: Objects/Consumable/Food/pastatomato.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/pastatomato.rsi
+
 
 #- type: entity
 #  parent: FoodBase
@@ -2015,8 +1898,7 @@
 #    restore_amount: 1
 #  - type: Sprite
 #    sprite: Objects/Consumable/Food/peppermillsmall.rsi
-#  - type: Icon
-#    sprite: Objects/Consumable/Food/peppermillsmall.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2031,8 +1913,7 @@
         Quantity: 10
   - type: Sprite
     sprite: Objects/Consumable/Food/phelmbiscuit.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/phelmbiscuit.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2047,8 +1928,7 @@
         Quantity: 8
   - type: Sprite
     sprite: Objects/Consumable/Food/pizzamargheritaslice.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/pizzamargheritaslice.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2065,8 +1945,7 @@
         Quantity: 8
   - type: Sprite
     sprite: Objects/Consumable/Food/plaincake_slice.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/plaincake_slice.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2081,8 +1960,7 @@
         Quantity: 16
   - type: Sprite
     sprite: Objects/Consumable/Food/plump_pie.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/plump_pie.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2100,8 +1978,7 @@
         Quantity: 4
   - type: Sprite
     sprite: Objects/Consumable/Food/popcorn.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/popcorn.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2116,8 +1993,7 @@
         Quantity: 10
   - type: Sprite
     sprite: Objects/Consumable/Food/poppypretzel.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/poppypretzel.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2134,8 +2010,7 @@
         Quantity: 6
   - type: Sprite
     sprite: Objects/Consumable/Food/pumpkinpieslice.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/pumpkinpieslice.rsi
+
 
 # TODO: Boiled rice?
 #- type: entity
@@ -2150,8 +2025,7 @@
 #    restore_amount: 1
 #  - type: Sprite
 #    sprite: Objects/Consumable/Food/rice.rsi
-#  - type: Icon
-#    sprite: Objects/Consumable/Food/rice.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2166,8 +2040,7 @@
         Quantity: 4
   - type: Sprite
     sprite: Objects/Consumable/Food/roburger.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/roburger.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2184,8 +2057,7 @@
         Quantity: 16
   - type: Sprite
     sprite: Objects/Consumable/Food/rofflewaffles.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/rofflewaffles.rsi
+
 
 #- type: entity
 #  parent: FoodBase
@@ -2199,8 +2071,7 @@
 #    restore_amount: 1
 #  - type: Sprite
 #    sprite: Objects/Consumable/Food/rorosoup.rsi
-#  - type: Icon
-#    sprite: Objects/Consumable/Food/rorosoup.rsi
+
 
 #- type: entity
 #  parent: FoodBase
@@ -2214,8 +2085,7 @@
 #    restore_amount: 1
 #  - type: Sprite
 #    sprite: Objects/Consumable/Food/rottenmeat.rsi
-#  - type: Icon
-#    sprite: Objects/Consumable/Food/rottenmeat.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2232,8 +2102,7 @@
         Quantity: 8
   - type: Sprite
     sprite: Objects/Consumable/Food/rpudding.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/rpudding.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2250,8 +2119,7 @@
         Quantity: 6
   - type: Sprite
     sprite: Objects/Consumable/Food/sandwich.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/sandwich.rsi
+
 
 #- type: entity
 #  parent: FoodBase
@@ -2265,8 +2133,7 @@
 #    restore_amount: 1
 #  - type: Sprite
 #    sprite: Objects/Consumable/Food/sandwich_filling.rsi
-#  - type: Icon
-#    sprite: Objects/Consumable/Food/sandwich_filling.rsi
+
 
 #- type: entity
 #  parent: FoodBase
@@ -2280,8 +2147,7 @@
 #    restore_amount: 1
 #  - type: Sprite
 #    sprite: Objects/Consumable/Food/sandwich_top.rsi
-#  - type: Icon
-#    sprite: Objects/Consumable/Food/sandwich_top.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2296,8 +2162,7 @@
         Quantity: 4
   - type: Sprite
     sprite: Objects/Consumable/Food/sausage.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/sausage.rsi
+
 
 #- type: entity
 #  parent: FoodBase
@@ -2311,8 +2176,7 @@
 #    restore_amount: 1
 #  - type: Sprite
 #    sprite: Objects/Consumable/Food/shandp.rsi
-#  - type: Icon
-#    sprite: Objects/Consumable/Food/shandp.rsi
+
 
 #- type: entity
 #  parent: FoodBase
@@ -2326,8 +2190,7 @@
 #    restore_amount: 1
 #  - type: Sprite
 #    sprite: Objects/Consumable/Food/skrellsnacks.rsi
-#  - type: Icon
-#    sprite: Objects/Consumable/Food/skrellsnacks.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2343,8 +2206,7 @@
     trash: TrashSOSJerky
   - type: Sprite
     sprite: Objects/Consumable/Food/sosjerky.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/sosjerky.rsi
+
   - type: Item
     sprite: Objects/Consumable/Food/sosjerky.rsi
 
@@ -2363,8 +2225,7 @@
         Quantity: 4
   - type: Sprite
     sprite: Objects/Consumable/Food/soydope.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/soydope.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2381,8 +2242,7 @@
         Quantity: 4
   - type: Sprite
     sprite: Objects/Consumable/Food/soylent_green.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/soylent_green.rsi
+
 
 # why these were named different i have no idea
 - type: entity
@@ -2400,8 +2260,7 @@
         Quantity: 4
   - type: Sprite
     sprite: Objects/Consumable/Food/soylent_yellow.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/soylent_yellow.rsi
+
 
 #- type: entity
 #  parent: FoodBase
@@ -2415,8 +2274,7 @@
 #    restore_amount: 1
 #  - type: Sprite
 #    sprite: Objects/Consumable/Food/soysauce.rsi
-#  - type: Icon
-#    sprite: Objects/Consumable/Food/soysauce.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2431,8 +2289,7 @@
         Quantity: 4
   - type: Sprite
     sprite: Objects/Consumable/Food/space_twinkie.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/space_twinkie.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2449,8 +2306,7 @@
         Quantity: 12
   - type: Sprite
     sprite: Objects/Consumable/Food/spacylibertyduff.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/spacylibertyduff.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2465,8 +2321,7 @@
         Quantity: 2
   - type: Sprite
     sprite: Objects/Consumable/Food/spaghetti.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/spaghetti.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2481,8 +2336,7 @@
         Quantity: 12
   - type: Sprite
     sprite: Objects/Consumable/Food/spellburger.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/spellburger.rsi
+
   - type: Item
     sprite: Objects/Consumable/Food/spellburger.rsi
 
@@ -2499,8 +2353,7 @@
         Quantity: 8
   - type: Sprite
     sprite: Objects/Consumable/Food/spesslaw.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/spesslaw.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2515,8 +2368,7 @@
         Quantity: 12
   - type: Sprite
     sprite: Objects/Consumable/Food/stew.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/stew.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2533,8 +2385,7 @@
         Quantity: 16
   - type: Sprite
     sprite: Objects/Consumable/Food/stewedsoymeat.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/stewedsoymeat.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2549,8 +2400,7 @@
         Quantity: 6
   - type: Sprite
     sprite: Objects/Consumable/Food/stuffing.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/stuffing.rsi
+
 
 #- type: entity
 #  parent: FoodBase
@@ -2564,8 +2414,7 @@
 #    restore_amount: 1
 #  - type: Sprite
 #    sprite: Objects/Consumable/Food/sugar.rsi
-#  - type: Icon
-#    sprite: Objects/Consumable/Food/sugar.rsi
+
 
 #- type: entity
 #  parent: FoodBase
@@ -2579,8 +2428,7 @@
 #    restore_amount: 1
 #  - type: Sprite
 #    sprite: Objects/Consumable/Food/sugarsmall.rsi
-#  - type: Icon
-#    sprite: Objects/Consumable/Food/sugarsmall.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2595,8 +2443,7 @@
         Quantity: 40
   - type: Sprite
     sprite: Objects/Consumable/Food/superbiteburger.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/superbiteburger.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2613,8 +2460,7 @@
         Quantity: 8
   - type: Sprite
     sprite: Objects/Consumable/Food/syndi_cakes.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/syndi_cakes.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2629,8 +2475,7 @@
         Quantity: 8
   - type: Sprite
     sprite: Objects/Consumable/Food/taco.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/taco.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2647,8 +2492,7 @@
         Quantity: 12
   - type: Sprite
     sprite: Objects/Consumable/Food/tastybread.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/tastybread.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2665,8 +2509,7 @@
         Quantity: 6
   - type: Sprite
     sprite: Objects/Consumable/Food/toastedsandwich.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/toastedsandwich.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2681,8 +2524,7 @@
         Quantity: 6
   - type: Sprite
     sprite: Objects/Consumable/Food/tofu.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/tofu.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2699,8 +2541,7 @@
         Quantity: 12
   - type: Sprite
     sprite: Objects/Consumable/Food/tofubreadslice.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/tofubreadslice.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2715,8 +2556,7 @@
         Quantity: 12
   - type: Sprite
     sprite: Objects/Consumable/Food/tofuburger.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/tofuburger.rsi
+
   - type: Item
     sprite: Objects/Consumable/Food/tofuburger.rsi
 
@@ -2735,8 +2575,7 @@
         Quantity: 16
   - type: Sprite
     sprite: Objects/Consumable/Food/kabob.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/kabob.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2751,8 +2590,7 @@
         Quantity: 24
   - type: Sprite
     sprite: Objects/Consumable/Food/tofurkey.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/tofurkey.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2767,8 +2605,7 @@
         Quantity: 6
   - type: Sprite
     sprite: Objects/Consumable/Food/tomatomeat.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/tomatomeat.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2785,8 +2622,7 @@
         Quantity: 4
   - type: Sprite
     sprite: Objects/Consumable/Food/tomatosoup.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/tomatosoup.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2801,8 +2637,7 @@
         Quantity: 4
   - type: Sprite
     sprite: Objects/Consumable/Food/twobread.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/twobread.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2819,8 +2654,7 @@
         Quantity: 12
   - type: Sprite
     sprite: Objects/Consumable/Food/validsalad.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/validsalad.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2835,8 +2669,7 @@
         Quantity: 12
   - type: Sprite
     sprite: Objects/Consumable/Food/vegetablepizzaslice.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/vegetablepizzaslice.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2853,8 +2686,7 @@
         Quantity: 16
   - type: Sprite
     sprite: Objects/Consumable/Food/vegetablesoup.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/vegetablesoup.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2871,8 +2703,7 @@
         Quantity: 16
   - type: Sprite
     sprite: Objects/Consumable/Food/waffles.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/waffles.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2887,8 +2718,7 @@
         Quantity: 2
   - type: Sprite
     sprite: Objects/Consumable/Food/watermelonslice.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/watermelonslice.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2905,8 +2735,7 @@
         Quantity: 12
   - type: Sprite
     sprite: Objects/Consumable/Food/wingfangchu.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/wingfangchu.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2923,8 +2752,7 @@
         Quantity: 2
   - type: Sprite
     sprite: Objects/Consumable/Food/wishsoup.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/wishsoup.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2939,8 +2767,7 @@
         Quantity: 16
   - type: Sprite
     sprite: Objects/Consumable/Food/xburger.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/xburger.rsi
+
   - type: Item
     sprite: Objects/Consumable/Food/xburger.rsi
 
@@ -2959,8 +2786,7 @@
         Quantity: 20
   - type: Sprite
     sprite: Objects/Consumable/Food/xenobreadslice.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/xenobreadslice.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2975,8 +2801,7 @@
         Quantity: 20
   - type: Sprite
     sprite: Objects/Consumable/Food/xenomeat.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/xenomeat.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -2993,8 +2818,7 @@
         Quantity: 20
   - type: Sprite
     sprite: Objects/Consumable/Food/xenomeatpie.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/xenomeatpie.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -3011,8 +2835,7 @@
         Quantity: 15
   - type: Sprite
     sprite: Objects/Consumable/Food/stew.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/stew.rsi
+
 
 - type: entity
   parent: FoodBase
@@ -3030,8 +2853,7 @@
         Quantity: 20
   - type: Sprite
     sprite: Objects/Consumable/Food/milkape.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Food/milkape.rsi
+
 
 - type: entity
   name: banana
@@ -3048,8 +2870,7 @@
             Quantity: 6
     - type: Sprite
       sprite: Objects/Consumable/Food/banana.rsi
-    - type: Icon
-      sprite: Objects/Consumable/Food/banana.rsi
+
 
 - type: entity
   name: memory leek
@@ -3066,6 +2887,4 @@
     - type: Sprite
       sprite: Objects/Consumable/Food/memoryleek.rsi
       state: memoryLeek
-    - type: Icon
-      sprite: Objects/Consumable/Food/memoryleek.rsi
-      state: memoryLeek
+
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/food_containers.yml b/Resources/Prototypes/Entities/Objects/Consumable/food_containers.yml
index 3dbe0e1055..5d7c98fe6b 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/food_containers.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/food_containers.yml
@@ -7,8 +7,7 @@
   - type: Sprite
     state: icon
     netsync: false
-  - type: Icon
-    state: icon
+
 
 # Containers
 - type: entity
@@ -22,8 +21,7 @@
     trash: TrashTray
   - type: Sprite
     sprite: Objects/Consumable/FoodContainers/apple_cake.rsi
-  - type: Icon
-    sprite: Objects/Consumable/FoodContainers/apple_cake.rsi
+
 
 - type: entity
   parent: FoodContainerBase
@@ -35,8 +33,7 @@
       FoodBananaBreadSlice: 100
   - type: Sprite
     sprite: Objects/Consumable/FoodContainers/bananabread.rsi
-  - type: Icon
-    sprite: Objects/Consumable/FoodContainers/bananabread.rsi
+
 
 - type: entity
   parent: FoodContainerBase
@@ -48,8 +45,7 @@
       FoodBirthdayCakeSlice: 100
   - type: Sprite
     sprite: Objects/Consumable/FoodContainers/birthdaycake.rsi
-  - type: Icon
-    sprite: Objects/Consumable/FoodContainers/birthdaycake.rsi
+
 
 - type: entity
   parent: FoodContainerBase
@@ -61,8 +57,7 @@
       FoodBrainCakeSlice: 100
   - type: Sprite
     sprite: Objects/Consumable/FoodContainers/braincake.rsi
-  - type: Icon
-    sprite: Objects/Consumable/FoodContainers/braincake.rsi
+
 
 - type: entity
   parent: FoodContainerBase
@@ -74,8 +69,7 @@
       FoodBreadSlice: 100
   - type: Sprite
     sprite: Objects/Consumable/FoodContainers/bread.rsi
-  - type: Icon
-    sprite: Objects/Consumable/FoodContainers/bread.rsi
+
 
 - type: entity
   parent: FoodContainerBase
@@ -87,8 +81,7 @@
       FoodCarrotCakeSlice: 100
   - type: Sprite
     sprite: Objects/Consumable/FoodContainers/carrotcake.rsi
-  - type: Icon
-    sprite: Objects/Consumable/FoodContainers/carrotcake.rsi
+
 
 - type: entity
   parent: FoodContainerBase
@@ -100,8 +93,7 @@
       FoodCheeseCakeSlice: 100
   - type: Sprite
     sprite: Objects/Consumable/FoodContainers/cheesecake.rsi
-  - type: Icon
-    sprite: Objects/Consumable/FoodContainers/cheesecake.rsi
+
 
 - type: entity
   parent: FoodContainerBase
@@ -113,8 +105,7 @@
       FoodCheeseWedge: 100
   - type: Sprite
     sprite: Objects/Consumable/FoodContainers/apple_cake.rsi
-  - type: Icon
-    sprite: Objects/Consumable/FoodContainers/apple_cake.rsi
+
 
 - type: entity
   parent: FoodContainerBase
@@ -126,8 +117,7 @@
       FoodChocolateCakeSlice: 100
   - type: Sprite
     sprite: Objects/Consumable/FoodContainers/chocolatecake.rsi
-  - type: Icon
-    sprite: Objects/Consumable/FoodContainers/chocolatecake.rsi
+
 
 - type: entity
   parent: FoodContainerBase
@@ -139,8 +129,7 @@
       FoodCreamCheeseBreadSlice: 100
   - type: Sprite
     sprite: Objects/Consumable/FoodContainers/creamcheesebread.rsi
-  - type: Icon
-    sprite: Objects/Consumable/FoodContainers/creamcheesebread.rsi
+
 
 - type: entity
   parent: FoodContainerBase
@@ -154,8 +143,7 @@
       FoodFrostedDonut: 30
   - type: Sprite
     sprite: Objects/Consumable/FoodContainers/donutbox.rsi
-  - type: Icon
-    sprite: Objects/Consumable/FoodContainers/donutbox.rsi
+
   - type: Appearance
     visuals:
     - type: FoodContainerVisualizer
@@ -174,8 +162,7 @@
       FoodContainerEggBox: 100
   - type: Sprite
     sprite: Objects/Consumable/FoodContainers/eggbox_shut.rsi
-  - type: Icon
-    sprite: Objects/Consumable/FoodContainers/eggbox_shut.rsi
+
   - type: Item
     sprite: Objects/Consumable/FoodContainers/eggbox_shut.rsi
 
@@ -191,9 +178,7 @@
   - type: Sprite
     sprite: Objects/Consumable/FoodContainers/eggbox.rsi
     state: eggbox-12
-  - type: Icon
-    sprite: Objects/Consumable/FoodContainers/eggbox.rsi
-    state: eggbox-12
+
   - type: Item
     sprite: Objects/Consumable/FoodContainers/eggbox.rsi
   - type: Appearance
@@ -213,8 +198,7 @@
       FoodLemonCakeSlice: 100
   - type: Sprite
     sprite: Objects/Consumable/FoodContainers/lemoncake.rsi
-  - type: Icon
-    sprite: Objects/Consumable/FoodContainers/lemoncake.rsi
+
 
 - type: entity
   parent: FoodContainerBase
@@ -226,8 +210,7 @@
       FoodLimeCakeSlice: 100
   - type: Sprite
     sprite: Objects/Consumable/FoodContainers/limecake.rsi
-  - type: Icon
-    sprite: Objects/Consumable/FoodContainers/limecake.rsi
+
 
 - type: entity
   parent: FoodContainerBase
@@ -239,8 +222,7 @@
       FoodMeatBreadSlice: 100
   - type: Sprite
     sprite: Objects/Consumable/FoodContainers/meatbread.rsi
-  - type: Icon
-    sprite: Objects/Consumable/FoodContainers/meatbread.rsi
+
 
 - type: entity
   parent: FoodContainerBase
@@ -253,8 +235,7 @@
       FoodMeatPizzaSlice: 100
   - type: Sprite
     sprite: Objects/Consumable/FoodContainers/meatpizza.rsi
-  - type: Icon
-    sprite: Objects/Consumable/FoodContainers/meatpizza.rsi
+
 
 # These two will probably get moved one day
 - type: entity
@@ -267,8 +248,7 @@
       FoodContainerMonkeyCubeWrap: 100
   - type: Sprite
     sprite: Objects/Consumable/FoodContainers/monkeycubebox.rsi
-  - type: Icon
-    sprite: Objects/Consumable/FoodContainers/monkeycubebox.rsi
+
 
 - type: entity
   parent: FoodContainerBase
@@ -280,8 +260,7 @@
       FoodMonkeyCube: 100
   - type: Sprite
     sprite: Objects/Consumable/FoodContainers/monkeycubewrap.rsi
-  - type: Icon
-    sprite: Objects/Consumable/FoodContainers/monkeycubewrap.rsi
+
 
 - type: entity
   parent: FoodContainerBase
@@ -294,8 +273,7 @@
       FoodMushroomPizzaSlice: 100
   - type: Sprite
     sprite: Objects/Consumable/FoodContainers/mushroompizza.rsi
-  - type: Icon
-    sprite: Objects/Consumable/FoodContainers/mushroompizza.rsi
+
 
 - type: entity
   parent: FoodContainerBase
@@ -307,8 +285,7 @@
       FoodOrangeCakeSlice: 100
   - type: Sprite
     sprite: Objects/Consumable/FoodContainers/orangecake.rsi
-  - type: Icon
-    sprite: Objects/Consumable/FoodContainers/orangecake.rsi
+
 
 # TODO: Probably replace it with a stacking thing
 - type: entity
@@ -321,8 +298,7 @@
       FoodContainerPizzaBox: 100
   - type: Sprite
     sprite: Objects/Consumable/FoodContainers/pizzaboxstack.rsi
-  - type: Icon
-    sprite: Objects/Consumable/FoodContainers/pizzaboxstack.rsi
+
   - type: Appearance
     visuals:
     - type: FoodContainerVisualizer
@@ -344,8 +320,7 @@
       FoodContainerVegetablePizza: 25
   - type: Sprite
     sprite: Objects/Consumable/FoodContainers/pizzabox.rsi
-  - type: Icon
-    sprite: Objects/Consumable/FoodContainers/pizzabox.rsi
+
   - type: Item
     sprite: Objects/Consumable/FoodContainers/pizzabox.rsi
 
@@ -360,8 +335,7 @@
       FoodMargheritaPizzaSlice: 100
   - type: Sprite
     sprite: Objects/Consumable/FoodContainers/pizzamargherita.rsi
-  - type: Icon
-    sprite: Objects/Consumable/FoodContainers/pizzamargherita.rsi
+
 
 - type: entity
   parent: FoodContainerBase
@@ -374,8 +348,7 @@
     trash: TrashTray
   - type: Sprite
     sprite: Objects/Consumable/FoodContainers/plaincake.rsi
-  - type: Icon
-    sprite: Objects/Consumable/FoodContainers/plaincake.rsi
+
 
 - type: entity
   parent: FoodContainerBase
@@ -387,8 +360,7 @@
       FoodPumpkinPieSlice: 100
   - type: Sprite
     sprite: Objects/Consumable/FoodContainers/pumpkinpie.rsi
-  - type: Icon
-    sprite: Objects/Consumable/FoodContainers/pumpkinpie.rsi
+
   - type: Item
     sprite: Objects/Consumable/FoodContainers/pumpkinpie.rsi
 
@@ -402,8 +374,7 @@
       FoodTofuBreadSlice: 100
   - type: Sprite
     sprite: Objects/Consumable/FoodContainers/tofubread.rsi
-  - type: Icon
-    sprite: Objects/Consumable/FoodContainers/tofubread.rsi
+
 
 - type: entity
   parent: FoodContainerBase
@@ -416,8 +387,7 @@
       FoodVegetablePizzaSlice: 100
   - type: Sprite
     sprite: Objects/Consumable/FoodContainers/vegetablepizza.rsi
-  - type: Icon
-    sprite: Objects/Consumable/FoodContainers/vegetablepizza.rsi
+
 
 - type: entity
   parent: FoodContainerBase
@@ -429,5 +399,4 @@
       FoodXenomeatBreadSlice: 100
   - type: Sprite
     sprite: Objects/Consumable/FoodContainers/xenomeatbread.rsi
-  - type: Icon
-    sprite: Objects/Consumable/FoodContainers/xenomeatbread.rsi
+
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/kitchen_reagent_containers.yml b/Resources/Prototypes/Entities/Objects/Consumable/kitchen_reagent_containers.yml
index 940bdee2be..0815d3ac06 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/kitchen_reagent_containers.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/kitchen_reagent_containers.yml
@@ -17,7 +17,5 @@
   - type: Sprite
     sprite: Objects/Consumable/Food/flour.rsi
     state: icon
-  - type: Icon
-    sprite: Objects/Consumable/Food/flour.rsi
-    state: icon
+
   - type: Spillable
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/trash.yml b/Resources/Prototypes/Entities/Objects/Consumable/trash.yml
index dd95f0e23f..98b4ae05a8 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/trash.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/trash.yml
@@ -6,8 +6,7 @@
   components:
   - type: Sprite
     state: icon
-  - type: Icon
-    state: icon
+
 
 # Trash mountain
 - type: entity
@@ -17,8 +16,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Trash/4no_raisins.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Trash/4no_raisins.rsi
+
 
 - type: entity
   name: candy (trash)
@@ -27,8 +25,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Trash/candy.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Trash/candy.rsi
+
 
 - type: entity
   name: cheesie honkers (trash)
@@ -37,8 +34,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Trash/cheesie_honkers.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Trash/cheesie_honkers.rsi
+
 
 - type: entity
   name: chips (trash)
@@ -47,8 +43,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Trash/chips.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Trash/chips.rsi
+
 
 - type: entity
   name: corn cob (trash)
@@ -57,8 +52,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Trash/corncob.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Trash/corncob.rsi
+
 
 - type: entity
   name: liquid food (trash)
@@ -67,8 +61,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Trash/liquidfood.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Trash/liquidfood.rsi
+
 
 - type: entity
   name: pistachos pack (trash)
@@ -77,8 +70,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Trash/pistachios_pack.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Trash/pistachios_pack.rsi
+
 
 - type: entity
   name: messy pizza box (trash)
@@ -87,8 +79,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Trash/pizzabox_messy.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Trash/pizzabox_messy.rsi
+
 
 - type: entity
   name: plastic bag (trash)
@@ -97,8 +88,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Trash/plasticbag.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Trash/plasticbag.rsi
+
 
 - type: entity
   name: plate (trash)
@@ -107,8 +97,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Trash/plate.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Trash/plate.rsi
+
 
 - type: entity
   name: popcorn (trash)
@@ -117,8 +106,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Trash/popcorn.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Trash/popcorn.rsi
+
 
 - type: entity
   name: semki pack (trash)
@@ -127,8 +115,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Trash/semki_pack.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Trash/semki_pack.rsi
+
 
 - type: entity
   name: snack bowl (trash)
@@ -137,8 +124,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Trash/snack_bowl.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Trash/snack_bowl.rsi
+
 
 - type: entity
   name: SOS jerky (trash)
@@ -147,8 +133,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Trash/sosjerky.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Trash/sosjerky.rsi
+
 
 - type: entity
   name: syndi cakes (trash)
@@ -157,8 +142,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Trash/syndi_cakes.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Trash/syndi_cakes.rsi
+
 
 - type: entity
   name: tasty bread (trash)
@@ -167,8 +151,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Trash/tastybread.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Trash/tastybread.rsi
+
 
 - type: entity
   name: trash bag
@@ -177,8 +160,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Trash/trashbag.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Trash/trashbag.rsi
+
   - type: Storage
     capacity: 125
 
@@ -189,8 +171,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Trash/tray.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Trash/tray.rsi
+
 
 - type: entity
   name: waffles (trash)
@@ -199,8 +180,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Trash/waffles.rsi
-  - type: Icon
-    sprite: Objects/Consumable/Trash/waffles.rsi
+
 
 - type: entity
   name: banana peel
@@ -210,9 +190,7 @@
   - type: Sprite
     sprite: Objects/Consumable/Food/banana.rsi
     state: peel
-  - type: Icon
-    sprite: Objects/Consumable/Food/banana.rsi
-    state: peel
+
   - type: Slippery
     intersectPercentage: 0.2
   - type: Collidable
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/trash_drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/trash_drinks.yml
index b03140442e..16cb3c0946 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/trash_drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/trash_drinks.yml
@@ -9,8 +9,7 @@
   - type: LoopingSound
   - type: Sprite
     state: icon
-  - type: Icon
-    state: icon
+
   - type: SolutionContainer
     maxVol: 10
     caps: AddTo, RemoveFrom
@@ -29,8 +28,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/TrashDrinks/absinthebottle_empty.rsi
-  - type: Icon
-    sprite: Objects/Consumable/TrashDrinks/absinthebottle_empty.rsi
+
 
 - type: entity
   name: alcohol bottle
@@ -39,8 +37,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/TrashDrinks/alco-clear.rsi
-  - type: Icon
-    sprite: Objects/Consumable/TrashDrinks/alco-clear.rsi
+
 
 - type: entity
   name: ale bottle
@@ -49,8 +46,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/TrashDrinks/alebottle_empty.rsi
-  - type: Icon
-    sprite: Objects/Consumable/TrashDrinks/alebottle_empty.rsi
+
 
 - type: entity
   name: beer bottle
@@ -59,8 +55,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/TrashDrinks/beer_empty.rsi
-  - type: Icon
-    sprite: Objects/Consumable/TrashDrinks/beer_empty.rsi
+
 
 - type: entity
   name: broken bottle
@@ -69,8 +64,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/TrashDrinks/broken_bottle.rsi
-  - type: Icon
-    sprite: Objects/Consumable/TrashDrinks/broken_bottle.rsi
+
 
 - type: entity
   name: cognac bottle
@@ -79,8 +73,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/TrashDrinks/cognacbottle_empty.rsi
-  - type: Icon
-    sprite: Objects/Consumable/TrashDrinks/cognacbottle_empty.rsi
+
 
 - type: entity
   name: griffeater gin bottle
@@ -89,8 +82,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/TrashDrinks/ginbottle_empty.rsi
-  - type: Icon
-    sprite: Objects/Consumable/TrashDrinks/ginbottle_empty.rsi
+
 
 - type: entity
   name: goldschlager bottle
@@ -99,8 +91,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/TrashDrinks/goldschlagerbottle_empty.rsi
-  - type: Icon
-    sprite: Objects/Consumable/TrashDrinks/goldschlagerbottle_empty.rsi
+
 
 - type: entity
   name: kahlua bottle
@@ -109,8 +100,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/TrashDrinks/kahluabottle_empty.rsi
-  - type: Icon
-    sprite: Objects/Consumable/TrashDrinks/kahluabottle_empty.rsi
+
 
 - type: entity
   name: nt cahors bottle
@@ -119,8 +109,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/TrashDrinks/ntcahors_empty.rsi
-  - type: Icon
-    sprite: Objects/Consumable/TrashDrinks/ntcahors_empty.rsi
+
 
 - type: entity
   name: patron bottle
@@ -129,8 +118,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/TrashDrinks/patronbottle_empty.rsi
-  - type: Icon
-    sprite: Objects/Consumable/TrashDrinks/patronbottle_empty.rsi
+
 
 - type: entity
   name: poison wine bottle
@@ -139,8 +127,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/TrashDrinks/pwinebottle_empty.rsi
-  - type: Icon
-    sprite: Objects/Consumable/TrashDrinks/pwinebottle_empty.rsi
+
 
 - type: entity
   name: rum bottle
@@ -149,8 +136,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/TrashDrinks/rumbottle_empty.rsi
-  - type: Icon
-    sprite: Objects/Consumable/TrashDrinks/rumbottle_empty.rsi
+
 
 - type: entity
   name: tequila bottle
@@ -159,8 +145,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/TrashDrinks/tequillabottle_empty.rsi
-  - type: Icon
-    sprite: Objects/Consumable/TrashDrinks/tequillabottle_empty.rsi
+
 
 - type: entity
   name: vermouth bottle
@@ -169,8 +154,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/TrashDrinks/vermouthbottle_empty.rsi
-  - type: Icon
-    sprite: Objects/Consumable/TrashDrinks/vermouthbottle_empty.rsi
+
 
 - type: entity
   name: vodka bottle
@@ -179,8 +163,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/TrashDrinks/vodkabottle_empty.rsi
-  - type: Icon
-    sprite: Objects/Consumable/TrashDrinks/vodkabottle_empty.rsi
+
 
 - type: entity
   name: whiskey bottle
@@ -189,8 +172,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/TrashDrinks/whiskeybottle_empty.rsi
-  - type: Icon
-    sprite: Objects/Consumable/TrashDrinks/whiskeybottle_empty.rsi
+
 
 - type: entity
   name: wine bottle
@@ -199,5 +181,4 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/TrashDrinks/winebottle_empty.rsi
-  - type: Icon
-    sprite: Objects/Consumable/TrashDrinks/winebottle_empty.rsi
+
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index c6e848a267..be256a7896 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -29,9 +29,6 @@
   components:
   - type: PDA
     idCard: AssistantIDCard
-  - type: Icon
-    sprite: Objects/Devices/pda.rsi
-    state: pda
   - type: Sprite
     sprite: Objects/Devices/pda.rsi
     netsync: false
@@ -50,9 +47,6 @@
   components:
   - type: PDA
     idCard: ChefIDCard
-  - type: Icon
-    sprite: Objects/Devices/pda.rsi
-    state: pda-cook
   - type: Sprite
     sprite: Objects/Devices/pda.rsi
     netsync: false
@@ -71,9 +65,6 @@
   components:
   - type: PDA
     idCard: ClownIDCard
-  - type: Icon
-    sprite: Objects/Devices/pda.rsi
-    state: pda-clown
   - type: Sprite
     sprite: Objects/Devices/pda.rsi
     netsync: false
@@ -100,9 +91,6 @@
   components:
   - type: PDA
     idCard: MimeIDCard
-  - type: Icon
-    sprite: Objects/Devices/pda.rsi
-    state: pda-mime
   - type: Sprite
     sprite: Objects/Devices/pda.rsi
     netsync: false
@@ -121,9 +109,7 @@
   components:
   - type: PDA
     idCard: CargoIDCard
-  - type: Icon
-    sprite: Objects/Devices/pda.rsi
-    state: pda-cargo
+
   - type: Sprite
     sprite: Objects/Devices/pda.rsi
     netsync: false
@@ -142,9 +128,7 @@
   components:
   - type: PDA
     idCard: BartenderIDCard
-  - type: Icon
-    sprite: Objects/Devices/pda.rsi
-    state: pda-bartender
+
   - type: Sprite
     sprite: Objects/Devices/pda.rsi
     netsync: false
@@ -164,9 +148,7 @@
   components:
   - type: PDA
     idCard: JanitorIDCard
-  - type: Icon
-    sprite: Objects/Devices/pda.rsi
-    state: pda-janitor
+
   - type: Sprite
     sprite: Objects/Devices/pda.rsi
     netsync: false
@@ -185,9 +167,7 @@
   components:
   - type: PDA
     idCard: CaptainIDCard
-  - type: Icon
-    sprite: Objects/Devices/pda.rsi
-    state: pda-captain
+
   - type: Sprite
     sprite: Objects/Devices/pda.rsi
     netsync: false
@@ -205,9 +185,7 @@
   components:
   - type: PDA
     idCard: HoPIDCard
-  - type: Icon
-    sprite: Objects/Devices/pda.rsi
-    state: pda-hop
+
   - type: Sprite
     sprite: Objects/Devices/pda.rsi
     netsync: false
@@ -225,9 +203,7 @@
   components:
   - type: PDA
     idCard: CEIDCard
-  - type: Icon
-    sprite: Objects/Devices/pda.rsi
-    state: pda-ce
+
   - type: Sprite
     sprite: Objects/Devices/pda.rsi
     netsync: false
@@ -246,9 +222,7 @@
   components:
   - type: PDA
     idCard: EngineeringIDCard
-  - type: Icon
-    sprite: Objects/Devices/pda.rsi
-    state: pda-engineer
+
   - type: Sprite
     sprite: Objects/Devices/pda.rsi
     netsync: false
@@ -266,9 +240,7 @@
   components:
   - type: PDA
     idCard: CMOIDCard
-  - type: Icon
-    sprite: Objects/Devices/pda.rsi
-    state: pda-cmo
+
   - type: Sprite
     sprite: Objects/Devices/pda.rsi
     netsync: false
@@ -286,9 +258,7 @@
   components:
   - type: PDA
     idCard: MedicalIDCard
-  - type: Icon
-    sprite: Objects/Devices/pda.rsi
-    state: pda-medical
+
   - type: Sprite
     sprite: Objects/Devices/pda.rsi
     netsync: false
@@ -306,9 +276,7 @@
   components:
   - type: PDA
     idCard: RDIDCard
-  - type: Icon
-    sprite: Objects/Devices/pda.rsi
-    state: pda-rd
+
   - type: Sprite
     sprite: Objects/Devices/pda.rsi
     netsync: false
@@ -326,9 +294,7 @@
   components:
   - type: PDA
     idCard: ResearchIDCard
-  - type: Icon
-    sprite: Objects/Devices/pda.rsi
-    state: pda-rd
+
   - type: Sprite
     sprite: Objects/Devices/pda.rsi
     netsync: false
@@ -346,9 +312,7 @@
   components:
   - type: PDA
     idCard: HoSIDCard
-  - type: Icon
-    sprite: Objects/Devices/pda.rsi
-    state: pda-hos
+
   - type: Sprite
     sprite: Objects/Devices/pda.rsi
     netsync: false
@@ -366,9 +330,7 @@
   components:
   - type: PDA
     idCard: SecurityIDCard
-  - type: Icon
-    sprite: Objects/Devices/pda.rsi
-    state: pda-security
+
   - type: Sprite
     sprite: Objects/Devices/pda.rsi
     netsync: false
diff --git a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
index a0ccdbfd84..0620ba7a4d 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
@@ -8,9 +8,7 @@
     sprite: Objects/Fun/bikehorn.rsi
     state: icon
 
-  - type: Icon
-    sprite: Objects/Fun/bikehorn.rsi
-    state: icon
+
 
   - type: Item
     size: 5
diff --git a/Resources/Prototypes/Entities/Objects/Fun/dice.yml b/Resources/Prototypes/Entities/Objects/Fun/dice.yml
index 041f65a0c8..3f16a24dc8 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/dice.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/dice.yml
@@ -19,9 +19,7 @@
   - type: Sprite
     sprite: Objects/Fun/dice.rsi
     state: d100100
-  - type: Icon
-    sprite: Objects/Fun/dice.rsi
-    state: d100100
+
 
 - type: entity
   name: "d20"
@@ -34,9 +32,7 @@
   - type: Sprite
     sprite: Objects/Fun/dice.rsi
     state: d2020
-  - type: Icon
-    sprite: Objects/Fun/dice.rsi
-    state: d2020
+
 
 - type: entity
   name: "d12"
@@ -49,9 +45,7 @@
   - type: Sprite
     sprite: Objects/Fun/dice.rsi
     state: d1212
-  - type: Icon
-    sprite: Objects/Fun/dice.rsi
-    state: d1212
+
 
 - type: entity
   name: "d10"
@@ -64,9 +58,7 @@
   - type: Sprite
     sprite: Objects/Fun/dice.rsi
     state: d1010
-  - type: Icon
-    sprite: Objects/Fun/dice.rsi
-    state: d1010
+
 
 - type: entity
   name: "d8"
@@ -79,9 +71,7 @@
   - type: Sprite
     sprite: Objects/Fun/dice.rsi
     state: d88
-  - type: Icon
-    sprite: Objects/Fun/dice.rsi
-    state: d88
+
 
 - type: entity
   name: "d6"
@@ -94,9 +84,7 @@
   - type: Sprite
     sprite: Objects/Fun/dice.rsi
     state: d66
-  - type: Icon
-    sprite: Objects/Fun/dice.rsi
-    state: d66
+
 
 - type: entity
   name: "d4"
@@ -109,6 +97,4 @@
   - type: Sprite
     sprite: Objects/Fun/dice.rsi
     state: d44
-  - type: Icon
-    sprite: Objects/Fun/dice.rsi
-    state: d44
+
diff --git a/Resources/Prototypes/Entities/Objects/Fun/instruments.yml b/Resources/Prototypes/Entities/Objects/Fun/instruments.yml
index 97b6d71fd2..ca54c2f3a4 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/instruments.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/instruments.yml
@@ -24,9 +24,7 @@
   - type: Sprite
     sprite: Objects/Fun/Instruments/h_synthesizer.rsi
     state: icon
-  - type: Icon
-    sprite: Objects/Fun/Instruments/h_synthesizer.rsi
-    state: icon
+
   - type: Item
     size: 24
     sprite: Objects/Fun/Instruments/h_synthesizer.rsi
@@ -42,9 +40,7 @@
   - type: Sprite
     sprite: Objects/Fun/Instruments/guitar.rsi
     state: icon
-  - type: Icon
-    sprite: Objects/Fun/Instruments/guitar.rsi
-    state: icon
+
   - type: Item
     size: 24
     sprite: Objects/Fun/Instruments/guitar.rsi
@@ -59,9 +55,7 @@
   - type: Sprite
     sprite: Objects/Fun/Instruments/violin.rsi
     state: icon
-  - type: Icon
-    sprite: Objects/Fun/Instruments/violin.rsi
-    state: icon
+
   - type: Item
     size: 24
     sprite: Objects/Fun/Instruments/violin.rsi
@@ -75,8 +69,7 @@
     program: 56
   - type: Sprite
     texture: Objects/Fun/Instruments/otherinstruments.rsi/trumpet.png
-  - type: Icon
-    texture: Objects/Fun/Instruments/otherinstruments.rsi/trumpet.png
+
 
 - type: entity
   name: electric guitar
@@ -88,9 +81,7 @@
   - type: Sprite
     sprite: Objects/Fun/Instruments/eguitar.rsi
     state: icon
-  - type: Icon
-    sprite: Objects/Fun/Instruments/eguitar.rsi
-    state: icon
+
   - type: Item
     size: 24
     sprite: Objects/Fun/Instruments/eguitar.rsi
@@ -105,9 +96,7 @@
   - type: Sprite
     sprite: Objects/Fun/Instruments/accordion.rsi
     state: icon
-  - type: Icon
-    sprite: Objects/Fun/Instruments/accordion.rsi
-    state: icon
+
   - type: Item
     size: 24
     sprite: Objects/Fun/Instruments/accordion.rsi
@@ -122,9 +111,7 @@
   - type: Sprite
     sprite: Objects/Fun/Instruments/harmonica.rsi
     state: icon
-  - type: Icon
-    sprite: Objects/Fun/Instruments/harmonica.rsi
-    state: icon
+
   - type: Item
     size: 10
     sprite: Objects/Fun/Instruments/harmonica.rsi
@@ -139,9 +126,7 @@
   - type: Sprite
     sprite: Objects/Fun/Instruments/recorder.rsi
     state: icon
-  - type: Icon
-    sprite: Objects/Fun/Instruments/recorder.rsi
-    state: icon
+
   - type: Item
     size: 24
     sprite: Objects/Fun/Instruments/recorder.rsi
@@ -156,9 +141,7 @@
   - type: Sprite
     sprite: Objects/Fun/Instruments/trombone.rsi
     state: icon
-  - type: Icon
-    sprite: Objects/Fun/Instruments/trombone.rsi
-    state: icon
+
   - type: Item
     size: 24
     sprite: Objects/Fun/Instruments/trombone.rsi
@@ -173,9 +156,7 @@
   - type: Sprite
     sprite: Objects/Fun/Instruments/saxophone.rsi
     state: icon
-  - type: Icon
-    sprite: Objects/Fun/Instruments/saxophone.rsi
-    state: icon
+
   - type: Item
     size: 24
     sprite: Objects/Fun/Instruments/saxophone.rsi
@@ -190,9 +171,7 @@
   - type: Sprite
     sprite: Objects/Fun/Instruments/glockenspiel.rsi
     state: icon
-  - type: Icon
-    sprite: Objects/Fun/Instruments/glockenspiel.rsi
-    state: icon
+
   - type: Item
     size: 24
     sprite: Objects/Fun/Instruments/glockenspiel.rsi
@@ -207,9 +186,7 @@
   - type: Sprite
     sprite: Objects/Fun/Instruments/banjo.rsi
     state: icon
-  - type: Icon
-    sprite: Objects/Fun/Instruments/banjo.rsi
-    state: icon
+
   - type: Item
     size: 24
     sprite: Objects/Fun/Instruments/banjo.rsi
@@ -226,9 +203,7 @@
   - type: Sprite
     sprite: Objects/Fun/Instruments/bike_horn.rsi
     state: icon
-  - type: Icon
-    sprite: Objects/Fun/Instruments/bike_horn.rsi
-    state: icon
+
   - type: Item
     size: 24
     sprite: Objects/Fun/Instruments/bike_horn.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Fun/skub.yml b/Resources/Prototypes/Entities/Objects/Fun/skub.yml
index 1a61e0f37c..07b17500d8 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/skub.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/skub.yml
@@ -7,9 +7,6 @@
   - type: Sprite
     sprite: Objects/Misc/skub.rsi
     state: icon
-  - type: Icon
-    sprite: Objects/Misc/skub.rsi
-    state: icon
   - type: Item
     sprite: Objects/Misc/skub.rsi
   - type: ItemCooldown
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index c366e09883..9b96f0f6f9 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -11,9 +11,6 @@
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
     state: plushie_h
-  - type: Icon
-    sprite: Objects/Fun/toys.rsi
-    state: plushie_h
   - type: ItemCooldown
   - type: UseDelay
     delay: 1.0
@@ -29,9 +26,6 @@
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
     state: plushie_nuke
-  - type: Icon
-    sprite: Objects/Fun/toys.rsi
-    state: plushie_nuke
   - type: ItemCooldown
   - type: UseDelay
     delay: 1.0
@@ -47,9 +41,6 @@
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
     state: plushie_lizard
-  - type: Icon
-    sprite: Objects/Fun/toys.rsi
-    state: plushie_lizard
   - type: ItemCooldown
   - type: UseDelay
     delay: 1.0
@@ -65,9 +56,6 @@
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
     state: narplush
-  - type: Icon
-    sprite: Objects/Fun/toys.rsi
-    state: narplush
   - type: ItemCooldown
   - type: UseDelay
     delay: 1.0
@@ -83,9 +71,6 @@
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
     state: carpplush
-  - type: Icon
-    sprite: Objects/Fun/toys.rsi
-    state: carpplush
   - type: Item
     sprite: Objects/Fun/toys.rsi
     HeldPrefix: carpplush
@@ -104,9 +89,6 @@
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
     state: plushie_slime
-  - type: Icon
-    sprite: Objects/Fun/toys.rsi
-    state: plushie_slime
   - type: ItemCooldown
   - type: UseDelay
     delay: 1.0
@@ -120,9 +102,6 @@
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
     state: plushie_snake
-  - type: Icon
-    sprite: Objects/Fun/toys.rsi
-    state: plushie_snake
   - type: ItemCooldown
   - type: LoopingSound
   - type: EmitSoundOnUse
@@ -139,9 +118,6 @@
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
     state: toy_mouse
-  - type: Icon
-    sprite: Objects/Fun/toys.rsi
-    state: toy_mouse
   - type: ItemCooldown
   - type: LoopingSound
   - type: EmitSoundOnUse
@@ -158,9 +134,6 @@
   - type: Sprite
     sprite: Objects/Misc/carvings.rsi
     state: help_me
-  - type: Icon
-    sprite: Objects/Misc/carvings.rsi
-    state: help_me
   - type: Item
     sprite: Objects/Misc/carvings.rsi
   - type: EmitSoundOnThrow
@@ -183,9 +156,6 @@
   - type: Sprite
     sprite: Objects/Misc/carvings.rsi
     state: hello
-  - type: Icon
-    sprite: Objects/Misc/carvings.rsi
-    state: hello
   - type: Item
     sprite: Objects/Misc/carvings.rsi
   - type: EmitSoundOnThrow
@@ -206,9 +176,6 @@
   - type: Sprite
     sprite: Objects/Misc/carvings.rsi
     state: thank_you
-  - type: Icon
-    sprite: Objects/Misc/carvings.rsi
-    state: thank_you
   - type: Item
     sprite: Objects/Misc/carvings.rsi
   - type: EmitSoundOnThrow
@@ -229,9 +196,6 @@
   - type: Sprite
     sprite: Objects/Misc/carvings.rsi
     state: very_good
-  - type: Icon
-    sprite: Objects/Misc/carvings.rsi
-    state: very_good
   - type: Item
     sprite: Objects/Misc/carvings.rsi
   - type: EmitSoundOnThrow
@@ -252,9 +216,6 @@
   - type: Sprite
     sprite: Objects/Misc/carvings.rsi
     state: im_sorry
-  - type: Icon
-    sprite: Objects/Misc/carvings.rsi
-    state: im_sorry
   - type: Item
     sprite: Objects/Misc/carvings.rsi
   - type: EmitSoundOnThrow
@@ -277,9 +238,6 @@
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
     state: AI
-  - type: Icon
-    sprite: Objects/Fun/toys.rsi
-    state: AI
 
 - type: entity
   name: nuke toy
@@ -290,9 +248,6 @@
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
     state: nuketoy
-  - type: Icon
-    sprite: Objects/Fun/toys.rsi
-    state: nuketoy
 
 - type: entity
   name: assistant toy
@@ -303,9 +258,6 @@
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
     state: doll
-  - type: Icon
-    sprite: Objects/Fun/toys.rsi
-    state: doll
   - type: Item
     sprite: Objects/Fun/toys.rsi
     HeldPrefix: doll
@@ -319,9 +271,6 @@
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
     state: griffinprize
-  - type: Icon
-    sprite: Objects/Fun/toys.rsi
-    state: griffinprize
 
 - type: entity
   name: h.o.n.k. toy
@@ -332,9 +281,6 @@
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
     state: honkprize
-  - type: Icon
-    sprite: Objects/Fun/toys.rsi
-    state: honkprize
 
 - type: entity
   name: ian toy
@@ -345,9 +291,6 @@
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
     state: ian
-  - type: Icon
-    sprite: Objects/Fun/toys.rsi
-    state: ian
   - type: ItemCooldown
   - type: LoopingSound
   - type: EmitSoundOnUse
@@ -364,9 +307,6 @@
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
     state: marauderprize
-  - type: Icon
-    sprite: Objects/Fun/toys.rsi
-    state: marauderprize
 
 - type: entity
   name: mauler toy
@@ -377,9 +317,6 @@
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
     state: maulerprize
-  - type: Icon
-    sprite: Objects/Fun/toys.rsi
-    state: maulerprize
 
 - type: entity
   name: gygax toy
@@ -390,9 +327,6 @@
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
     state: gygaxtoy
-  - type: Icon
-    sprite: Objects/Fun/toys.rsi
-    state: gygaxtoy
 
 - type: entity
   name: odysseus toy
@@ -403,9 +337,6 @@
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
     state: odysseusprize
-  - type: Icon
-    sprite: Objects/Fun/toys.rsi
-    state: odysseusprize
 
 - type: entity
   name: owl toy
@@ -416,9 +347,6 @@
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
     state: owlprize
-  - type: Icon
-    sprite: Objects/Fun/toys.rsi
-    state: owlprize
 
 - type: entity
   name: deathripley toy
@@ -429,9 +357,6 @@
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
     state: deathripleytoy
-  - type: Icon
-    sprite: Objects/Fun/toys.rsi
-    state: deathripleytoy
 
 - type: entity
   name: phazon toy
@@ -442,9 +367,6 @@
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
     state: phazonprize
-  - type: Icon
-    sprite: Objects/Fun/toys.rsi
-    state: phazonprize
 
 - type: entity
   name: fire ripley
@@ -455,9 +377,6 @@
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
     state: fireripleytoy
-  - type: Icon
-    sprite: Objects/Fun/toys.rsi
-    state: fireripleytoy
 
 - type: entity
   name: reticence toy
@@ -468,9 +387,6 @@
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
     state: reticenceprize
-  - type: Icon
-    sprite: Objects/Fun/toys.rsi
-    state: reticenceprize
 
 - type: entity
   name: ripley toy
@@ -481,9 +397,7 @@
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
     state: ripleytoy
-  - type: Icon
-    sprite: Objects/Fun/toys.rsi
-    state: ripleytoy
+
 
 - type: entity
   name: seraph toy
@@ -494,9 +408,7 @@
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
     state: seraphprize
-  - type: Icon
-    sprite: Objects/Fun/toys.rsi
-    state: seraphprize
+
 
 - type: entity
   name: durand toy
@@ -507,9 +419,7 @@
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
     state: durandprize
-  - type: Icon
-    sprite: Objects/Fun/toys.rsi
-    state: durandprize
+
 
 ### Yeah I left these all mixed up for a future coder to puzzle over, it's lore.
 
@@ -522,9 +432,7 @@
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
     state: skeletonprize
-  - type: Icon
-    sprite: Objects/Fun/toys.rsi
-    state: skeletonprize
+
 
 ## Toyweapons
 
@@ -537,8 +445,7 @@
   components:
   - type: Sprite
     netsync: false
-  - type: Icon
-    state: icon
+
   - type: Item
     size: 24
     state: icon
@@ -552,9 +459,7 @@
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
     state: foamcrossbow
-  - type: Icon
-    sprite: Objects/Fun/toys.rsi
-    state: foamcrossbow
+
   - type: Item
     size: 24
     sprite: Objects/Fun/toys.rsi
@@ -580,7 +485,6 @@
   components:
   - type: Sprite
     netsync: false
-  - type: Icon
 
 - type: entity
   name: cap gun
@@ -595,9 +499,7 @@
       map: ["enum.RangedBarrelVisualLayers.Base"]
     - state: bolt-closed
       map: ["enum.RangedBarrelVisualLayers.Bolt"]
-  - type: Icon
-    sprite: Objects/Fun/toys.rsi
-    state: base
+
   - type: Item
     size: 24
     sprite: Objects/Fun/toys.rsi
@@ -626,9 +528,7 @@
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
     state: foamblade
-  - type: Icon
-    sprite: Objects/Fun/toys.rsi
-    state: foamblade
+
   - type: MeleeWeapon
     range: 2.0
     arcwidth: 0
@@ -650,14 +550,12 @@
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
     state: basketball
-  - type: Icon
-    sprite: Objects/Fun/toys.rsi
-    state: basketball
+
   - type: Item
     size: 24
     sprite: Objects/Fun/toys.rsi
     HeldPrefix: bask
-    
+
 - type: entity
   name: football
   parent: BaseItem
@@ -667,14 +565,12 @@
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
     state: football
-  - type: Icon
-    sprite: Objects/Fun/toys.rsi
-    state: football
+
   - type: Item
     size: 12
     sprite: Objects/Fun/toys.rsi
     HeldPrefix: footb
-  
+
 
 - type: entity
   name: syndie balloon
@@ -685,9 +581,7 @@
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
     state: synb
-  - type: Icon
-    sprite: Objects/Fun/toys.rsi
-    state: synb
+
   - type: Item
     size: 24
     sprite: Objects/Fun/toys.rsi
@@ -702,9 +596,7 @@
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
     state: corgib
-  - type: Icon
-    sprite: Objects/Fun/toys.rsi
-    state: corgib
+
   - type: Item
     size: 24
     sprite: Objects/Fun/toys.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
index bdd598aedc..f9da2ce23b 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
@@ -11,8 +11,7 @@
   components:
   - type: Sprite
     sprite: Objects/Misc/bedsheets.rsi
-  - type: Icon
-    sprite: Objects/Misc/bedsheets.rsi
+
   - type: Clothing
     size: 10
     QuickEquip: true
@@ -28,8 +27,7 @@
   components:
   - type: Sprite
     state: sheetblack
-  - type: Icon
-    state: sheetblack
+
   - type: Clothing
     size: 10
     QuickEquip: true
@@ -45,8 +43,7 @@
   components:
   - type: Sprite
     state: sheetblue
-  - type: Icon
-    state: sheetblue
+
   - type: Clothing
     size: 10
     QuickEquip: true
@@ -62,8 +59,7 @@
   components:
   - type: Sprite
     state: sheetbrown
-  - type: Icon
-    state: sheetbrown
+
   - type: Clothing
     size: 10
     QuickEquip: true
@@ -80,8 +76,7 @@
   components:
   - type: Sprite
     state: sheetcaptain
-  - type: Icon
-    state: sheetcaptain
+
   - type: Clothing
     size: 10
     QuickEquip: true
@@ -97,8 +92,7 @@
   components:
   - type: Sprite
     state: sheetce
-  - type: Icon
-    state: sheetce
+
   - type: Clothing
     size: 10
     QuickEquip: true
@@ -114,8 +108,7 @@
   components:
   - type: Sprite
     state: sheetcentcom
-  - type: Icon
-    state: sheetcentcom
+
   - type: Clothing
     size: 10
     QuickEquip: true
@@ -131,8 +124,7 @@
   components:
   - type: Sprite
     state: sheetclown
-  - type: Icon
-    state: sheetclown
+
   - type: Clothing
     size: 10
     QuickEquip: true
@@ -148,8 +140,7 @@
   components:
   - type: Sprite
     state: sheetcmo
-  - type: Icon
-    state: sheetcmo
+
   - type: Clothing
     size: 10
     QuickEquip: true
@@ -165,8 +156,7 @@
   components:
   - type: Sprite
     state: sheetcosmos
-  - type: Icon
-    state: sheetcosmos
+
   - type: Clothing
     size: 10
     QuickEquip: true
@@ -182,8 +172,7 @@
   components:
   - type: Sprite
     state: sheetcult
-  - type: Icon
-    state: sheetcult
+
   - type: Clothing
     size: 10
     QuickEquip: true
@@ -199,8 +188,7 @@
   components:
   - type: Sprite
     state: sheetgreen
-  - type: Icon
-    state: sheetgreen
+
   - type: Clothing
     size: 10
     QuickEquip: true
@@ -216,8 +204,7 @@
   components:
   - type: Sprite
     state: sheetgrey
-  - type: Icon
-    state: sheetgrey
+
   - type: Clothing
     size: 10
     QuickEquip: true
@@ -233,8 +220,7 @@
   components:
   - type: Sprite
     state: sheethop
-  - type: Icon
-    state: sheethop
+
   - type: Clothing
     size: 10
     QuickEquip: true
@@ -250,8 +236,7 @@
   components:
   - type: Sprite
     state: sheethos
-  - type: Icon
-    state: sheethos
+
   - type: Clothing
     size: 10
     QuickEquip: true
@@ -267,8 +252,7 @@
   components:
   - type: Sprite
     state: sheetian
-  - type: Icon
-    state: sheetian
+
   - type: Clothing
     size: 10
     QuickEquip: true
@@ -284,8 +268,7 @@
   components:
   - type: Sprite
     state: sheetmedical
-  - type: Icon
-    state: sheetmedical
+
   - type: Clothing
     size: 10
     QuickEquip: true
@@ -301,8 +284,7 @@
   components:
   - type: Sprite
     state: sheetmime
-  - type: Icon
-    state: sheetmime
+
   - type: Clothing
     size: 10
     QuickEquip: true
@@ -318,8 +300,7 @@
   components:
   - type: Sprite
     state: sheetNT
-  - type: Icon
-    state: sheetNT
+
   - type: Clothing
     size: 10
     QuickEquip: true
@@ -335,8 +316,7 @@
   components:
   - type: Sprite
     state: sheetorange
-  - type: Icon
-    state: sheetorange
+
   - type: Clothing
     size: 10
     QuickEquip: true
@@ -352,8 +332,7 @@
   components:
   - type: Sprite
     state: sheetpurple
-  - type: Icon
-    state: sheetpurple
+
   - type: Clothing
     size: 10
     QuickEquip: true
@@ -369,8 +348,7 @@
   components:
   - type: Sprite
     state: sheetqm
-  - type: Icon
-    state: sheetqm
+
   - type: Clothing
     size: 10
     QuickEquip: true
@@ -386,8 +364,7 @@
   components:
   - type: Sprite
     state: sheetrainbow
-  - type: Icon
-    state: sheetrainbow
+
   - type: Clothing
     size: 10
     QuickEquip: true
@@ -403,8 +380,7 @@
   components:
   - type: Sprite
     state: sheetrd
-  - type: Icon
-    state: sheetrd
+
   - type: Clothing
     size: 10
     QuickEquip: true
@@ -420,8 +396,7 @@
   components:
   - type: Sprite
     state: sheetred
-  - type: Icon
-    state: sheetred
+
   - type: Clothing
     size: 10
     QuickEquip: true
@@ -437,8 +412,7 @@
   components:
   - type: Sprite
     state: sheetsyndie
-  - type: Icon
-    state: sheetsyndie
+
   - type: Clothing
     size: 10
     QuickEquip: true
@@ -454,8 +428,7 @@
   components:
   - type: Sprite
     state: sheetUSA
-  - type: Icon
-    state: sheetUSA
+
   - type: Clothing
     size: 10
     QuickEquip: true
@@ -471,8 +444,7 @@
   components:
   - type: Sprite
     state: sheetwhite
-  - type: Icon
-    state: sheetwhite
+
   - type: Clothing
     size: 10
     QuickEquip: true
@@ -488,8 +460,7 @@
   components:
   - type: Sprite
     state: sheetwiz
-  - type: Icon
-    state: sheetwiz
+
   - type: Clothing
     size: 10
     QuickEquip: true
@@ -505,8 +476,7 @@
   components:
   - type: Sprite
     state: sheetyellow
-  - type: Icon
-    state: sheetyellow
+
   - type: Clothing
     size: 10
     QuickEquip: true
diff --git a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
index 78b20f0e77..1956b4ba29 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
@@ -9,9 +9,6 @@
       layers:
         - state: fire_extinguisher_closed
           map: [ "enum.SprayVisualLayers.Base" ]
-    - type: Icon
-      sprite: Objects/Misc/fire_extinguisher.rsi
-      state: fire_extinguisher_closed
     - type: Item
       sprite: Objects/Misc/fire_extinguisher.rsi
       size: 10
@@ -50,9 +47,6 @@
       layers:
         - state: extinguish
           map: [ "enum.VaporVisualLayers.Base" ]
-    - type: Icon
-      sprite: Effects/extinguisherSpray.rsi
-      state: extinguish
     - type: Collidable
       hard: false
       shapes:
diff --git a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
index c972607ef5..675f7e2642 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
@@ -14,9 +14,7 @@
   - type: Sprite
     sprite: Objects/Misc/handcuffs.rsi
     state: handcuff
-  - type: Icon
-    sprite: Objects/Misc/handcuffs.rsi
-    state: handcuff
+
   - type: Clothing
     sprite: Objects/Misc/handcuffs.rsi
     Slots: [belt]
@@ -50,11 +48,6 @@
     state: cuff
     color: red
 
-  - type: Icon
-    sprite: Objects/Misc/cablecuffs.rsi
-    state: cuff
-    color: red
-
   - type: Clothing
     sprite: Objects/Misc/cablecuffs.rsi
     color: red
diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
index 403ce841b4..57896542e4 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -7,8 +7,7 @@
   components:
   - type: Sprite
     sprite: Objects/Misc/id_cards.rsi
-  - type: Icon
-    sprite: Objects/Misc/id_cards.rsi
+
   - type: Clothing
     Slots:
     - idcard
@@ -29,8 +28,7 @@
     - state: default
     - state: assigned
     - state: idassistant
-  - type: Icon
-    state: default
+
   - type: PresetIdCard
     job: Assistant
 
@@ -44,8 +42,7 @@
     - state: gold
     - state: assigned
     - state: idcaptain
-  - type: Icon
-    state: idcaptain_icon
+
   - type: Clothing
     HeldPrefix: gold
   - type: PresetIdCard
@@ -61,8 +58,7 @@
     - state: default
     - state: assigned
     - state: idsecurityofficer
-  - type: Icon
-    state: idsecurityofficer_icon
+
   - type: PresetIdCard
     job: SecurityOfficer
 
@@ -76,8 +72,7 @@
     - state: default
     - state: assigned
     - state: idstationengineer
-  - type: Icon
-    state: idstationengineer_icon
+
   - type: PresetIdCard
     job: StationEngineer
 
@@ -91,8 +86,7 @@
     - state: default
     - state: assigned
     - state: idmedicaldoctor
-  - type: Icon
-    state: idmedicaldoctor_icon
+
   - type: PresetIdCard
     job: MedicalDoctor
 
@@ -106,8 +100,7 @@
     - state: default
     - state: assigned
     - state: idcargotechnician
-  - type: Icon
-    state: idcargotechnician_icon
+
   - type: PresetIdCard
     job: CargoTechnician
 
@@ -121,8 +114,7 @@
     - state: default
     - state: assigned
     - state: idscientist
-  - type: Icon
-    state: idscientist_icon
+
   - type: PresetIdCard
     job: Scientist
 
@@ -136,8 +128,7 @@
     - state: default
     - state: assigned
     - state: idclown
-  - type: Icon
-    state: idclown_icon
+
   - type: PresetIdCard
     job: Clown
 
@@ -151,8 +142,7 @@
     - state: default
     - state: assigned
     - state: idmime
-  - type: Icon
-    state: idmime_icon
+
   - type: PresetIdCard
     job: Mime
 
@@ -166,8 +156,7 @@
     - state: default
     - state: assigned
     - state: idjanitor
-  - type: Icon
-    state: idjanitor_icon
+
   - type: PresetIdCard
     job: Janitor
 
@@ -181,8 +170,7 @@
     - state: default
     - state: assigned
     - state: idbartender
-  - type: Icon
-    state: idbartender_icon
+
   - type: PresetIdCard
     job: Bartender
 
@@ -196,8 +184,7 @@
     - state: default
     - state: assigned
     - state: idcook
-  - type: Icon
-    state: idcook_icon
+
   - type: PresetIdCard
     job: Chef
 
@@ -211,8 +198,7 @@
     - state: silver
     - state: assigned
     - state: idheadofpersonnel
-  - type: Icon
-    state: idheadofpersonnel_icon
+
   - type: Clothing
     HeldPrefix: silver
   - type: PresetIdCard
@@ -228,8 +214,7 @@
     - state: silver
     - state: assigned
     - state: idchiefengineer
-  - type: Icon
-    state: idchiefengineer_icon
+
   - type: Clothing
     HeldPrefix: silver
   - type: PresetIdCard
@@ -245,8 +230,7 @@
     - state: silver
     - state: assigned
     - state: idchiefmedicalofficer
-  - type: Icon
-    state: idchiefmedicalofficer_icon
+
   - type: Clothing
     HeldPrefix: silver
   - type: PresetIdCard
@@ -262,8 +246,7 @@
     - state: silver
     - state: assigned
     - state: idresearchdirector
-  - type: Icon
-    state: idresearchdirector_icon
+
   - type: Clothing
     HeldPrefix: silver
   - type: PresetIdCard
@@ -279,8 +262,7 @@
     - state: silver
     - state: assigned
     - state: idheadofsecurity
-  - type: Icon
-    state: idheadofsecurity_icon
+
   - type: Clothing
     HeldPrefix: silver
   - type: PresetIdCard
@@ -296,8 +278,7 @@
     - state: gold
     - state: assigned
     - state: idcentcom
-  - type: Icon
-    state: idcentcom_icon
+
   - type: Clothing
     HeldPrefix: gold
   - type: IdCard
diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
index 7785ba5504..1ffc061593 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -9,9 +9,7 @@
     layers:
     - state: paper_words
     - state: paper
-  - type: Icon
-    sprite: Objects/Misc/bureaucracy.rsi
-    state: paper
+
   - type: Paper
   - type: UserInterface
     interfaces:
@@ -27,7 +25,5 @@
   - type: Sprite
     sprite: Objects/Misc/bureaucracy.rsi
     state: pen
-  - type: Icon
-    sprite: Objects/Misc/bureaucracy.rsi
-    state: pen
+
   - type: Write
diff --git a/Resources/Prototypes/Entities/Objects/Misc/teleporters.yml b/Resources/Prototypes/Entities/Objects/Misc/teleporters.yml
index ea1ee9ccb4..e7249c47b2 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/teleporters.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/teleporters.yml
@@ -8,9 +8,6 @@
     netsync: false
     sprite: Objects/Misc/hand_tele.rsi
     state: ready
-  - type: Icon
-    sprite: Objects/Misc/hand_tele.rsi
-    state: ready
   - type: ItemTeleporter
     teleporter_type: Random
   - type: Item
diff --git a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
index 9b1a9ccc3e..866f4b691f 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
@@ -6,8 +6,7 @@
   - type: Sprite
     sprite: Objects/Misc/utensils.rsi
 
-  - type: Icon
-    sprite: Objects/Misc/utensils.rsi
+
 
 
 - type: entity
@@ -17,8 +16,7 @@
   components:
   - type: Sprite
     state: fork
-  - type: Icon
-    state: fork
+
   - type: Utensil
     types:
     - Fork
@@ -30,8 +28,7 @@
   components:
   - type: Sprite
     state: plastic_fork
-  - type: Icon
-    state: plastic_fork
+
   - type: Utensil
     types:
     - Fork
@@ -45,8 +42,7 @@
   components:
   - type: Sprite
     state: spoon
-  - type: Icon
-    state: spoon
+
   - type: Utensil
     types:
     - Spoon
@@ -59,8 +55,7 @@
   components:
   - type: Sprite
     state: plastic_spoon
-  - type: Icon
-    state: plastic_spoon
+
   - type: Utensil
     types:
     - Spoon
@@ -73,8 +68,7 @@
   components:
   - type: Sprite
     state: plastic_knife
-  - type: Icon
-    state: plastic_knife
+
   - type: Utensil
     types:
     - Knife
diff --git a/Resources/Prototypes/Entities/Objects/Power/antimatter_jar.yml b/Resources/Prototypes/Entities/Objects/Power/antimatter_jar.yml
index 37c7d7f639..74057a3178 100644
--- a/Resources/Prototypes/Entities/Objects/Power/antimatter_jar.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/antimatter_jar.yml
@@ -10,7 +10,4 @@
   - type: Sprite
     sprite: Objects/Power/AME/ame_jar.rsi
     state: jar
-  - type: Icon
-    sprite: Objects/Power/AME/ame_jar.rsi
-    state: jar
-  - type: AMEFuelContainer
\ No newline at end of file
+  - type: AMEFuelContainer
diff --git a/Resources/Prototypes/Entities/Objects/Power/antimatter_part.yml b/Resources/Prototypes/Entities/Objects/Power/antimatter_part.yml
index 2c17c51179..ef54fc3fac 100644
--- a/Resources/Prototypes/Entities/Objects/Power/antimatter_part.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/antimatter_part.yml
@@ -10,7 +10,4 @@
   - type: Sprite
     sprite: Objects/Power/AME/ame_part.rsi
     state: box
-  - type: Icon
-    sprite: Objects/Power/AME/ame_part.rsi
-    state: box
-  - type: AMEPart
\ No newline at end of file
+  - type: AMEPart
diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml
index 1cd62c0441..b1623d1e1c 100644
--- a/Resources/Prototypes/Entities/Objects/Power/lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml
@@ -9,9 +9,6 @@
   - type: Sprite
     sprite: Objects/Power/light_bulb.rsi
     state: normal
-  - type: Icon
-    sprite: Objects/Power/light_bulb.rsi
-    state: normal
 
 - type: entity
   parent: BaseItem
@@ -32,9 +29,6 @@
   - type: Sprite
     sprite:  Objects/Power/light_tube.rsi
     state: normal
-  - type: Icon
-    sprite:  Objects/Power/light_tube.rsi
-    state: normal
 
 - type: entity
   parent: BaseLightbulb
@@ -49,6 +43,3 @@
   - type: Sprite
     sprite:  Objects/Power/light_tube.rsi
     state: normal
-  - type: Icon
-    sprite:  Objects/Power/light_tube.rsi
-    state: normal
diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml
index 98bb8936e3..3636b34a84 100644
--- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml
@@ -23,9 +23,6 @@
     sprite: Objects/Power/PowerCells/power_cell_small_st.rsi
     layers:
     - state: s_st
-  - type: Icon
-    sprite: Objects/Power/PowerCells/power_cell_small_st.rsi
-    state: s_st
   - type: PowerCell
     maxCharge: 15000
     startingCharge: 15000
@@ -44,9 +41,6 @@
     sprite: Objects/Power/PowerCells/power_cell_small_hi.rsi
     layers:
     - state: s_hi
-  - type: Icon
-    sprite: Objects/Power/PowerCells/power_cell_small_hi.rsi
-    state: s_hi
   - type: PowerCell
     maxCharge: 30000
     startingCharge: 30000
@@ -65,9 +59,6 @@
     sprite: Objects/Power/PowerCells/power_cell_small_sup.rsi
     layers:
     - state: s_sup
-  - type: Icon
-    sprite: Objects/Power/PowerCells/power_cell_small_sup.rsi
-    state: s_sup
   - type: PowerCell
     maxCharge: 60000
     startingCharge: 60000
@@ -86,9 +77,6 @@
     sprite: Objects/Power/PowerCells/power_cell_small_hy.rsi
     layers:
     - state: s_hy
-  - type: Icon
-    sprite: Objects/Power/PowerCells/power_cell_small_hy.rsi
-    state: s_hy
   - type: PowerCell
     maxCharge: 80000
     startingCharge: 80000
@@ -108,9 +96,6 @@
   - type: PowerCellCharger
     transfer_efficiency: 0.85
   - type: PowerReceiver
-  - type: Icon
-    sprite: Constructible/Power/cell_recharger.rsi
-    state: empty
   - type: Appearance
     visuals:
     - type: PowerChargerVisualizer
@@ -138,9 +123,6 @@
   - type: WeaponCapacitorCharger
     transfer_efficiency: 0.85
   - type: PowerReceiver
-  - type: Icon
-    sprite: Constructible/Power/recharger.rsi
-    state: empty
   - type: Appearance
     visuals:
     - type: PowerChargerVisualizer
@@ -168,9 +150,6 @@
   - type: WeaponCapacitorCharger
     transfer_efficiency: 0.95
   - type: PowerReceiver
-  - type: Icon
-    sprite: Constructible/Power/wall_recharger.rsi
-    state: empty
   - type: Appearance
     visuals:
     - type: PowerChargerVisualizer
diff --git a/Resources/Prototypes/Entities/Objects/Specific/atmos.yml b/Resources/Prototypes/Entities/Objects/Specific/atmos.yml
index 1e36174408..5ff4f0eac5 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/atmos.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/atmos.yml
@@ -7,9 +7,7 @@
   - type: Sprite
     sprite: Objects/Specific/Atmos/gasanalyzer.rsi
     state: icon
-  - type: Icon
-    sprite: Objects/Specific/Atmos/gasanalyzer.rsi
-    state: icon
+
   - type: GasAnalyzer
   - type: UserInterface
     interfaces:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
index 047e74ec72..9211c7f91c 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -6,8 +6,7 @@
   components:
   - type: Sprite
     texture: Objects/Specific/Chemistry/beakers.rsi/beaker.png
-  - type: Icon
-    texture: Objects/Specific/Chemistry/beakers.rsi/beaker.png
+
   - type: Item
     sprite: Objects/Specific/Chemistry/beakers.rsi
     HeldPrefix: beaker
@@ -27,8 +26,7 @@
   components:
   - type: Sprite
     texture: Objects/Specific/Chemistry/beakers.rsi/beakerlarge.png
-  - type: Icon
-    texture: Objects/Specific/Chemistry/beakers.rsi/beakerlarge.png
+
   - type: Item
     sprite: Objects/Specific/Chemistry/beakers.rsi
     HeldPrefix: beaker
@@ -48,8 +46,7 @@
   components:
   - type: Sprite
     texture: Objects/Specific/Chemistry/dropper.rsi/dropper.png
-  - type: Icon
-    texture: Objects/Specific/Chemistry/dropper.rsi/dropper.png
+
   - type: SolutionContainer
     fillingState: dropper
     fillingSteps: 2
@@ -67,8 +64,7 @@
   components:
   - type: Sprite
     texture: Objects/Specific/Chemistry/syringe.rsi/0.png
-  - type: Icon
-    texture: Objects/Specific/Chemistry/syringe.rsi/0.png
+
   - type: SolutionContainer
     fillingState: syringe
     fillingSteps: 5
@@ -91,8 +87,7 @@
       transferAmount: 5
     - type: Sprite
       texture: Objects/Specific/Chemistry/bottle.rsi/bottle.png
-    - type: Icon
-      texture: Objects/Specific/Chemistry/bottle.rsi/bottle.png
+
     - type: Spillable
 
 - type: entity
@@ -107,5 +102,4 @@
       caps: RemoveFrom
     - type: Sprite
       texture: Objects/Specific/Chemistry/pills.rsi/pill.png
-    - type: Icon
-      texture: Objects/Specific/Chemistry/pills.rsi/pill.png
+
diff --git a/Resources/Prototypes/Entities/Objects/Specific/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/janitor.yml
index 61d57d1045..eedd17ec83 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/janitor.yml
@@ -7,9 +7,6 @@
   - type: Sprite
     sprite: Objects/Specific/Janitorial/mop.rsi
     state: mop
-  - type: Icon
-    sprite: Objects/Specific/Janitorial/mop.rsi
-    state: mop
   - type: Item
     size: 10
     sprite: Objects/Specific/Janitorial/mop.rsi
@@ -28,8 +25,6 @@
   - type: Sprite
     texture: Objects/Specific/Janitorial/mopbucket.png
     drawdepth: Objects
-  - type: Icon
-    texture: Objects/Specific/Janitorial/mopbucket.png
   - type: InteractionOutline
   - type: Bucket
   - type: LoopingSound
@@ -62,8 +57,6 @@
   - type: Sprite
     texture: Objects/Specific/Janitorial/bucket.png
     drawdepth: Objects
-  - type: Icon
-    texture: Objects/Specific/Janitorial/bucket.png
   - type: Bucket
   - type: LoopingSound
   - type: SolutionContainer
@@ -90,9 +83,6 @@
   - type: Sprite
     sprite: Objects/Specific/Janitorial/wet_floor_sign.rsi
     state: caution
-  - type: Icon
-    sprite: Objects/Specific/Janitorial/wet_floor_sign.rsi
-    state: caution
   - type: Item
     sprite: Objects/Specific/Janitorial/wet_floor_sign.rsi
 
@@ -105,9 +95,6 @@
   - type: Sprite
     sprite: Objects/Specific/Janitorial/soap.rsi
     state: soap
-  - type: Icon
-    sprite: Objects/Specific/Janitorial/soap.rsi
-    state: soap
   - type: Item
     sprite: Objects/Specific/Janitorial/soap.rsi
   - type: Slippery
@@ -127,8 +114,6 @@
   components:
     - type: Sprite
       state: soapnt
-    - type: Icon
-      state: soapnt
 
 - type: entity
   name: soap
@@ -138,8 +123,6 @@
   components:
     - type: Sprite
       state: soapdeluxe
-    - type: Icon
-      state: soapdeluxe
 
 - type: entity
   name: soap
@@ -149,8 +132,6 @@
   components:
     - type: Sprite
       state: soapsyndie
-    - type: Icon
-      state: soapsyndie
     - type: Slippery
       paralyzeTime: 5
 
@@ -162,8 +143,6 @@
   components:
     - type: Sprite
       state: soapgibs
-    - type: Icon
-      state: soapgibs
     - type: Slippery
       paralyzeTime: 2
 
@@ -175,8 +154,6 @@
   components:
     - type: Sprite
       state: soapomega
-    - type: Icon
-      state: soapomega
     - type: Slippery
       paralyzeTime: 7
 
@@ -196,9 +173,6 @@
       layers:
         - state: chempuff
           map: [ "enum.VaporVisualLayers.Base" ]
-    - type: Icon
-      sprite: Effects/chempuff.rsi
-      state: chempuff
     - type: Physics
     - type: Collidable
       hard: false
@@ -222,8 +196,6 @@
   components:
   - type: Sprite
     texture: Objects/Specific/Janitorial/cleaner.png
-  - type: Icon
-    texture: Objects/Specific/Janitorial/cleaner.png
   - type: SolutionContainer
     maxVol: 100
     caps: AddTo, RemoveFrom
diff --git a/Resources/Prototypes/Entities/Objects/Specific/medical.yml b/Resources/Prototypes/Entities/Objects/Specific/medical.yml
index 4c33d8180d..1c378a6f7b 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/medical.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/medical.yml
@@ -6,8 +6,7 @@
   components:
   - type: Sprite
     texture: Objects/Specific/Medical/medkit_r.png
-  - type: Icon
-    texture: Objects/Specific/Medical/medkit_r.png
+
   - type: Storage
     capacity: 60
   - type: Item
@@ -44,8 +43,7 @@
   components:
   - type: Sprite
     texture: Objects/Specific/Medical/ointment.png
-  - type: Icon
-    texture: Objects/Specific/Medical/ointment.png
+
   - type: Healing
     heal:
       Heat: 10
@@ -62,8 +60,7 @@
   components:
   - type: Sprite
     texture: Objects/Specific/Medical/brutepack.png
-  - type: Icon
-    texture: Objects/Specific/Medical/brutepack.png
+
   - type: Healing
     heal:
       Blunt: 10
diff --git a/Resources/Prototypes/Entities/Objects/Tools/flare.yml b/Resources/Prototypes/Entities/Objects/Tools/flare.yml
index e9311b8b39..33f92c918a 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/flare.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/flare.yml
@@ -1,13 +1,13 @@
 - type: entity
   name: emergency flare # todo: we need some sort of IgnitionSourceComponent we can add to this, so when it's lit it will cause fires when touching fuel
-  parent: BaseItem 
+  parent: BaseItem
   id: FlareBase
   description: A flare that produces a very bright light for a short while. Point the flame away from yourself.
   components:
     - type: ExpendableLight
       spentName: spent flare
       spentDesc: It looks like this flare has burnt out. What a bummer.
-      glowDuration: 400 
+      glowDuration: 400
       fadeOutDuration: 4
       iconStateOn: flare_unlit
       iconStateSpent: flare_spent
@@ -25,12 +25,9 @@
           shader: unshaded
         - state: flare_unlit
           color: "#FF0000"
-    - type: Icon
-      sprite: Objects/Misc/flare.rsi
-      state: flare_spent
     - type: Item
       sprite: Objects/Misc/flare.rsi
-      color: "#FF0000" 
+      color: "#FF0000"
       HeldPrefix: off
     - type: LoopingSound
     - type: Appearance
@@ -74,4 +71,4 @@
           maxDuration: 4.0
           startValue: 6.0
           endValue: 1.0
-          property: Radius
\ No newline at end of file
+          property: Radius
diff --git a/Resources/Prototypes/Entities/Objects/Tools/flashlight.yml b/Resources/Prototypes/Entities/Objects/Tools/flashlight.yml
index cd4c5f7768..ecc02b8a2d 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/flashlight.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/flashlight.yml
@@ -12,9 +12,6 @@
         - state: HandheldLightOnOverlay
           shader: unshaded
           visible: false
-    - type: Icon
-      sprite: Objects/Tools/flashlight.rsi
-      state: lantern_off
     - type: Item
       sprite: Objects/Tools/flashlight.rsi
       HeldPrefix: off
diff --git a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
index 6b42ea0bbe..7f14e7b9aa 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
@@ -24,12 +24,9 @@
           shader: unshaded
         - state: glowstick_unlit
           color: "#00FF00"
-    - type: Icon
-      sprite: Objects/Misc/glowstick.rsi
-      state: glowstick_unlit
     - type: Item
       sprite: Objects/Misc/glowstick.rsi
-      color: "#00FF00" 
+      color: "#00FF00"
       HeldPrefix: off
     - type: Appearance
       visuals:
@@ -90,7 +87,7 @@
           color: "#FF0000"
     - type: Item
       sprite: Objects/Misc/glowstick.rsi
-      color: "#FF0000" 
+      color: "#FF0000"
       HeldPrefix: off
     - type: PointLight
       enabled: false
@@ -125,7 +122,7 @@
           color: "#FF00FF"
     - type: Item
       sprite: Objects/Misc/glowstick.rsi
-      color: "#FF00FF" 
+      color: "#FF00FF"
       HeldPrefix: off
     - type: PointLight
       enabled: false
@@ -160,7 +157,7 @@
           color: "#FFFF00"
     - type: Item
       sprite: Objects/Misc/glowstick.rsi
-      color: "#FFFF00" 
+      color: "#FFFF00"
       HeldPrefix: off
     - type: PointLight
       enabled: false
@@ -195,7 +192,7 @@
           color: "#0000FF"
     - type: Item
       sprite: Objects/Misc/glowstick.rsi
-      color: "#0000FF" 
+      color: "#0000FF"
       HeldPrefix: off
     - type: PointLight
       enabled: false
@@ -221,9 +218,6 @@
     - type: Item
       sprite: Objects/Misc/glowstick.rsi
       HeldPrefix: off
-    - type: Icon
-      sprite: Objects/Misc/glowstick.rsi
-      state: glowstick_unlit
     - type: PointLight
       enabled: true
       color: "#FF0000"
@@ -254,9 +248,6 @@
     - type: Item
       sprite: Objects/Misc/glowstick.rsi
       HeldPrefix: off
-    - type: Icon
-      sprite: Objects/Misc/glowstick.rsi
-      state: glowstick_unlit
     - type: PointLight
       enabled: true
       color: "#FF0000"
@@ -288,9 +279,6 @@
     - type: Item
       sprite: Objects/Misc/glowstick.rsi
       HeldPrefix: off
-    - type: Icon
-      sprite: Objects/Misc/glowstick.rsi
-      state: glowstick_unlit
     - type: PointLight
       enabled: false
       color: "#FF0000"
@@ -330,9 +318,6 @@
     - type: Item
       sprite: Objects/Misc/glowstick.rsi
       HeldPrefix: off
-    - type: Icon
-      sprite: Objects/Misc/glowstick.rsi
-      state: glowstick_unlit
     - type: PointLight
       enabled: false
       color: "#FF0000"
@@ -363,9 +348,6 @@
     - type: Item
       sprite: Objects/Misc/glowstick.rsi
       HeldPrefix: off
-    - type: Icon
-      sprite: Objects/Misc/glowstick.rsi
-      state: glowstick_unlit
     - type: PointLight
       enabled: false
       color: "#FF0000"
@@ -397,9 +379,6 @@
     - type: Item
       sprite: Objects/Misc/glowstick.rsi
       HeldPrefix: off
-    - type: Icon
-      sprite: Objects/Misc/glowstick.rsi
-      state: glowstick_unlit
     - type: PointLight
       enabled: false
       color: "#FF0000"
@@ -414,4 +393,4 @@
           maxValue: 25.0
           isLooped: true
           property: Radius
-          enabled: true
\ No newline at end of file
+          enabled: true
diff --git a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
index d974dce9aa..54ecf29b51 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
@@ -12,9 +12,6 @@
         - state: lantern-on
           shader: unshaded
           visible: false
-    - type: Icon
-      sprite: Objects/Tools/lantern.rsi
-      state: lantern
     - type: Item
       sprite: Objects/Tools/lantern.rsi
       HeldPrefix: off
diff --git a/Resources/Prototypes/Entities/Objects/Tools/surgery.yml b/Resources/Prototypes/Entities/Objects/Tools/surgery.yml
index ecb3d12221..6f4e6a3f71 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/surgery.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/surgery.yml
@@ -23,9 +23,6 @@
   - type: Sprite
     sprite: Objects/Specific/Medical/surgery_tools.rsi
     state: scalpel
-  - type: Icon
-    sprite: Objects/Specific/Medical/surgery_tools.rsi
-    state: scalpel
   - type: ItemCooldown
   - type: MeleeWeapon
 
@@ -41,9 +38,6 @@
   - type: Sprite
     sprite: Objects/Specific/Medical/surgery_tools.rsi
     state: retractor
-  - type: Icon
-    sprite: Objects/Specific/Medical/surgery_tools.rsi
-    state: retractor
   - type: ItemCooldown
   - type: MeleeWeapon
 
@@ -59,9 +53,6 @@
   - type: Sprite
     sprite: Objects/Specific/Medical/surgery_tools.rsi
     state: cautery
-  - type: Icon
-    sprite: Objects/Specific/Medical/surgery_tools.rsi
-    state: cautery
   - type: ItemCooldown
   - type: MeleeWeapon
 
@@ -77,9 +68,6 @@
   - type: Sprite
     sprite: Objects/Specific/Medical/surgery_tools.rsi
     state: drill
-  - type: Icon
-    sprite: Objects/Specific/Medical/surgery_tools.rsi
-    state: drill
   - type: ItemCooldown
   - type: MeleeWeapon
 
@@ -95,9 +83,6 @@
   - type: Sprite
     sprite: Objects/Specific/Medical/surgery_tools.rsi
     state: bone_saw
-  - type: Icon
-    sprite: Objects/Specific/Medical/surgery_tools.rsi
-    state: bone_saw
   - type: ItemCooldown
   - type: MeleeWeapon
 
@@ -113,8 +98,5 @@
   - type: Sprite
     sprite: Objects/Specific/Medical/surgery_tools.rsi
     state: hemostat
-  - type: Icon
-    sprite: Objects/Specific/Medical/surgery_tools.rsi
-    state: hemostat
   - type: ItemCooldown
   - type: MeleeWeapon
diff --git a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
index d64a4d4420..e236d3f0d7 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
@@ -20,9 +20,6 @@
   - type: Sprite
     sprite: Objects/Tools/Toolboxes/toolbox_red.rsi
     state: icon
-  - type: Icon
-    sprite: Objects/Tools/Toolboxes/toolbox_red.rsi
-    state: icon
   - type: Item
     sprite: Objects/Tools/Toolboxes/toolbox_red.rsi
 
@@ -54,9 +51,6 @@
   - type: Sprite
     sprite: Objects/Tools/Toolboxes/toolbox_blue.rsi
     state: icon
-  - type: Icon
-    sprite: Objects/Tools/Toolboxes/toolbox_blue.rsi
-    state: icon
   - type: Item
     sprite: Objects/Tools/Toolboxes/toolbox_blue.rsi
 
@@ -69,9 +63,6 @@
   - type: Sprite
     sprite: Objects/Tools/Toolboxes/toolbox_yellow.rsi
     state: icon
-  - type: Icon
-    sprite: Objects/Tools/Toolboxes/toolbox_yellow.rsi
-    state: icon
   - type: Item
     sprite: Objects/Tools/Toolboxes/toolbox_yellow.rsi
 
@@ -103,9 +94,6 @@
   - type: Sprite
     sprite: Objects/Tools/Toolboxes/toolbox_green.rsi
     state: icon
-  - type: Icon
-    sprite: Objects/Tools/Toolboxes/toolbox_green.rsi
-    state: icon
   - type: Item
     sprite: Objects/Tools/Toolboxes/toolbox_green.rsi
 
@@ -118,9 +106,6 @@
   - type: Sprite
     sprite: Objects/Tools/Toolboxes/toolbox_syn.rsi
     state: icon
-  - type: Icon
-    sprite: Objects/Tools/Toolboxes/toolbox_syn.rsi
-    state: icon
   - type: Item
     sprite: Objects/Tools/Toolboxes/toolbox_syn.rsi
 
@@ -133,9 +118,6 @@
   - type: Sprite
     sprite: Objects/Tools/Toolboxes/toolbox_gold.rsi
     state: icon
-  - type: Icon
-    sprite: Objects/Tools/Toolboxes/toolbox_gold.rsi
-    state: icon
   - type: Item
     sprite: Objects/Tools/Toolboxes/toolbox_gold.rsi
 
diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
index ad297957de..d5baeee518 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -9,9 +9,6 @@
     layers:
     - state: cutters-map
     - state: cutters-cutty-thingy
-  - type: Icon
-    sprite: Objects/Tools/wirecutters.rsi
-    state: cutters-map
   - type: ItemCooldown
   - type: MeleeWeapon
   - type: Tool
@@ -43,9 +40,6 @@
       - state: screwdriver-map
       - state: screwdriver-screwybits
 
-  - type: Icon
-    sprite: Objects/Tools/screwdriver.rsi
-    state: screwdriver-map
 
   - type: Item
     sprite: Objects/Tools/screwdriver.rsi
@@ -79,9 +73,6 @@
     - state: welder_flame
       shader: unshaded
       visible: false
-  - type: Icon
-    sprite: Objects/Tools/welder.rsi
-    state: welder
   - type: Item
     size: 10
     sprite: Objects/Tools/welder.rsi
@@ -112,9 +103,6 @@
   - type: Sprite
     sprite: Objects/Tools/wrench.rsi
     state: icon
-  - type: Icon
-    sprite: Objects/Tools/wrench.rsi
-    state: icon
   - type: Item
     sprite: Objects/Tools/wrench.rsi
   - type: ItemCooldown
@@ -133,9 +121,6 @@
   - type: Sprite
     sprite: Objects/Tools/crowbar.rsi
     state: icon
-  - type: Icon
-    sprite: Objects/Tools/crowbar.rsi
-    state: icon
   - type: Item
     sprite: Objects/Tools/crowbar.rsi
   - type: ItemCooldown
@@ -155,9 +140,6 @@
   - type: Sprite
     sprite: Objects/Tools/crowbar_red.rsi
     state: icon
-  - type: Icon
-    sprite: Objects/Tools/crowbar_red.rsi
-    state: icon
   - type: Item
     sprite: Objects/Tools/crowbar_red.rsi
   - type: ItemCooldown
@@ -177,9 +159,6 @@
   - type: Sprite
     sprite: Objects/Tools/multitool.rsi
     state: multitool
-  - type: Icon
-    sprite: Objects/Tools/multitool.rsi
-    state: multitool
   - type: Item
     sprite: Objects/Tools/multitool.rsi
   - type: Tool
@@ -196,9 +175,6 @@
     - type: Sprite
       sprite: Objects/Tools/jaws_of_life.rsi
       state: jaws_pry
-    - type: Icon
-      sprite: Objects/Tools/jaws_of_life.rsi
-      state: jaws_pry
     - type: Item
       sprite: Objects/Tools/jaws_of_life.rsi
     - type: TilePrying
@@ -226,9 +202,6 @@
     - type: Sprite
       sprite: Objects/Tools/drill.rsi
       state: drill_screw
-    - type: Icon
-      sprite: Objects/Tools/drill.rsi
-      state: drill_screw
     - type: Item
       sprite: Objects/Tools/drill.rsi
     - type: Tool
@@ -258,9 +231,6 @@
   - type: Sprite
     sprite: Objects/Tools/rcd.rsi
     state: rcd
-  - type: Icon
-    sprite: Objects/Tools/rcd.rsi
-    state: rcd
   - type: Item
     sprite: Objects/Tools/rcd.rsi
 
@@ -274,6 +244,3 @@
     - type: Sprite
       sprite: Objects/Tools/rcd.rsi
       state: rcd_ammo
-    - type: Icon
-      sprite: Objects/Tools/rcd.rsi
-      state: rcd_ammo
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/AntiMaterial/boxes.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/AntiMaterial/boxes.yml
index 3f0a4f2f54..a2233758d2 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/AntiMaterial/boxes.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/AntiMaterial/boxes.yml
@@ -7,9 +7,6 @@
     caliber: AntiMaterial
     capacity: 30
     fillPrototype: CartridgeAntiMaterial
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/AntiMaterial/anti_material.rsi
-    state: icon
   - type: Sprite
     netsync: false
     sprite: Objects/Weapons/Guns/Ammunition/Boxes/AntiMaterial/anti_material.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/AntiMaterial/cartridges.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/AntiMaterial/cartridges.yml
index 1a879e91e5..4e744432ed 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/AntiMaterial/cartridges.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/AntiMaterial/cartridges.yml
@@ -15,9 +15,6 @@
     - state: base
       map: ["enum.AmmoVisualLayers.Base"]
     drawdepth: FloorObjects
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Casings/large_casing.rsi
-    state: base
   - type: Appearance
     visuals:
     - type: SpentAmmoVisualizer
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/boxes.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/boxes.yml
index 32febfbd15..8ae452d1ff 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/boxes.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/boxes.yml
@@ -7,8 +7,7 @@
   - type: AmmoBox
     caliber: ClRifle
     capacity: 30
-  - type: Icon
-    state: icon
+
   - type: Sprite
     netsync: false
     layers:
@@ -32,8 +31,7 @@
   - type: AmmoBox
     capacity: 200
     fillPrototype: CartridgeClRifle
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/10x24_box.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/10x24_box.rsi
 
@@ -45,8 +43,7 @@
   - type: AmmoBox
     capacity: 200
     fillPrototype: CartridgeClRifle
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box.rsi
 
@@ -58,8 +55,7 @@
   - type: AmmoBox
     capacity: 200
     fillPrototype: CartridgeClRifleRubber
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box_rubber.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box_rubber.rsi
 
@@ -71,8 +67,7 @@
   - type: AmmoBox
     capacity: 60
     fillPrototype: CartridgeClRifle
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box.rsi
 
@@ -84,8 +79,7 @@
   - type: AmmoBox
     capacity: 60
     fillPrototype: CartridgeClRifleFlash
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_flash.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_flash.rsi
 
@@ -97,8 +91,7 @@
   - type: AmmoBox
     capacity: 60
     fillPrototype: CartridgeClRifleHV
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_hv.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_hv.rsi
 
@@ -110,8 +103,7 @@
   - type: AmmoBox
     capacity: 60
     fillPrototype: CartridgeClRiflePractice
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_practice.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_practice.rsi
 
@@ -123,7 +115,6 @@
   - type: AmmoBox
     capacity: 60
     fillPrototype: CartridgeClRifleRubber
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_rubber.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_rubber.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/cartridges.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/cartridges.yml
index 0cabed783e..6d59efac73 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/cartridges.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/cartridges.yml
@@ -12,9 +12,7 @@
     sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
     state: s-casing
     drawdepth: FloorObjects
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
-    state: s-casing
+
 
 - type: entity
   id: CartridgeClRifle
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/magazines.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/magazines.yml
index b30edba88f..c4063d3e35 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/magazines.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/magazines.yml
@@ -9,8 +9,7 @@
     caliber: ClRifle
     magazineType: Rifle
     capacity: 30
-  - type: Icon
-    state: icon
+
   - type: Sprite
     netsync: false
     layers:
@@ -34,8 +33,7 @@
   - type: RangedMagazine
     fillPrototype: CartridgeClRifle
     capacity: 99
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/10x24.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/10x24.rsi
 
@@ -48,8 +46,7 @@
     fillPrototype: CartridgeClRifle
     magazineType: Pistol
     capacity: 10
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi
   - type: Appearance
@@ -70,8 +67,7 @@
     fillPrototype: CartridgeClRifleHV
     magazineType: Pistol
     capacity: 10
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi
   - type: Appearance
@@ -90,8 +86,7 @@
     fillPrototype: CartridgeClRiflePractice
     magazineType: Pistol
     capacity: 10
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi
   - type: Appearance
@@ -110,8 +105,7 @@
     fillPrototype: CartridgeClRifleRubber
     magazineType: Pistol
     capacity: 10
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi
   - type: Appearance
@@ -128,8 +122,7 @@
   components:
   - type: RangedMagazine
     fillPrototype: CartridgeClRifle
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag.rsi
 
@@ -140,8 +133,7 @@
   components:
   - type: RangedMagazine
     fillPrototype: CartridgeClRifleHV
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_hv.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_hv.rsi
 
@@ -152,8 +144,7 @@
   components:
   - type: RangedMagazine
     fillPrototype: CartridgeClRiflePractice
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_practice.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_practice.rsi
 
@@ -164,8 +155,7 @@
   components:
   - type: RangedMagazine
     fillPrototype: CartridgeClRifleRubber
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_rubber.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_rubber.rsi
 
@@ -177,8 +167,7 @@
   - type: RangedMagazine
     fillPrototype: CartridgeClRifle
     capacity: 20
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short.rsi
 
@@ -190,8 +179,7 @@
   - type: RangedMagazine
     fillPrototype: CartridgeClRifleFlash
     capacity: 20
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_flash.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_flash.rsi
 
@@ -203,8 +191,7 @@
   - type: RangedMagazine
     fillPrototype: CartridgeClRifleHV
     capacity: 20
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_hv.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_hv.rsi
 
@@ -216,8 +203,7 @@
   - type: RangedMagazine
     fillPrototype: CartridgeClRiflePractice
     capacity: 20
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_practice.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_practice.rsi
 
@@ -229,7 +215,6 @@
   - type: RangedMagazine
     fillPrototype: CartridgeClRifleRubber
     capacity: 20
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_rubber.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_rubber.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Explosives/ammunition.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Explosives/ammunition.yml
index 34498bd0b6..b82141afd1 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Explosives/ammunition.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Explosives/ammunition.yml
@@ -13,9 +13,6 @@
     sprite: Objects/Weapons/Guns/Ammunition/Explosives/rpg.rsi
     state: frag
     drawdepth: FloorObjects
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Explosives/rpg.rsi
-    state: frag
 
 - type: entity
   id: GrenadeBaton
@@ -32,9 +29,6 @@
     - state: base
       map: ["enum.AmmoVisualLayers.Base"]
     drawdepth: FloorObjects
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Explosives/grenade_baton.rsi
-    state: base
   - type: Appearance
     visuals:
     - type: SpentAmmoVisualizer
@@ -54,9 +48,6 @@
     - state: base
       map: ["enum.AmmoVisualLayers.Base"]
     drawdepth: FloorObjects
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Explosives/grenade_blast.rsi
-    state: base
   - type: Appearance
     visuals:
     - type: SpentAmmoVisualizer
@@ -76,9 +67,6 @@
     - state: base
       map: ["enum.AmmoVisualLayers.Base"]
     drawdepth: FloorObjects
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Explosives/grenade_flash.rsi
-    state: base
   - type: Appearance
     visuals:
     - type: SpentAmmoVisualizer
@@ -98,9 +86,6 @@
     - state: base
       map: ["enum.AmmoVisualLayers.Base"]
     drawdepth: FloorObjects
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Explosives/grenade_frag.rsi
-    state: base
   - type: Appearance
     visuals:
     - type: SpentAmmoVisualizer
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/boxes.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/boxes.yml
index 084cc73e06..1d20ffcde0 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/boxes.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/boxes.yml
@@ -7,8 +7,7 @@
   - type: AmmoBox
     caliber: LRifle
     capacity: 30
-  - type: Icon
-    state: icon
+
   - type: Sprite
     netsync: false
     layers:
@@ -32,8 +31,7 @@
   - type: AmmoBox
     capacity: 200
     fillPrototype: CartridgeLRifle
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_big_box.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_big_box.rsi
 
@@ -45,8 +43,7 @@
   - type: AmmoBox
     capacity: 50
     fillPrototype: CartridgeLRifleHV
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_hv.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_hv.rsi
 
@@ -58,8 +55,7 @@
   - type: AmmoBox
     capacity: 50
     fillPrototype: CartridgeLRiflePractice
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_practice.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_practice.rsi
 
@@ -71,7 +67,6 @@
   - type: AmmoBox
     capacity: 50
     fillPrototype: CartridgeLRifleRubber
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_rubber.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_rubber.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/cartridges.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/cartridges.yml
index 692780a077..a6e72f2389 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/cartridges.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/cartridges.yml
@@ -12,9 +12,7 @@
     sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
     state: s-casing
     drawdepth: FloorObjects
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
-    state: s-casing
+
 
 - type: entity
   id: CartridgeLRifle
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/magazines.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/magazines.yml
index 6ab6b615ca..6f1233a107 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/magazines.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/magazines.yml
@@ -9,8 +9,7 @@
     caliber: LRifle
     magazineType: Rifle
     capacity: 30
-  - type: Icon
-    state: icon
+
   - type: Sprite
     netsync: false
     layers:
@@ -35,8 +34,7 @@
     fillPrototype: CartridgeLRifle
     magazineType: Box
     capacity: 50
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi
   - type: Appearance
@@ -53,8 +51,7 @@
   components:
   - type: RangedMagazine
     fillPrototype: CartridgeLRifle
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag.rsi
 
@@ -65,8 +62,7 @@
   components:
   - type: RangedMagazine
     fillPrototype: CartridgeLRifleFlash
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_flash.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_flash.rsi
 
@@ -77,8 +73,7 @@
   components:
   - type: RangedMagazine
     fillPrototype: CartridgeLRifleHV
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_hv.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_hv.rsi
 
@@ -89,8 +84,7 @@
   components:
   - type: RangedMagazine
     fillPrototype: CartridgeLRiflePractice
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_practice.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_practice.rsi
 
@@ -101,8 +95,7 @@
   components:
   - type: RangedMagazine
     fillPrototype: CartridgeLRifleRubber
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_rubber.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_rubber.rsi
 
@@ -115,8 +108,7 @@
     fillPrototype: CartridgeLRifle
     capacity: 96
     magazineType: Pan
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/LRifle/maxim.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/LRifle/maxim.rsi
 
@@ -129,8 +121,7 @@
     fillPrototype: CartridgeLRifle
     magazineType: Box
     capacity: 80
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/LRifle/pk_box.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/LRifle/pk_box.rsi
   - type: Appearance
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/speed_loaders.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/speed_loaders.yml
index ae9b2ed79b..4ee6e57204 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/speed_loaders.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/speed_loaders.yml
@@ -7,9 +7,7 @@
     caliber: LRifle
     capacity: 5
     fillPrototype: CartridgeLRifle
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi
-    state: icon
+
   - type: Sprite
     netsync: false
     sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/boxes.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/boxes.yml
index f8af073da0..67d57e9918 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/boxes.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/boxes.yml
@@ -7,8 +7,6 @@
   - type: AmmoBox
     caliber: Magnum
     capacity: 30
-  - type: Icon
-    state: icon
   - type: Sprite
     netsync: false
     layers:
@@ -32,8 +30,6 @@
   - type: AmmoBox
     capacity: 60
     fillPrototype: CartridgeMagnum
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box.rsi
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box.rsi
 
@@ -45,8 +41,6 @@
   - type: AmmoBox
     capacity: 60
     fillPrototype: CartridgeMagnumFlash
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_flash.rsi
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_flash.rsi
 
@@ -58,8 +52,6 @@
   - type: AmmoBox
     capacity: 60
     fillPrototype: CartridgeMagnumHV
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_hv.rsi
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_hv.rsi
 
@@ -71,8 +63,6 @@
   - type: AmmoBox
     capacity: 60
     fillPrototype: CartridgeMagnumPractice
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_practice.rsi
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_practice.rsi
 
@@ -84,7 +74,5 @@
   - type: AmmoBox
     capacity: 60
     fillPrototype: CartridgeMagnumRubber
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_rubber.rsi
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_rubber.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/cartridges.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/cartridges.yml
index 2bcc2ee1d4..8536808c02 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/cartridges.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/cartridges.yml
@@ -12,9 +12,7 @@
     sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
     state: s-casing
     drawdepth: FloorObjects
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
-    state: s-casing
+
 
 - type: entity
   id: CartridgeMagnum
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/magazines.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/magazines.yml
index 06cb461ba9..1ddfe294e4 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/magazines.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/magazines.yml
@@ -9,8 +9,7 @@
     caliber: Magnum
     magazineType: Pistol
     capacity: 10
-  - type: Icon
-    state: icon
+
   - type: Sprite
     netsync: false
     layers:
@@ -35,8 +34,7 @@
     caliber: Magnum
     magazineType: Smg
     capacity: 25
-  - type: Icon
-    state: icon
+
   - type: Sprite
     netsync: false
     layers:
@@ -59,8 +57,7 @@
   components:
   - type: RangedMagazine
     fillPrototype: CartridgeMagnum
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi
 
@@ -71,8 +68,7 @@
   components:
   - type: RangedMagazine
     fillPrototype: CartridgeMagnumFlash
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi
 
@@ -83,8 +79,7 @@
   components:
   - type: RangedMagazine
     fillPrototype: CartridgeMagnumHV
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi
 
@@ -95,8 +90,7 @@
   components:
   - type: RangedMagazine
     fillPrototype: CartridgeMagnumPractice
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi
 
@@ -107,8 +101,7 @@
   components:
   - type: RangedMagazine
     fillPrototype: CartridgeMagnumRubber
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi
 
@@ -119,8 +112,7 @@
   components:
   - type: RangedMagazine
     fillPrototype: CartridgeMagnum
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi
 
@@ -131,8 +123,7 @@
   components:
   - type: RangedMagazine
     fillPrototype: CartridgeMagnumHV
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_hv.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_hv.rsi
 
@@ -143,8 +134,7 @@
   components:
   - type: RangedMagazine
     fillPrototype: CartridgeMagnumPractice
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_practice.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_practice.rsi
 
@@ -155,7 +145,6 @@
   components:
   - type: RangedMagazine
     fillPrototype: CartridgeMagnumRubber
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_rubber.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_rubber.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/speed_loaders.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/speed_loaders.yml
index 79599f481b..c64de56e91 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/speed_loaders.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/speed_loaders.yml
@@ -7,8 +7,7 @@
   - type: SpeedLoader
     caliber: Magnum
     capacity: 6
-  - type: Icon
-    state: icon
+
   - type: Sprite
     netsync: false
     layers:
@@ -30,8 +29,7 @@
   components:
   - type: SpeedLoader
     fillPrototype: CartridgeMagnum
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi
 
@@ -42,8 +40,7 @@
   components:
   - type: SpeedLoader
     fillPrototype: CartridgeMagnumFlash
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi
 
@@ -54,8 +51,7 @@
   components:
   - type: SpeedLoader
     fillPrototype: CartridgeMagnumHV
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi
 
@@ -66,8 +62,7 @@
   components:
   - type: SpeedLoader
     fillPrototype: CartridgeMagnumPractice
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi
 
@@ -78,7 +73,6 @@
   components:
   - type: SpeedLoader
     fillPrototype: CartridgeMagnumRubber
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/boxes.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/boxes.yml
index 0748c9fe9b..eb5e1a71db 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/boxes.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/boxes.yml
@@ -7,8 +7,7 @@
   - type: AmmoBox
     caliber: Pistol
     capacity: 30
-  - type: Icon
-    state: icon
+
   - type: Sprite
     netsync: false
     layers:
@@ -32,8 +31,7 @@
   - type: AmmoBox
     capacity: 60
     fillPrototype: CartridgePistol
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box.rsi
 
@@ -45,8 +43,7 @@
   - type: AmmoBox
     capacity: 60
     fillPrototype: CartridgePistolFlash
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_flash.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_flash.rsi
 
@@ -58,8 +55,7 @@
   - type: AmmoBox
     capacity: 60
     fillPrototype: CartridgePistolHV
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_hv.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_hv.rsi
 
@@ -71,8 +67,7 @@
   - type: AmmoBox
     capacity: 60
     fillPrototype: CartridgePistolPractice
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_practice.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_practice.rsi
 
@@ -84,7 +79,6 @@
   - type: AmmoBox
     capacity: 60
     fillPrototype: CartridgePistolRubber
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_rubber.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_rubber.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/cartridges.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/cartridges.yml
index 99e4ad3a1a..7bab3b00bb 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/cartridges.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/cartridges.yml
@@ -12,9 +12,7 @@
     sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
     state: s-casing
     drawdepth: FloorObjects
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
-    state: s-casing
+
 
 - type: entity
   id: CartridgePistol
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/magazines.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/magazines.yml
index 85bd3f04ed..6eb6d27ac7 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/magazines.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/magazines.yml
@@ -8,8 +8,7 @@
     caliber: Pistol
     magazineType: Pistol
     capacity: 10
-  - type: Icon
-    state: icon
+
   - type: Sprite
     netsync: false
     layers:
@@ -34,8 +33,7 @@
     caliber: Pistol
     magazineType: HCPistol
     capacity: 16
-  - type: Icon
-    state: icon
+
   - type: Sprite
     netsync: false
     layers:
@@ -60,8 +58,7 @@
     caliber: Pistol
     magazineType: Smg
     capacity: 35
-  - type: Icon
-    state: icon
+
   - type: Sprite
     netsync: false
     layers:
@@ -86,8 +83,7 @@
     caliber: Pistol
     magazineType: SmgTopMounted
     fillPrototype: CartridgePistol
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi
     layers:
@@ -113,8 +109,7 @@
     magazineType: CalicoTopMounted
     fillPrototype: CartridgePistol
     capacity: 100
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi
     layers:
@@ -136,8 +131,7 @@
   components:
   - type: RangedMagazine
     fillPrototype: CartridgePistol
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi
 
@@ -148,8 +142,7 @@
   components:
   - type: RangedMagazine
     fillPrototype: CartridgePistolFlash
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi
 
@@ -160,8 +153,7 @@
   components:
   - type: RangedMagazine
     fillPrototype: CartridgePistolHV
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi
 
@@ -172,8 +164,7 @@
   components:
   - type: RangedMagazine
     fillPrototype: CartridgePistolPractice
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi
 
@@ -184,8 +175,7 @@
   components:
   - type: RangedMagazine
     fillPrototype: CartridgePistolRubber
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi
 
@@ -196,8 +186,7 @@
   components:
   - type: RangedMagazine
     fillPrototype: CartridgePistol
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi
 
@@ -208,8 +197,7 @@
   components:
   - type: RangedMagazine
     fillPrototype: CartridgePistol
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi
 
@@ -220,8 +208,7 @@
   components:
   - type: RangedMagazine
     fillPrototype: CartridgePistol
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi
 
@@ -232,8 +219,7 @@
   components:
   - type: RangedMagazine
     fillPrototype: CartridgePistol
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi
 
@@ -244,8 +230,7 @@
   components:
   - type: RangedMagazine
     fillPrototype: CartridgePistol
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi
 
@@ -256,8 +241,7 @@
   components:
   - type: RangedMagazine
     fillPrototype: CartridgePistolFlash
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_flash.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_flash.rsi
 
@@ -268,8 +252,7 @@
   components:
   - type: RangedMagazine
     fillPrototype: CartridgePistolHV
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_hv.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_hv.rsi
 
@@ -280,8 +263,7 @@
   components:
   - type: RangedMagazine
     fillPrototype: CartridgePistolPractice
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_practice.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_practice.rsi
 
@@ -292,7 +274,6 @@
   components:
   - type: RangedMagazine
     fillPrototype: CartridgePistolRubber
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_rubber.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_rubber.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/speed_loaders.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/speed_loaders.yml
index 9213984fac..96c401f2b6 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/speed_loaders.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/speed_loaders.yml
@@ -7,8 +7,7 @@
   - type: SpeedLoader
     caliber: Pistol
     capacity: 6
-  - type: Icon
-    state: icon
+
   - type: Sprite
     netsync: false
     layers:
@@ -30,8 +29,7 @@
   components:
   - type: SpeedLoader
     fillPrototype: CartridgePistol
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi
 
@@ -42,8 +40,7 @@
   components:
   - type: SpeedLoader
     fillPrototype: CartridgePistolFlash
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi
 
@@ -54,8 +51,7 @@
   components:
   - type: SpeedLoader
     fillPrototype: CartridgePistolHV
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi
 
@@ -66,8 +62,7 @@
   components:
   - type: SpeedLoader
     fillPrototype: CartridgePistolPractice
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi
 
@@ -78,7 +73,6 @@
   components:
   - type: SpeedLoader
     fillPrototype: CartridgePistolRubber
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/boxes.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/boxes.yml
index bbc84c88e5..6b41ac93c1 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/boxes.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/boxes.yml
@@ -7,8 +7,7 @@
   - type: AmmoBox
     caliber: SRifle
     capacity: 30
-  - type: Icon
-    state: icon
+
   - type: Sprite
     netsync: false
     layers:
@@ -32,8 +31,7 @@
   - type: AmmoBox
     capacity: 200
     fillPrototype: CartridgeSRifle
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box.rsi
 
@@ -45,8 +43,7 @@
   - type: AmmoBox
     capacity: 200
     fillPrototype: CartridgeSRifleRubber
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box_rubber.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box_rubber.rsi
 
@@ -58,8 +55,7 @@
   - type: AmmoBox
     capacity: 60
     fillPrototype: CartridgeSRifle
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box.rsi
 
@@ -71,8 +67,7 @@
   - type: AmmoBox
     capacity: 60
     fillPrototype: CartridgeSRifleFlash
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_flash.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_flash.rsi
 
@@ -84,8 +79,7 @@
   - type: AmmoBox
     capacity: 60
     fillPrototype: CartridgeSRifleHV
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_hv.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_hv.rsi
 
@@ -97,8 +91,7 @@
   - type: AmmoBox
     capacity: 60
     fillPrototype: CartridgeSRiflePractice
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_practice.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_practice.rsi
 
@@ -110,7 +103,6 @@
   - type: AmmoBox
     capacity: 60
     fillPrototype: CartridgeSRifleRubber
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_rubber.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_rubber.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/cartridges.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/cartridges.yml
index 0e1d477801..e714fe6424 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/cartridges.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/cartridges.yml
@@ -12,9 +12,7 @@
     sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
     state: s-casing
     drawdepth: FloorObjects
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
-    state: s-casing
+
 
 - type: entity
   id: CartridgeSRifle
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/magazines.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/magazines.yml
index f3d3da53fa..adb5d72815 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/magazines.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/magazines.yml
@@ -9,8 +9,7 @@
     caliber: SRifle
     magazineType: Rifle
     capacity: 25
-  - type: Icon
-    state: icon
+
   - type: Sprite
     netsync: false
     layers:
@@ -33,8 +32,7 @@
   components:
   - type: RangedMagazine
     fillPrototype: CartridgeSRifle
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag.rsi
 
@@ -45,8 +43,7 @@
   components:
   - type: RangedMagazine
     fillPrototype: CartridgeSRifleFlash
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_flash.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_flash.rsi
 
@@ -57,8 +54,7 @@
   components:
   - type: RangedMagazine
     fillPrototype: CartridgeSRifleHV
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_hv.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_hv.rsi
 
@@ -69,8 +65,7 @@
   components:
   - type: RangedMagazine
     fillPrototype: CartridgeSRiflePractice
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_practice.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_practice.rsi
 
@@ -81,7 +76,6 @@
   components:
   - type: RangedMagazine
     fillPrototype: CartridgeSRifleRubber
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_rubber.rsi
+
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_rubber.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Shotgun/cartridges.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Shotgun/cartridges.yml
index 76b981fdfe..715394c48f 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Shotgun/cartridges.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Shotgun/cartridges.yml
@@ -16,9 +16,6 @@
     - state: base
       map: ["enum.AmmoVisualLayers.Base"]
     drawdepth: FloorObjects
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi
-    state: base
   - type: Appearance
     visuals:
     - type: SpentAmmoVisualizer
@@ -30,8 +27,6 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_beanbag.rsi
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_beanbag.rsi
   - type: Ammo
     ammoSpread: 0
     projectile: PelletShotgunBeanbag
@@ -44,8 +39,6 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_slug.rsi
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_slug.rsi
   - type: Ammo
     projectile: PelletShotgunSlug
     projectilesFired: 4
@@ -58,8 +51,6 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi
   - type: Ammo
     projectile: PelletShotgun
     projectilesFired: 6
@@ -71,8 +62,6 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_flash.rsi
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_flash.rsi
   - type: Ammo
     projectile: PelletShotgunFlash
     projectilesFired: 6
@@ -84,8 +73,6 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_incendiary.rsi
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_incendiary.rsi
   - type: Ammo
     projectile: PelletShotgun
     projectilesFired: 6
@@ -97,8 +84,6 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_practice.rsi
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_practice.rsi
   - type: Ammo
     projectile: PelletShotgun
     projectilesFired: 6
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Shotgun/magazines.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Shotgun/magazines.yml
index 33f31f7d9a..702567b9ce 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Shotgun/magazines.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Shotgun/magazines.yml
@@ -8,8 +8,6 @@
     caliber: Shotgun
     magazineType: Rifle
     capacity: 8
-  - type: Icon
-    state: icon
   - type: Sprite
     netsync: false
     layers:
@@ -31,8 +29,6 @@
   components:
   - type: RangedMagazine
     fillPrototype: ShellShotgun
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_pellets.rsi
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_pellets.rsi
 
@@ -43,8 +39,6 @@
   components:
   - type: RangedMagazine
     fillPrototype: ShellShotgunBeanbag
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_beanbag.rsi
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_beanbag.rsi
 
@@ -55,7 +49,5 @@
   components:
   - type: RangedMagazine
     fillPrototype: ShellShotgunSlug
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_slug.rsi
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_slug.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/boxes.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/boxes.yml
index 5f50fe2fe2..24cf7532d4 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/boxes.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/boxes.yml
@@ -7,7 +7,6 @@
   - type: AmmoBox
     caliber: Rocket
     capacity: 30
-  - type: Icon
   - type: Sprite
     netsync: false
 
@@ -20,9 +19,7 @@
   - type: AmmoBox
     capacity: 40
     fillPrototype: BulletDonkSoft
-  - type: Icon
-    sprite: Objects/Fun/toys.rsi
-    state: foambox
+
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
     state: foambox
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/cartridges.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/cartridges.yml
index e05a67e888..b1073733ee 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/cartridges.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/cartridges.yml
@@ -12,9 +12,6 @@
     sprite: Objects/Consumable/Trash/ash.rsi
     state: icon
     drawdepth: FloorObjects
-  - type: Icon
-    sprite: Objects/Consumable/Trash/ash.rsi
-    state: icon
 
 - type: entity
   id: CartridgeCap
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/projectiles.yml
index 4951cc008a..6859842556 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/projectiles.yml
@@ -22,9 +22,6 @@
     netsync: false
     sprite: Objects/Fun/toys.rsi
     state: foamdart
-  - type: Icon
-    sprite: Objects/Fun/toys.rsi
-    state: foamdart
   - type: Projectile
     damages:
       Blunt: 1
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/speedloaders.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/speedloaders.yml
index 44bb2954c5..99cd30370c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/speedloaders.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/speedloaders.yml
@@ -7,8 +7,6 @@
   - type: SpeedLoader
     caliber: Cap
     capacity: 6
-  - type: Icon
-    state: icon
   - type: Sprite
     netsync: false
     layers:
@@ -30,7 +28,5 @@
   components:
   - type: SpeedLoader
     fillPrototype: CartridgeCap
-  - type: Icon
-    sprite: Objects/Fun/caps.rsi
   - type: Sprite
     sprite: Objects/Fun/caps.rsi
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 f57ce3d57f..21897e31d1 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -13,9 +13,7 @@
       - state: mag-unshaded-4
         map: ["enum.RangedBarrelVisualLayers.MagUnshaded"]
         shader: unshaded
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Battery/laser_retro.rsi
-    state: icon
+
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/Battery/laser_retro.rsi
@@ -55,9 +53,7 @@
       - state: mag-unshaded-4
         map: ["enum.RangedBarrelVisualLayers.MagUnshaded"]
         shader: unshaded
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Battery/laser_cannon.rsi
-    state: icon
+
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/Battery/laser_cannon.rsi
@@ -97,9 +93,7 @@
       - state: mag-unshaded-0
         map: ["enum.RangedBarrelVisualLayers.MagUnshaded"]
         shader: unshaded
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Battery/xray.rsi
-    state: icon
+
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/Battery/xray.rsi
@@ -140,9 +134,7 @@
       - state: mag-unshaded-0
         map: ["enum.RangedBarrelVisualLayers.MagUnshaded"]
         shader: unshaded
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Battery/taser.rsi
-    state: icon
+
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/Battery/taser.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml
index 9bc3144e0f..c6790d818c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml
@@ -9,9 +9,7 @@
     layers:
     - state: icon
       map: ["enum.TriggerVisualLayers.Base"]
-  - type: Icon
-    sprite: Objects/Weapons/Grenades/grenade.rsi
-    state: icon
+
   - type: Item
     size: 5
   - type: OnUseTimerTrigger
@@ -39,9 +37,7 @@
     layers:
     - state: icon
       map: ["enum.TriggerVisualLayers.Base"]
-  - type: Icon
-    sprite: Objects/Weapons/Grenades/flashbang.rsi
-    state: icon
+
   - type: Item
     size: 5
   - type: OnUseTimerTrigger
@@ -65,9 +61,7 @@
     layers:
     - state: icon
       map: ["enum.TriggerVisualLayers.Base"]
-  - type: Icon
-    sprite: Objects/Weapons/Grenades/syndgrenade.rsi
-    state: icon
+
   - type: Item
     size: 5
   - type: OnUseTimerTrigger
@@ -95,9 +89,7 @@
     layers:
     - state: icon
       map: ["enum.TriggerVisualLayers.Base"]
-  - type: Icon
-    sprite: Objects/Weapons/Grenades/nukenade.rsi
-    state: icon
+
   - type: Item
     size: 5
   - type: OnUseTimerTrigger
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
index 1708167025..977bcd8d96 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
@@ -7,8 +7,7 @@
   components:
   - type: Sprite
     netsync: false
-  - type: Icon
-    state: icon
+
   - type: Item
     size: 24
     state: icon
@@ -49,8 +48,7 @@
       map: ["enum.RangedBarrelVisualLayers.Bolt"]
     - state: mag-3
       map: ["enum.RangedBarrelVisualLayers.Mag"]
-  - type: Icon
-    sprite: Objects/Weapons/Guns/LMGs/l6.rsi
+
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/LMGs/l6.rsi
@@ -85,8 +83,7 @@
       map: ["enum.RangedBarrelVisualLayers.Bolt"]
     - state: mag-5
       map: ["enum.RangedBarrelVisualLayers.Mag"]
-  - type: Icon
-    sprite: Objects/Weapons/Guns/LMGs/pk.rsi
+
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/LMGs/pk.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
index 9e46661326..3b4d8fd1c0 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
@@ -7,8 +7,6 @@
   components:
   - type: Sprite
     netsync: false
-  - type: Icon
-    state: icon
   - type: Item
     size: 24
     state: icon
@@ -26,8 +24,7 @@
         map: ["enum.RangedBarrelVisualLayers.Base"]
       - state: bolt-closed
         map: ["enum.RangedBarrelVisualLayers.Bolt"]
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi
+
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi
@@ -60,8 +57,7 @@
         map: ["enum.RangedBarrelVisualLayers.Base"]
       - state: mag-0
         map: ["enum.RangedBarrelVisualLayers.Mag"]
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Launchers/rocket.rsi
+
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/Launchers/rocket.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
index c59eda9874..d5d4d37588 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -14,8 +14,7 @@
         map: ["enum.RangedBarrelVisualLayers.Bolt"]
       - state: mag-0
         map: ["enum.RangedBarrelVisualLayers.Mag"]
-  - type: Icon
-    state: icon
+
   - type: Item
     size: 12
     state: icon
@@ -55,8 +54,7 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Pistols/clarissa.rsi
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Pistols/clarissa.rsi
+
   - type: Item
     size: 12
     sprite: Objects/Weapons/Guns/Pistols/clarissa.rsi
@@ -85,8 +83,7 @@
         map: ["enum.RangedBarrelVisualLayers.Base"]
       - state: bolt-closed
         map: ["enum.RangedBarrelVisualLayers.Bolt"]
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Pistols/colt.rsi
+
   - type: Item
     size: 12
     sprite: Objects/Weapons/Guns/Pistols/colt.rsi
@@ -112,8 +109,7 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Pistols/giskard.rsi
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Pistols/giskard.rsi
+
   - type: Item
     size: 12
     sprite: Objects/Weapons/Guns/Pistols/giskard.rsi
@@ -142,9 +138,7 @@
         map: ["enum.RangedBarrelVisualLayers.Base"]
       - state: bolt-closed
         map: ["enum.RangedBarrelVisualLayers.Bolt"]
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Pistols/hm_pistol.rsi
-    state: icon
+
   - type: Item
     size: 12
     sprite: Objects/Weapons/Guns/Pistols/hm_pistol.rsi
@@ -187,8 +181,7 @@
       map: ["enum.RangedBarrelVisualLayers.Base"]
     - state: mag-0
       map: ["enum.RangedBarrelVisualLayers.Mag"]
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Pistols/gyro_pistol.rsi
+
   - type: Item
     size: 12
     sprite: Objects/Weapons/Guns/Pistols/gyro_pistol.rsi
@@ -231,8 +224,7 @@
       map: ["enum.RangedBarrelVisualLayers.Bolt"]
     - state: mag-0
       map: ["enum.RangedBarrelVisualLayers.Mag"]
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Pistols/mandella.rsi
+
   - type: Item
     size: 12
     sprite: Objects/Weapons/Guns/Pistols/mandella.rsi
@@ -263,8 +255,7 @@
       map: ["enum.RangedBarrelVisualLayers.Base"]
     - state: bolt-closed
       map: ["enum.RangedBarrelVisualLayers.Bolt"]
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Pistols/mk58.rsi
+
   - type: Item
     size: 12
     sprite: Objects/Weapons/Guns/Pistols/mk58.rsi
@@ -295,8 +286,7 @@
       map: ["enum.RangedBarrelVisualLayers.Base"]
     - state: bolt-closed
       map: ["enum.RangedBarrelVisualLayers.Bolt"]
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Pistols/mk58_wood.rsi
+
   - type: Item
     size: 12
     sprite: Objects/Weapons/Guns/Pistols/mk58_wood.rsi
@@ -322,8 +312,7 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Pistols/molly.rsi
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Pistols/molly.rsi
+
   - type: Item
     size: 12
     sprite: Objects/Weapons/Guns/Pistols/molly.rsi
@@ -357,8 +346,7 @@
       map: ["enum.RangedBarrelVisualLayers.Base"]
     - state: bolt-closed
       map: ["enum.RangedBarrelVisualLayers.Bolt"]
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Pistols/olivaw_civil.rsi
+
   - type: Item
     size: 12
     sprite: Objects/Weapons/Guns/Pistols/olivaw_civil.rsi
@@ -385,8 +373,7 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Pistols/paco.rsi
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Pistols/paco.rsi
+
   - type: Item
     size: 12
     sprite: Objects/Weapons/Guns/Pistols/paco.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index a0eeec12a4..d7af84094c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -11,9 +11,7 @@
     directional: false
     sprite: Objects/Weapons/Guns/Projectiles/bullet.rsi
     state: bullet
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Projectiles/bullet.rsi
-    state: bullet
+
   - type: Collidable
     hard: false
     shapes:
@@ -99,10 +97,6 @@
     layers:
     - state: spark
       shader: unshaded
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Projectiles/spark.rsi
-    state: spark
-    color: "#ffff33"
   - type: Collidable
     hard: false
     shapes:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
index 2f8b6c8fe3..9017f4b5e0 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
@@ -8,8 +8,7 @@
   - type: Sprite
     netsync: false
     state: icon
-  - type: Icon
-    state: icon
+
 
 - type: entity
   name: Deckard
@@ -27,8 +26,7 @@
     - state: mag-unshaded-3
       map: ["enum.RangedBarrelVisualLayers.MagUnshaded"]
       shader: unshaded
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi
+
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi
@@ -60,8 +58,7 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi
+
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi
@@ -86,8 +83,7 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi
+
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
index 1d144ed9e7..b68d6c97a0 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -7,8 +7,7 @@
   components:
   - type: Sprite
     netsync: false
-  - type: Icon
-    state: icon
+
   - type: Item
     size: 24
     state: icon
@@ -43,8 +42,7 @@
         map: ["enum.RangedBarrelVisualLayers.Base"]
       - state: mag-0
         map: ["enum.RangedBarrelVisualLayers.Mag"]
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Rifles/ak.rsi
+
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/Rifles/ak.rsi
@@ -82,8 +80,7 @@
         map: ["enum.RangedBarrelVisualLayers.Base"]
       - state: mag-0
         map: ["enum.RangedBarrelVisualLayers.Mag"]
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Rifles/black_ak.rsi
+
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/Rifles/black_ak.rsi
@@ -123,8 +120,7 @@
         map: ["enum.RangedBarrelVisualLayers.Bolt"]
       - state: mag-0
         map: ["enum.RangedBarrelVisualLayers.Mag"]
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Rifles/carbine.rsi
+
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/Rifles/carbine.rsi
@@ -164,8 +160,7 @@
         map: ["enum.RangedBarrelVisualLayers.Base"]
       - state: mag-0
         map: ["enum.RangedBarrelVisualLayers.Mag"]
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Rifles/dallas.rsi
+
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/Rifles/dallas.rsi
@@ -206,8 +201,7 @@
         map: ["enum.RangedBarrelVisualLayers.Bolt"]
       - state: mag-0
         map: ["enum.RangedBarrelVisualLayers.Mag"]
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Rifles/sts.rsi
+
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/Rifles/sts.rsi
@@ -248,8 +242,7 @@
         map: ["enum.RangedBarrelVisualLayers.Bolt"]
       - state: mag-0
         map: ["enum.RangedBarrelVisualLayers.Mag"]
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Rifles/vintorez.rsi
+
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/Rifles/vintorez.rsi
@@ -287,8 +280,7 @@
         map: ["enum.RangedBarrelVisualLayers.Bolt"]
       - state: mag-0
         map: ["enum.RangedBarrelVisualLayers.Mag"]
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Rifles/wintermute.rsi
+
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/Rifles/wintermute.rsi
@@ -329,8 +321,7 @@
         map: ["enum.RangedBarrelVisualLayers.Base"]
       - state: mag-0
         map: ["enum.RangedBarrelVisualLayers.Mag"]
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Rifles/calico.rsi
+
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/Rifles/calico.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index 5880fd2600..56bfd8b2e8 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -7,8 +7,7 @@
   components:
   - type: Sprite
     netsync: false
-  - type: Icon
-    state: icon
+
   - type: Item
     size: 24
     state: icon
@@ -49,8 +48,7 @@
       map: ["enum.RangedBarrelVisualLayers.Bolt"]
     - state: mag-0
       map: ["enum.RangedBarrelVisualLayers.Mag"]
-  - type: Icon
-    sprite: Objects/Weapons/Guns/SMGs/atreides.rsi
+
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/SMGs/atreides.rsi
@@ -90,8 +88,7 @@
       map: ["enum.RangedBarrelVisualLayers.Bolt"]
     - state: mag-0
       map: ["enum.RangedBarrelVisualLayers.Mag"]
-  - type: Icon
-    sprite: Objects/Weapons/Guns/SMGs/c20r.rsi
+
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/SMGs/c20r.rsi
@@ -133,8 +130,7 @@
         map: ["enum.RangedBarrelVisualLayers.Bolt"]
       - state: mag-0
         map: ["enum.RangedBarrelVisualLayers.Mag"]
-  - type: Icon
-    sprite: Objects/Weapons/Guns/SMGs/drozd.rsi
+
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/SMGs/drozd.rsi
@@ -179,8 +175,7 @@
     - state: mag-unshaded-0
       map: ["enum.RangedBarrelVisualLayers.MagUnshaded"]
       shader: unshaded
-  - type: Icon
-    sprite: Objects/Weapons/Guns/SMGs/wt550.rsi
+
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/SMGs/wt550.rsi
@@ -216,8 +211,7 @@
       map: ["enum.RangedBarrelVisualLayers.Bolt"]
     - state: mag-0
       map: ["enum.RangedBarrelVisualLayers.Mag"]
-  - type: Icon
-    sprite: Objects/Weapons/Guns/SMGs/zoric.rsi
+
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/SMGs/zoric.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
index 6b69365dd1..74d4862b3a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -8,8 +8,6 @@
   - type: Sprite
     netsync: false
     state: icon
-  - type: Icon
-    state: icon
   - type: Item
     size: 24
   - type: PumpBarrel
@@ -44,9 +42,6 @@
       map: ["enum.RangedBarrelVisualLayers.Bolt"]
     - state: mag-0
       map: ["enum.RangedBarrelVisualLayers.Mag"]
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Shotguns/bojevic.rsi
-    state: icon
   - type: Item
     sprite: Objects/Weapons/Guns/Shotguns/bojevic.rsi
   - type: RangedWeapon
@@ -88,9 +83,6 @@
         map: ["enum.RangedBarrelVisualLayers.Base"]
       - state: bolt-closed
         map: ["enum.RangedBarrelVisualLayers.Bolt"]
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi
-    state: icon
   - type: Item
     sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi
     state: icon
@@ -131,8 +123,6 @@
       - state: mag-unshaded-1
         map: ["enum.RangedBarrelVisualLayers.MagUnshaded"]
         shader: unshaded
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Shotguns/bull.rsi
   - type: Item
     sprite: Objects/Weapons/Guns/Shotguns/bull.rsi
   - type: RangedWeapon
@@ -155,8 +145,6 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Shotguns/gladstone.rsi
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Shotguns/gladstone.rsi
   - type: Item
     sprite: Objects/Weapons/Guns/Shotguns/gladstone.rsi
   - type: RangedWeapon
@@ -172,8 +160,6 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Shotguns/regulator.rsi
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Shotguns/regulator.rsi
   - type: Item
     sprite: Objects/Weapons/Guns/Shotguns/regulator.rsi
   - type: RangedWeapon
@@ -189,8 +175,6 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Shotguns/pump.rsi
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Shotguns/pump.rsi
   - type: Item
     sprite: Objects/Weapons/Guns/Shotguns/pump.rsi
   - type: RangedWeapon
@@ -212,9 +196,6 @@
         map: ["enum.RangedBarrelVisualLayers.Base"]
       - state: bolt-closed
         map: ["enum.RangedBarrelVisualLayers.Bolt"]
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Shotguns/sawn.rsi
-    state: icon
   - type: Item
     sprite: Objects/Weapons/Guns/Shotguns/sawn.rsi
     state: icon
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
index 2d9acc1abb..5718881ebe 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -12,8 +12,6 @@
       map: ["enum.RangedBarrelVisualLayers.Base"]
     - state: bolt-closed
       map: ["enum.RangedBarrelVisualLayers.Bolt"]
-  - type: Icon
-    state: icon
   - type: Item
     size: 24
   - type: BoltActionBarrel
@@ -40,8 +38,6 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Snipers/bolt_gun.rsi
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Snipers/bolt_gun.rsi
   - type: Item
     sprite: Objects/Weapons/Guns/Snipers/bolt_gun.rsi
   - type: RangedWeapon
@@ -58,8 +54,6 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi
   - type: RangedWeapon
   - type: BoltActionBarrel
   - type: Appearance
@@ -74,8 +68,6 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Snipers/heavy_sniper.rsi
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Snipers/heavy_sniper.rsi
   - type: RangedWeapon
   - type: BoltActionBarrel
     caliber: AntiMaterial
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cleaver.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cleaver.yml
index 576b2b544c..aca670ba8c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cleaver.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cleaver.yml
@@ -9,9 +9,7 @@
     size: 4
     state: butch
 
-  - type: Icon
-    sprite: Objects/Weapons/Melee/cleaver.rsi
-    state: butch
+
 
   - type: ItemCooldown
   - type: MeleeWeapon
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
index f83f00ede2..467dfe7ff5 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
@@ -7,9 +7,7 @@
     sprite: Objects/Weapons/Melee/pickaxe.rsi
     state: pickaxe
 
-  - type: Icon
-    sprite: Objects/Weapons/Melee/pickaxe.rsi
-    state: pickaxe
+
   - type: Pickaxe
   - type: ItemCooldown
   - type: MeleeWeapon
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
index 5842d9b1e9..7d3d9016ee 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
@@ -7,9 +7,7 @@
     sprite: Objects/Weapons/Melee/spear.rsi
     state: spear
 
-  - type: Icon
-    sprite: Objects/Weapons/Melee/spear.rsi
-    state: spear
+
 
   - type: MeleeWeapon
     range: 1.5
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml
index eef88d5d8f..3941a5322e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml
@@ -7,9 +7,7 @@
       sprite: Objects/Weapons/Melee/stunbaton.rsi
       state: stunbaton_off
 
-    - type: Icon
-      sprite: Objects/Weapons/Melee/stunbaton.rsi
-      state: stunbaton_off
+
 
     - type: Stunbaton
       damage: 1
@@ -33,9 +31,7 @@
       sprite: Objects/Weapons/Melee/flash.rsi
       state: flash
 
-    - type: Icon
-      sprite: Objects/Weapons/Melee/flash.rsi
-      state: flash
+
 
     - type: Flash
       damage: 0
diff --git a/Resources/Prototypes/Entities/Objects/materials.yml b/Resources/Prototypes/Entities/Objects/materials.yml
index 664c8af7ea..fe11f9306d 100644
--- a/Resources/Prototypes/Entities/Objects/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/materials.yml
@@ -22,9 +22,6 @@
   - type: Sprite
     sprite: Objects/Materials/sheets.rsi
     state: metal
-  - type: Icon
-    sprite: Objects/Materials/sheets.rsi
-    state: metal
   - type: Item
     sprite: Objects/Materials/sheets.rsi
     HeldPrefix: metal
@@ -51,9 +48,6 @@
   - type: Sprite
     sprite: Objects/Materials/sheets.rsi
     state: glass
-  - type: Icon
-    sprite: Objects/Materials/sheets.rsi
-    state: glass
   - type: Item
     sprite: Objects/Materials/sheets.rsi
     HeldPrefix: glass
@@ -77,8 +71,6 @@
     stacktype: enum.StackType.Cable
   - type: Sprite
     texture: Objects/Tools/cable_coil.png
-  - type: Icon
-    texture: Objects/Tools/cable_coil.png
   - type: WirePlacer
   - type: Clickable
 
@@ -152,8 +144,6 @@
     stacktype: enum.StackType.Gold
   - type: Sprite
     texture: Objects/Materials/goldbar_single.png
-  - type: Icon
-    texture: Objects/Materials/goldbar_single.png
 
 - type: entity
   id: GoldStack1
@@ -170,8 +160,6 @@
   components:
   - type: Sprite
     texture: Objects/Materials/phoron_ore.png
-  - type: Icon
-    texture: Objects/Materials/phoron_ore.png
 
 - type: entity
   name: phoron sheet
@@ -187,9 +175,6 @@
   - type: Sprite
     sprite: Objects/Materials/sheets.rsi
     state: phoron
-  - type: Icon
-    sprite: Objects/Materials/sheets.rsi
-    state: phoron
   - type: Item
     sprite: Objects/Materials/sheets.rsi
     HeldPrefix: phoron
@@ -209,5 +194,3 @@
   components:
   - type: Sprite
     texture: Objects/Materials/wood.png
-  - type: Icon
-    texture: Objects/Materials/wood.png
diff --git a/Resources/Prototypes/Entities/Objects/radio.yml b/Resources/Prototypes/Entities/Objects/radio.yml
index f087bc6a2c..183416ee9b 100644
--- a/Resources/Prototypes/Entities/Objects/radio.yml
+++ b/Resources/Prototypes/Entities/Objects/radio.yml
@@ -12,7 +12,5 @@
   components:
   - type: Sprite
     texture: Objects/Devices/radio.png
-  - type: Icon
-    texture: Objects/Devices/radio.png
   - type: Listening
   - type: Radio
diff --git a/Resources/Prototypes/Entities/Objects/tiles.yml b/Resources/Prototypes/Entities/Objects/tiles.yml
index 1360ab0622..5bd88b6541 100644
--- a/Resources/Prototypes/Entities/Objects/tiles.yml
+++ b/Resources/Prototypes/Entities/Objects/tiles.yml
@@ -7,9 +7,7 @@
   - type: Sprite
     sprite: Objects/Tiles/tile.rsi
     state: tile_steel
-  - type: Icon
-    sprite: Objects/Tiles/tile.rsi
-    state: tile_steel
+
   - type: FloorTile
     output: floor_steel
   - type: Stack
@@ -34,9 +32,7 @@
   - type: Sprite
     sprite: Objects/Tiles/tile.rsi
     state: tile_carpet
-  - type: Icon
-    sprite: Objects/Tiles/tile.rsi
-    state: tile_carpet
+
   - type: Item
     sprite: Objects/Tiles/tile.rsi
     HeldPrefix: tile_carpet
@@ -53,9 +49,7 @@
   - type: Sprite
     sprite: Objects/Tiles/tile.rsi
     state: tile_wood
-  - type: Icon
-    sprite: Objects/Tiles/tile.rsi
-    state: tile_wood
+
   - type: Item
     sprite: Objects/Tiles/tile.rsi
     HeldPrefix: tile_wood
@@ -74,9 +68,7 @@
   - type: Sprite
     sprite: Objects/Tiles/tile.rsi
     state: tile_white
-  - type: Icon
-    sprite: Objects/Tiles/tile.rsi
-    state: tile_white
+
   - type: Item
     sprite: Objects/Tiles/tile.rsi
     HeldPrefix: tile_white
@@ -95,9 +87,7 @@
   - type: Sprite
     sprite: Objects/Tiles/tile.rsi
     state: tile_dark
-  - type: Icon
-    sprite: Objects/Tiles/tile.rsi
-    state: tile_dark
+
   - type: Item
     sprite: Objects/Tiles/tile.rsi
     HeldPrefix: tile_dark
@@ -116,9 +106,7 @@
   - type: Sprite
     sprite: Objects/Tiles/tile.rsi
     state: tile_dark_techfloor_grid
-  - type: Icon
-    sprite: Objects/Tiles/tile.rsi
-    state: tile_dark_techfloor_grid
+
   - type: Item
     sprite: Objects/Tiles/tile.rsi
     HeldPrefix: tile_dark
@@ -133,9 +121,7 @@
   - type: Sprite
     sprite: Objects/Tiles/tile.rsi
     state: tile_showroom
-  - type: Icon
-    sprite: Objects/Tiles/tile.rsi
-    state: tile_showroom
+
   - type: Item
     sprite: Objects/Tiles/tile.rsi
     HeldPrefix: tile_showroom
@@ -150,9 +136,7 @@
   - type: Sprite
     sprite: Objects/Tiles/tile.rsi
     state: tile_showroom
-  - type: Icon
-    sprite: Objects/Tiles/tile.rsi
-    state: tile_showroom
+
   - type: Item
     sprite: Objects/Tiles/tile.rsi
     HeldPrefix: tile_showroom
@@ -167,9 +151,7 @@
   - type: Sprite
     sprite: Objects/Tiles/tile.rsi
     state: tile_snow
-  - type: Icon
-    sprite: Objects/Tiles/tile.rsi
-    state: tile_snow
+
   - type: Item
     sprite: Objects/Tiles/tile.rsi
     HeldPrefix: tile_silver
@@ -184,9 +166,7 @@
   - type: Sprite
     sprite: Objects/Tiles/tile.rsi
     state: tile_gcircuit
-  - type: Icon
-    sprite: Objects/Tiles/tile.rsi
-    state: tile_gcircuit
+
   - type: Item
     sprite: Objects/Tiles/tile.rsi
     HeldPrefix: tile_silver
@@ -201,9 +181,7 @@
   - type: Sprite
     sprite: Objects/Tiles/tile.rsi
     state: tile_gold
-  - type: Icon
-    sprite: Objects/Tiles/tile.rsi
-    state: tile_gold
+
   - type: Item
     sprite: Objects/Tiles/tile.rsi
     HeldPrefix: tile_gold
@@ -218,9 +196,7 @@
   - type: Sprite
     sprite: Objects/Tiles/tile.rsi
     state: tile_reinforced
-  - type: Icon
-    sprite: Objects/Tiles/tile.rsi
-    state: tile_reinforced
+
   - type: Item
     sprite: Objects/Tiles/tile.rsi
     HeldPrefix: tile_reinforced
@@ -235,9 +211,7 @@
   - type: Sprite
     sprite: Objects/Tiles/tile.rsi
     state: tile_rockvault
-  - type: Icon
-    sprite: Objects/Tiles/tile.rsi
-    state: tile_rockvault
+
   - type: Item
     sprite: Objects/Tiles/tile.rsi
     HeldPrefix: tile_steel
@@ -252,9 +226,7 @@
   - type: Sprite
     sprite: Objects/Tiles/tile.rsi
     state: tile_white_monofloor
-  - type: Icon
-    sprite: Objects/Tiles/tile.rsi
-    state: tile_white_monofloor
+
   - type: Item
     sprite: Objects/Tiles/tile.rsi
     HeldPrefix: tile_steel
@@ -269,9 +241,7 @@
   - type: Sprite
     sprite: Objects/Tiles/tile.rsi
     state: tile_white_monofloor
-  - type: Icon
-    sprite: Objects/Tiles/tile.rsi
-    state: tile_white_monofloor
+
   - type: Item
     sprite: Objects/Tiles/tile.rsi
     HeldPrefix: tile_steel
@@ -286,9 +256,7 @@
   - type: Sprite
     sprite: Objects/Tiles/tile.rsi
     state: tile_white
-  - type: Icon
-    sprite: Objects/Tiles/tile.rsi
-    state: tile_white
+
   - type: Item
     sprite: Objects/Tiles/tile.rsi
     HeldPrefix: tile_brown
@@ -303,9 +271,7 @@
   - type: Sprite
     sprite: Objects/Tiles/tile.rsi
     state: tile_hydro
-  - type: Icon
-    sprite: Objects/Tiles/tile.rsi
-    state: tile_hydro
+
   - type: Item
     sprite: Objects/Tiles/tile.rsi
     HeldPrefix: tile_hydro
@@ -320,9 +286,7 @@
   - type: Sprite
     sprite: Objects/Tiles/tile.rsi
     state: tile_dirty
-  - type: Icon
-    sprite: Objects/Tiles/tile.rsi
-    state: tile_dirty
+
   - type: Item
     sprite: Objects/Tiles/tile.rsi
     HeldPrefix: tile_brown
diff --git a/Resources/Prototypes/Entities/puddle.yml b/Resources/Prototypes/Entities/puddle.yml
index fcfb393adf..53de374fc9 100644
--- a/Resources/Prototypes/Entities/puddle.yml
+++ b/Resources/Prototypes/Entities/puddle.yml
@@ -38,9 +38,6 @@
   - type: Sprite
     sprite: Fluids/gibblet.rsi # Placeholder
     state: gibblet-0
-  - type: Icon
-    sprite: Fluids/gibblet.rsi
-    state: gibblet-0
   - type: Puddle
     variants: 5
 
@@ -53,9 +50,6 @@
   - type: Sprite
     sprite: Fluids/smear.rsi # Placeholder
     state: smear-0
-  - type: Icon
-    sprite: Fluids/smear.rsi
-    state: smear-0
   - type: Puddle
     variants: 7
 
@@ -68,9 +62,6 @@
   - type: Sprite
     sprite: Fluids/splatter.rsi # Placeholder
     state: splatter-0
-  - type: Icon
-    sprite: Fluids/splatter.rsi
-    state: splatter-0
   - type: Puddle
     variants: 6
 
@@ -83,9 +74,6 @@
   - type: Sprite
     sprite: Fluids/vomit.rsi
     state: vomit-0
-  - type: Icon
-    sprite: Fluids/vomit.rsi
-    state: vomit-0
   - type: Puddle
     variants: 4
     recolor: false
@@ -100,9 +88,6 @@
   - type: Sprite
     sprite: Fluids/vomit_toxin.rsi
     state: vomit_toxin-0
-  - type: Icon
-    sprite: Fluids/vomit_toxin.rsi
-    state: vomit_toxin-0
   - type: Puddle
     variants: 4
     recolor: false
@@ -116,8 +101,5 @@
   - type: Sprite
     sprite: Fluids/writing.rsi # Placeholder
     state: writing-0
-  - type: Icon
-    sprite: Fluids/writing.rsi
-    state: writing-0
   - type: Puddle
     variants: 5
diff --git a/Resources/Prototypes/Entities/stress_test.yml b/Resources/Prototypes/Entities/stress_test.yml
index c21ac2af96..979e2c7cd0 100644
--- a/Resources/Prototypes/Entities/stress_test.yml
+++ b/Resources/Prototypes/Entities/stress_test.yml
@@ -2,8 +2,6 @@
   id: StressTest
   name: stress test
   components:
-  - type: Icon
-    texture: Effects/explosion.rsi/explosion.png
   - type: Sprite
     texture: Effects/explosion.rsi/explosion.png
   - type: StressTestMovement
diff --git a/RobustToolbox b/RobustToolbox
index f1334ca57d..4ce4fb9a9f 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit f1334ca57d3938503b3498729ea1bf3ed38c3fd2
+Subproject commit 4ce4fb9a9f63930d4f4148f4b5db478df5d8e147