diff --git a/OpenRA.Mods.Cnc/Widgets/CncMapChooserLogic.cs b/OpenRA.Mods.Cnc/Widgets/CncMapChooserLogic.cs
index 4a861e4601..73bcc0e927 100644
--- a/OpenRA.Mods.Cnc/Widgets/CncMapChooserLogic.cs
+++ b/OpenRA.Mods.Cnc/Widgets/CncMapChooserLogic.cs
@@ -15,6 +15,7 @@ using OpenRA.Network;
 using OpenRA.Widgets;
 using System.IO;
 using System;
+using OpenRA.Graphics;
 
 namespace OpenRA.Mods.Cnc.Widgets
 {
@@ -67,7 +68,7 @@ namespace OpenRA.Mods.Cnc.Widgets
 					continue;
 
 				var template = itemTemplate.Clone() as ContainerWidget;
-				template.GetBackground = () => ((Map == map) ? "panel-darkred" : null);
+				template.GetBackground = () => (template.RenderBounds.Contains(Viewport.LastMousePos) ? "button-hover" : (Map == map) ? "button-pressed" : null);
 				template.OnMouseDown = mi => { if (mi.Button != MouseButton.Left) return false;  Map = map; return true; };
 				template.IsVisible = () => true;
 				template.GetWidget<LabelWidget>("TITLE").GetText = () => map.Title;
diff --git a/OpenRA.Mods.Cnc/Widgets/CncReplayBrowserLogic.cs b/OpenRA.Mods.Cnc/Widgets/CncReplayBrowserLogic.cs
index 5c596de7d9..cb8f300598 100644
--- a/OpenRA.Mods.Cnc/Widgets/CncReplayBrowserLogic.cs
+++ b/OpenRA.Mods.Cnc/Widgets/CncReplayBrowserLogic.cs
@@ -16,6 +16,7 @@ using OpenRA.FileFormats;
 using OpenRA.Network;
 using OpenRA.Widgets;
 using OpenRA.Mods.RA.Widgets.Delegates;
+using OpenRA.Graphics;
 
 namespace OpenRA.Mods.Cnc.Widgets
 {
@@ -101,7 +102,7 @@ namespace OpenRA.Mods.Cnc.Widgets
 			var entry = template.Clone() as ContainerWidget;
 			var f = Path.GetFileName(filename);
 			entry.GetWidget<LabelWidget>("TITLE").GetText = () => f;
-			entry.GetBackground = () => (CurrentReplay == filename) ? "panel-darkred" : null;
+			entry.GetBackground = () => (entry.RenderBounds.Contains(Viewport.LastMousePos) ? "button-hover" : (CurrentReplay == filename) ? "button-pressed" : null);
 			entry.OnMouseDown = mi => { if (mi.Button != MouseButton.Left) return false; CurrentReplay = filename; return true; };
 			entry.IsVisible = () => true;
 			list.AddChild(entry);
diff --git a/OpenRA.Mods.Cnc/Widgets/CncServerBrowserLogic.cs b/OpenRA.Mods.Cnc/Widgets/CncServerBrowserLogic.cs
index 9fcfcd94a7..8ccc44c185 100644
--- a/OpenRA.Mods.Cnc/Widgets/CncServerBrowserLogic.cs
+++ b/OpenRA.Mods.Cnc/Widgets/CncServerBrowserLogic.cs
@@ -15,6 +15,7 @@ using OpenRA.FileFormats;
 using OpenRA.Server;
 using OpenRA.Widgets;
 using OpenRA.Mods.RA.Widgets.Delegates;
+using OpenRA.Graphics;
 
 namespace OpenRA.Mods.Cnc.Widgets
 {
@@ -164,7 +165,7 @@ namespace OpenRA.Mods.Cnc.Widgets
 				var game = loop;
 				
 				var template = serverTemplate.Clone() as ContainerWidget;
-				template.GetBackground = () => (currentServer == game) ? "panel-darkred" : null;
+				template.GetBackground = () => (template.RenderBounds.Contains(Viewport.LastMousePos) ? "button-hover" : (currentServer == game) ? "button-pressed" : null);
 				template.OnMouseDown = mi => { if (mi.Button != MouseButton.Left) return false; currentServer = game; return true; };
 				template.IsVisible = () => true;
 				template.GetWidget<LabelWidget>("TITLE").GetText = () => game.Name;