diff --git a/mods/d2k/rules/atreides.yaml b/mods/d2k/rules/atreides.yaml
index 53cf5b8218..27888d3ddc 100644
--- a/mods/d2k/rules/atreides.yaml
+++ b/mods/d2k/rules/atreides.yaml
@@ -25,8 +25,6 @@ REFA:
 	Inherits: ^REFINERY
 	Buildable:
 		Owner: atreides
-	RenderBuildingWarFactory:
-		Image: REFA
 
 BARRA:
 	Inherits: ^BARRACKS
@@ -76,15 +74,11 @@ LIGHTA:
 	Inherits: ^LIGHT
 	Buildable:
 		Owner: atreides
-	RenderBuildingWarFactory:
-		Image: LIGHTA
 
 HEAVYA:
 	Inherits: ^HEAVY
 	Buildable:
 		Owner: atreides
-	RenderBuildingWarFactory:
-		Image: HEAVYA
 
 RADARA:
 	Inherits: ^RADAR
diff --git a/mods/d2k/rules/harkonnen.yaml b/mods/d2k/rules/harkonnen.yaml
index 2fb4408687..0059cd8e5a 100644
--- a/mods/d2k/rules/harkonnen.yaml
+++ b/mods/d2k/rules/harkonnen.yaml
@@ -25,8 +25,6 @@ REFH:
 	Inherits: ^REFINERY
 	Buildable:
 		Owner: harkonnen
-	RenderBuildingWarFactory:
-		Image: REFH
 
 BARRH:
 	Inherits: ^BARRACKS
@@ -53,15 +51,11 @@ LIGHTH:
 	Inherits: ^LIGHT
 	Buildable:
 		Owner: harkonnen
-	RenderBuildingWarFactory:
-		Image: LIGHTH
 
 HEAVYH:
 	Inherits: ^HEAVY
 	Buildable:
 		Owner: harkonnen
-	RenderBuildingWarFactory:
-		Image: HEAVYH
 
 RADARH:
 	Inherits: ^RADAR
diff --git a/mods/d2k/rules/ordos.yaml b/mods/d2k/rules/ordos.yaml
index 2b8d64b9f2..04ae639c57 100644
--- a/mods/d2k/rules/ordos.yaml
+++ b/mods/d2k/rules/ordos.yaml
@@ -25,8 +25,6 @@ REFO:
 	Inherits: ^REFINERY
 	Buildable:
 		Owner: ordos
-	RenderBuildingWarFactory:
-		Image: REFO
 
 BARRO:
 	Inherits: ^BARRACKS
@@ -52,15 +50,11 @@ LIGHTO:
 	Inherits: ^LIGHT
 	Buildable:
 		Owner: ordos
-	RenderBuildingWarFactory:
-		Image: LIGHTO
 
 HEAVYO:
 	Inherits: ^HEAVY
 	Buildable:
 		Owner: ordos
-	RenderBuildingWarFactory:
-		Image: HEAVYO
 
 RADARO:
 	Inherits: ^RADAR
diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml
index 816b28b5f7..83699966ad 100644
--- a/mods/d2k/rules/structures.yaml
+++ b/mods/d2k/rules/structures.yaml
@@ -176,7 +176,6 @@ CONCRETEB:
 		Type: Wood
 	RevealsShroud:
 		Range: 6c0
-	-RenderBuilding:
 	OreRefinery:
 		DockOffset: 2,1
 		DockAngle: 160
@@ -198,6 +197,8 @@ CONCRETEB:
 		Sequence: smoke
 	Power:
 		Amount: -30
+	WithIdleOverlay@TOP:
+		Sequence: idle-top
 
 ^SILO:
 	Inherits: ^Building
@@ -256,7 +257,6 @@ CONCRETEB:
 		Type: Wood
 	RevealsShroud:
 		Range: 4c0
-	-RenderBuilding:
 	RallyPoint:
 		RallyPoint: 2,2
 	Exit@1:
@@ -270,6 +270,8 @@ CONCRETEB:
 		Prerequisite: Light
 	WithProductionOverlay@WELDING:
 		Sequence: production-welding
