diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs
index d6acaa3f790b..0db9114b5abe 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs
@@ -348,7 +348,6 @@ ScrollItemWidget EconomyStats(Player player)
 
 			template.Get<LabelWidget>("CASH").GetText = () => "$" + (res.Cash + res.Resources);
 			template.Get<LabelWidget>("EARNED_MIN").GetText = () => AverageEarnedPerMinute(res.Earned);
-			template.Get<LabelWidget>("EARNED_THIS_MIN").GetText = () => "$" + stats.EarnedThisMinute;
 			template.Get<LabelWidget>("EARNED").GetText = () => "$" + res.Earned;
 			template.Get<LabelWidget>("SPENT").GetText = () => "$" + res.Spent;
 
@@ -360,6 +359,10 @@ ScrollItemWidget EconomyStats(Player player)
 			var harvesters = template.Get<LabelWidget>("HARVESTERS");
 			harvesters.GetText = () => world.ActorsHavingTrait<Harvester>().Count(a => a.Owner == player && !a.IsDead).ToString();
 
+			var derricks = template.GetOrNull<LabelWidget>("DERRICKS");
+			if (derricks != null)
+				derricks.GetText = () => world.ActorsHavingTrait<UpdatesDerrickCount>().Count(a => a.Owner == player && !a.IsDead).ToString();
+
 			return template;
 		}
 
diff --git a/mods/cnc/chrome/ingame.yaml b/mods/cnc/chrome/ingame.yaml
index 3286379e875c..e8d448b9aa48 100644
--- a/mods/cnc/chrome/ingame.yaml
+++ b/mods/cnc/chrome/ingame.yaml
@@ -397,7 +397,7 @@ Container@OBSERVER_WIDGETS:
 						Container@ECONOMY_STATS_HEADERS:
 							X: 0
 							Y: 0
-							Width: 745
+							Width: 715
 							Height: PARENT_BOTTOM
 							Children:
 								ColorBlock@HEADER_COLOR:
@@ -436,16 +436,8 @@ Container@OBSERVER_WIDGETS:
 									Text: $/min
 									Align: Right
 									Shadow: True
-								Label@EARNED_THIS_MIN_HEADER:
-									X: 300
-									Width: 120
-									Height: PARENT_BOTTOM
-									Font: Bold
-									Text: Earned this min
-									Align: Right
-									Shadow: True
 								Label@ASSETS_HEADER:
-									X: 420
+									X: 300
 									Width: 80
 									Height: PARENT_BOTTOM
 									Font: Bold
@@ -453,7 +445,7 @@ Container@OBSERVER_WIDGETS:
 									Align: Right
 									Shadow: True
 								Label@EARNED_HEADER:
-									X: 500
+									X: 380
 									Width: 80
 									Height: PARENT_BOTTOM
 									Font: Bold
@@ -461,7 +453,7 @@ Container@OBSERVER_WIDGETS:
 									Align: Right
 									Shadow: True
 								Label@SPENT_HEADER:
-									X: 580
+									X: 460
 									Width: 80
 									Height: PARENT_BOTTOM
 									Font: Bold
@@ -469,13 +461,21 @@ Container@OBSERVER_WIDGETS:
 									Align: Right
 									Shadow: True
 								Label@HARVESTERS_HEADER:
-									X: 660
+									X: 540
 									Width: 80
 									Height: PARENT_BOTTOM
 									Font: Bold
 									Text: Harvesters
 									Align: Right
 									Shadow: True
+								Label@DERRICKS_HEADER:
+									X: 630
+									Width: 80
+									Height: PARENT_BOTTOM
+									Font: Bold
+									Text: Oil Derricks
+									Align: Right
+									Shadow: True
 						Container@PRODUCTION_STATS_HEADERS:
 							X: 0
 							Y: 0
@@ -773,7 +773,7 @@ Container@OBSERVER_WIDGETS:
 						ScrollItem@ECONOMY_PLAYER_TEMPLATE:
 							X: 0
 							Y: 0
-							Width: 745
+							Width: 715
 							Height: 24
 							BaseName: scrollitem-nohover
 							Children:
@@ -815,36 +815,36 @@ Container@OBSERVER_WIDGETS:
 									Height: PARENT_BOTTOM
 									Align: Right
 									Shadow: True
-								Label@EARNED_THIS_MIN:
+								Label@ASSETS:
 									X: 300
 									Y: 0
