diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex
index 603f841f..3d73c46f 100644
Binary files a/mpq/arr/flingy.datex and b/mpq/arr/flingy.datex differ
diff --git a/mpq/arr/flingy.txt b/mpq/arr/flingy.txt
index 817bbd5f..6263a3b4 100644
--- a/mpq/arr/flingy.txt
+++ b/mpq/arr/flingy.txt
@@ -590,8 +590,8 @@ Vulture (Hecaton)
 Tartarus Mine (Hecaton)
 Madrigal (Hecaton, Imperioso)
 Madrigal Turret (Hecaton, Imperioso)
-Extended Flingy #384
-Extended Flingy #385
+Madrigal (Hecaton, Furia)
+Madrigal Turret (Hecaton, Furia)
 Extended Flingy #386
 Extended Flingy #387
 Extended Flingy #388
diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex
index 9d0d0388..c5bb5c8e 100644
Binary files a/mpq/arr/images.datex and b/mpq/arr/images.datex differ
diff --git a/mpq/arr/images.tbl b/mpq/arr/images.tbl
index 157160fb..0ca4bc1c 100644
Binary files a/mpq/arr/images.tbl and b/mpq/arr/images.tbl differ
diff --git a/mpq/arr/images.txt b/mpq/arr/images.txt
index 6716707b..0cc245fc 100644
--- a/mpq/arr/images.txt
+++ b/mpq/arr/images.txt
@@ -2103,8 +2103,8 @@ Tartarus Mine (Hecaton) Shadow
 Madrigal (Hecaton, Imperioso)
 Madrigal (Hecaton, Imperioso) Shadow
 Madrigal Turret (Hecaton, Imperioso)
-Extended Image #1103
-Extended Image #1104
+Madrigal (Hecaton, Furia)
+Madrigal Turret (Hecaton, Furia)
 Extended Image #1105
 Extended Image #1106
 Extended Image #1107
diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex
index 17694c05..72528e6a 100644
Binary files a/mpq/arr/sprites.datex and b/mpq/arr/sprites.datex differ
diff --git a/mpq/arr/sprites.txt b/mpq/arr/sprites.txt
index 901985e4..0650b150 100644
--- a/mpq/arr/sprites.txt
+++ b/mpq/arr/sprites.txt
@@ -1039,8 +1039,8 @@ Vulture (Hecaton)
 Tartarus Mine (Hecaton)
 Madrigal (Hecaton, Imperioso)
 Madrigal Turret (Hecaton, Imperioso)
-Extended Sprite #525
-Extended Sprite #526
+Madrigal (Hecaton, Furia)
+Madrigal Turret (Hecaton, Furia)
 Extended Sprite #527
 Extended Sprite #528
 Extended Sprite #529
diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex
index 59ac5b2a..9f169640 100644
Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ
diff --git a/mpq/unit/cm/faction-t/madrigal-hecaton-base.grp b/mpq/unit/cm/faction-t/madrigal-hecaton-base.grp
new file mode 100644
index 00000000..ef3ef22c
Binary files /dev/null and b/mpq/unit/cm/faction-t/madrigal-hecaton-base.grp differ
diff --git a/mpq/unit/cm/faction-t/madrigal-hecaton-turret.grp b/mpq/unit/cm/faction-t/madrigal-hecaton-turret.grp
new file mode 100644
index 00000000..14c5a0e1
Binary files /dev/null and b/mpq/unit/cm/faction-t/madrigal-hecaton-turret.grp differ
diff --git a/mpq/unit/cm/terran/madrigal-base.grp b/mpq/unit/cm/terran/madrigal-base.grp
index 86987278..aee36612 100644
Binary files a/mpq/unit/cm/terran/madrigal-base.grp and b/mpq/unit/cm/terran/madrigal-base.grp differ
diff --git a/mpq/unit/cm/terran/madrigal-turret.grp b/mpq/unit/cm/terran/madrigal-turret.grp
index 737fc825..df3844b4 100644
Binary files a/mpq/unit/cm/terran/madrigal-turret.grp and b/mpq/unit/cm/terran/madrigal-turret.grp differ
diff --git a/patchnotes.md b/patchnotes.md
index d623febf..b338f7e0 100644
--- a/patchnotes.md
+++ b/patchnotes.md
@@ -15,10 +15,12 @@
 - **Audiovisual:**
 	- Fixed wonky birth and mutation animations for the Izirokor (c. Solstice)
 	- Added **Miasma** passive icons & tooltips to **Kagralisk** and **Cherbrathalor** (r. Raenarill)
+	- Fixed **Golden Republic Blackjack** build icon missing before Scrapyard completion (r. SgzzZ)
 	- Added **Brontes Payload** icon to **Futurist Cyclops** (r. Raenarill)
 
 ## Audiovisuals
 - Modified models for:
+	- **Madrigal** (material updates)
 	- **Legionnaire** and **Izirokor** (slight size increases, c. Solstice)
 - New portrait for:
 	- **Izirokor** (c. Solstice)
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index 20df2f4a..f26aeb49 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