diff --git a/js/client-mainmenu.js b/js/client-mainmenu.js
index 724552401..da936ef78 100644
--- a/js/client-mainmenu.js
+++ b/js/client-mainmenu.js
@@ -193,7 +193,7 @@
 				buf += '<h3><button class="closebutton" href="' + app.root + 'teambuilder" tabindex="-1" aria-label="Close"><i class="fa fa-times-circle"></i></button>';
 				buf += '<button class="minimizebutton" href="' + app.root + 'teambuilder" tabindex="-1" aria-label="Minimize"><i class="fa fa-minus-circle"></i></button>';
 				buf += group + BattleLog.escapeHTML(name.substr(1)) + '</h3>';
-				buf += '<div class="pm-log"><div class="inner" role="log"><div class="pm-buttonbar"><button class="pm-challenge">Challenge</button> <button class="pm-userOptions">...</button></div></div></div>';
+				buf += '<div class="pm-log"><div class="pm-buttonbar"><button class="pm-challenge">Challenge</button><button class="pm-userOptions">...</button></div><div class="inner" role="log"></div></div>';
 				buf += '<div class="pm-log-add"><form class="chatbox nolabel"><textarea class="textbox" type="text" size="70" autocomplete="off" name="message"></textarea></form></div></div>';
 				$pmWindow = $(buf).prependTo(this.$pmBox);
 				$pmWindow.find('textarea').autoResize({
diff --git a/style/client.css b/style/client.css
index de2d487c4..0e8efc8a3 100644
--- a/style/client.css
+++ b/style/client.css
@@ -1684,6 +1684,19 @@ a.ilink.yours {
 	-webkit-overflow-scrolling: touch;
 	overflow-scrolling: touch;
 }
+.pm-buttonbar {
+	height: 21px;
+}
+.pm-buttonbar button {
+	float: left;
+	font: 8pt Verdana, sans-serif;
+	height: 21px;
+	background: #EEF2F5;
+	color: black;
+	border: 0;
+	border-right: 1px solid #AAAAAA;
+	border-bottom: 1px solid #AAAAAA;
+}
 .userlist-minimized {
 	height: 21px;
 	bottom: auto;
@@ -1702,7 +1715,8 @@ a.ilink.yours {
 	cursor: pointer;
 }
 .userlist-minimized .userlist-count:hover,
-.userlist-maximized .userlist-count:hover {
+.userlist-maximized .userlist-count:hover,
+.pm-buttonbar button:hover {
 	background: #DEE4EA;
 }
 .chat-log.hasuserlist,
@@ -3244,12 +3258,14 @@ a.ilink.yours {
 	background: #444444;
 	color: #DDD;
 }
-.dark .userlist-minimized {
+.dark .userlist-minimized,
+.dark .pm-buttonbar button {
 	background: #444444;
 	color: #4488EE;
 }
 .dark .userlist-minimized .userlist-count:hover,
-.dark .userlist-maximized .userlist-count:hover {
+.dark .userlist-maximized .userlist-count:hover,
+.dark .pm-buttonbar button:hover {
 	background: #666666;
 }