diff --git a/artsrc/cnc/buttons.svg b/artsrc/cnc/buttons.svg
new file mode 100644
index 0000000000..2960a85eed
--- /dev/null
+++ b/artsrc/cnc/buttons.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="buttons.svg"
+   inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/uibits/shellmap-border.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4"
+     inkscape:cx="38.797739"
+     inkscape:cy="49.497475"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1386"
+     inkscape:window-height="856"
+     inkscape:window-x="54"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-924.3622)">
+    <rect
+       style="fill:#2b0000;fill-opacity:0.50196078;stroke:#800000;stroke-width:2;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none"
+       id="rect3776"
+       width="126"
+       height="126"
+       x="1"
+       y="925.36218" />
+  </g>
+</svg>
diff --git a/mods/cnc/chrome.yaml b/mods/cnc/chrome.yaml
index 301e827b13..91e8ea9d2e 100644
--- a/mods/cnc/chrome.yaml
+++ b/mods/cnc/chrome.yaml
@@ -1,6 +1,7 @@
 shellmap: reticle.png
 	reticle: 0,0,512,512
-
+logo: logo.png
+	logo:0,0,128,128
 chrome-gdi: chrome-gdi.png
 	specialbin-top: 0,0,30,51
 	specialbin-middle: 0,51,30,51
@@ -140,16 +141,16 @@ dialog: dialog.png
 	corner-bl: 0,82,46,46
 	corner-br: 82,82,46,46
 
-dialog2: dialog2.png
-	background: 1,1,126,126
-	border-r: 127,1,1,126
-	border-l: 0,1,1,126
-	border-b: 1,127,126,1
-	border-t: 1,0,126,1
-	corner-tl: 0,0,1,1
-	corner-tr: 82,0,1,1
-	corner-bl: 0,82,1,1
-	corner-br: 82,82,1,1
+dialog2: uibuttons.png
+	background: 2,2,124,124
+	border-r: 126,2,2,124
+	border-l: 0,2,2,124
+	border-b: 2,126,124,2
+	border-t: 2,0,124,2
+	corner-tl: 0,0,2,2
+	corner-tr: 126,0,2,2
+	corner-bl: 0,126,2,2
+	corner-br: 126,126,2,2
 
 dialog3: dialog3.png
 	background: 1,1,126,126
diff --git a/mods/cnc/chrome/mainmenu.yaml b/mods/cnc/chrome/mainmenu.yaml
index a4b28040f8..1a2b94a9e9 100644
--- a/mods/cnc/chrome/mainmenu.yaml
+++ b/mods/cnc/chrome/mainmenu.yaml
@@ -21,50 +21,50 @@ Container@MAINMENU_BG:
 			Background:shellmapborder
 		Button@MAINMENU_BUTTON_JOIN:
 			Id:MAINMENU_BUTTON_JOIN
-			X:45
-			Y:70
+			X:WINDOW_RIGHT-WIDTH-47
+			Y:150
 			Width:160
-			Height:25
-			Text:Join Game
+			Height:35
+			Text:Campaign
 			Bold:True
 		Button@MAINMENU_BUTTON_CREATE:
 			Id:MAINMENU_BUTTON_CREATE
-			X:45
-			Y:110
+			X:WINDOW_RIGHT-WIDTH-47
+			Y:200
 			Width:160
-			Height:25
-			Text:Create Game
+			Height:35
+			Text:Skirmish/Online
 			Bold:True
 		Button@MAINMENU_BUTTON_SETTINGS:
 			Id:MAINMENU_BUTTON_SETTINGS
-			X:45
-			Y:150
+			X:WINDOW_RIGHT-WIDTH-47
+			Y:250
 			Width:160
-			Height:25
+			Height:35
 			Text:Settings
 			Bold:True
 		Button@MAINMENU_BUTTON_MUSIC:
 			Id:MAINMENU_BUTTON_MUSIC
-			X:45
-			Y:190
+			X:WINDOW_RIGHT-WIDTH-47
+			Y:300
 			Width:160
-			Height:25
+			Height:35
 			Text:Music
 			Bold:True
 		Button@MAINMENU_BUTTON_REPLAY_VIEWER:
 			Id:MAINMENU_BUTTON_REPLAY_VIEWER
-			X:45
-			Y:230
+			X:WINDOW_RIGHT-WIDTH-47
+			Y:350
 			Width:160
-			Height:25
+			Height:35
 			Text: Replay Viewer
 			Bold: True
 		Button@MAINMENU_BUTTON_QUIT:
 			Id:MAINMENU_BUTTON_QUIT
-			X:45
-			Y:270
+			X:WINDOW_RIGHT-WIDTH-47
+			Y:400
 			Width:160
-			Height:25
+			Height:35
 			Text:Quit
 			Bold:True
 Background@QUICKMODSWITCHER:
@@ -73,6 +73,7 @@ Background@QUICKMODSWITCHER:
 	X:(WINDOW_RIGHT - PARENT_LEFT - WIDTH - 10)
 	Y:10 - PARENT_TOP
 	Width:205
+	Visible:false
 	Height:65
 	Children:
 		Label@TITLE:
diff --git a/mods/cnc/uibits/uibuttons.png b/mods/cnc/uibits/uibuttons.png
new file mode 100644
index 0000000000..3e47a19278
Binary files /dev/null and b/mods/cnc/uibits/uibuttons.png differ