diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index ac3a46d6e8c..78c9c4bf065 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1635,7 +1635,9 @@ else
 				print '<tr><td colspan="2" align="right">'.$langs->trans("Billed").' :</td><td align="right" style="border: 1px solid;">'.price($fac->total_ttc).'</td><td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>';
 				if ($fac->close_code == 'escompte')
 				{
-					print '<tr><td colspan="2" align="right">'.$langs->trans("EscompteOffered").' :</td><td align="right">'.price($fac->total_ttc - $totalpaye).'</td><td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>';
+					print '<tr><td colspan="2" align="right" nowrap="1">';
+					$html->textwithhelp($langs->trans("Escompte").':',$langs->trans("HelpEscompte"),-1);
+					print '</td><td align="right">'.price($fac->total_ttc - $totalpaye).'</td><td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>';
 				}
 				print '<tr><td colspan="2" align="right">'.$langs->trans('RemainderToPay').' :</td>';
 				print '<td align="right" style="border: 1px solid;" bgcolor="#f0f0f0"><b>'.price($resteapayer).'</b></td><td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>';
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index b72f781059b..db0693b2074 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -152,6 +152,7 @@ DiscountOfferedBy=Granted by
 DiscountStillRemaining=Discount still remaining
 DiscountAlreadyCounted=Discount already counted
 BillAddress=Bill address
+HelpEscompte=This discount is a discount granted to customer because its paiement was made before term.
 # PaymentConditions
 PaymentConditionShortRECEP=After reception
 PaymentConditionRECEP=After invoice reception
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 7a3e5e7c6b5..15f3b3f131b 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -152,6 +152,7 @@ DiscountOfferedBy=Accord
 DiscountStillRemaining=Remises fixes restant en cours
 DiscountAlreadyCounted=Remises fixes déjà appliquées
 BillAddress=Adresse de facturation
+HelpEscompte=Un <b>escompte</b> est une remise accordée, sur une facture donnée, à un client car ce dernier a réalisé son paiement bien avant l'échéance.
 # PaymentConditions
 PaymentConditionShortRECEP=A réception
 PaymentConditionRECEP=A réception de facture
diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php
index f52cbdf131c..a84b3b2ab89 100644
--- a/htdocs/lib/functions.inc.php
+++ b/htdocs/lib/functions.inc.php
@@ -761,7 +761,7 @@ function img_help($usehelpcursor=1,$usealttitle=1)
 	global $conf,$langs;
 	$s ='<img ';
 	if ($usehelpcursor) $s.='style="cursor: help;" ';
-	$s.='src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/help.png" border="0"';
+	$s.='src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/info.png" border="0"';
 	if ($usealttitle) $s.=' alt="'.$langs->trans("Info").'" title="'.$langs->trans("Info");
 	$s.='">';
 	return $s;
diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index fc2f7c0695d..dc4806b728f 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -713,7 +713,7 @@ else
             }
             else
             {
-                print '<img width="100" src="'.DOL_URL_ROOT.'/theme/nophoto.jpg">';
+                print '<img width="100" src="'.DOL_URL_ROOT.'/theme/common/nophoto.jpg">';
             }
             print '</td></tr>';
 
@@ -1040,7 +1040,7 @@ else
             }
             else
             {
-                print '<img src="'.DOL_URL_ROOT.'/theme/nophoto.jpg">';
+                print '<img src="'.DOL_URL_ROOT.'/theme/common/nophoto.jpg">';
             }
             if ($caneditfield) 
             {
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 0b26b4d5319..f28e964c402 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -242,7 +242,8 @@ function show_theme($fuser,$edit=0)
     $i=0;
     while (($subdir = readdir($handle))!==false)
     {
-        if (is_dir($dirtheme."/".$subdir) && substr($subdir, 0, 1) <> '.' && substr($subdir, 0, 3) <> 'CVS')
+        if (is_dir($dirtheme."/".$subdir) && substr($subdir, 0, 1) <> '.'
+        	&& substr($subdir, 0, 3) <> 'CVS' && ! eregi('common',$subdir))
         {
             if ($i % $thumbsbyrow == 0)
             {
@@ -251,7 +252,7 @@ function show_theme($fuser,$edit=0)
             
             print '<td align="center">';
             $file=$dirtheme."/".$subdir."/thumb.png";
-            if (! file_exists($file)) $file=$dirtheme."/nophoto.jpg";
+            if (! file_exists($file)) $file=$dirtheme."/common/nophoto.jpg";
             print '<table><tr><td><img src="'.$file.'" width="80" height="60"></td></tr><tr><td align="center">';
             if ($subdir == $fuser->conf->MAIN_THEME)
             {