diff --git a/Resources/Prototypes/Catalog/LatheRecipes/sheet.yml b/Resources/Prototypes/Catalog/LatheRecipes/sheet.yml
index 90916bc1c8..229280a581 100644
--- a/Resources/Prototypes/Catalog/LatheRecipes/sheet.yml
+++ b/Resources/Prototypes/Catalog/LatheRecipes/sheet.yml
@@ -1,6 +1,8 @@
 - type: latheRecipe
   id: MetalStack
-  icon: Objects/Materials/sheets.rsi/metal.png
+  icon:
+    sprite: Objects/Materials/sheets.rsi
+    state: metal
   result: SteelSheet1
   completetime: 500
   materials:
@@ -8,7 +10,9 @@
 
 - type: latheRecipe
   id: GlassStack
-  icon: Objects/Materials/sheets.rsi/glass.png
+  icon: 
+    sprite: Objects/Materials/sheets.rsi
+    state: glass
   result: GlassSheet1
   completetime: 500
   materials:
diff --git a/Resources/Prototypes/technologies.yml b/Resources/Prototypes/Catalog/Research/technologies.yml
similarity index 96%
rename from Resources/Prototypes/technologies.yml
rename to Resources/Prototypes/Catalog/Research/technologies.yml
index 561b730b83..776649dc4e 100644
--- a/Resources/Prototypes/technologies.yml
+++ b/Resources/Prototypes/Catalog/Research/technologies.yml
@@ -47,7 +47,9 @@
   name: material sheet printing
   id: Sheets
   description: Print those sheets!
-  icon: Objects/Materials/materials.rsi/sheet_metal.png
+  icon:
+    sprite: Objects/Materials/sheets.rsi
+    state: researchicon
   requiredPoints: 250
   requiredTechnologies:
     - IndustrialEngineering
diff --git a/Resources/Prototypes/Catalog/cargo_products.yml b/Resources/Prototypes/Catalog/cargo_products.yml
index 6a0c13c19a..010bc232e3 100644
--- a/Resources/Prototypes/Catalog/cargo_products.yml
+++ b/Resources/Prototypes/Catalog/cargo_products.yml
@@ -14,7 +14,9 @@
   name: "medkit"
   id: cargo.Medkit
   description: "Everything you need to patch someone up."
-  icon: Objects/Specific/Medical/medkit_r.png
+  icon:
+    sprite: Objects/Specific/Medical/medical.rsi
+    state: medkit_r
   product: Medkit
   cost: 200
   category: Medical
@@ -48,7 +50,9 @@
   name: "fire extinguisher"
   id: cargo.fireextinguisher
   description: "Puts out fires. Or propels you in space."
-  icon: Objects/Misc/fire_extinguisher.png
+  icon:
+    sprite: Objects/Misc/fire_extinguisher.rsi
+    state: fire_extinguisher_closed
   product: CrateFireExtinguisher
   cost: 300
   category: Other
@@ -94,7 +98,9 @@
   name: "fuel tank"
   id: cargo.fueltank
   description: "Movable fuel tank for welders. No boom boom."
-  icon: Constructible/Misc/weldtank.png
+  icon:
+    sprite: Constructible/Misc/tanks.rsi
+    state: fueltank
   product: CrateFuelTank
   cost: 200
   category: Engineering
@@ -116,7 +122,9 @@
   name: "glass crate"
   id: cargo.glass
   description: "50 sheets of glass."
-  icon: Objects/Materials/sheets.rsi/glass.png
+  icon:
+    sprite: Objects/Materials/sheets.rsi
+    state: glass
   product: CrateGlass
   cost: 50
   category: Engineering
@@ -126,7 +134,9 @@
   name: "cable crate"
   id: cargo.cable
   description: "50 coils of cable."
-  icon: /Textures/Objects/Tools/cables.rsi/coil-30.png
+  icon:
+    sprite: Objects/Tools/cables.rsi
+    state: coilall-30
   product: CrateCable
   cost: 50
   category: Engineering
diff --git a/Resources/Prototypes/Entities/Constructible/Power/research.yml b/Resources/Prototypes/Entities/Constructible/Power/research.yml
index ce3dbbef53..1e36c8ae7e 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/research.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/research.yml
@@ -6,7 +6,6 @@
   - type: Sprite
     sprite: Constructible/Power/server.rsi
     state: server
-
   - type: Clickable
   - type: InteractionOutline
   - type: Physics
@@ -30,7 +29,6 @@
     - state: rndpointsource
       shader: unshaded
       map: ["enum.PowerDeviceVisualLayers.Powered"]
-
   - type: Clickable
   - type: InteractionOutline
   - type: Physics
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/meta.json b/Resources/Textures/Objects/Materials/materials.rsi/meta.json
index f5a8e0510a..65b920d118 100644
--- a/Resources/Textures/Objects/Materials/materials.rsi/meta.json
+++ b/Resources/Textures/Objects/Materials/materials.rsi/meta.json
@@ -94,14 +94,6 @@
         {
             "name": "rods",
             "directions": 1
-        },
-        {
-            "name": "sheet_glass",
-            "directions": 1
-        },
-        {
-            "name": "sheet_metal",
-            "directions": 1
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/sheet_glass.png b/Resources/Textures/Objects/Materials/materials.rsi/sheet_glass.png
deleted file mode 100644
index 534d188b29..0000000000
Binary files a/Resources/Textures/Objects/Materials/materials.rsi/sheet_glass.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/sheet_metal.png b/Resources/Textures/Objects/Materials/materials.rsi/sheet_metal.png
deleted file mode 100644
index 999b6e2927..0000000000
Binary files a/Resources/Textures/Objects/Materials/materials.rsi/sheet_metal.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/meta.json b/Resources/Textures/Objects/Materials/sheets.rsi/meta.json
index 346fc6797b..23a0a0978e 100644
--- a/Resources/Textures/Objects/Materials/sheets.rsi/meta.json
+++ b/Resources/Textures/Objects/Materials/sheets.rsi/meta.json
@@ -165,5 +165,9 @@
             "name": "plasteel",
             "directions": 1
         },
+        {
+            "name": "researchicon",
+            "directions": 1
+        }
     ]
 }
diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/researchicon.png b/Resources/Textures/Objects/Materials/sheets.rsi/researchicon.png
new file mode 100644
index 0000000000..353d7b5988
Binary files /dev/null and b/Resources/Textures/Objects/Materials/sheets.rsi/researchicon.png differ
diff --git a/Resources/Textures/Objects/Tools/cables.rsi/coilall-30.png b/Resources/Textures/Objects/Tools/cables.rsi/coilall-30.png
new file mode 100644
index 0000000000..f31a7dd6c0
Binary files /dev/null and b/Resources/Textures/Objects/Tools/cables.rsi/coilall-30.png differ
diff --git a/Resources/Textures/Objects/Tools/cables.rsi/meta.json b/Resources/Textures/Objects/Tools/cables.rsi/meta.json
index c1e9348602..c5724138d5 100644
--- a/Resources/Textures/Objects/Tools/cables.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/cables.rsi/meta.json
@@ -222,6 +222,15 @@
           1
         ]
       ]
+    },
+    {
+      "name": "coilall-30",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
     }
   ]
 }