diff --git a/OpenRA.Mods.RA/Widgets/Logic/ReplayControlBarLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/ReplayControlBarLogic.cs
index 179ecc6995..a2530d9302 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/ReplayControlBarLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/ReplayControlBarLogic.cs
@@ -22,9 +22,9 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 		{
 			if (world.IsReplay)
 			{
-				var container = widget.Get<ContainerWidget>("REPLAY_PLAYER");
+				var container = widget.Get("REPLAY_PLAYER");
 
-				var background = widget.Parent.GetOrNull<BackgroundWidget>("OBSERVER_CONTROL_BG");
+				var background = widget.Parent.GetOrNull("OBSERVER_CONTROL_BG");
 				if (background != null)
 					background.Bounds.Height += container.Bounds.Height;
 
diff --git a/mods/cnc/chrome/ingame.yaml b/mods/cnc/chrome/ingame.yaml
index f8f7e73c6e..c2d9ef3671 100644
--- a/mods/cnc/chrome/ingame.yaml
+++ b/mods/cnc/chrome/ingame.yaml
@@ -86,85 +86,78 @@ Container@OBSERVER_WIDGETS:
 					Y:1
 					Width:PARENT_RIGHT-2
 					Height:PARENT_BOTTOM-2
-		Background@OBSERVER_CONTROL_BG:
+		Background@REPLAY_PLAYER:
+			Logic:ReplayControlBarLogic
+			X:WINDOW_RIGHT-173
+			Y:195
+			Width:168
+			Height:46
+			Background:panel-black
+			Visible:false
+			Children:
+				Button@BUTTON_PAUSE:
+					X:14
+					Y:10
+					Width:26
+					Height:26
+					IgnoreChildMouseOver:true
+					Children:
+						Image@IMAGE_PAUSE:
+							X:5
+							Y:5
+							Width:16
+							Height:16
+							ImageCollection:music
+							ImageName:pause
+				Button@BUTTON_SLOW:
+					X:14 + 38
+					Y:10
+					Width:26
+					Height:26
+					IgnoreChildMouseOver:true
+					Children:
+						Image@IMAGE_SLOW:
+							X:5
+							Y:5
+							Width:16
+							Height:16
+							ImageCollection:music
+							ImageName:slowmo
+				Button@BUTTON_NORMALSPEED:
+					X:14 + 38*2
+					Y:10
+					Width:26
+					Height:26
+					IgnoreChildMouseOver:true
+					Children:
+						Image@IMAGE_PLAY:
+							X:5
+							Y:5
+							Width:16
+							Height:16
+							ImageCollection:music
+							ImageName:play
+				Button@BUTTON_FASTFORWARD:
+					X:14 + 38*3
+					Y:10
+					Width:26
+					Height:26
+					IgnoreChildMouseOver:true
+					Children:
+						Image@IMAGE_FASTFORWARD:
+							X:5
+							Y:5
+							Width:16
+							Height:16
+							ImageCollection:music
+							ImageName:fastforward
+		DropDownButton@SHROUD_SELECTOR:
+			Logic:ObserverShroudSelectorLogic
 			X:WINDOW_RIGHT-173
 			Y:172
 			Width:168
-			Height:35
-			Background:panel-black
-			Children:
-				DropDownButton@SHROUD_SELECTOR:
-					Logic:ObserverShroudSelectorLogic
-					X:5
-					Y:5
-					Width:158
-					Height:25
-					Font:Bold
-					Visible:true
-				Container@REPLAY_PLAYER:
-					Logic:ReplayControlBarLogic
-					X:PARENT_RIGHT/2 - 70
-					Y:30
-					Width:160
-					Height:35
-					Visible:false
-					Children:
-						Button@BUTTON_PAUSE:
-							X:5
-							Y:5
-							Width:26
-							Height:26
-							IgnoreChildMouseOver:true
-							Children:
-								Image@IMAGE_PAUSE:
-									X:5
-									Y:5
-									Width:16
-									Height:16
-									ImageCollection:music
-									ImageName:pause
-						Button@BUTTON_SLOW:
-							X:40
-							Y:5
-							Width:26
-							Height:26
-							IgnoreChildMouseOver:true
-							Children:
-								Image@IMAGE_SLOW:
-									X:5
-									Y:5
-									Width:16
-									Height:16
-									ImageCollection:music
-									ImageName:slowmo
-						Button@BUTTON_NORMALSPEED:
-							X:75
-							Y:5
-							Width:26
-							Height:26
-							IgnoreChildMouseOver:true
-							Children:
-								Image@IMAGE_PLAY:
-									X:5
-									Y:5
-									Width:16
-									Height:16
-									ImageCollection:music
-									ImageName:play
-						Button@BUTTON_FASTFORWARD:
-							X:110
-							Y:5
-							Width:26
-							Height:26
-							IgnoreChildMouseOver:true
-							Children:
-								Image@IMAGE_FASTFORWARD:
-									X:5
-									Y:5
-									Width:16
-									Height:16
-									ImageCollection:music
-									ImageName:fastforward
+			Height:25
+			Font:Bold
 
 Container@PLAYER_WIDGETS:
 	Children: