diff --git a/static/css/pad.css b/static/css/pad.css
index 933b7af1..5d95c9f4 100644
--- a/static/css/pad.css
+++ b/static/css/pad.css
@@ -970,14 +970,15 @@ position: relative;
 } 
 
 .ui-resizable-nw {
-  background-image: url("../img/nw-resize.png");
+  background-image: url("../../static/img/etherpad_lite_icons.png");
+  background-position: 0 -416px;
   background-repeat: no-repeat;
   background-size: 100% auto;
   cursor: nw-resize;
-  height: 22px;
-  left: 0;
-  top: 0;
-  width: 22px;
+  height: 17px;
+  left: 3px;
+  top: 3px;
+  width: 17px;
 } 
 
 .ui-resizable-ne 
@@ -1022,10 +1023,10 @@ position: relative;
 }
 
 .exporttype{
-  line-height:25px;
+  line-height:20px;
   background-repeat:no-repeat;
   padding-left:25px;
-  background-image: url("../img/fileicons.gif");
+  background-image: url("../../static/img/etherpad_lite_icons.png");
   color:#fff;
   text-decoration:none;
 }
@@ -1045,31 +1046,31 @@ position: relative;
 }
 
 #exporthtml{
-  background-position: 2px -25px;
+  background-position: 0px -299px;
 }
 
 #exportplain{
-  background-position: 2px -121px;
+  background-position: 0px -395px;
 }
 
 #exportword{
-  background-position: 2px -0px;
+  background-position: 0px -275px;
 }
 
 #exportpdf{
-  background-position: 2px -97px;
+  background-position: 0px -371px;
 }
 
 #exportopen{
-  background-position: 2px -74px;
+  background-position: 0px -347px;
 }
 
 #exportwordle{
-  background-position: 2px -49px;
+  background-position: 0px -323px;
 }
 
 #exportdokuwiki{
-  background-position: 2px -144px;
+  background-position: 0px -459px;
 }
 
 #export a{
diff --git a/static/img/etherpad_lite_icons.png b/static/img/etherpad_lite_icons.png
index 60661231..b22da518 100644
Binary files a/static/img/etherpad_lite_icons.png and b/static/img/etherpad_lite_icons.png differ
diff --git a/static/img/fileicons.gif b/static/img/fileicons.gif
deleted file mode 100644
index c03b6031..00000000
Binary files a/static/img/fileicons.gif and /dev/null differ
diff --git a/static/img/nw-resize.png b/static/img/nw-resize.png
deleted file mode 100644
index b6c5e395..00000000
Binary files a/static/img/nw-resize.png and /dev/null differ
diff --git a/static/pad.html b/static/pad.html
index 4324544e..c6fd3e77 100644
--- a/static/pad.html
+++ b/static/pad.html
@@ -100,7 +100,7 @@
 </li>
 <li id="usericon" onClick="window.pad&amp;&amp;pad.editbarClick('showusers');return false;" >
   <a title="Show connected users">
-    <div class="buttonicon" id="usericonback" style="background-position:0px -184px;display:inline-block;"></div>
+    <div class="buttonicon" id="usericonback" style="background-position:0px -183px;display:inline-block;"></div>
  <span id="online_count">1</span>
   </a>
 </li>