diff --git a/static/css/pad.css b/static/css/pad.css
index 5444800ab..362311fcb 100644
--- a/static/css/pad.css
+++ b/static/css/pad.css
@@ -1068,6 +1068,9 @@ margin-top: 1px;
 .buttonicon-clearauthorship {
   background-position: 0px -86px;
 }
+.buttonicon-settings {
+  background-position: 0px -436px;
+}
 .buttonicon-import_export {
   background-position: 0px -68px;
 }
@@ -1079,9 +1082,11 @@ margin-top: 1px;
 }
 .buttonicon-chat {
   background-position: 0px -102px;
+  display: inline-block;
 }
 .buttonicon-showusers {
   background-position: 0px -183px;
+  display: inline-block;
 }
 
 #usericon
@@ -1227,7 +1232,7 @@ label {
 
 .popup {
  font-size: 14px;
- width: 400px;
+ width: 450px;
  z-index: 500;
  padding: 10px;
  border-radius: 6px;
@@ -1269,6 +1274,8 @@ label {
 
 .right_popup {
  float: left;
+ width: 50%;
+ box-sizing: border-box;
  padding-left: 10px;
 }
 
@@ -1279,10 +1286,6 @@ label {
  display: none;
 }
 
-#settingsmenu .right_popup {
-  float:none;
-}
-
 .note {
  color: #ddd;
  font-size: 11px;
diff --git a/static/pad.html b/static/pad.html
index 43eea48b6..2d8889b1b 100644
--- a/static/pad.html
+++ b/static/pad.html
@@ -33,7 +33,7 @@
                 </li>
                 <li onClick="window.pad&amp;&amp;pad.editbarClick('underline');return false;" >
                     <a title="Underline (ctrl-U)">
-                        <div class="buttonicon buttonicon-underline" style="margin-top:1px;"></div>
+                        <div class="buttonicon buttonicon-underline"></div>
                     </a>
                 </li>
                 <li onClick="window.pad&amp;&amp;pad.editbarClick('strikethrough');return false;" >
@@ -104,7 +104,7 @@
                 </li>
                 <li id="usericon" onClick="window.pad&amp;&amp;pad.editbarClick('showusers');return false;" >
                     <a title="Show connected users">
-                        <div class="buttonicon buttonicon-showusers" id="usericonback" style="display:inline-block;"></div>
+                        <div class="buttonicon buttonicon-showusers" id="usericonback"></div>
                         <span id="online_count">1</span>
                     </a>
                 </li>
@@ -228,7 +228,7 @@
         <div id="chaticon">
             <a onClick="chat.show();return false;" title="Open the chat for this pad">
                 <span id="chatlabel">Chat</span>
-                <div class="buttonicon buttonicon-chat" style="display:inline-block;"></div>
+                <div class="buttonicon buttonicon-chat"></div>
             </a>
             <span id="chatcounter">0</span>
         </div>