diff --git a/Content.Shared/_NF/Trade/TradeCrateDestinationIconPrototype.cs b/Content.Shared/_NF/Trade/TradeCrateDestinationPrototype.cs
similarity index 100%
rename from Content.Shared/_NF/Trade/TradeCrateDestinationIconPrototype.cs
rename to Content.Shared/_NF/Trade/TradeCrateDestinationPrototype.cs
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml
index fdd84fcb432..34779ad03b4 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml
@@ -36,6 +36,16 @@
     sprite: _NF/Structures/Storage/Crates/tradedark.rsi
   - type: Sprite
     sprite: _NF/Structures/Storage/Crates/tradedark.rsi
+    layers:
+    - state: icon
+    - sprite: _NF/Interface/Misc/cargo_destination_icons.rsi
+      state: cargo_other
+      map: ["enum.TradeCrateVisualLayers.Icon"]
+      visible: false
+    - sprite: _NF/Interface/Misc/cargo_destination_icons.rsi
+      state: cargo_priority_inactive
+      map: ["enum.TradeCrateVisualLayers.Priority"]
+      visible: false
   - type: EntityStorage
     deleteContentsOnDestruction: true
   - type: Fixtures
@@ -66,6 +76,16 @@
     sprite: _NF/Structures/Storage/Crates/tradelight.rsi
   - type: Sprite
     sprite: _NF/Structures/Storage/Crates/tradelight.rsi
+    layers:
+    - state: icon
+    - sprite: _NF/Interface/Misc/cargo_destination_icons.rsi
+      state: cargo_other
+      map: ["enum.TradeCrateVisualLayers.Icon"]
+      visible: false
+    - sprite: _NF/Interface/Misc/cargo_destination_icons.rsi
+      state: cargo_priority_inactive
+      map: ["enum.TradeCrateVisualLayers.Priority"]
+      visible: false
   - type: EntityStorage
     deleteContentsOnDestruction: true
   - type: Fixtures
@@ -123,6 +143,16 @@
     sprite: _NF/Structures/Storage/Crates/contraband1_crate.rsi
   - type: Sprite
     sprite: _NF/Structures/Storage/Crates/contraband1_crate.rsi
+    layers:
+    - state: icon
+    - sprite: _NF/Interface/Misc/cargo_destination_icons.rsi
+      state: cargo_other
+      map: ["enum.TradeCrateVisualLayers.Icon"]
+      visible: false
+    - sprite: _NF/Interface/Misc/cargo_destination_icons.rsi
+      state: cargo_priority_inactive
+      map: ["enum.TradeCrateVisualLayers.Priority"]
+      visible: false
   - type: TradeCrate
     valueAtDestination: 3000
     valueElsewhere: 1500
@@ -136,6 +166,16 @@
     sprite: _NF/Structures/Storage/Crates/contraband2_crate.rsi
   - type: Sprite
     sprite: _NF/Structures/Storage/Crates/contraband2_crate.rsi
+    layers:
+    - state: icon
+    - sprite: _NF/Interface/Misc/cargo_destination_icons.rsi
+      state: cargo_other
+      map: ["enum.TradeCrateVisualLayers.Icon"]
+      visible: false
+    - sprite: _NF/Interface/Misc/cargo_destination_icons.rsi
+      state: cargo_priority_inactive
+      map: ["enum.TradeCrateVisualLayers.Priority"]
+      visible: false
   - type: TradeCrate
     valueAtDestination: 5000
     valueElsewhere: 2500
@@ -152,6 +192,16 @@
     sprite: _NF/Structures/Storage/Crates/contraband3_crate.rsi
   - type: Sprite
     sprite: _NF/Structures/Storage/Crates/contraband3_crate.rsi
+    layers:
+    - state: icon
+    - sprite: _NF/Interface/Misc/cargo_destination_icons.rsi
+      state: cargo_other
+      map: ["enum.TradeCrateVisualLayers.Icon"]
+      visible: false
+    - sprite: _NF/Interface/Misc/cargo_destination_icons.rsi
+      state: cargo_priority_inactive
+      map: ["enum.TradeCrateVisualLayers.Priority"]
+      visible: false
   - type: TradeCrate
     valueAtDestination: 7500
     valueElsewhere: 3750
@@ -169,6 +219,16 @@
     sprite: _NF/Structures/Storage/Crates/donkco_crate.rsi
   - type: Sprite
     sprite: _NF/Structures/Storage/Crates/donkco_crate.rsi
+    layers:
+    - state: icon
+    - sprite: _NF/Interface/Misc/cargo_destination_icons.rsi
+      state: cargo_other
+      map: ["enum.TradeCrateVisualLayers.Icon"]
+      visible: false
+    - sprite: _NF/Interface/Misc/cargo_destination_icons.rsi
+      state: cargo_priority_inactive
+      map: ["enum.TradeCrateVisualLayers.Priority"]
+      visible: false
   - type: TradeCrate
     valueAtDestination: 10000
     valueElsewhere: 5000
@@ -186,6 +246,16 @@
     sprite: _NF/Structures/Storage/Crates/cybersun_crate.rsi
   - type: Sprite
     sprite: _NF/Structures/Storage/Crates/cybersun_crate.rsi
+    layers:
+    - state: icon
+    - sprite: _NF/Interface/Misc/cargo_destination_icons.rsi
+      state: cargo_other
+      map: ["enum.TradeCrateVisualLayers.Icon"]
+      visible: false
+    - sprite: _NF/Interface/Misc/cargo_destination_icons.rsi
+      state: cargo_priority_inactive
+      map: ["enum.TradeCrateVisualLayers.Priority"]
+      visible: false
   - type: TradeCrate
     valueAtDestination: 10000
     valueElsewhere: 5000
diff --git a/Resources/Prototypes/_NF/PointsOfInterest/depots.yml b/Resources/Prototypes/_NF/PointsOfInterest/depots.yml
index 53abefb0626..f7e3f5345a0 100644
--- a/Resources/Prototypes/_NF/PointsOfInterest/depots.yml
+++ b/Resources/Prototypes/_NF/PointsOfInterest/depots.yml
@@ -31,6 +31,7 @@
   name: Cargo Depot
   minimumDistance: 4500
   maximumDistance: 6000
+  spawnGamePreset: [ NFAdventure, NFPirate ]
   spawnGroup: CargoDepot
   gridPath: /Maps/_NF/POI/cargodepotalt.yml
   addComponents: