diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 19bfe518ca..bc62341791 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -801,21 +801,77 @@ fieldset.rows .inputnote {
     visibility:visible; /* you propably don't need to change this one */
     display:block;
 }
-#addbiblio a, #addchild a, #newentry a {
+#newbiblio a, #addchild a, #newentry a, #newshelf a, #newmenuc .first-child, #newsupplier .first-child, #newlabel a, #newtemplate a, #newbatch a, #newsubscription a, #newdictionary a, #neworder a {
 	padding-left : 34px;
 	background-image: url("../../img/toolbar-new.gif");
 	background-position : center left;
 	background-repeat : no-repeat;
 }
 
-#deletebiblio button, #deletebiblio a, #deletepatron a {
+#changepassword a {
+	padding-left : 34px;
+	background-image: url("../../img/toolbar-password.gif");
+	background-position : center left;
+	background-repeat : no-repeat;
+}
+
+#manageorders a {
+	padding-left : 34px;
+	background-image: url("../../img/toolbar-orders.gif");
+	background-position : center left;
+	background-repeat : no-repeat;
+}
+
+
+#savemenuc .first-child {
+	padding-left : 15px;
+	background-image: url("../../img/toolbar-save.gif");
+	background-position : center left;
+	background-repeat : no-repeat;
+}
+
+#editpatron a, #editmenuc .first-child, #editshelf a, #edit a, #editsupplier a {
+	padding-left : 34px;
+	background-image: url("../../img/toolbar-edit.gif");
+	background-position : center left;
+	background-repeat : no-repeat;
+}
+
+#duplicate a {
+	padding-left : 34px;
+	background-image: url("../../img/toolbar-duplicate.gif");
+	background-position : center left;
+	background-repeat : no-repeat;
+}
+
+#receive a {
+	padding-left : 34px;
+	background-image: url("../../img/toolbar-receive.gif");
+	background-position : center left;
+	background-repeat : no-repeat;
+}
+
+#renew a {
+	padding-left : 34px;
+	background-image: url("../../img/toolbar-renew.gif");
+	background-position : center left;
+	background-repeat : no-repeat;
+}
+
+#deletebiblio button, #deletebiblio a, #deletepatron a, #deleteshelf .first-child, #delete a {
 	padding-left : 34px;
 	background-image: url("../../img/toolbar-delete.gif");
 	background-position : center left;
 	background-repeat : no-repeat;
 }
 
-#printbiblio button, #printbiblio a {
+#z3950search .first-child {
+	padding-left : 34px;
+	background-image: url("../../img/toolbar-search.gif");
+	background-position : center left;
+	background-repeat : no-repeat;
+}
+#printbiblio button, #printbiblio a, #printmenuc .first-child {
 	padding-left : 34px;
 	background-image: url("../../img/toolbar-print.gif");
 	background-position : center left;
@@ -836,6 +892,10 @@ fieldset.rows .inputnote {
 	background-repeat : no-repeat;
 }
 
+#editmenuc .first-child, #deleteshelf .first-child,#newmenuc .first-child, #addbiblio .first-child, #z3950search .first-child, #printmenuc .first-child, #newsupplier .first-child, #addbiblio .first-child {
+	padding-left : 15px;
+}
+
 div.error {
 	border : 2px dashed #990000;
 	background-color : #FFFF99;
@@ -1290,4 +1350,21 @@ div.pages a:active {
 
 div.browse {
 	margin : .5em 0;
-}
\ No newline at end of file
+}
+
+div#header_search input.submit {
+	font-size : 1em;
+}
+
+input[type=submit], input[type=button], input.submit {
+	border: 1px outset #999999;
+	border-top-color: #666;
+	border-left-color: #666;
+	padding: 0.25em;
+	background : #E8E8E8 url(../../img/button-bg2.gif) top left repeat-x;
+	color: #333333;
+}
+
+input[type=submit]:active, input[type=button]:active, input.submit:active {
+	border : 1px inset #999999;
+}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-history-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-history-search.inc
index a88b9c8aaf..c092196957 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-history-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-history-search.inc
@@ -13,7 +13,7 @@
 	
 		<form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
 		<label for="title">Title: </label><input type="text" id="title" name="title" size="15" value="<!-- TMPL_VAR name="title"-->" /> <label for="searchsupplier">Supplier:</label> <input type="text" id="searchsupplier" name="name" size="15" value="<!-- TMPL_VAR name="name" -->" />
-	<input value="Submit" type="submit" /> <a href="/cgi-bin/koha/acqui/histsearch.pl">Advanced Search</a>
+	<input value="Submit" class="submit" type="submit" /> <a href="/cgi-bin/koha/acqui/histsearch.pl">Advanced Search</a>
 	</form>
 	</div>	
 			<ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
index e914f92f4b..b8bba01449 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
@@ -12,7 +12,7 @@
 	
 		<form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
 		<label for="title">Title: </label><input type="text" id="title" name="title" size="15" value="<!-- TMPL_VAR name="title"-->" /> <label for="searchsupplier">Supplier:</label> <input type="text" id="searchsupplier" name="name" size="15" value="<!-- TMPL_VAR name="name" -->" />
-	<input value="Submit" type="submit" /> <a href="/cgi-bin/koha/acqui/histsearch.pl">Advanced Search</a>
+	<input value="Submit" class="submit" type="submit" /> <a href="/cgi-bin/koha/acqui/histsearch.pl">Advanced Search</a>
 	</form>
 	</div>	
 			<ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-search.inc
index bdb9a507ff..63ffe4e05e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-search.inc
@@ -92,7 +92,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
             <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
             <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
             <input name="printer" value="" type="hidden" />
-            <input value="Submit" type="submit" />
+            <input value="Submit" class="submit" type="submit" />
 	<!-- /TMPL_IF -->
     </form>
 	</div>	
@@ -103,7 +103,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	<p class="tip">Enter search keywords:</p>
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
 			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
-				<input type="submit" value="Submit"  class="form-submit" />
+				<input type="submit" value="Submit"  class="submit" />
 		</form>
 	</div><!-- /TMPL_IF -->
 			<ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
index 63f31c1ede..66e4ed1b43 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
@@ -63,7 +63,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
             <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
             <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
             <input name="printer" value="" type="hidden" />
-            <input value="Submit" type="submit" />
+            <input value="Submit" class="submit" type="submit" />
 	<!-- /TMPL_IF -->
     </form>
 	</div>
@@ -74,7 +74,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
     <p class="tip">Scan a barcode to check in:</p>
     <form method="post" action="/cgi-bin/koha/circ/returns.pl">
         <input name="barcode" id="ret_barcode" size="40" maxlength="14" />
-        <input value="Submit" type="submit" />
+        <input value="Submit" class="submit" type="submit" />
     </form>
 </div>
 	<!-- /TMPL_IF -->
@@ -83,7 +83,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	<p class="tip">Enter search keywords:</p>
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
 			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
-				<input type="submit" class="form-submit" value="Submit" />
+				<input type="submit" class="submit" value="Submit" />
 		</form>
 	</div>
 	<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
index 3a25cfc17f..9b5b144afc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
@@ -93,7 +93,7 @@ function confirm_deletion() {
 											onclick: {fn: printBiblio }
                                         });
 
-	    var addbiblioButton = new YAHOO.widget.Button("addbiblio");
+	    var newbiblioButton = new YAHOO.widget.Button("newbiblio");
 	    var placeholdButton = new YAHOO.widget.Button("placehold");
 		
 	}
@@ -103,7 +103,7 @@ function confirm_deletion() {
 	
 <ul class="toolbar">
 
-	<li><a id="addbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl">New</a></li>
+	<li><a id="newbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl">New</a></li>
 	
 	<li id="editmenuc"><a id="editbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=<!--TMPL_VAR Name="current_framework" -->&amp;op=">Edit Record</a></li>
 	<li><a id="edititems" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Edit Items</a></li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
index f30901f6a6..8689c3a56f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
@@ -70,7 +70,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
             <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
             <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
             <input name="printer" value="" type="hidden" />
-            <input value="Submit" type="submit" />
+            <input value="Submit" class="submit" type="submit" />
 	<!-- /TMPL_IF -->
     </form>
 	</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
index 2b49be91e2..ab1a8f1a0e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
@@ -64,7 +64,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
             <input id="findborrower" name="findborrower" size="40" type="text" />
             <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
             <input name="printer" value="" type="hidden" />
-            <input value="Submit" type="submit" />
+            <input value="Submit" class="submit" type="submit" />
 	<!-- /TMPL_IF -->
     </form>
 </div>  
@@ -74,7 +74,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
     <p class="tip">Scan a barcode to check in:</p>
     <form method="post" action="/cgi-bin/koha/circ/returns.pl">
         <input name="barcode" id="ret_barcode" size="40" maxlength="14" />
-        <input value="Submit" type="submit" />
+        <input value="Submit" class="submit" type="submit" />
     </form>
 </div>
 <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
index 00ecd93c1e..bb83807e19 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
@@ -55,7 +55,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
             <div id="borrowerautocomplete" class="autocomplete">
                 <input autocomplete="off" id="findborrower" name="findborrower" class="focus" type="text" />
                 <div id="yborrowercontainer"></div>
-                <input id="ysearchsubmit" type="submit" value="Submit" />
+                <input id="ysearchsubmit" type="submit" class="submit" value="Submit" />
                 <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
                 <input name="printer" value="" type="hidden" />
             </div>
@@ -64,7 +64,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
             <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
             <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
             <input name="printer" value="" type="hidden" />
-            <input value="Submit" type="submit" />
+            <input value="Submit" class="submit" type="submit" />
 	<!-- /TMPL_IF -->
     </form>
 </div>  <!-- /TMPL_IF -->
@@ -73,7 +73,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
     <p class="tip">Scan a barcode to check in:</p>
     <form method="post" action="/cgi-bin/koha/circ/returns.pl">
         <input name="barcode" id="ret_barcode" size="40" maxlength="14" />
-        <input value="Submit" type="submit" />
+        <input value="Submit" class="submit" type="submit" />
     </form>
 </div><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="CAN_user_catalogue" -->
@@ -81,7 +81,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
     <p class="tip">Enter search keywords:</p>
     <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
         <input type="text" name="q" id="search-form" size="40" />
-        <input type="submit" class="form-submit" value="Submit"/>
+        <input type="submit" class="submit" value="Submit"/>
     </form>
 </div><!-- /TMPL_IF -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
index 2ec9496bdd..8c40250dab 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
@@ -70,7 +70,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
             <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
             <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
             <input name="printer" value="" type="hidden" />
-            <input value="Submit" type="submit" />
+            <input value="Submit" class="submit" type="submit" />
 	<!-- /TMPL_IF -->
     </form>
 	</div><!-- /TMPL_IF -->
@@ -79,7 +79,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	<p class="tip">Enter search keywords:</p>
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
 			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
-				<input type="submit" value="Submit"  class="form-submit" />
+				<input type="submit" value="Submit"  class="submit" />
 		</form>
 	</div><!-- /TMPL_IF -->
 			<ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
index 80768466c4..2231d2ec25 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
@@ -49,7 +49,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	<p class="tip">Currencies Search:</p>
         <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
                 <input type="text" name="description" size="40" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-                <input type="submit" name="Search" value="Search" />
+                <input type="submit" class="submit" name="search" value="Search" />
         </form>	
 	</div>
 	<!-- TMPL_IF NAME="CAN_user_circulate" -->
@@ -70,7 +70,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
             <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
             <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
             <input name="printer" value="" type="hidden" />
-            <input value="Submit" type="submit" />
+            <input value="Submit" class="submit" type="submit" />
 	<!-- /TMPL_IF -->
     </form>
 	</div><!-- /TMPL_IF -->
@@ -79,7 +79,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	<p class="tip">Enter search keywords:</p>
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
 			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
-				<input type="submit" value="Submit"  class="form-submit" />
+				<input type="submit" value="Submit"  class="submit" />
 		</form>
 	</div><!-- /TMPL_IF -->
 			<ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
index 1bf41330f4..b0eb78dadc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
@@ -49,7 +49,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	<p class="tip">Search Existing Notices:</p>
 <form action="/cgi-bin/koha/tools/letter.pl" method="post">
 		<input type="text" name="searchfield" size="40" value="" />
-                <input type="submit" name="Search" value="Search" />
+                <input type="submit" class="submit" name="search" value="Search" />
         </form>	
 	</div>
 	<!-- TMPL_IF NAME="CAN_user_circulate" -->
@@ -70,7 +70,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
             <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
             <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
             <input name="printer" value="" type="hidden" />
-            <input value="Submit" type="submit" />
+            <input value="Submit" class="submit" type="submit" />
 	<!-- /TMPL_IF -->
     </form>
 	</div>	<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
index 0d4c4b957d..09f33a953e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -75,7 +75,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
             <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
             <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
             <input name="printer" value="" type="hidden" />
-            <input value="Submit" type="submit" />
+            <input value="Submit" class="submit" type="submit" />
 	<!-- /TMPL_IF -->
     </form>
 	</div><!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
index 399812c44b..e7cf42ce75 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
@@ -49,7 +49,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	<p class="tip">Search by Patron Category Name:</p>
 	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 		<input type="text" name="description" size="40" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-		<input type="submit" name="search" value="Search" />
+		<input type="submit" class="submit" name="search" value="Search" />
 	</form>	
 	</div>
 	<!-- TMPL_IF NAME="CAN_user_circulate" -->
@@ -70,7 +70,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
             <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
             <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
             <input name="printer" value="" type="hidden" />
-            <input value="Submit" type="submit" />
+            <input value="Submit" class="submit" type="submit" />
 	<!-- /TMPL_IF -->
     </form>
 	</div>	<!-- /TMPL_IF -->
@@ -79,7 +79,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	<p class="tip">Enter search keywords:</p>
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
 			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
-				<input type="submit" value="Submit"  class="form-submit" />
+				<input type="submit" value="Submit"  class="submit" />
 		</form>
 	</div><!-- /TMPL_IF -->
 			<ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc
index ed4f09b173..f0a724e9b6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc
@@ -70,7 +70,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
             <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
             <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
             <input name="printer" value="" type="hidden" />
-            <input value="Submit" type="submit" />
+            <input value="Submit" class="submit" type="submit" />
 	<!-- /TMPL_IF -->
     </form>
 	</div>
@@ -80,7 +80,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	<p class="tip">Enter search keywords:</p>
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
 			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
-				<input type="submit" value="Submit"  class="form-submit" />
+				<input type="submit" value="Submit"  class="submit" />
 		</form>
 	</div>
 	<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc
index e53392bf42..3ded39525d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc
@@ -70,7 +70,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
             <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
             <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
             <input name="printer" value="" type="hidden" />
-            <input value="Submit" type="submit" />
+            <input value="Submit" class="submit" type="submit" />
 	<!-- /TMPL_IF -->
     </form>
 	</div>
@@ -80,7 +80,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	<p class="tip">Enter search keywords:</p>
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
 			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
-				<input type="submit" value="Submit"  class="form-submit" />
+				<input type="submit" value="Submit"  class="submit" />
 		</form>
 	</div>
 	<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
index 9695e3bcf0..4dd6ed2b18 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
@@ -68,7 +68,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
             <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
             <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
             <input name="printer" value="" type="hidden" />
-            <input value="Submit" type="submit" />
+            <input value="Submit" class="submit" type="submit" />
 	<!-- /TMPL_IF -->
     </form>
 </div>
@@ -78,7 +78,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	<p class="tip">Enter search keywords:</p>
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
 			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
-				<input type="submit" value="Submit"  class="form-submit" />
+				<input type="submit" value="Submit"  class="submit" />
 		</form>
 	</div>
 	<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc
index e853448e24..4b6a9302b4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc
@@ -69,7 +69,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
             <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
             <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
             <input name="printer" value="" type="hidden" />
-            <input value="Submit" type="submit" />
+            <input value="Submit" class="submit" type="submit" />
 	<!-- /TMPL_IF -->
     </form>
 </div>
@@ -79,7 +79,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	<p class="tip">Enter search keywords:</p>
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
 			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
-				<input type="submit" value="Submit"  class="form-submit" />
+				<input type="submit" value="Submit"  class="submit" />
 		</form>
 	</div>
 	<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
index a0fde13a5d..54415db28f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
@@ -72,7 +72,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
             <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
             <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
             <input name="printer" value="" type="hidden" />
-            <input value="Submit" type="submit" />
+            <input value="Submit" class="submit" type="submit" />
 	<!-- /TMPL_IF -->
     </form>
 </div>
@@ -82,7 +82,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	<p class="tip">Enter search keywords:</p>
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
 			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
-				<input type="submit" value="Submit"  class="form-submit" />
+				<input type="submit" value="Submit"  class="submit" />
 		</form>
 	</div>
 	<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-admin-search.inc
index 5136fb8d2f..f323b4baed 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-admin-search.inc
@@ -70,7 +70,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
             <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
             <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
             <input name="printer" value="" type="hidden" />
-            <input value="Submit" type="submit" />
+            <input value="Submit" class="submit" type="submit" />
 	<!-- /TMPL_IF -->
     </form>
 </div>
@@ -80,7 +80,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	<p class="tip">Enter search keywords:</p>
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
 			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
-				<input type="submit" value="Submit"  class="form-submit" />
+				<input type="submit" value="Submit"  class="submit" />
 		</form>
 	</div>
 	<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
index 96eea89b0d..11458a3b91 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
@@ -49,7 +49,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	<p class="tip">Z39.50 Server Search:</p>
 	<form action="/cgi-bin/koha/admin/z3950servers.pl" method="post">
                 <input type="text" name="description" size="40" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-                <input type="submit" name="search" value="Search" />
+                <input type="submit" class="submit" name="search" value="Search" />
         </form>
 	</div>
 	<!-- TMPL_IF NAME="CAN_user_circulate" -->
@@ -70,7 +70,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
             <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
             <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
             <input name="printer" value="" type="hidden" />
-            <input value="Submit" type="submit" />
+            <input value="Submit" class="submit" type="submit" />
 	<!-- /TMPL_IF -->
     </form>
 </div>
@@ -80,7 +80,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	<p class="tip">Enter search keywords:</p>
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
 			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
-				<input type="submit" value="Submit"  class="form-submit" />
+				<input type="submit" value="Submit"  class="submit" />
 		</form>
 	</div>
 	<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/autocomplete.css b/koha-tmpl/intranet-tmpl/prog/en/lib/yui/autocomplete.css
index 5913743b70..a0d78c8a70 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/autocomplete.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/lib/yui/autocomplete.css
@@ -47,7 +47,7 @@
     color:#FFF;
 }
 
-#borrowerautocomplete { width: 405px; text-align:left;} /* z-index needed on top instances for ie & sf absolute inside relative issue */
+#borrowerautocomplete { width: 450px; text-align:left;} /* z-index needed on top instances for ie & sf absolute inside relative issue */
 .autocomplete { width:130px; }/* set width of widget here*/
 .autocomplete .yui-ac-highlight ,
 .autocomplete .yui-ac-highlight .sample-result,
diff --git a/koha-tmpl/intranet-tmpl/prog/img/toolbar-edit.gif b/koha-tmpl/intranet-tmpl/prog/img/toolbar-edit.gif
index 8438975468..f2a80a9d03 100644
Binary files a/koha-tmpl/intranet-tmpl/prog/img/toolbar-edit.gif and b/koha-tmpl/intranet-tmpl/prog/img/toolbar-edit.gif differ