-									Width: 120
+									Width: 80
 									Height: PARENT_BOTTOM
 									Align: Right
 									Shadow: True
-								Label@ASSETS:
-									X: 420
+								Label@EARNED:
+									X: 380
 									Y: 0
 									Width: 80
 									Height: PARENT_BOTTOM
 									Align: Right
 									Shadow: True
-								Label@EARNED:
-									X: 500
+								Label@SPENT:
+									X: 460
 									Y: 0
 									Width: 80
 									Height: PARENT_BOTTOM
 									Align: Right
 									Shadow: True
-								Label@SPENT:
-									X: 580
+								Label@HARVESTERS:
+									X: 540
 									Y: 0
 									Width: 80
 									Height: PARENT_BOTTOM
 									Align: Right
 									Shadow: True
-								Label@HARVESTERS:
-									X: 660
+								Label@DERRICKS:
+									X: 630
 									Y: 0
 									Width: 80
 									Height: PARENT_BOTTOM
diff --git a/mods/cnc/rules/tech.yaml b/mods/cnc/rules/tech.yaml
index 74e598b9e5b1..32d23da819dd 100644
--- a/mods/cnc/rules/tech.yaml
+++ b/mods/cnc/rules/tech.yaml
@@ -18,6 +18,7 @@ V19:
 		ValidStances: Neutral, Enemy
 	SpawnActorOnDeath:
 		Actor: V19.Husk
+	UpdatesDerrickCount:
 
 V19.Husk:
 	Inherits: ^CivBuildingHusk
diff --git a/mods/common/chrome/ingame-observer.yaml b/mods/common/chrome/ingame-observer.yaml
index c07efa5e3afb..c60c2f012f84 100644
--- a/mods/common/chrome/ingame-observer.yaml
+++ b/mods/common/chrome/ingame-observer.yaml
@@ -301,7 +301,7 @@ Container@OBSERVER_WIDGETS:
 						Container@ECONOMY_STATS_HEADERS:
 							X: 0
 							Y: 0
-							Width: 740
+							Width: 620
 							Height: PARENT_BOTTOM
 							Children:
 								ColorBlock@HEADER_COLOR:
@@ -340,16 +340,8 @@ Container@OBSERVER_WIDGETS:
 									Text: $/min
 									Align: Right
 									Shadow: True
-								Label@EARNED_THIS_MIN_HEADER:
-									X: 295
-									Width: 120
-									Height: PARENT_BOTTOM
-									Font: Bold
-									Text: Earned this min
-									Align: Right
-									Shadow: True
 								Label@ASSETS_HEADER:
-									X: 415
+									X: 295
 									Width: 80
 									Height: PARENT_BOTTOM
 									Font: Bold
@@ -357,7 +349,7 @@ Container@OBSERVER_WIDGETS:
 									Align: Right
 									Shadow: True
 								Label@EARNED_HEADER:
-									X: 495
+									X: 375
 									Width: 80
 									Height: PARENT_BOTTOM
 									Font: Bold
@@ -365,7 +357,7 @@ Container@OBSERVER_WIDGETS:
 									Align: Right
 									Shadow: True
 								Label@SPENT_HEADER:
-									X: 575
+									X: 455
 									Width: 80
 									Height: PARENT_BOTTOM
 									Font: Bold
@@ -373,7 +365,7 @@ Container@OBSERVER_WIDGETS:
 									Align: Right
 									Shadow: True
 								Label@HARVESTERS_HEADER:
-									X: 655
+									X: 535
 									Width: 80
 									Height: PARENT_BOTTOM
 									Font: Bold
@@ -675,7 +667,7 @@ Container@OBSERVER_WIDGETS:
 						ScrollItem@ECONOMY_PLAYER_TEMPLATE:
 							X: 0
 							Y: 0
-							Width: 740
+							Width: 620
 							Height: 25
 							BaseName: scrollitem-nohover
 							Children:
@@ -715,36 +707,29 @@ Container@OBSERVER_WIDGETS:
 									Height: PARENT_BOTTOM
 									Align: Right
 									Shadow: True
-								Label@EARNED_THIS_MIN:
-									X: 295
-									Y: 0
-									Width: 120
-									Height: PARENT_BOTTOM
-									Align: Right
-									Shadow: True
 								Label@ASSETS:
