diff --git a/static/css/pad.css b/static/css/pad.css
index e5a98ad6..4bcd4cfc 100644
--- a/static/css/pad.css
+++ b/static/css/pad.css
@@ -308,7 +308,13 @@ a#hidetopmsg { position: absolute; right: 5px; bottom: 5px; }
 .hidesidebar #padeditor { right: 0; }
 
 #vdraggie {
-  background: url(static/img/vdraggie.gif) no-repeat top center;
+/*  background: url(static/img/vdraggie.gif) no-repeat top center;*/
+  width:16px;
+  height:16px;
+  background-image:url('../../static/img/etherpad_lite_icons.gif');
+  background-repeat: no-repeat;
+  background-position: 0px -300px;
+
   cursor: W-resize;
   bottom:0;
   position:absolute;
@@ -906,19 +912,18 @@ position: relative;
   display: block;
     
 } 
-/*
-.ui-resizable-disabled .ui-resizable-handle, .ui-resizable- autohide .ui-resizable-handle { display: none; } 
-*/
 
 .ui-resizable-nw {
+  width:16px;
+  height:16px;
+  background-image:url('../../static/img/etherpad_lite_icons.gif');
+  background-repeat: no-repeat;
+  background-position: 0px -455px;
   cursor: nw-resize; 
   width: 22px; 
   height: 22px; 
-  left: 0px; top: 0px; 
-  background-size: 100% auto;
-  background-image: url("../img/nw-resize.png");
-  background-repeat: no-repeat;
-/*  background-position: -5px -5px;*/
+  left: 2px; top: 1px; 
+  background-size: 80% auto;
 } 
 .ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: 
 -5px; top: -5px;} 
@@ -1046,3 +1051,10 @@ padding: 10px;
 border-radius: 6px;
 opacity:.8;
 }
+
+.buttonicon{
+width:16px;
+height:16px;
+background-image:url('../../static/img/etherpad_lite_icons.gif');
+background-repeat: no-repeat;
+}
diff --git a/static/img/etherpad_lite_icons.gif b/static/img/etherpad_lite_icons.gif
new file mode 100644
index 00000000..e18bf911
Binary files /dev/null and b/static/img/etherpad_lite_icons.gif differ
diff --git a/static/img/maximize_maximized.png b/static/img/maximize_maximized.png
deleted file mode 100644
index d1ae8f87..00000000
Binary files a/static/img/maximize_maximized.png and /dev/null differ
diff --git a/static/img/padtop5.gif b/static/img/padtop5.gif
deleted file mode 100644
index e6e071d6..00000000
Binary files a/static/img/padtop5.gif and /dev/null differ
diff --git a/static/img/padtopback2.gif b/static/img/padtopback2.gif
deleted file mode 100644
index db46567b..00000000
Binary files a/static/img/padtopback2.gif and /dev/null differ
diff --git a/static/pad.html b/static/pad.html
index 8d7f69ae..55ca7a69 100644
--- a/static/pad.html
+++ b/static/pad.html
@@ -25,76 +25,75 @@
 <ul id="menu_left">
 <li>
   <a onClick="window.pad&&pad.editbarClick('bold');return false" title="Bold (ctrl-B)">
-    <img src="../static/img/editbar_bold.gif" width="16" height="16" />
+    <div class="buttonicon" style="background-position:0px -116px"></div>
   </a>
 </li>
 <li>
-	<a onClick="window.pad&&pad.editbarClick('italic'); return false;" title="Italics (ctrl-I)">
-	  <img src="../static/img/editbar_italic.gif" width="16" height="16" />
-	</a>
+  <a onClick="window.pad&&pad.editbarClick('italic'); return false;" title="Italics (ctrl-I)">
+    <div class="buttonicon" style="background-position:0px 0px"></div>
+  </a>
 </li>
 <li>
   <a onClick="window.pad&&pad.editbarClick('underline');return false;" title="Underline (ctrl-U)">
-    <img src="../static/img/editbar_underline.gif" width="16" height="16" />
+    <div class="buttonicon" style="background-position:0px -236px;margin-top:1px;"></div>
   </a>
 </li>
 <li>
-	<a onClick="window.pad&&pad.editbarClick('strikethrough');return false;" title="Strikethrough">
-	  <img src="../static/img/editbar_strikethrough.gif" width="16" height="16" />
-	</a>
+  <a onClick="window.pad&&pad.editbarClick('strikethrough');return false;" title="Strikethrough">
+    <div class="buttonicon" style="background-position:0px -200px"></div>
+  </a>
 </li>
 <li class="separator"></li>
 <li>
   <a onClick="window.pad&&pad.editbarClick('insertunorderedlist');return false;" title="Toggle Bullet List">
-    <img src="../static/img/editbar_insertunorderedlist.gif" width="16" height="16" />
+    <div class="buttonicon" style="background-position:0px -34px"></div>
   </a>
 </li>
 <li>
   <a onClick="window.pad&&pad.editbarClick('indent');return false;" title="Indent List">
