diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index 09c7b11e06..900d95ed3d 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -336,13 +336,28 @@ a .term {
 	padding : .3em 0;
 }
 
-#action a {
-	background-position : left;
+#action a, #toolbar a {
+	background-position : 5px center;
 	background-repeat : no-repeat;
 	text-decoration : none;
 	padding-left : 26px;
 }
 
+
+
+#toolbar ul li {
+	display : inline;
+	list-style : none;
+}
+
+#toolbar ul li a {
+	border-left : 1px solid #e8e8e8;
+}
+
+#toolbar ul li:first-child {
+	border-left : 0;
+}
+
 #action a.reserve, #toolbar a.reserve, .searchresults a.reserve {
 	background-image:url(../../images/placereserve.gif);
 }
@@ -359,6 +374,29 @@ a .term {
 	background-image:url(../../images/print.gif);
 }
 
+#toolbar a.brief {
+	background-image: url(../../images/brief.gif);
+}
+
+#toolbar  a.detail {
+	background-image: url(../../images/detail.gif);
+}
+
+#toolbar a.print {
+	background-image: url(../../images/print.gif);
+}
+
+#toolbar a.hide {
+	background-image: url(../../images/close.gif);
+}
+
+#toolbar a.send {
+	background-image: url(../../images/send.gif);
+}
+#toolbar a.empty {
+	background-image: url(../../images/trash.gif);
+}
+
 /* the itemtype list in advanced search */
 #advsearch-itemtype table {
 	border-collapse : separate;
@@ -641,36 +679,6 @@ a.cancel {
 	padding-left : 1em;
 }
 
-#toolbar ul {
-	border-bottom : 1px solid #AFBCCF;
-}
-
-#toolbar ul {
-	margin : 1em 0 0 0;
-	padding : 0 0 .3em 0;
-}
-
-#toolbar ul li {
-	display : inline;
-	list-style : none;
-}
-
-#toolbar ul li a {
-	border-left : 1px solid #afbccf;
-	border-top : 1px solid #afbccf;
-	border-right : 1px solid #afbccf;
-	padding : .3em;
-	text-decoration : none;
-	margin-left : .3em;
-}
-
-#toolbar ul li a.link {
-	border : 0;
-	background-position : left;
-	background-repeat : no-repeat;
-	padding : .3em .3em .3em 26px;
-}
-
 .resultscontrol, .resultscontrol select {
 	font-size: 90%;
 }
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
index 06b295a2e2..f45c2d94ad 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
@@ -1,7 +1,5 @@
 </title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
 <link rel="shortcut icon" href="<!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico" type="image/x-icon" />
 <!-- TMPL_IF name="RSS" --><link rel="alternate" type="application/rss+xml" title="Koha - RSS" href="<!-- TMPL_VAR name="site_url"-->/opac-rss.pl?q=<!-- TMPL_VAR name="searchdesc"-->" /><!-- /TMPL_IF -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/lib/yui/button.css" />
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
index fd1ba87cc1..7da9d134c3 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
@@ -16,7 +16,7 @@
 		var checked = [];
 		$("#bookbag_form").checkCheckboxes("*", true).each(
 		    function() {
-				selRecord(this.id,true); 
+				selRecord(this.value,true); 
 			}
 		); 
 	        return false;
@@ -25,7 +25,7 @@
 	    var checked = [];
 		$("#bookbag_form").unCheckCheckboxes("*",true).each(
 		    function() {
-				selRecord(this.id,false);
+				selRecord(this.value,false);
 			}
 		);
 	        return false;
@@ -44,31 +44,34 @@
 
 <div id="toolbar">
 <ul>
-	<li><!-- TMPL_IF NAME="verbose" --><a href="opac-basket.pl" onclick="showLess(); return false;">Brief Display</a><!-- TMPL_ELSE --><a href="opac-basket.pl" onclick="showMore(); return false;">More Details</a><!-- /TMPL_IF --></li>
-	<li><a href="opac-basket.pl" onclick="sendBasket(); return false;">Send</a></li>
-	<li><a href="opac-basket.pl" onclick="printBasket(); return false;">Print</a></li>
-	<li><a href="opac-basket.pl" onclick="delBasket(); return false;">Empty and Close</a></li>
-	<li><a href="opac-basket.pl" onclick="quit(); return false;">Hide Window</a></li>
+	<li><!-- TMPL_IF NAME="verbose" --><a href="opac-basket.pl" class="brief" onclick="showLess(); return false;">Brief Display</a><!-- TMPL_ELSE --><a href="opac-basket.pl" class="detail" onclick="showMore(); return false;">More Details</a><!-- /TMPL_IF --></li>
+	<li><a class="send" href="opac-basket.pl" onclick="sendBasket(); return false;">Send</a></li>
+	<li><a class="print" href="opac-basket.pl" onclick="printBasket(); return false;">Print</a></li>
+	<li><a class="empty" href="opac-basket.pl" onclick="delBasket(); return false;">Empty and Close</a></li>
+	<li><a class="hide" href="opac-basket.pl" onclick="quit(); return false;">Hide Window</a></li>
 </ul>
         <!-- /TMPL_UNLESS -->
 </div>
 
 <!-- TMPL_IF NAME="verbose" -->
+	<!-- TMPL_UNLESS NAME="print_basket" --><p style="padding: 7px 0; border-top : 1px solid #E8E8E8;"><a id="CheckAll" href="#">Select All</a> <a id="CheckNone" href="#">Clear All</a> | <b>Selected items :</b>
+<a href="#" onclick="delSelRecords(); return false;">Remove</a>
+<!-- TMPL_IF NAME="loggedinusername" -->
+     | <a href="#" onclick="addSelToShelf(); return false;">Add to a shelf</a>
+<!-- /TMPL_IF --></p><!-- /TMPL_UNLESS -->
+            <form action="opac-basket.pl" method="get" name="bookbag_form" id="bookbag_form">
     <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
     <h3>
         <!-- TMPL_IF NAME="print_basket" -->
             <!-- TMPL_VAR NAME="title" -->
                 <!-- TMPL_IF name="subtitle" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF -->
         <!-- TMPL_ELSE -->
-            <form action="opac-basket.pl" method="get">
                 <input type="checkbox" value="<!-- TMPL_VAR NAME="biblionumber" -->" name="bib<!-- TMPL_VAR NAME="biblionumber" -->" id="bib<!-- TMPL_VAR NAME="biblionumber" -->" onclick="selRecord(value,checked)" />
                 <!-- TMPL_VAR NAME="title" -->
                 <!-- TMPL_IF name="subtitle" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF -->
-            </form>
         <!-- /TMPL_IF -->
     </h3>
     <table>
-    	
         <!-- TMPL_IF name="isbn" -->
         <tr>
             <th scope="row">ISBN</th>
@@ -178,6 +181,7 @@
         </tr>
     </table>
     <!-- /TMPL_LOOP -->
+            </form>
 
 <!-- TMPL_ELSE -->
 	<form action="/cgi-bin/koha/opac-basket.pl" method="get" name="bookbag_form" id="bookbag_form">
diff --git a/koha-tmpl/opac-tmpl/prog/images/brief.gif b/koha-tmpl/opac-tmpl/prog/images/brief.gif
new file mode 100644
index 0000000000..9b0efe7294
Binary files /dev/null and b/koha-tmpl/opac-tmpl/prog/images/brief.gif differ
diff --git a/koha-tmpl/opac-tmpl/prog/images/close.gif b/koha-tmpl/opac-tmpl/prog/images/close.gif
new file mode 100644
index 0000000000..8f02351ab3
Binary files /dev/null and b/koha-tmpl/opac-tmpl/prog/images/close.gif differ
diff --git a/koha-tmpl/opac-tmpl/prog/images/detail.gif b/koha-tmpl/opac-tmpl/prog/images/detail.gif
new file mode 100644
index 0000000000..42102f9fbf
Binary files /dev/null and b/koha-tmpl/opac-tmpl/prog/images/detail.gif differ
diff --git a/koha-tmpl/opac-tmpl/prog/images/send.gif b/koha-tmpl/opac-tmpl/prog/images/send.gif
new file mode 100644
index 0000000000..d8e9b0a953
Binary files /dev/null and b/koha-tmpl/opac-tmpl/prog/images/send.gif differ
diff --git a/koha-tmpl/opac-tmpl/prog/images/trash.gif b/koha-tmpl/opac-tmpl/prog/images/trash.gif
new file mode 100644
index 0000000000..78d73d1d2e
Binary files /dev/null and b/koha-tmpl/opac-tmpl/prog/images/trash.gif differ