diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/machineparts.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/machineparts.yml
index 4c71ae5035f..bf0e2042829 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/machineparts.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/machineparts.yml
@@ -8,7 +8,7 @@
     - type: Sprite
       layers:
         - state: red
-        - sprite: Objects/Misc/stock_parts.rsi
+        - sprite: _NF/Objects/Misc/stock_parts.rsi # Frontier
           state: matter_bin
     - type: RandomSpawner
       prototypes:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/medsec_hud.yml b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/medsec_hud.yml
index 03a70cb7fe7..46d22a5095f 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/medsec_hud.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/medsec_hud.yml
@@ -22,21 +22,21 @@
               amount: 5
               doAfter: 5
             - tag: Radio
-              name: radio
+              name: handicomms # Frontier handicomms<radio
               icon:
-                sprite: Objects/Devices/communication.rsi
-                state: walkietalkie
+                sprite: _NF/Objects/Devices/communication.rsi # Frontier
+                state: base # Frontier
               doAfter: 5
             - tag: CapacitorStockPart
               name: capacitor
               icon:
-                sprite: Objects/Misc/stock_parts.rsi
+                sprite: _NF/Objects/Misc/stock_parts.rsi # Frontier
                 state: capacitor
               doAfter: 5
             - tag: CapacitorStockPart
               name: capacitor
               icon:
-                sprite: Objects/Misc/stock_parts.rsi
+                sprite: _NF/Objects/Misc/stock_parts.rsi # Frontier
                 state: capacitor
               doAfter: 5
     - node: medsecHud
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/machines/machine.yml b/Resources/Prototypes/Recipes/Construction/Graphs/machines/machine.yml
index 01d8b443222..5094321da9d 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/machines/machine.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/machines/machine.yml
@@ -59,7 +59,7 @@
                 sprite: Objects/Misc/module.rsi
                 state: id_mod
               guideIconParts:
-                sprite: Objects/Misc/stock_parts.rsi
+                sprite: _NF/Objects/Misc/stock_parts.rsi # Frontier
                 state: scan_module
           steps:
             - tool: Screwing
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml
index 7e4087b20a2..3be72637a23 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml
@@ -61,7 +61,7 @@
           name: a capacitor
           store: capacitor
           icon:
-            sprite: "Objects/Misc/stock_parts.rsi"
+            sprite: "_NF/Objects/Misc/stock_parts.rsi" # Frontier
             state: "capacitor"
           doAfter: 0.5
       - to: frame
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/potato.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/potato.yml
index e3f972cfda4..b77f99b37df 100644
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/potato.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/potato.yml
@@ -63,12 +63,12 @@
             - tag: CapacitorStockPart
               name: capacitor
               icon:
-                sprite: Objects/Misc/stock_parts.rsi
+                sprite: _NF/Objects/Misc/stock_parts.rsi # Frontier
                 state: capacitor
             - tag: CapacitorStockPart
               name: capacitor
               icon:
-                sprite: Objects/Misc/stock_parts.rsi
+                sprite: _NF/Objects/Misc/stock_parts.rsi # Frontier
                 state: capacitor
     - node: potatoaichip
       entity: PotatoAIChip
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_engineering.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_engineering.yml
index 899073ad57c..bc7fdfc0b2d 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_engineering.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_engineering.yml
@@ -435,7 +435,7 @@
     layers:
       - state: green
         scale: 0.7, 0.7
-      - sprite: Objects/Misc/stock_parts.rsi
+      - sprite: _NF/Objects/Misc/stock_parts.rsi
         state: bluespace_matter_bin
       - sprite: _NF/Markers/general.rsi
         state: questionmark
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/parts.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/parts.yml
index 8d93aa5c664..d46f19c8922 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/parts.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/parts.yml
@@ -6,7 +6,7 @@
     - type: Sprite
       layers:
         - state: red
-        - sprite: Objects/Misc/stock_parts.rsi
+        - sprite: _NF/Objects/Misc/stock_parts.rsi # Frontier
           state: advanced_matter_bin
     - type: RandomSpawner
       prototypes:
@@ -22,7 +22,7 @@
   components:
   - type: Sprite
     layers:
-    - sprite: Objects/Misc/stock_parts.rsi
+    - sprite: _NF/Objects/Misc/stock_parts.rsi # Frontier
       state: super_matter_bin
   - type: RandomSpawner
     rarePrototypes:
@@ -45,7 +45,7 @@
   components:
   - type: Sprite
     layers:
-    - sprite: Objects/Misc/stock_parts.rsi
+    - sprite: _NF/Objects/Misc/stock_parts.rsi # Frontier
       state: super_matter_bin
   - type: RandomSpawner
     prototypes:
@@ -62,7 +62,7 @@
   components:
   - type: Sprite
     layers:
-    - sprite: Objects/Misc/stock_parts.rsi
+    - sprite: _NF/Objects/Misc/stock_parts.rsi # Frontier
       state: bluespace_matter_bin
   - type: RandomSpawner
     prototypes: