diff --git a/dist/choix_mots.html b/dist/choix_mots.html
index 4888c01bba02b4f3fd8565e5159858da3612d8d3..bbd78f87a9602b37dd420921a35f570703e42876 100644
--- a/dist/choix_mots.html
+++ b/dist/choix_mots.html
@@ -8,7 +8,7 @@
 		    	id='mot#ID_MOT' 
 			[(#ID_MOT|in_any{#ENV*{ajouter_mot}, ''}|?
 				{'checked="checked"',''})] />
-		    #LOGO_MOT
+		    [(#LOGO_MOT|lien)]
 		<b><label for='mot#ID_MOT'>#TITRE</label></b><br />
 	</BOUCLE_M>
 		  </td></tr></table>
diff --git a/inc-calcul-outils.php3 b/inc-calcul-outils.php3
index 2739b2e9fd6065a8bbefcfe3f909b155bde0475a..4e0209996862feb9140f9d3bf1b52884701cd453 100644
--- a/inc-calcul-outils.php3
+++ b/inc-calcul-outils.php3
@@ -52,14 +52,14 @@ function affiche_logos($logos, $lien, $align) {
 			."onmouseout=\"this.src='$arton'\"";
 
 	$milieu = "<img src=\"$arton\" alt=\"\""
-		. ($align ? " align='$align'" : '') 
+		. ($align ? " align=\"$align\"" : '') 
 		. $taille
 		. $mouseover
 		. " style='border-width: 0px;' class='spip_logos' />";
 
 	return (!$lien ? $milieu :
 		('<a href="' .
-		 str_replace('&', '&amp;', $lien) .
+		 quote_amp($lien) .
 		'">' .
 		$milieu .
 		'</a>'	 ));