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 2154ca73c3..411725362d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -297,6 +297,11 @@ div#header_search div.residentsearch {
 	border : 0;
 	border-bottom : 1px solid #FF9900;
 	padding : 0 0 .2em 0;
+	display: none;
+}
+
+div#header_search div.residentsearch.primary {
+	display : block;
 }
 
 div#reserves,div#checkouts {
@@ -309,6 +314,15 @@ div#header_search .tip {
 	color : Gray;
 }
 
+div#header_search ul li {
+	display : inline;
+	list-style-type : none;
+}
+
+div#header_search ul li.tabs-selected {
+	font-weight: bold;
+}
+
 .ex {
 	font-family : "Courier New", Courier, fixed-width;
 	font-weight : bold;
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 03bec164c1..74125ce848 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
@@ -1,6 +1,6 @@
 <!-- Begin Acquisitions Resident Search Box -->
 <div id="header_search">
-<div id="supplier_search" class="residentsearch">
+<div id="supplier_search" class="residentsearch primary">
 	<p class="tip">Search suppliers:</p>
         <form name="findsupplier" action="/cgi-bin/koha/acqui/booksellers.pl" method="post">
            <input type="text" size="25" name="supplier" id="supplier" class="focus" />
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 e0a893f55b..e88b2a81b5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
@@ -1,6 +1,6 @@
 <!-- Begin Acquisitions Resident Search Box -->
 <div id="header_search">
-<div id="supplier_search" class="residentsearch">
+<div id="supplier_search" class="residentsearch primary">
 	<p class="tip">Search suppliers:</p>
         <form name="findsupplier" action="/cgi-bin/koha/acqui/booksellers.pl" method="post">
            <input type="text" size="25" name="supplier" id="supplier" class="focus" />
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 c6ea1c6092..ea0d3943c1 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
@@ -44,7 +44,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
  //]]>
  </script>  <!-- /TMPL_IF -->
 <div id="header_search">
-	<div id="bookfund_search" class="residentsearch">
+	<div id="bookfund_search" class="residentsearch primary">
 	<p class="tip">Search Book Funds:</p>
 
 	<form action="/cgi-bin/koha/admin/aqbookfund.pl" method="post">
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 0fc47ad0be..22077c1aaf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
@@ -45,7 +45,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 </script><!-- /TMPL_IF --><!-- /TMPL_IF -->
 <div id="header_search">
 	<!-- TMPL_IF NAME="CAN_user_circulate" -->
-	<div id="circ_search" class="residentsearch">
+	<div id="circ_search" class="residentsearch primary">
 	<p class="tip">Enter patron card number or partial name:</p>
     <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
     <!-- TMPL_IF NAME="CircAutocompl" -->
@@ -78,7 +78,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 </div>
 	<!-- /TMPL_IF -->
 	<!-- TMPL_IF NAME="CAN_user_catalogue" -->
-	<div id="catalog_search" class="residentsearch">
+	<div id="catalog_search" class="residentsearch primary">
 	<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" />
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 cf07f6b2c8..bc403648c5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
@@ -42,7 +42,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 });    
 </script><!-- /TMPL_IF -->
 <div id="header_search">
-<div id="addbooks_search" class="residentsearch">
+<div id="addbooks_search" class="residentsearch primary">
 	<p class="tip">Search the catalog and the reservoir:</p>
 	<form name="search" action="addbooks.pl">
         <input type="text" name="q"  size="40" class="focus" />
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 ab54f68776..b6c2120a62 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
@@ -47,7 +47,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 
 <div id="header_search">
 
-<div id="circ_search" class="residentsearch">
+<div id="circ_search" class="residentsearch primary">
     <p class="tip">Enter patron card number or partial name:</p>
     <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
     <!-- TMPL_IF NAME="CircAutocompl" -->
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 f3af35fcb6..f8f61f0d2a 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
@@ -42,7 +42,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 });    
 </script><!-- /TMPL_IF -->
 <div id="header_search">
-	<div id="city_search" class="residentsearch">
+	<div id="city_search" class="residentsearch primary">
 	<p class="tip">City Search:</p>
 	<form action="<TMPL_VAR NAME="script_name">" method="post">
 		<input type="text" name="city_name" value="<!-- TMPL_VAR NAME="searchfield" -->" size="40" />
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 e1f0436b5b..ee665362e1 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
@@ -42,7 +42,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 });    
 </script><!-- /TMPL_IF -->
 <div id="header_search">
-	<div id="currency_search" class="residentsearch">
+	<div id="currency_search" class="residentsearch primary">
 	<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" -->" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