-									X: 415
+									X: 295
 									Y: 0
 									Width: 80
 									Height: PARENT_BOTTOM
 									Align: Right
 									Shadow: True
 								Label@EARNED:
-									X: 495
+									X: 375
 									Y: 0
 									Width: 80
 									Height: PARENT_BOTTOM
 									Align: Right
 									Shadow: True
 								Label@SPENT:
-									X: 575
+									X: 455
 									Y: 0
 									Width: 80
 									Height: PARENT_BOTTOM
 									Align: Right
 									Shadow: True
 								Label@HARVESTERS:
-									X: 655
+									X: 535
 									Y: 0
 									Width: 80
 									Height: PARENT_BOTTOM
diff --git a/mods/ra/chrome/ingame-observer.yaml b/mods/ra/chrome/ingame-observer.yaml
index 984a9fdef8f1..71829dddb685 100644
--- a/mods/ra/chrome/ingame-observer.yaml
+++ b/mods/ra/chrome/ingame-observer.yaml
@@ -333,7 +333,7 @@ Container@OBSERVER_WIDGETS:
 						Container@ECONOMY_STATS_HEADERS:
 							X: 0
 							Y: 0
-							Width: 745
+							Width: 715
 							Height: PARENT_BOTTOM
 							Children:
 								ColorBlock@HEADER_COLOR:
@@ -372,16 +372,8 @@ Container@OBSERVER_WIDGETS:
 									Text: $/min
 									Align: Right
 									Shadow: True
-								Label@EARNED_THIS_MIN_HEADER:
-									X: 300
-									Width: 120
-									Height: PARENT_BOTTOM
-									Font: Bold
-									Text: Earned this min
-									Align: Right
-									Shadow: True
 								Label@ASSETS_HEADER:
-									X: 420
+									X: 300
 									Width: 80
 									Height: PARENT_BOTTOM
 									Font: Bold
@@ -389,7 +381,7 @@ Container@OBSERVER_WIDGETS:
 									Align: Right
 									Shadow: True
 								Label@EARNED_HEADER:
-									X: 500
+									X: 380
 									Width: 80
 									Height: PARENT_BOTTOM
 									Font: Bold
@@ -397,7 +389,7 @@ Container@OBSERVER_WIDGETS:
 									Align: Right
 									Shadow: True
 								Label@SPENT_HEADER:
-									X: 580
+									X: 460
 									Width: 80
 									Height: PARENT_BOTTOM
 									Font: Bold
@@ -405,13 +397,21 @@ Container@OBSERVER_WIDGETS:
 									Align: Right
 									Shadow: True
 								Label@HARVESTERS_HEADER:
-									X: 660
+									X: 540
 									Width: 80
 									Height: PARENT_BOTTOM
 									Font: Bold
 									Text: Harvesters
 									Align: Right
 									Shadow: True
+								Label@DERRICKS_HEADER:
+									X: 630
+									Width: 80
+									Height: PARENT_BOTTOM
+									Font: Bold
+									Text: Oil Derricks
+									Align: Right
+									Shadow: True
 						Container@PRODUCTION_STATS_HEADERS:
 							X: 0
 							Y: 0
@@ -711,7 +711,7 @@ Container@OBSERVER_WIDGETS:
 						ScrollItem@ECONOMY_PLAYER_TEMPLATE:
 							X: 0
 							Y: 0
-							Width: 745
+							Width: 715
 							Height: 24
 							BaseName: scrollitem-nohover
 							Children:
@@ -753,36 +753,36 @@ Container@OBSERVER_WIDGETS:
 									Height: PARENT_BOTTOM
 									Align: Right
 									Shadow: True
-								Label@EARNED_THIS_MIN:
+								Label@ASSETS:
 									X: 300
 									Y: 0
-									Width: 120
+									Width: 80
 									Height: PARENT_BOTTOM
 									Align: Right
 									Shadow: True
-								Label@ASSETS:
-									X: 420
+								Label@EARNED:
+									X: 380
 									Y: 0
 									Width: 80
 									Height: PARENT_BOTTOM
 									Align: Right
 									Shadow: True
-								Label@EARNED:
-									X: 500
+								Label@SPENT:
+									X: 460
 									Y: 0
 									Width: 80
 									Height: PARENT_BOTTOM
 									Align: Right
 									Shadow: True