+	WithIdleOverlay@TOP:
+		Sequence: idle-top
 	Power:
 		Amount: -20
 
@@ -297,7 +299,6 @@ CONCRETEB:
 		Type: Wood
 	RevealsShroud:
 		Range: 4c0
-	-RenderBuilding:
 	RallyPoint:
 		RallyPoint: 0,3
 	Exit@1:
@@ -311,6 +312,8 @@ CONCRETEB:
 		Prerequisite: Heavy
 	WithProductionOverlay@WELDING:
 		Sequence: production-welding
+	WithIdleOverlay@TOP:
+		Sequence: idle-top
 	Power:
 		Amount: -30
 
@@ -739,8 +742,6 @@ PALACEC:
 HEAVYC:
 	Inherits: ^HEAVY
 	-Buildable:
-	RenderBuildingWarFactory:
-		Image: HEAVYC
 
 CONYARD:
 	Tooltip:
diff --git a/mods/d2k/sequences/structures.yaml b/mods/d2k/sequences/structures.yaml
index 598f9ca001..6f1bf2a411 100644
--- a/mods/d2k/sequences/structures.yaml
+++ b/mods/d2k/sequences/structures.yaml
@@ -693,14 +693,6 @@ lighta:
 	damaged-idle: DATA
 		Start: 2673
 		Offset: -48,64
-	build-top: DATA
-		Start: 2674
-		Length: 1
-		Offset: -48,64
-	damaged-build-top: DATA
-		Start: 2675
-		Length: 1
-		Offset: -48,64
 	idle-top: DATA
 		Start: 2674
 		Offset: -48,64
@@ -742,14 +734,6 @@ heavya:
 	damaged-idle: DATA
 		Start: 2518
 		Offset: -48,80
-	build-top: DATA
-		Start: 2519
-		Length: 1
-		Offset: -48,80
-	damaged-build-top: DATA
-		Start: 2520
-		Length: 1
-		Offset: -48,80
 	idle-top: DATA
 		Start: 2519
 		Offset: -48,80
@@ -1104,14 +1088,6 @@ lighth:
 	damaged-idle: DATA
 		Start: 2833
 		Offset: -48,64
-	build-top: DATA
-		Start: 2834
-		Length: 1
-		Offset: -48,64
-	damaged-build-top: DATA
-		Start: 2835
-		Length: 1
-		Offset: -48,64
 	idle-top: DATA
 		Start: 2834
 		Offset: -48,64
@@ -1153,14 +1129,6 @@ heavyh:
 	damaged-idle: DATA
 		Start: 2678
 		Offset: -48,80
-	build-top: DATA
-		Start: 2679
-		Length: 1
-		Offset: -48,80
-	damaged-build-top: DATA
-		Start: 2680
-		Length: 1
-		Offset: -48,80
 	idle-top: DATA
 		Start: 2679
 		Offset: -48,80
@@ -1508,14 +1476,6 @@ lighto:
 	damaged-idle: DATA
 		Start: 2993
 		Offset: -48,64
-	build-top: DATA
-		Start: 2994
-		Length: 1
-		Offset: -48,64
-	damaged-build-top: DATA
-		Start: 2995
-		Length: 1
-		Offset: -48,64
 	idle-top: DATA
 		Start: 2994
 		Offset: -48,64
@@ -1557,14 +1517,6 @@ heavyo:
 	damaged-idle: DATA
 		Start: 2838
 		Offset: -48,80
-	build-top: DATA
-		Start: 2839
-		Length: 1
-		Offset: -48,80
-	damaged-build-top: DATA
-		Start: 2840
-		Length: 1
-		Offset: -48,80
 	idle-top: DATA
 		Start: 2839
 		Offset: -48,80
@@ -1677,14 +1629,6 @@ heavyc: # TODO: unused
 	damaged-idle: DATA
 		Start: 3001
 		Offset: -48,64
-	build-top: DATA
-		Start: 3002
-		Length: 1
-		Offset: -48,64
-	damaged-build-top: DATA
-		Start: 3003
-		Length: 1
-		Offset: -48,64
 	idle-top: DATA
 		Start: 3002
 		Offset: -48,64