diff --git a/Resources/Prototypes/StatusEffects/job.yml b/Resources/Prototypes/StatusEffects/job.yml
index 5c2d3a2fa05..b04281afde5 100644
--- a/Resources/Prototypes/StatusEffects/job.yml
+++ b/Resources/Prototypes/StatusEffects/job.yml
@@ -85,7 +85,7 @@
   parent: JobIcon
   id: JobIconSecurityOfficer
   icon:
-    sprite: _NF/Interface/Misc/job_icons.rsi
+    sprite: /Textures/_NF/Interface/Misc/job_icons.rsi
     state: nfsddeputy
 
 - type: statusIcon
@@ -225,14 +225,14 @@
   parent: JobIcon
   id: JobIconHeadOfSecurity
   icon:
-    sprite: _NF/Interface/Misc/job_icons.rsi
+    sprite: /Textures/_NF/Interface/Misc/job_icons.rsi
     state: nfsdsheriff
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconBrigmedic
   icon:
-    sprite: _NF/Interface/Misc/job_icons.rsi
+    sprite: /Textures/_NF/Interface/Misc/job_icons.rsi
     state: nfsdbrigmed
 
 - type: statusIcon
@@ -260,7 +260,7 @@
   parent: JobIcon
   id: JobIconWarden
   icon:
-    sprite: _NF/Interface/Misc/job_icons.rsi
+    sprite: /Textures/_NF/Interface/Misc/job_icons.rsi
     state: nfsdbailiff
 
 - type: statusIcon
@@ -323,7 +323,7 @@
   parent: JobIcon
   id: JobIconSecurityCadet
   icon:
-    sprite: _NF/Interface/Misc/job_icons.rsi
+    sprite: /Textures/_NF/Interface/Misc/job_icons.rsi
     state: nfsdcadet
 
 - type: statusIcon
@@ -351,7 +351,7 @@
   parent: JobIcon
   id: JobIconSeniorOfficer
   icon:
-    sprite: _NF/Interface/Misc/job_icons.rsi
+    sprite: /Textures/_NF/Interface/Misc/job_icons.rsi
     state: nfsdsergeant
 
 - type: statusIcon
diff --git a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml b/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml
index 417f9964d9a..139b53a350d 100644
--- a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml
+++ b/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml
@@ -18,8 +18,8 @@
   id: UplinkSecurityHardsuit
   name:  uplink-security-hardsuit-name
   description: uplink-security-hardsuit-desc
-  productEntity: ClothingOuterHardsuitSecurity
-  icon: { sprite: Clothing/OuterClothing/Hardsuits/security.rsi, state: icon }
+  productEntity: ClothingOuterHardsuitNfsdBronze
+  icon: { sprite: _NF/Clothing/OuterClothing/Hardsuits/nfsd_bronze.rsi, state: icon }
   cost:
     FrontierUplinkCoin: 2
   categories:
@@ -34,8 +34,8 @@
   id: UplinkSecurityHardsuitPatrol
   name:  uplink-security-hardsuit-patrol-name
   description: uplink-security-hardsuit-patrol-desc
-  productEntity: ClothingOuterHardsuitSecuritypatrol
-  icon: { sprite: Clothing/OuterClothing/Hardsuits/security-patrol.rsi, state: icon }
+  productEntity: ClothingOuterHardsuitNfsdSilver
+  icon: { sprite: _NF/Clothing/OuterClothing/Hardsuits/nfsd_silver.rsi, state: icon }
   cost:
     FrontierUplinkCoin: 2
   categories:
@@ -50,8 +50,8 @@
   id: UplinkSecurityHardsuitBrigmedic
   name:  uplink-security-hardsuit-brigmedic-name
   description: uplink-security-hardsuit-brigmedic-desc
-  productEntity: ClothingOuterHardsuitBrigmedic
-  icon: { sprite: Clothing/OuterClothing/Hardsuits/brigmedic.rsi, state: icon }
+  productEntity: ClothingOuterHardsuitNfsdBrigMed
+  icon: { sprite: _NF/Clothing/OuterClothing/Hardsuits/nfsd_brigmed.rsi, state: icon }
   cost:
     FrontierUplinkCoin: 2
   categories:
@@ -66,8 +66,8 @@
   id: UplinkSecurityHardsuitWarden
   name:  uplink-security-hardsuit-warden-name
   description: uplink-security-hardsuit-warden-desc
-  productEntity: ClothingOuterHardsuitWarden
-  icon: { sprite: Clothing/OuterClothing/Hardsuits/security-warden.rsi, state: icon }
+  productEntity: ClothingOuterHardsuitNfsdGold
+  icon: { sprite: _NF/Clothing/OuterClothing/Hardsuits/nfsd_gold.rsi, state: icon }
   cost:
     FrontierUplinkCoin: 3
   categories:
@@ -108,8 +108,8 @@
   id: UplinkSecurityHardsuitSheriff
   name:  uplink-security-hardsuit-sheriff-name
   description: uplink-security-hardsuit-sheriff-desc
-  productEntity: ClothingOuterHardsuitSecurityRed
-  icon: { sprite: Clothing/OuterClothing/Hardsuits/security-red.rsi, state: icon }
+  productEntity: ClothingOuterHardsuitNfsdSheriff
+  icon: { sprite: _NF/Clothing/OuterClothing/Hardsuits/nfsd_sheriff.rsi, state: icon }
   cost:
     FrontierUplinkCoin: 3
   categories: