diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/css/openbis.css b/openbis/source/java/ch/systemsx/cisd/openbis/public/css/openbis.css
index 89c3d3565d069c973ba03f1bbee38b5cf49b8371..605a9aaf043c6281f544ce5a477bb4d4c7a0aee7 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/css/openbis.css
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/css/openbis.css
@@ -129,25 +129,88 @@ body,div,td {
 }
 
 /* Show background image for button even if mouse is not over it. */
+/* old
 .x-toolbar .x-btn-left{
-	background:url(../images/default/toolbar/tb-btn-sprite.gif) no-repeat 0 0;
+	background:url(../resources/images/default/toolbar/tb-btn-sprite.gif) no-repeat 0 0;
 }
 .x-toolbar .x-btn-right{
-	background:url(../images/default/toolbar/tb-btn-sprite.gif) no-repeat 0 -21px;
+	background:url(../resources/images/default/toolbar/tb-btn-sprite.gif) no-repeat 0 -21px;
   padding-right:2px;	
 }
 .x-toolbar .x-btn-center{
-	background:url(../images/default/toolbar/tb-btn-sprite.gif) repeat-x 0 -42px;
+	background:url(../resources/images/default/toolbar/tb-btn-sprite.gif) repeat-x 0 -42px;
 }
+*/
+.x-toolbar .x-btn-tl {
+	background-position: -6px 0;
+}
+.x-toolbar .x-btn-tr {
+	background-position: -9px 0;
+}
+.x-toolbar .x-btn-tc {
+	background-position: 0 -9px;
+}
+.x-toolbar .x-btn-ml {
+	background-position: -6px -24px;
+}
+.x-toolbar .x-btn-mr {
+	background-position: -9px -24px;
+}
+.x-toolbar .x-btn-mc {
+	background-position: 0 -2168px;
+}
+.x-toolbar .x-btn-bl {
+	background-position: -6px -3px;
+}
+.x-toolbar .x-btn-br {
+	background-position: -9px -3px;
+}
+.x-toolbar .x-btn-bc {
+	background-position: 0 -18px;
+}
+
 
-/* Don't show background image for button in top menu. */
-.x-toolbar .x-btn-top-menu * {
-	background:none;
+/* Don't show background image for button in top menu unless there is a mouse over it. 
+/* doesn't work
+.x-toolbar .x-btn-top-menu .x-btn-small {
+	background-image: none;
+}
+*/
+.x-toolbar .x-btn-top-menu .x-btn-tl {
+	background-position: 500px 500px;
+}
+.x-toolbar .x-btn-top-menu .x-btn-tr {
+	background-position: 500px 500px;
+}
+.x-toolbar .x-btn-top-menu .x-btn-tc {
+	background-position: 500px 500px;
+}
+.x-toolbar .x-btn-top-menu .x-btn-ml {
+	background-position: 500px 500px;
+}
+.x-toolbar .x-btn-top-menu .x-btn-mr {
+	background-position: 500px 500px;
+}
+.x-toolbar .x-btn-top-menu .x-btn-mc {
+	background-position: 500px 500px;
+}
+.x-toolbar .x-btn-top-menu .x-btn-bl {
+	background-position: 500px 500px;
+}
+.x-toolbar .x-btn-top-menu .x-btn-br {
+	background-position: 500px 500px;
+}
+.x-toolbar .x-btn-top-menu .x-btn-bc {
+	background-position: 500px 500px;
 }
 
-/* Change toolbar button text color when mouse is over it. */
-.x-toolbar .x-btn-center .x-btn-over .x-btn-text {
-	color: grey;
+/* Toolbar cells padding */
+.x-toolbar-cell {
+	padding-right: 2px;
+}
+/* Change toolbar button text color when mouse is over it*/
+.x-btn-over .x-btn-text {
+	color: black !important;
 }
 
 /*****************************