diff --git a/.gitattributes b/.gitattributes
index ffb41c888c33a7c625722a08325e709a76ba8272..7665cd848d13c4a088066a27a5a2b7b3fde64b3c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -46,23 +46,6 @@ IMG/icones/xls-dist.png -text
 IMG/icones/xml-dist.png -text
 IMG/icones/zip-dist.png -text
 IMG/icones_barre/agrave-maj.png -text
-IMG/icones_barre/barre-a-grave.png -text
-IMG/icones_barre/barre-bold.png -text
-IMG/icones_barre/barre-cadre.png -text
-IMG/icones_barre/barre-code.png -text
-IMG/icones_barre/barre-e-aigu.png -text
-IMG/icones_barre/barre-euro.png -text
-IMG/icones_barre/barre-guillemets.png -text
-IMG/icones_barre/barre-html.png -text
-IMG/icones_barre/barre-intertitre.png -text
-IMG/icones_barre/barre-italic.png -text
-IMG/icones_barre/barre-lien.png -text
-IMG/icones_barre/barre-note.png -text
-IMG/icones_barre/barre-oe-maj.png -text
-IMG/icones_barre/barre-oe.png -text
-IMG/icones_barre/barre-quote.png -text
-IMG/icones_barre/barre-tableau.png -text
-IMG/icones_barre/barre-wiki.png -text
 IMG/icones_barre/blanc.png -text
 IMG/icones_barre/eacute-maj.png -text
 IMG/icones_barre/euro.png -text
@@ -74,6 +57,7 @@ IMG/icones_barre/lien.png -text
 IMG/icones_barre/notes.png -text
 IMG/icones_barre/oelig-maj.png -text
 IMG/icones_barre/oelig.png -text
+IMG/icones_barre/quote.png -text
 IMG/test.gif -text
 IMG/test.jpg -text
 IMG/test.png -text
diff --git a/IMG/icones_barre/agrave-maj.png b/IMG/icones_barre/agrave-maj.png
index 56357cf600c9e4582def0f886349d6447026ba7d..e7aef6db96b9b33630e4a6442d07e654d38460f0 100644
Binary files a/IMG/icones_barre/agrave-maj.png and b/IMG/icones_barre/agrave-maj.png differ
diff --git a/IMG/icones_barre/barre-a-grave.png b/IMG/icones_barre/barre-a-grave.png
deleted file mode 100644
index 464af1466614040826e3689b62c745d8decda71e..0000000000000000000000000000000000000000
Binary files a/IMG/icones_barre/barre-a-grave.png and /dev/null differ
diff --git a/IMG/icones_barre/barre-bold.png b/IMG/icones_barre/barre-bold.png
deleted file mode 100644
index 7590a803d885c496db3c0ba84c58608a387cd9d7..0000000000000000000000000000000000000000
Binary files a/IMG/icones_barre/barre-bold.png and /dev/null differ
diff --git a/IMG/icones_barre/barre-cadre.png b/IMG/icones_barre/barre-cadre.png
deleted file mode 100644
index cd6d5c4b0b3e8c294d3e93060c6e1edd52c93920..0000000000000000000000000000000000000000
Binary files a/IMG/icones_barre/barre-cadre.png and /dev/null differ
diff --git a/IMG/icones_barre/barre-code.png b/IMG/icones_barre/barre-code.png
deleted file mode 100644
index 4bb5e2d03b8db13b0d145fc5c4c9854726234404..0000000000000000000000000000000000000000
Binary files a/IMG/icones_barre/barre-code.png and /dev/null differ
diff --git a/IMG/icones_barre/barre-e-aigu.png b/IMG/icones_barre/barre-e-aigu.png
deleted file mode 100644
index 4ef711d0ce6fecd229a855ef299e871f90806ece..0000000000000000000000000000000000000000
Binary files a/IMG/icones_barre/barre-e-aigu.png and /dev/null differ
diff --git a/IMG/icones_barre/barre-euro.png b/IMG/icones_barre/barre-euro.png
deleted file mode 100644
index d9d42811bf0be66553e2306950d9b881035ecf89..0000000000000000000000000000000000000000
Binary files a/IMG/icones_barre/barre-euro.png and /dev/null differ
diff --git a/IMG/icones_barre/barre-guillemets.png b/IMG/icones_barre/barre-guillemets.png
deleted file mode 100644
index 4ae8e53c15107829e7ee97ebccd00bd2c52f817a..0000000000000000000000000000000000000000
Binary files a/IMG/icones_barre/barre-guillemets.png and /dev/null differ
diff --git a/IMG/icones_barre/barre-html.png b/IMG/icones_barre/barre-html.png
deleted file mode 100644
index 381d8423226e33cbcc0b1209569aaebc0aff43c1..0000000000000000000000000000000000000000
Binary files a/IMG/icones_barre/barre-html.png and /dev/null differ
diff --git a/IMG/icones_barre/barre-intertitre.png b/IMG/icones_barre/barre-intertitre.png
deleted file mode 100644
index 85a15d2d67352ba9b3e2a3f08b8328aa72e5bbb5..0000000000000000000000000000000000000000
Binary files a/IMG/icones_barre/barre-intertitre.png and /dev/null differ
diff --git a/IMG/icones_barre/barre-italic.png b/IMG/icones_barre/barre-italic.png
deleted file mode 100644
index b96192a9ea302a4a078ac637bb79f016ebfa235b..0000000000000000000000000000000000000000
Binary files a/IMG/icones_barre/barre-italic.png and /dev/null differ
diff --git a/IMG/icones_barre/barre-lien.png b/IMG/icones_barre/barre-lien.png
deleted file mode 100644
index 3f639a6ba0946898037a8e8f0420a7658b622a3f..0000000000000000000000000000000000000000
Binary files a/IMG/icones_barre/barre-lien.png and /dev/null differ
diff --git a/IMG/icones_barre/barre-note.png b/IMG/icones_barre/barre-note.png
deleted file mode 100644
index f89d78c8b1e79d255af848915e87bb4f056ec881..0000000000000000000000000000000000000000
Binary files a/IMG/icones_barre/barre-note.png and /dev/null differ
diff --git a/IMG/icones_barre/barre-oe-maj.png b/IMG/icones_barre/barre-oe-maj.png
deleted file mode 100644
index aba72a7e924aa81318d4b321307dcf2bba2fed90..0000000000000000000000000000000000000000
Binary files a/IMG/icones_barre/barre-oe-maj.png and /dev/null differ
diff --git a/IMG/icones_barre/barre-oe.png b/IMG/icones_barre/barre-oe.png
deleted file mode 100644
index baac69f8019e01ba4ff8e280baf91b10f5b0b906..0000000000000000000000000000000000000000
Binary files a/IMG/icones_barre/barre-oe.png and /dev/null differ
diff --git a/IMG/icones_barre/barre-quote.png b/IMG/icones_barre/barre-quote.png
deleted file mode 100644
index 10bd53ad4969de2538049fb5148d6c64de043ef2..0000000000000000000000000000000000000000
Binary files a/IMG/icones_barre/barre-quote.png and /dev/null differ
diff --git a/IMG/icones_barre/barre-tableau.png b/IMG/icones_barre/barre-tableau.png
deleted file mode 100644
index 97e61f04d5eb492e20d037720c72f804ff847fea..0000000000000000000000000000000000000000
Binary files a/IMG/icones_barre/barre-tableau.png and /dev/null differ
diff --git a/IMG/icones_barre/barre-wiki.png b/IMG/icones_barre/barre-wiki.png
deleted file mode 100644
index 459b8a815e294233a90dd87c3e465a8148502fdf..0000000000000000000000000000000000000000
Binary files a/IMG/icones_barre/barre-wiki.png and /dev/null differ
diff --git a/IMG/icones_barre/eacute-maj.png b/IMG/icones_barre/eacute-maj.png
index 2e1e47d31363d896edddb9382979b26a6937e3b5..e6251741cdd6341c4e73ae567e3b99838734b31a 100644
Binary files a/IMG/icones_barre/eacute-maj.png and b/IMG/icones_barre/eacute-maj.png differ
diff --git a/IMG/icones_barre/euro.png b/IMG/icones_barre/euro.png
index bc87fb5c609f982e834667e69aff7fbed0494a49..02d72cad083d72a80b2ffccc6ace3c8c0ce67305 100644
Binary files a/IMG/icones_barre/euro.png and b/IMG/icones_barre/euro.png differ
diff --git a/IMG/icones_barre/gras.png b/IMG/icones_barre/gras.png
index 6adc653788ea9262adfddfd56f08a67ea51bfa11..baee119af9323f7aea3f65d72716b8f332b9c971 100644
Binary files a/IMG/icones_barre/gras.png and b/IMG/icones_barre/gras.png differ
diff --git a/IMG/icones_barre/guillemets.png b/IMG/icones_barre/guillemets.png
index 1791b8c3319f49581a1e77acb25f100f6d290bdc..c3dc35a16c2edc6aa462c5a030d0fbced9dfcc19 100644
Binary files a/IMG/icones_barre/guillemets.png and b/IMG/icones_barre/guillemets.png differ
diff --git a/IMG/icones_barre/intertitre.png b/IMG/icones_barre/intertitre.png
index bbce06b02c66353163bcbb5c9dbb2b1d4e26e6d0..e80e2391ba474b5f85e7f700c48a38c1ff84bbe2 100644
Binary files a/IMG/icones_barre/intertitre.png and b/IMG/icones_barre/intertitre.png differ
diff --git a/IMG/icones_barre/italique.png b/IMG/icones_barre/italique.png
index f4273e31ffc9ca7c49df3ab5bdd3d224a67b6334..e03d4e6a6760dd9f9527225382e0af1af18b7f35 100644
Binary files a/IMG/icones_barre/italique.png and b/IMG/icones_barre/italique.png differ
diff --git a/IMG/icones_barre/lien.png b/IMG/icones_barre/lien.png
index 7d7dca85055c735174b7efc71cca12b9d2a3aa6b..3f639a6ba0946898037a8e8f0420a7658b622a3f 100644
Binary files a/IMG/icones_barre/lien.png and b/IMG/icones_barre/lien.png differ
diff --git a/IMG/icones_barre/notes.png b/IMG/icones_barre/notes.png
index 9a005870ebd9f31c8db3ae256afd93f1c60fadfc..f89d78c8b1e79d255af848915e87bb4f056ec881 100644
Binary files a/IMG/icones_barre/notes.png and b/IMG/icones_barre/notes.png differ
diff --git a/IMG/icones_barre/oelig-maj.png b/IMG/icones_barre/oelig-maj.png
index 02ab463aa4fe3f1e59ca0e265efb376a63da8467..aba72a7e924aa81318d4b321307dcf2bba2fed90 100644
Binary files a/IMG/icones_barre/oelig-maj.png and b/IMG/icones_barre/oelig-maj.png differ
diff --git a/IMG/icones_barre/oelig.png b/IMG/icones_barre/oelig.png
index 6e5dc464498c8b54294b1ffeadf3b68d0962803b..b9354e2d529a3527e31d0e43df4d00c07c735e9f 100644
Binary files a/IMG/icones_barre/oelig.png and b/IMG/icones_barre/oelig.png differ
diff --git a/IMG/icones_barre/quote.png b/IMG/icones_barre/quote.png
new file mode 100644
index 0000000000000000000000000000000000000000..afb5fa3ff77e4d5ca6a0d5ae0ea8b44374275c4f
Binary files /dev/null and b/IMG/icones_barre/quote.png differ
diff --git a/ecrire/inc_barre.php3 b/ecrire/inc_barre.php3
index fb351bf0d567e2dbca7419e1315d6a7f84e49287..8df55ef1d7ad67ecd3863efca7939bd845e1a583 100644
--- a/ecrire/inc_barre.php3
+++ b/ecrire/inc_barre.php3
@@ -43,7 +43,7 @@ function bouton_barre_racc($action, $img, $help, $formulaire, $texte) {
 	$champhelp = "document.$formulaire.helpbox$texte";
 	return "<a href=\"".$action."\" class='spip_barre' title=\"".attribut_html($help)."\" "
 		."onMouseOver=\"helpline('$help',$champhelp)\" onMouseOut=\"helpline('Utilisez les raccourcis typographiques pour enrichir votre mise en page', $champhelp)\">"
-		."<img src='".($flag_ecrire ? "../" : "")."IMG/icones_barre/".$img."' border='0' height='24' align='middle'></a>";
+		."<img src='".($flag_ecrire ? "../" : "")."IMG/icones_barre/".$img."' border='0' height='16' align='middle'></a>";
 }
 
 function afficher_barre($formulaire='',$texte='', $forum=false) {
@@ -52,9 +52,9 @@ function afficher_barre($formulaire='',$texte='', $forum=false) {
 	if (test_barre()) {
 		$ret = afficher_script_barre();
 		$champ = "document.$formulaire.$texte";
-		$ret .= "<table style='background-color: #e8e8e4; margin-top:2px; padding-left: 2px; padding-top: 2px; border: 0px solid #eeeeee; border-left: 1px solid #ffffff; border-top: 1px solid #ffffff; border-bottom: 1px solid #aaaaaa; border-right: 1px solid #aaaaaa;' cellpadding='0' cellspacing='0' border='0' width='100%'>";
-		$ret .= "<tr width='100%' class='spip_barre'>";
-		$ret .= "<td align='left'>";
+		$ret .= "<table cellpadding='0' cellspacing='0' border='0' width='100%'>";
+		$ret .= "<tr width='100%'>";
+		$ret .= "<td align='left' style='padding-top: 4px; padding-bottom: 2px;'>";
 		$col++;
 
 		// Italique, gras, intertitres
@@ -73,11 +73,9 @@ function afficher_barre($formulaire='',$texte='', $forum=false) {
 		}
 		if ($forum) {
 			$ret .= "&nbsp;&nbsp;&nbsp;";
-			$ret .= bouton_barre_racc ("javascript:barre_raccourci('\n\n<quote>','</quote>\n\n',$champ)", "guillemets.png", "<quote>Citer un message</quote>", $formulaire, $texte);
-		}
-		else if ($spip_lang == "fr" OR $spip_lang == "eo" OR $spip_lang == "cpf") {
-			$ret .= bouton_barre_racc ("javascript:barre_raccourci('&laquo;','&raquo;',$champ)", "guillemets.png", "Entourer de &laquo; guillemets fran&ccedil;ais &raquo;", $formulaire, $texte);
+			$ret .= bouton_barre_racc ("javascript:barre_raccourci('\n\n<quote>','</quote>\n\n',$champ)", "quote.png", "<quote>Citer un message</quote>", $formulaire, $texte);
 		}
+
 		if ($options == "avancees") {
 			/*$ret .= "&nbsp;&nbsp;&nbsp;";
 			$ret .= bouton_barre_racc ("javascript:barre_raccourci('[?',']',$champ)", "barre-wiki.png", "Entr&eacute;e du [?glossaire] (Wikipedia)", $formulaire, $texte);
@@ -90,7 +88,9 @@ function afficher_barre($formulaire='',$texte='', $forum=false) {
 		// Insertion de caracteres difficiles a taper au clavier
 		$ret .= "<td align='center'>";
 		$col++;
-		if ($spip_lang == "fr") {
+		if ($spip_lang == "fr" OR $spip_lang == "eo" OR $spip_lang == "cpf") {
+			$ret .= bouton_barre_racc ("javascript:barre_raccourci('&laquo;','&raquo;',$champ)", "guillemets.png", "Entourer de &laquo; guillemets fran&ccedil;ais &raquo;", $formulaire, $texte);
+			$ret .= "&nbsp;&nbsp;&nbsp;";
 			$ret .= bouton_barre_racc ("javascript:barre_inserer('&Agrave;',$champ)", "agrave-maj.png", "Ins&eacute;rer un A accent grave majuscule", $formulaire, $texte);
 			$ret .= bouton_barre_racc ("javascript:barre_inserer('&Eacute;',$champ)", "eacute-maj.png", "Ins&eacute;rer un E accent aigu majuscule", $formulaire, $texte);
 			$ret .= bouton_barre_racc ("javascript:barre_inserer('&oelig;',$champ)", "oelig.png", "Ins&eacute;rer un E-dans-l-O", $formulaire, $texte);
@@ -113,7 +113,7 @@ function afficher_barre($formulaire='',$texte='', $forum=false) {
 
 		// Sur les forums publics, petite barre d'aide en survol des icones
 		if ($forum)
-			$ret .= "<tr><td colspan='$col'><input type='text' name='helpbox".$texte."' size='45' maxlength='100' style='width:100%; font-size:10px; background-color: #e8e8e4; border: 0px solid #dedede;' value='Utilisez les raccourcis typographiques pour enrichir votre mise en page' /></td></tr>";
+			$ret .= "<tr><td colspan='$col'><input type='text' name='helpbox".$texte."' size='45' maxlength='100' style='width:100%; font-size:10px; background-color: #e4e4e4; border: 0px solid #dedede;' value='Utilisez les raccourcis typographiques pour enrichir votre mise en page' /></td></tr>";
 		$ret .= "</table>";
 	}
 	return $ret;
diff --git a/ecrire/spip_style.php3 b/ecrire/spip_style.php3
index 97ad7eaa6c34804c1d2e72ed0f3d33dbd3c0ca34..081453ad6653f6b5850573899073ad639d42c594 100644
--- a/ecrire/spip_style.php3
+++ b/ecrire/spip_style.php3
@@ -59,8 +59,12 @@ a.icone:hover { text-decoration: none; }
  */
 
 a.spip_barre img {
-	border: 0px;
-	padding: 2px;
+	border-left: 1px solid #ffffff;
+	border-top: 1px solid #ffffff;
+	border-right: 1px solid #999999;
+	border-bottom: 1px solid #999999;
+	padding: 1px;
+	background-color: #cccccc;
 }
 a.spip_barre:hover img {
 	border: 1px solid #808080;
@@ -68,7 +72,6 @@ a.spip_barre:hover img {
 	background-color: #f8f8f4;
 }
 
-
 td.icone table {
 }
 td.icone a {
diff --git a/spip_style.css b/spip_style.css
index b076ea82f480fc08b50ba1c3637fe80da2ba10ee..d20994dab63c829c4ece9725521fa69ad14fabb6 100644
--- a/spip_style.css
+++ b/spip_style.css
@@ -100,12 +100,15 @@ i.spip { }
  */
 
 a.spip_barre img {
-	border: 0px;
-	padding: 2px;
+	border-left: 1px solid #ffffff;
+	border-top: 1px solid #ffffff;
+	border-right: 1px solid #999999;
+	border-bottom: 1px solid #999999;
+	padding: 1px;
+	background-color: #cccccc;
 }
 a.spip_barre:hover img {
 	border: 1px solid #808080;
 	padding: 1px;
 	background-color: #f8f8f4;
 }
-