diff --git a/dist/style_prive.html b/dist/style_prive.html
index 88bd3ebae5a55e2685e172d5ab95e4cb7c1c592c..58f93f05a3805a909b006a5ba80b043be978f8be 100644
--- a/dist/style_prive.html
+++ b/dist/style_prive.html
@@ -1443,13 +1443,19 @@ a.spip_glossaire:hover {
 }
 
 .spip_recherche {
+	width: 240px;
+	float: [(#GET{right})];
+}
+.spip_recherche .recherche{
 	padding: 3px; 
-	width: 100%; 
+	width: 200px; 
 	font-size: 10px;
 	border: 1px solid #fff;
 	background-color: #GET{foncee};
 	color: #fff;
+	margin:0 3px 6px 0;
 }
+.spip_recherche .submit{}
 
 /* Citations, code et poesie */
 q, blockquote.spip, .spip_poesie, .spip_serif { font-family: Georgia, Times, serif; }
diff --git a/ecrire/exec/recherche.php b/ecrire/exec/recherche.php
index ef3efb0c670306ed264022ef973fca417780b1a1..9e7563a31d28e5009c467c3e0e76912c67a8d715 100644
--- a/ecrire/exec/recherche.php
+++ b/ecrire/exec/recherche.php
@@ -61,8 +61,9 @@ function exec_recherche_dist() {
 		$onfocus = " onfocus=\"this.value='';\"";
 	} else $onfocus = '';
 
-	$onfocus = '<input type="text" size="10" value="'.$recherche_aff.'" name="recherche" class="spip_recherche" accesskey="r"' . $onfocus . ' />';
-	echo "<div style='width:200px;float:$spip_lang_right;'>".generer_form_ecrire("recherche", $onfocus, " method='get'")."</div>";
+	$form = '<input type="text" size="10" value="'.$recherche_aff.'" name="recherche" class="recherche" accesskey="r"' . $onfocus . ' />';
+	$form .= "<input type='image' width='26' height='20' src='"._DIR_IMG_PACK."loupe.png' name='submit' class='submit' alt='"._T('info_rechercher')."' />";
+	echo "<div class='spip_recherche'>".generer_form_ecrire("recherche", $form, " method='get'")."</div>";
 
 /*
 	// Si on est autorise a modifier, proposer le choix de REMPLACER
@@ -127,7 +128,7 @@ function exec_recherche_dist() {
 		if (strlen($recherche))
 			echo "<p class='verdana1'>"._T('avis_aucun_resultat')."</p>";
 
-	echo fin_grand_cadre(), fin_page();
+	echo fin_grand_cadre(true), fin_page();
 }
 
 ?>