diff --git a/koha-tmpl/intranet-tmpl/default/fr/catalogue/catalogue-home.tmpl b/koha-tmpl/intranet-tmpl/default/fr/catalogue/catalogue-home.tmpl
index 4ea68b7d55..be6cfb39c3 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/catalogue/catalogue-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/catalogue/catalogue-home.tmpl
@@ -14,10 +14,6 @@
 
 <FONT SIZE=6><em>Recherche Catalogue</em></FONT>
 
-<div align=right>
-	<input type="hidden" name="type" value="intra">
-	<INPUT TYPE="image"  alt="Start Search" src="/images/ok-start-search.gif"  WIDTH=187  HEIGHT=42 BORDER=0 >
-</div>
 <CENTER>
 
 <TABLE align="left" width="40%" cellspacing=0 cellpadding=5 border=0 >
@@ -92,8 +88,13 @@
 		<TD>Sujet</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="subject"></TD>
 	</TR>
 	<tr>
-		<TD></TD>
-		<TD><INPUT TYPE="reset"  VALUE= "Clear Fields"></TD>
+		<TD>
+			<input type="hidden" name="type" value="intra">
+			<input type="submit" class="button" value="Chercher">
+		</TD>
+		<TD>
+			<div align="right"><INPUT TYPE="reset"  VALUE= "effacer" class="button"></div>
+		</TD>
 	</TR>
 </TABLE>
 </FORM>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/catalogue/searchresults.tmpl b/koha-tmpl/intranet-tmpl/default/fr/catalogue/searchresults.tmpl
index cf6584bdfc..3d17e49b54 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/catalogue/searchresults.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/catalogue/searchresults.tmpl
@@ -23,24 +23,23 @@
 
 
     <!-- Row of numbers corresponding to search result pages -->
-    <TMPL_IF NAME=displayprev>
-	<a href=search.pl?startfrom=<TMPL_VAR NAME="prevstartfrom">&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=line>&</TMPL_LOOP>type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>><img src=/images/numbers/prev.gif border=0></a>
-    <TMPL_ELSE>
-	<img src=/images/numbers/placeholder.gif border=0>
-    </TMPL_IF>
-    <TMPL_LOOP NAME=numbers>
-	<TMPL_IF NAME=highlight>
-	    <img src=/images/numbers/<TMPL_VAR NAME=number>-highlight.gif>
+	<TMPL_IF NAME=displayprev>
+		<a href=search.pl?startfrom=<TMPL_VAR NAME="prevstartfrom">&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=term>=<TMPL_VAR name="value" ESCAPE=URL>&</TMPL_LOOP>type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>><img src=<TMPL_VAR name="themelang">/images/numbers/prev.gif border=0></a>
 	<TMPL_ELSE>
-	    <a href=search.pl?startfrom=<TMPL_VAR NAME=startfrom>&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=line>&</TMPL_LOOP>type=<TMPL_IF NAME=opac>opac<TMPL_ELSE>intra</TMPL_IF>><img src=/images/numbers/<TMPL_VAR NAME=number>.gif border=0></a>
+		<img src=<TMPL_VAR name="themelang">/images/numbers/placeholder.gif border=0>
+	</TMPL_IF>
+	<TMPL_LOOP NAME=numbers>
+		<TMPL_IF NAME=highlight>
+		<img src=<TMPL_VAR name="themelang">/images/numbers/<TMPL_VAR NAME=number>-highlight.gif>
+		<TMPL_ELSE>
+		<a href=search.pl?startfrom=<TMPL_VAR NAME=startfrom>&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=term>=<TMPL_VAR name="value" ESCAPE=URL>&</TMPL_LOOP>type=<TMPL_IF NAME=opac>opac<TMPL_ELSE>intra</TMPL_IF>><img src=<TMPL_VAR name="themelang">/images/numbers/<TMPL_VAR NAME=number>.gif border=0></a>
+		</TMPL_IF>
+	</TMPL_LOOP>
+	<TMPL_IF NAME=displaynext>
+		<a href=search.pl?startfrom=<TMPL_VAR NAME="nextstartfrom">&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=term>=<TMPL_VAR name="value" ESCAPE=URL>&</TMPL_LOOP>type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>><img src=<TMPL_VAR name="themelang">/images/numbers/next.gif border=0></a>
+	<TMPL_ELSE>
+		<img src=<TMPL_VAR name="themelang">/images/numbers/placeholder.gif border=0>
 	</TMPL_IF>
-    </TMPL_LOOP>
-    <TMPL_IF NAME=displaynext>
-	<a href=search.pl?startfrom=<TMPL_VAR NAME="nextstartfrom">&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=line>&</TMPL_LOOP>type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>><img src=/images/numbers/next.gif border=0></a>
-    <TMPL_ELSE>
-	<img src=/images/numbers/placeholder.gif border=0>
-    </TMPL_IF>
-
     <p>
 
 
@@ -82,13 +81,13 @@
 	<table border=0 cellpadding=0 cellspacing=0 width=100%">
 	<tr <TMPL_IF NAME="opac">bgcolor=#99cccc background=/images/background-opac.gif<TMPL_ELSE>bgcolor=#ccccff background="/images/background-mem.gif"</TMPL_IF>><td align=left>
 	<TMPL_IF NAME=displayprev>
-	    <a href=search.pl?startfrom=<TMPL_VAR NAME="prevstartfrom">&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=line>&</TMPL_LOOP>type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>>R&eacute;sultats pr&eacute;c&eacute;dents</a>
+		<a href=search.pl?startfrom=<TMPL_VAR NAME="prevstartfrom">&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=term>=<TMPL_VAR name="value" ESCAPE=URL>&</TMPL_LOOP>type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>>R&eacute;sultats pr&eacute;c&eacute;dents</a>
 	<TMPL_ELSE>
 	    &nbsp;
 	</TMPL_IF>
 	</td><td align=right>
 	<TMPL_IF NAME=displaynext>
-	    <a href=search.pl?startfrom=<TMPL_VAR NAME="nextstartfrom">&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=line>&</TMPL_LOOP>type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>>R&eacute;sultats suivants</a>
+		<a href=search.pl?startfrom=<TMPL_VAR NAME="nextstartfrom">&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=term>=<TMPL_VAR name="value" ESCAPE=URL>&</TMPL_LOOP>type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>>R&eacute;sultats suivants</a>
 	<TMPL_ELSE>
 	    &nbsp;
 	</TMPL_IF>