-								Label@SPENT:
-									X: 580
+								Label@HARVESTERS:
+									X: 540
 									Y: 0
 									Width: 80
 									Height: PARENT_BOTTOM
 									Align: Right
 									Shadow: True
-								Label@HARVESTERS:
-									X: 660
+								Label@DERRICKS:
+									X: 630
 									Y: 0
 									Width: 80
 									Height: PARENT_BOTTOM
diff --git a/mods/ra/rules/civilian.yaml b/mods/ra/rules/civilian.yaml
index 36d1a1075749..b875fd890e30 100644
--- a/mods/ra/rules/civilian.yaml
+++ b/mods/ra/rules/civilian.yaml
@@ -504,6 +504,7 @@ OILB:
 	AppearsOnMapPreview:
 	GivesCashOnCapture:
 		Amount: 100
+	UpdatesDerrickCount:
 
 BR1:
 	Inherits: ^Bridge
diff --git a/mods/ts/chrome/ingame-observer.yaml b/mods/ts/chrome/ingame-observer.yaml
index 2b1d629c3653..3bfb06a11a56 100644
--- a/mods/ts/chrome/ingame-observer.yaml
+++ b/mods/ts/chrome/ingame-observer.yaml
@@ -301,7 +301,7 @@ Container@OBSERVER_WIDGETS:
 						Container@ECONOMY_STATS_HEADERS:
 							X: 0
 							Y: 0
-							Width: 745
+							Width: 625
 							Height: PARENT_BOTTOM
 							Children:
 								ColorBlock@HEADER_COLOR:
@@ -340,16 +340,8 @@ Container@OBSERVER_WIDGETS:
 									Text: $/min
 									Align: Right
 									Shadow: True
-								Label@EARNED_THIS_MIN_HEADER:
-									X: 300
-									Width: 120
-									Height: PARENT_BOTTOM
-									Font: Bold
-									Text: Earned this min
-									Align: Right
-									Shadow: True
 								Label@ASSETS_HEADER:
-									X: 420
+									X: 300
 									Width: 80
 									Height: PARENT_BOTTOM
 									Font: Bold
@@ -357,7 +349,7 @@ Container@OBSERVER_WIDGETS:
 									Align: Right
 									Shadow: True
 								Label@EARNED_HEADER:
-									X: 500
+									X: 380
 									Width: 80
 									Height: PARENT_BOTTOM
 									Font: Bold
@@ -365,7 +357,7 @@ Container@OBSERVER_WIDGETS:
 									Align: Right
 									Shadow: True
 								Label@SPENT_HEADER:
-									X: 580
+									X: 460
 									Width: 80
 									Height: PARENT_BOTTOM
 									Font: Bold
@@ -373,7 +365,7 @@ Container@OBSERVER_WIDGETS:
 									Align: Right
 									Shadow: True
 								Label@HARVESTERS_HEADER:
-									X: 660
+									X: 540
 									Width: 80
 									Height: PARENT_BOTTOM
 									Font: Bold
@@ -677,7 +669,7 @@ Container@OBSERVER_WIDGETS:
 						ScrollItem@ECONOMY_PLAYER_TEMPLATE:
 							X: 0
 							Y: 0
-							Width: 745
+							Width: 625
 							Height: 24
 							BaseName: scrollitem-nohover
 							Children:
@@ -719,36 +711,29 @@ Container@OBSERVER_WIDGETS:
 									Height: PARENT_BOTTOM
 									Align: Right
 									Shadow: True
-								Label@EARNED_THIS_MIN:
-									X: 300
-									Y: 0
-									Width: 120
-									Height: PARENT_BOTTOM
-									Align: Right
-									Shadow: True
 								Label@ASSETS:
-									X: 420
+									X: 300
 									Y: 0
 									Width: 80
 									Height: PARENT_BOTTOM
 									Align: Right
 									Shadow: True
 								Label@EARNED:
-									X: 500
+									X: 380
 									Y: 0
 									Width: 80
 									Height: PARENT_BOTTOM
 									Align: Right
 									Shadow: True
 								Label@SPENT:
-									X: 580
+									X: 460
 									Y: 0
 									Width: 80
 									Height: PARENT_BOTTOM
 									Align: Right
 									Shadow: True
 								Label@HARVESTERS:
-									X: 660
+									X: 540
 									Y: 0
 									Width: 80
 									Height: PARENT_BOTTOM