diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex
index 83d1bf85..fd7fac56 100644
Binary files a/mpq/arr/sprites.datex and b/mpq/arr/sprites.datex differ
diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex
index 5a286e4c..52a3fdba 100644
Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ
diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp
index bace9c38..213958cb 100644
Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ
diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin
index b932fde0..dd90ae95 100644
Binary files a/mpq/scripts/iscript_terran.bin and b/mpq/scripts/iscript_terran.bin differ
diff --git a/mpq/scripts/iscript_terran.txt b/mpq/scripts/iscript_terran.txt
index 2320f4b3..d9f8f237 100644
--- a/mpq/scripts/iscript_terran.txt
+++ b/mpq/scripts/iscript_terran.txt
@@ -207,7 +207,7 @@ TrojanDeath:
 
 TrojanWalking:
 	setvertpos        	0
-	imgol             	225 0 5 # Trojan Engines (thingy\tdrGlow.grp)
+	imgol             	225 0 0 # Trojan Engines (thingy\tdrGlow.grp)
 	goto              	SkryrokorLocal00
 
 # ----------------------------------------------------------------------------- #
diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp
index ed5ab512..521b3046 100644
Binary files a/mpq/unit/cmdbtns/cmdicons.grp and b/mpq/unit/cmdbtns/cmdicons.grp differ
diff --git a/mpq/unit/cmdbtns/uniticons.grp b/mpq/unit/cmdbtns/uniticons.grp
index 35c73b0b..b826b894 100644
Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ
diff --git a/mpq/unit/terran/trojan-engine.grp b/mpq/unit/terran/trojan-engine.grp
index ea14367d..260bf62a 100644
Binary files a/mpq/unit/terran/trojan-engine.grp and b/mpq/unit/terran/trojan-engine.grp differ
diff --git a/mpq/unit/terran/trojan.grp b/mpq/unit/terran/trojan.grp
index c3fecea6..34009dc1 100644
Binary files a/mpq/unit/terran/trojan.grp and b/mpq/unit/terran/trojan.grp differ
diff --git a/mpq/unit/terran/valkyrie-engine.grp b/mpq/unit/terran/valkyrie-engine.grp
index 20e4cd0e..d18b0812 100644
Binary files a/mpq/unit/terran/valkyrie-engine.grp and b/mpq/unit/terran/valkyrie-engine.grp differ
diff --git a/mpq/unit/terran/valkyrie.grp b/mpq/unit/terran/valkyrie.grp
index 82eea103..7085b3a5 100644
Binary files a/mpq/unit/terran/valkyrie.grp and b/mpq/unit/terran/valkyrie.grp differ
diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp
index 811d2c25..cca12890 100644
Binary files a/mpq/unit/wirefram/grpwire.grp and b/mpq/unit/wirefram/grpwire.grp differ
diff --git a/mpq/unit/wirefram/wirefram.grp b/mpq/unit/wirefram/wirefram.grp
index eb34ec2b..12bf543d 100644
Binary files a/mpq/unit/wirefram/wirefram.grp and b/mpq/unit/wirefram/wirefram.grp differ
diff --git a/patchnotes.md b/patchnotes.md
index 80a5625a..05b8c46a 100644
--- a/patchnotes.md
+++ b/patchnotes.md
@@ -18,6 +18,7 @@
 
 ## Bugfixes
 - **Stability:**
+	- Resolved a crash when certain weapons targeted units directly on top of them (r. shopkeeper dog)
 	- Crashes now generate replays, which can be attached with your bug reports! (c. DF)
 	- Lardfix: Fixed rare crash from AI attack force handling (c. DF)
 - **Gameplay:**
@@ -25,6 +26,7 @@
 		- *Caveat: Still throws an error message and some abilities will issue move orders to units with insufficient energy*
 	- **Tethzorokor**s no longer fail to hit large enemies from certain angles
 	- Flying workers and **Dyad**s now use iscript-based movement, removing acceleration and eliminating rare visual and harvesting bugs
+	- The **Bounty** is no longer a resource drop-off point (r. ConcealedOrganic)
 	- Flyers can now correctly be loaded into air garrisons (e.g. Askosi Grandstand)
 	- **Scrapworld: Gold Rush** now correctly accounts for the resource cost of dual- and triple-birth units (r. shopkeeper dog)
 	- Computer-controlled **Cantavis** now spam **Psionic Storm** casts less frequently
@@ -46,8 +48,8 @@
 - Updated background graphics for Options and CrownLink Join menus (c. Jesse)
 - New models for:
 	- Eidolon (Solstice)
-	- Amaranth, Atreus, Zethrokor, Hydralisk (c. Baelethal)
-	- Inzorthrokor (Imicren), Sovrokor (Goszirith), Hydralisk (Orkoti), Iziralisk (Zorthos)
+	- Valkyrie, Trojan, Amaranth, Atreus, Zethrokor, Hydralisk (c. Baelethal)
+	- Valkyrie (Hecaton), Inzorthrokor (Imicren), Sovrokor (Goszirith), Hydralisk (Orkoti), Iziralisk (Zorthos)
 - New death SFX for:
 	- Striga (c. Milia)
 - Added unique shadows for **Vornath Pond**, **Chokral Chaszal**
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index a505fde3..bf861fc8 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