diff --git a/Resources/Prototypes/Actions/anomaly.yml b/Resources/Prototypes/Actions/anomaly.yml
index f89ccce92c..3c1d270870 100644
--- a/Resources/Prototypes/Actions/anomaly.yml
+++ b/Resources/Prototypes/Actions/anomaly.yml
@@ -6,6 +6,6 @@
   components:
   - type: Action
     useDelay: 30
-    icon: Structures/Specific/anomaly.rsi/anom1.png
+    icon: { sprite: Structures/Specific/anomaly.rsi, state: anom1 }
   - type: InstantAction
     event: !type:ActionAnomalyPulseEvent
diff --git a/Resources/Prototypes/Alerts/revenant.yml b/Resources/Prototypes/Alerts/revenant.yml
index a550a54af7..0367d6b58d 100644
--- a/Resources/Prototypes/Alerts/revenant.yml
+++ b/Resources/Prototypes/Alerts/revenant.yml
@@ -10,7 +10,7 @@
 
 - type: alert
   id: Corporeal
-  icons: [ /Textures/_DV/Mobs/Ghosts/revenant.rsi/icon.png ] # DeltaV - Custom revenant sprite
+  icons: [ { sprite: /Textures/_DV/Mobs/Ghosts/revenant.rsi, state: icon } ] # DeltaV - Custom revenant sprite
   name: alerts-revenant-corporeal-name
   description: alerts-revenant-corporeal-desc
 
diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
index 51685354df..2fbfb269b1 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -138,7 +138,7 @@
   components:
   - type: Action
     icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
-    iconOn: Structures/Machines/parts.rsi/box_2.png
+    iconOn: { sprite: Structures/Machines/parts.rsi, state: box_2 }
     keywords: [ "AI", "console", "interface" ]
     priority: -10
 
@@ -159,7 +159,7 @@
   components:
   - type: Action
     icon: { sprite: Interface/Actions/actions_ai.rsi, state: comms_console }
-    iconOn: Interface/Actions/actions_ai.rsi/comms_console.png
+    iconOn: { sprite: Interface/Actions/actions_ai.rsi, state: comms_console }
     keywords: [ "AI", "console", "interface" ]
     priority: -4
   - type: InstantAction
@@ -173,7 +173,7 @@
   components:
   - type: Action
     icon: { sprite: Interface/Actions/actions_ai.rsi, state: mass_scanner }
-    iconOn: Interface/Actions/actions_ai.rsi/mass_scanner.png
+    iconOn: { sprite: Interface/Actions/actions_ai.rsi, state: comms_console }
     keywords: [ "AI", "console", "interface" ]
     priority: -6
   - type: InstantAction
@@ -196,7 +196,7 @@
   components:
   - type: Action
     icon: { sprite: Interface/Actions/actions_ai.rsi, state: crew_monitor }
-    iconOn: Interface/Actions/actions_ai.rsi/crew_monitor.png
+    iconOn: { sprite: Interface/Actions/actions_ai.rsi, state: crew_monitor }
     keywords: [ "AI", "console", "interface" ]
     priority: -8
   - type: InstantAction
@@ -210,7 +210,7 @@
   components:
   - type: Action
     icon: { sprite: Interface/Actions/actions_ai.rsi, state: station_records }
-    iconOn: Interface/Actions/actions_ai.rsi/station_records.png
+    iconOn: { sprite: Interface/Actions/actions_ai.rsi, state: station_records }
     keywords: [ "AI", "console", "interface" ]
     priority: -7
   - type: InstantAction
@@ -225,7 +225,7 @@
   components:
   - type: Action
     icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
-    iconOn: Structures/Machines/parts.rsi/box_2.png
+    iconOn: { sprite: Structures/Machines/parts.rsi, state: box_2 }
     keywords: [ "AI", "console", "interface" ]
     priority: -10
   - type: InstantAction
diff --git a/Resources/Prototypes/Entities/Mobs/Species/golem.yml b/Resources/Prototypes/Entities/Mobs/Species/golem.yml
index 659a8d45d9..c46e9b8295 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/golem.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/golem.yml
@@ -254,8 +254,8 @@
 #         toggleAction:
 #           name: action-name-show-laws
 #           description: action-description-show-laws
-#           icon: Structures/Wallmounts/posters.rsi/poster11_legit.png #someone wanna make new icons?
-#           iconOn: Structures/Wallmounts/posters.rsi/poster11_legit.png
+#           icon: { sprite: Structures/Wallmounts/posters.rsi, state: poster11_legit } #someone wanna make new icons?
+#           iconOn: { sprite: Structures/Wallmounts/posters.rsi, state: poster11_legit }
 #           keywords: [ "AI", "console", "interface", "laws", "borg" ]
 #           priority: -3
 #           event: !type:ToggleIntrinsicUIEvent
diff --git a/Resources/Prototypes/_DV/Entities/Actions/cancel-escape-inventory.yml b/Resources/Prototypes/_DV/Entities/Actions/cancel-escape-inventory.yml
index 0178df3574..a7581ea305 100644
--- a/Resources/Prototypes/_DV/Entities/Actions/cancel-escape-inventory.yml
+++ b/Resources/Prototypes/_DV/Entities/Actions/cancel-escape-inventory.yml
@@ -4,7 +4,7 @@
   description: Calm down and sit peacefuly in your carrier's inventory
   components:
   - type: Action
-    icon: _DV/Actions/escapeinventory.rsi/cancel-escape.png
+    icon: { sprite: _DV/Actions/escapeinventory.rsi, state: cancel-escape }
     useDelay: 2
   - type: InstantAction
     event: !type:EscapeInventoryCancelActionEvent
diff --git a/Resources/Prototypes/_DV/Reagents/Materials/materials.yml b/Resources/Prototypes/_DV/Reagents/Materials/materials.yml
index 99f1098fca..489e369029 100644
--- a/Resources/Prototypes/_DV/Reagents/Materials/materials.yml
+++ b/Resources/Prototypes/_DV/Reagents/Materials/materials.yml
@@ -2,7 +2,7 @@
   id: Bluespace
   name: bluespace
   unit: materials-unit-crystal
-  icon: /Textures/Nyanotrasen/Objects/Materials/materials.rsi/bluespace.png
+  icon: { sprite: /Textures/Nyanotrasen/Objects/Materials/materials.rsi, state: bluespace }
   color: "#53a9ff"
   stackEntity: MaterialBluespace
   price: 15
@@ -11,7 +11,7 @@
   id: NormalityCrystal
   name: normality
   unit: materials-unit-crystal
-  icon: /Textures/Nyanotrasen/Objects/Materials/materials.rsi/bluespace.png
+  icon: { sprite: /Textures/Nyanotrasen/Objects/Materials/materials.rsi, state: bluespace }
   color: "#999999"
   stackEntity: CrystalNormality
   price: 30
diff --git a/Resources/Prototypes/_DV/Voice/speech_emotes.yml b/Resources/Prototypes/_DV/Voice/speech_emotes.yml
index 5b6f39363a..593d88d1fb 100644
--- a/Resources/Prototypes/_DV/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/_DV/Voice/speech_emotes.yml
@@ -41,7 +41,8 @@
 - type: emote
   id: HarpyPew
   name: delta-chat-emote-name-pew
-  icon: Objects/Weapons/Guns/Battery/antiquelasergun.rsi/base.png
+  # icons in .rsi directories need to be specified this way, because they get packaged
+  icon: { sprite: Objects/Weapons/Guns/Battery/antiquelasergun.rsi, state: base }
   category: Vocal
   available: false
   whitelist:
@@ -59,7 +60,8 @@
 - type: emote
   id: HarpyBang
   name: delta-chat-emote-name-bang
-  icon: Objects/Weapons/Grenades/grenade.rsi/icon.png
+  # icons in .rsi directories need to be specified this way, because they get packaged
+  icon: { sprite: Objects/Weapons/Grenades/grenade.rsi, state: icon }
   category: Vocal
   available: false
   whitelist:
@@ -97,7 +99,8 @@
 - type: emote
   id: HarpyRev
   name: delta-chat-emote-name-rev
-  icon: Structures/Machines/grinder.rsi/grinder_beaker_attached.png
+  # icons in .rsi directories need to be specified this way, because they get packaged
+  icon: { sprite: Structures/Machines/grinder.rsi, state: grinder_beaker_attached }
   category: Vocal
   available: false
   whitelist: