diff --git a/Resources/Prototypes/Actions/diona.yml b/Resources/Prototypes/Actions/diona.yml
index 73bc1ba5290..1215276f283 100644
--- a/Resources/Prototypes/Actions/diona.yml
+++ b/Resources/Prototypes/Actions/diona.yml
@@ -5,7 +5,9 @@
   noSpawn: true
   components:
   - type: InstantAction
-    icon: Mobs/Species/Diona/organs.rsi/brain.png
+    icon:
+      sprite: Mobs/Species/Diona/organs.rsi
+      state: brain
     event: !type:GibActionEvent {}
     checkCanInteract: false
 
@@ -16,6 +18,8 @@
   noSpawn: true
   components:
   - type: InstantAction
-    icon: Mobs/Species/Diona/parts.rsi/full.png
+    icon:
+      sprite: Mobs/Species/Diona/parts.rsi
+      state: full
     event: !type:ReformEvent {}
     useDelay: 600 # Once every 10 minutes. Keep them dead for a fair bit before reforming
diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml
index 2d5ec9a6784..b2038b04b75 100644
--- a/Resources/Prototypes/Actions/types.yml
+++ b/Resources/Prototypes/Actions/types.yml
@@ -40,7 +40,7 @@
   components:
   - type: InstantAction
     icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
-    iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
+    iconOn: { sprite: Objects/Tools/flashlight.rsi, state: flashlight-on }
     event: !type:ToggleActionEvent
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/misc.yml b/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
index 05067ff68a0..6b4be3c9f84 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
@@ -73,7 +73,9 @@
   noSpawn: true
   components:
   - type: EntityTargetAction
-    icon: Clothing/Neck/Misc/stethoscope.rsi/icon.png
+    icon:
+      sprite: Clothing/Neck/Misc/stethoscope.rsi
+      state: icon
     event: !type:StethoscopeActionEvent
     checkCanInteract: false
     priority: -1
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
index 5f5d275521e..8da2c34231b 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
@@ -47,5 +47,7 @@
   - type: InstantAction
     priority: -1
     useDelay: 30
-    icon: Structures/Walls/solid.rsi/full.png
+    icon:
+      sprite: Structures/Walls/solid.rsi
+      state: full
     event: !type:InvisibleWallActionEvent