diff --git a/static/css/pad.css b/static/css/pad.css
index c4bd18e9..fa267301 100644
--- a/static/css/pad.css
+++ b/static/css/pad.css
@@ -32,43 +32,40 @@ a img
   padding-right: 3px;
   padding-left: 1px;
   z-index: 2;
-  height: 31px;
-    overflow: hidden;
+  overflow: hidden;
 
 }
 
-#editbar
+#editbar 
 {
-  background-color: #F3F7F9;
-  width: 100%;
-  height: 31px;
-  padding-top: 4px;
+  background: #f7f7f7;
+  background: -moz-linear-gradient(#f7f7f7, #f1f1f1 80%);
+  background: -ms-linear-gradient(#f7f7f7, #f1f1f1 80%);
+  background: -o-linear-gradient(#f7f7f7, #f1f1f1 80%);
+  background: -webkit-linear-gradient(#f7f7f7, #f1f1f1 80%);
   border-bottom: 1px solid #ccc;
+  height: 32px;
   overflow: hidden;
+  padding-top: 3px;
+  width: 100%;
 }
 
-#editbar ul li
+#editbar ul li 
 {
-  float: left;
-  margin-left: 2px;
-  background-color: #fff;
-  
-  -moz-border-radius: 4px;
-  border-radius: 4px; 
-  
+  background: #fff;
+  background: -moz-linear-gradient(#fff, #f0f0f0);
+  background: -ms-linear-gradient(#fff, #f0f0f0);
+  background: -o-linear-gradient(#fff, #f0f0f0);
+  background: -webkit-linear-gradient(#fff, #f0f0f0);
   border: 1px solid #ccc;
-  padding: 4px 5px;
-  
-  height: 18px;
-  width: 18px;
-
+  border-radius: 4px;
   cursor: pointer;
-  
+  float: left;
+  height: 18px;
+  margin-left: 2px;
   overflow: hidden;
-  
-  background: white; /* fallback for older/unsupporting browsers */  
-  background: -moz-linear-gradient(top, #eee, white 20%, white 20%);  
-  background: -webkit-gradient(linear, 0 0, 0 100%, from(#eee), color-stop(20%, white), color-stop(20%, white));  
+  padding: 4px 5px;
+  width: 18px;
 }
 
 #editbar ul li a
@@ -83,12 +80,22 @@ a img
   top:-2px
 }
 
-#editbar ul li:hover
-{
-  border: 1px solid #888;
+#editbar ul li:hover {
   background: #fff;
 }
 
+#editbar ul li:active {
+  background: #eee;
+  background: -moz-linear-gradient(#ddd, #fff);
+  background: -ms-linear-gradient(#ddd, #fff);
+  background: -o-linear-gradient(#ddd, #fff);
+  background: -webkit-linear-gradient(#ddd, #fff);
+}
+
+input[type="file"] {
+ color: #fff;
+}
+
 #editbar ul li.separator
 {
   border: inherit;
@@ -312,7 +319,7 @@ a#hidetopmsg { position: absolute; right: 5px; bottom: 5px; }
 /*  background: url(static/img/vdraggie.gif) no-repeat top center;*/
   width:16px;
   height:16px;
-  background-image:url('../../static/img/etherpad_lite_icons.gif');
+  background-image:url('../../static/img/etherpad_lite_icons.png');
   background-repeat: no-repeat;
   background-position: 0px -300px;
 
@@ -779,7 +786,7 @@ ul#colorpickerswatches li:hover
   width: 180px;
   height: 200px;
   z-index: 400;
-  background-color:#f3f7f9;
+  background-color:#f7f7f7;
   border-left: 1px solid #999;
   border-right: 1px solid #999;
   border-top: 1px solid #999;
@@ -1063,7 +1070,7 @@ opacity:.8;
 .buttonicon{
 width:16px;
 height:16px;
-background-image:url('../../static/img/etherpad_lite_icons.gif');
+background-image:url('../../static/img/etherpad_lite_icons.png');
 background-repeat: no-repeat;
 margin-left: 1px;
 margin-top: 1px;