index 5dadd7798a..d31633195e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -1,4 +1,4 @@
-<div id="header">
+<div id="header" class="yui-g">
 
 <div id="toplevelnav">
 <ul id="toplevelmenu">
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 3e6d62a441..7d3e96edac 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
@@ -42,7 +42,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 });    
 </script><!-- /TMPL_IF -->
 <div id="header_search">
-	<div id="notices_search" class="residentsearch">
+	<div id="notices_search" class="residentsearch primary">
 	<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="" />
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 93909507e1..2706c6c52b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -42,7 +42,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 });    
 </script><!-- /TMPL_IF -->
 <div id="header_search">
-	<div id="patron_search" class="residentsearch">
+	<div id="patron_search" class="residentsearch primary">
 	<p class="tip">Enter patron card number or partial name:</p>
 	<form action="/cgi-bin/koha/members/member.pl" method="post">
     <input id="searchmember" size="25" name="member" type="text" />
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 98f61d4f13..1caa4777e9 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
@@ -42,7 +42,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 });    
 </script><!-- /TMPL_IF -->
 <div id="header_search">
-	<div id="patron_category_search" class="residentsearch">
+	<div id="patron_category_search" class="residentsearch primary">
 	<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" -->" />
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 a73f76fb4b..2c574e5c9c 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
@@ -44,7 +44,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 //]]>
 </script><!-- /TMPL_IF -->
 <div id="header_search">
-	<div id="printer_search" class="residentsearch">
+	<div id="printer_search" class="residentsearch primary">
 	<p class="tip">Printer Search:</p>
 <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
                 <input type="text" size="40" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->" />
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 85fe9a428e..14c4fa94fd 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
@@ -42,7 +42,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 });    
 </script><!-- /TMPL_IF -->
 <div id="header_search">
-	<div id="roadtype_search" class="residentsearch">
+	<div id="roadtype_search" class="residentsearch primary">
 	<p class="tip">Road Type Search:</p>
 		<form action="<TMPL_VAR NAME="script_name">" method="post">
 		<input type="text" name="road_type" value="<!-- TMPL_VAR NAME="searchfield" -->" size="40" />
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 08714248f0..24ac617aa9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
@@ -42,7 +42,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 });    
 </script><!-- /TMPL_IF -->
 <div id="header_search">
-	<div id="subscription_search" class="residentsearch">
+	<div id="subscription_search" class="residentsearch primary">
 	<p class="tip">Search Subscriptions:</p>
  <form action="/cgi-bin/koha/serials/serials-home.pl" method="get"><!-- TMPL_IF NAME="routing" --><input type="hidden" name="routing" value="<!-- TMPL_VAR NAME="routing" -->" /><!-- /TMPL_IF --><input type="hidden" name="searched" value="1" /> <label for="ISSN_filter">ISSN:</label> <input type="text" size="10" maxlength="11" name="ISSN_filter" id="ISSN_filter" value="<!-- TMPL_VAR name="ISSN_filter" -->" /> <label for="title_filter">Title:</label> <input type="text" size="20" maxlength="40" name="title_filter" id="title_filter" value="<!-- TMPL_VAR name="title_filter" -->" /><input type="submit" value="Search" class="button" />
 </form>
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 eb3da85711..1d12bda1ad 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
@@ -43,7 +43,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 });     //]]>
 </script><!-- /TMPL_IF -->
 <div id="header_search">
-	<div id="stopword_search" class="residentsearch">
+	<div id="stopword_search" class="residentsearch primary">
 	<p class="tip">Stop Word Search:</p>
 	    <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
         <input type="text" size="40" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
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 11fae93cb9..3f563c0cf7 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
@@ -44,7 +44,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
  //]]>
  </script>  <!-- /TMPL_IF -->
 <div id="header_search">
-	<div id="suggestions_search" class="residentsearch">
+	<div id="suggestions_search" class="residentsearch primary">
 	<p class="tip">Suggestions Search:</p>
 	<form action="/cgi-bin/koha/acqui/newordersuggestion.pl" method="get">
 	<label for="searchtitle">Title:</label> <input type="text" id="searchtitle" name="title" size="10" value="<!-- TMPL_VAR NAME="title"-->" />
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 1515be2d26..3117470bcf 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
@@ -1,6 +1,6 @@
 <!-- Begin Members Resident Search Box -->
 <div id="header_search">
-	<div id="z3950_search" class="residentsearch">
+	<div id="z3950_search" class="residentsearch primary">
 	<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" -->" />