-    <img src="../static/img/editbar_indent.gif" width="16" height="16" />
+    <div class="buttonicon" style="background-position:0px -52px"></div>
   </a>
 </li>
 <li>
-	<a onClick="window.pad&&pad.editbarClick('outdent');return false;" title="Unindent List">
-	  <img src="../static/img/editbar_outdent.gif" width="16" height="16" />
+  <a onClick="window.pad&&pad.editbarClick('outdent');return false;" title="Unindent List">
+    <div class="buttonicon" style="background-position:0px -134px"></div>
 	</a>
 </li>
 <li class="separator"></li>
 <li>
-	<a onClick="window.pad&&pad.editbarClick('undo');return false;" title="Undo (ctrl-Z)">
-	  <img src="../static/img/editbar_undo.gif" width="16" height="16" />
-	</a>
+  <a onClick="window.pad&&pad.editbarClick('undo');return false;" title="Undo (ctrl-Z)">
+    <div class="buttonicon" style="background-position:0px -255px"></div>
+  </a>
 </li>
 <li>
 	<a onClick="window.pad&&pad.editbarClick('redo');return false;" title="Redo (ctrl-Y)">
-	  <img src="../static/img/editbar_redo.gif" width="16" height="16" />
-	</a>
+    <div class="buttonicon" style="background-position:0px -166px"></div>
+  </a>
 </li>
 <li class="separator"></li>
 <li>
-	<a onClick="window.pad&&pad.editbarClick('clearauthorship');return false;" title="Clear Authorship Colors">
-	  <img src="../static/img/editbar_clearauthorship.gif" width="16" height="16" />
-	</a>
+  <a onClick="window.pad&&pad.editbarClick('clearauthorship');return false;" title="Clear Authorship Colors">
+    <div class="buttonicon" style="background-position:0px -86px"></div>
+  </a>
 </li>
 </ul>
 
 <ul id="menu_right">
 
 <li>
-	<a id="readonlylink" onClick="window.pad&&pad.editbarClick('readonly');return false;" title="Create a readonly link for this pad">
-	  <img src="../static/img/editbar_readonly.gif" width="16" height="16" />
-	</a>
+  <a id="readonlylink" onClick="window.pad&&pad.editbarClick('readonly');return false;" title="Create a readonly link for this pad">
+     <div class="buttonicon" style="background-position:0px -150px"></div>
+  </a>
 </li>
 <li>
-	<a id="exportlink" onClick="window.pad&&pad.editbarClick('import_export');return false;"
-	title="Import/Export from/to different document formats">
-	  <img src="../static/img/editbar_import_export.gif" width="16" height="16" />
-	</a>
+  <a id="exportlink" onClick="window.pad&&pad.editbarClick('import_export');return false;" title="Import/Export from/to different document formats">
+    <div class="buttonicon" style="background-position:0px -68px"></div>
+  </a>
 </li>
 <li>
-	<a id="embedlink" onClick="window.pad&&pad.editbarClick('embed');return false;" title="Embed this pad">
-	  <img src="../static/img/editbar_embed.gif" width="16" height="16" />
-	</a>
+  <a id="embedlink" onClick="window.pad&&pad.editbarClick('embed');return false;" title="Embed this pad">
+    <div class="buttonicon" style="background-position:0px -18px"></div>
+  </a>
 </li>
 <!--
 We removed this feature cause its not worth the space it needs in the editbar
@@ -109,23 +108,18 @@ We removed this feature cause its not worth the space it needs in the editbar
 	</select>
 </li>-->
 <li class="separator"></li>
-<!--<li>
-	<a onClick="window.pad&&pad.editbarClick('chat'); return false;"
-	title="(Placeholder, not implemented so far) Open the chat for this pad">
-	  <img src="../static/img/editbar_chat.gif" width="16" height="16" />
-	</a>
-</li>-->
 <li>
   <a id="timesliderlink" title="Show the history of this pad">
     <script>
       document.getElementById('timesliderlink').href = document.location+ '/timeslider';
     </script>
-    <img src="../static/img/editbar_timeslider.gif" width="16" height="16" />
+    <div class="buttonicon" style="background-position:0px -218px"></div>
   </a>
 </li>
 <li>
   <a onClick="window.pad&&pad.editbarClick('showusers');return false;" title="Show connected users">
-    <img id="showusersicon" src="../static/img/editbar_showusers.gif" width="16" height="16" /> <span id="online_count">1</span>
+    <div class="buttonicon" style="background-position:0px -184px;display:inline-block;"></div>
+ <span id="online_count">1</span>
   </a>
 </li>
 </ul>
@@ -256,7 +250,7 @@ Use this link to share a read-only version of your pad:<input id="readonlyInput"
 <a onClick="chat.show();return false;"
 	title="Open the chat for this pad">
 	  <span id="chatlabel">Chat</span>
-	  <img src="../static/img/editbar_chat.gif" width="16" height="16" />
+          <div class="buttonicon" style="background-position:0px -104px;display:inline-block;"></div>
 </a>
 <span id="chatcounter">0</span>
 </div>