diff --git a/src/static/css/pad.css b/src/static/css/pad.css
index 233942fa..71f482f5 100644
--- a/src/static/css/pad.css
+++ b/src/static/css/pad.css
@@ -87,10 +87,6 @@ a img {
   color: #ccc;
   position: absolute;
 }
-.toolbar ul li a span {
-  position: relative;
-  top: -2px;
-}
 .toolbar ul li:hover {
   background: #fff;
   background: -webkit-linear-gradient(#f4f4f4, #e4e4e4);
@@ -425,6 +421,7 @@ a#hidetopmsg {
   top: 0;
   width: 56px;
   z-index: 10;
+  display: inline-block;
 }
 .toolbarsavetable {
   position: absolute;
@@ -1232,6 +1229,7 @@ ul#colorpickerswatches li:hover {
   height: 16px;
   background-image: url('../../static/img/etherpad_lite_icons.png');
   background-repeat: no-repeat;
+  display: inline-block;
   margin-left: 1px;
   margin-top: 1px;
 }
diff --git a/src/templates/pad.html b/src/templates/pad.html
index 1fd0372b..94a75f51 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -22,60 +22,92 @@
             <ul class="menu_left">
                 <% e.begin_block("editbarMenuLeft"); %>
                 <li id="bold" data-key="bold">
-                    <a class="buttonicon buttonicon-bold" title="Bold (ctrl-B)"></a>
+                    <a title="Bold (ctrl-B)">
+                      <span class="buttonicon buttonicon-bold"></span>
+                    </a>
                 </li>
                 <li id="italic" data-key="italic">
-                    <a class="buttonicon buttonicon-italic" title="Italics (ctrl-I)"></a>
+                    <a title="Italics (ctrl-I)">
+                      <span class="buttonicon buttonicon-italic"></span>
+                    </a>
                 </li>
                 <li id="underline" data-key="underline">
-                    <a class="buttonicon buttonicon-underline" title="Underline (ctrl-U)"></a>
+                    <a title="Underline (ctrl-U)">
+                      <span class="buttonicon buttonicon-underline"></span>
+                    </a>
                 </li>
                 <li id="strikethrough" data-key="strikethrough">
-                    <a class="buttonicon buttonicon-strikethrough" title="Strikethrough"></a>
+                    <a title="Strikethrough">
+                      <span class="buttonicon buttonicon-strikethrough"></span>
+                    </a>
                 </li>
                 <li class="separator"></li>
                 <li id="oderedlist" data-key="insertorderedlist">
-                    <a class="buttonicon buttonicon-insertorderedlist" title="Toggle Ordered List"></a>
+                    <a title="Toggle Ordered List">
+                      <span class="buttonicon buttonicon-insertorderedlist"></span>
+                    </a>
                 </li>
                 <li id="unoderedlist" data-key="insertunorderedlist">
-                    <a class="buttonicon buttonicon-insertunorderedlist" title="Toggle Bullet List"></a>
+                    <a title="Toggle Bullet List">
+                      <span class="buttonicon buttonicon-insertunorderedlist"></span>
+                    </a>
                 </li>
                 <li id="indent" data-key="indent">
-                    <a class="buttonicon buttonicon-indent" title="Indent"></a>
+                    <a title="Indent">
+                      <span class="buttonicon buttonicon-indent"></span>
+                    </a>
                 </li>
                 <li id="outdent" data-key="outdent">
-                    <a class="buttonicon buttonicon-outdent" title="Unindent"></a>
+                    <a title="Unindent">
+                      <span class="buttonicon buttonicon-outdent"></span>
+                    </a>
                 </li>
                 <li class="separator"></li>
                 <li id="undo" data-key="undo">
-                    <a class="buttonicon buttonicon-undo" title="Undo (ctrl-Z)"></a>
+                    <a title="Undo (ctrl-Z)">
+                      <span class="buttonicon buttonicon-undo"></span>
+                    </a>
                 </li>
                 <li id="redo" data-key="redo">
-                    <a class="buttonicon buttonicon-redo" title="Redo (ctrl-Y)"></a>
+                    <a title="Redo (ctrl-Y)">
+                      <span class="buttonicon buttonicon-redo"></span>
+                    </a>
                 </li>
                 <li class="separator"></li>
                 <li id="clearAuthorship" data-key="clearauthorship">
-                    <a class="buttonicon buttonicon-clearauthorship" title="Clear Authorship Colors"></a>
+                    <a title="Clear Authorship Colors">
+                      <span class="buttonicon buttonicon-clearauthorship"></span>
+                    </a>
                 </li>
                 <% e.end_block(); %>
             </ul>
             <ul class="menu_right">
                 <% e.begin_block("editbarMenuRight"); %>
                 <li id="settingslink" data-key="settings">
-                    <a class="buttonicon buttonicon-settings" title="Settings of this pad"></a>
+                    <a title="Settings of this pad">
+                        <span class="buttonicon buttonicon-settings"></span>
+                    </a>
                 </li>
                 <li id="importexportlink" data-key="import_export">
-                    <a class="buttonicon buttonicon-import_export" title="Import/Export from/to different document formats"></a>
+                    <a title="Import/Export from/to different document formats">
+                        <span class="buttonicon buttonicon-import_export"></span>
+                    </a>
                 </li>
                 <li id="embedlink" data-key="embed">
-                    <a class="buttonicon buttonicon-embed" title="Share and Embed this pad"></a>
+                    <a title="Share and Embed this pad">
+                        <span class="buttonicon buttonicon-embed"></span>
+                    </a>
                 </li>
                 <li id="revisionlink" data-key="savedRevision">
-                    <a class="buttonicon buttonicon-savedRevision" title="Mark this revision as a saved revision"></a>
+                    <a title="Mark this revision as a saved revision">
+                        <span class="buttonicon buttonicon-savedRevision"></span>
+                    </a>
                 </li>
                 <li class="separator"></li>
                 <li id="timesliderlink" onClick="document.location = document.location.pathname+ '/timeslider'">
-                    <a class="buttonicon buttonicon-history" title="Show the history of this pad"></a>
+                    <a title="Show the history of this pad">
+                        <span class="buttonicon buttonicon-history"></span>
+                    </a>
                 </li>
                 <li id="usericon" data-key="showusers">
                     <a title="Show connected users">