diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index b3938e5b3e2..f0148dbaf49 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -236,7 +236,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
 		elseif ($conf->global->MAIN_MAIL_SENDMODE == 'smtps') $text = 'SMTPS library';
 		else { $text = $langs->trans("Undefined"); }
 		$htmltext = $langs->trans("ContactSuperAdminForChange");
-		print $html->textwithpicto($text,$htmltext,1,0,'superadmin');
+		print $html->textwithpicto($text,$htmltext,1,'superadmin');
 	}
 	print '</td></tr>';
 
@@ -263,7 +263,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
 		{
 			$text = $conf->global->MAIN_MAIL_SMTP_SERVER ? $conf->global->MAIN_MAIL_SMTP_SERVER : $smtpserver;
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
-			print $html->textwithpicto($text,$htmltext,1,0,'superadmin');
+			print $html->textwithpicto($text,$htmltext,1,'superadmin');
 		}
 	}
 	print '</td></tr>';
@@ -291,7 +291,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
 		{
 			$text = $conf->global->MAIN_MAIL_SMTP_PORT ? $conf->global->MAIN_MAIL_SMTP_PORT : $smtpport;
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
-			print $html->textwithpicto($text,$htmltext,1,0,'superadmin');
+			print $html->textwithpicto($text,$htmltext,1,'superadmin');
 		}
 	}
 	print '</td></tr>';
@@ -309,7 +309,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
 		else
 		{
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
-			print $html->textwithpicto($conf->global->MAIN_MAIL_SMTPS_ID,$htmltext,1,0,'superadmin');
+			print $html->textwithpicto($conf->global->MAIN_MAIL_SMTPS_ID,$htmltext,1,'superadmin');
 		}
 		print '</td></tr>';
 	}
@@ -327,7 +327,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
 		else
 		{
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
-			print $html->textwithpicto($conf->global->MAIN_MAIL_SMTPS_PW,$htmltext,1,0,'superadmin');
+			print $html->textwithpicto($conf->global->MAIN_MAIL_SMTPS_PW,$htmltext,1,'superadmin');
 		}
 		print '</td></tr>';
 	}
diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index fc4e7c5c7a3..7a2f49b6b29 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -203,7 +203,7 @@ if (function_exists("imagecreatefrompng"))
 else
 {
 	$html = new Form($db);
-	$desc = $html->textwithpicto('',$langs->transnoentities("EnableGDLibraryDesc"),1,0,'warning');
+	$desc = $html->textwithpicto('',$langs->transnoentities("EnableGDLibraryDesc"),1,'warning');
 	print $desc;
 }
 print "</td>";
@@ -246,7 +246,7 @@ if (function_exists("cl_scanfile")) // Clamav
 else
 {
 	$html = new Form($db);
-	$desc = $html->textwithpicto('',$langs->transnoentities("EnablePhpAVModuleDesc"),1,0,'warning');
+	$desc = $html->textwithpicto('',$langs->transnoentities("EnablePhpAVModuleDesc"),1,'warning');
 	print $desc;
 }
 print "</td>";
diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php
index de92eee7286..b86bfdba126 100644
--- a/htdocs/admin/system/database.php
+++ b/htdocs/admin/system/database.php
@@ -128,7 +128,7 @@ else
 				}
 				if ($show==0) print $row[1];
 				if ($show==1) print $html->textwithhelp($row[1],$text);
-				if ($show==2) print $html->textwithpicto($row[1],$text,1,0,'warning');
+				if ($show==2) print $html->textwithpicto($row[1],$text,1,'warning');
 				print '</td>';
 				print "</tr>\n";
 			}
diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php
index d21c542132d..7cbb156a4ac 100644
--- a/htdocs/html.form.class.php
+++ b/htdocs/html.form.class.php
@@ -171,7 +171,7 @@ class Form
 	{
 		global $conf;
 		$alt='';
-		if ($type == 'help')    	$img=img_help($alt);
+		if ($type == 'help')    	$img=img_help(1,$alt);
 		if ($type == 'warning') 	$img=img_warning($alt);
 		if ($type == 'superadmin') 	$img=img_redstar($alt);
 		if (empty($conf->use_javascript_ajax)) $alt='Help disabled (javascript disabled)';
diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index 70a127ae6e9..5c43b6f5a34 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -1090,24 +1090,24 @@ else
 			// On selectionne les groups
 			$grouplistid = array();
       $uss = array();
-            
+
       $sql = "SELECT ug.fk_usergroup";
       $sql.= " FROM ".MAIN_DB_PREFIX."usergroup_user as ug";
       $sql.= ", ".MAIN_DB_PREFIX."usergroup as u";
       $sql.= " WHERE ug.fk_user = ".$fuser->id;
       $sql.= " AND ug.fk_usergroup = u.rowid";
       $sql.= " AND u.entity IN (0,".$conf->entity.")";
-          
+
       $result = $db->query($sql);
       if ($result)
       {
       	$num = $db->num_rows($result);
         $i = 0;
-              
+
         while ($i < $num)
         {
         	$obj = $db->fetch_object($result);
-              	
+
           $grouplistid[]=$obj->fk_usergroup;
           $i++;
         }
@@ -1115,9 +1115,9 @@ else
       else {
         dol_print_error($db);
       }
-      
+
       $idList = implode(",",$grouplistid);
-      
+
       if (!empty($idList))
       {
       	$sql = "SELECT ug.rowid, ug.nom ";
@@ -1125,17 +1125,17 @@ else
       	$sql.= " WHERE ug.entity IN (0,".$conf->entity.")";
       	$sql.= " AND ug.rowid NOT IN (".$idList.")";
       	$sql.= " ORDER BY ug.nom";
-      	
+
       	$resql = $db->query($sql);
       	if ($resql)
       	{
       		$num = $db->num_rows($resql);
       		$i = 0;
-      		
+
       		while ($i < $num)
       		{
       			$obj = $db->fetch_object($resql);
-      			
+
       			$uss[$obj->rowid] = $obj->nom;
       			$i++;
       		}
@@ -1150,17 +1150,17 @@ else
       	$sql.= " FROM ".MAIN_DB_PREFIX."usergroup as ug ";
       	$sql.= " WHERE ug.entity IN (0,".$conf->entity.")";
       	$sql.= " ORDER BY ug.nom";
-      	
+
       	$resql = $db->query($sql);
       	if ($resql)
       	{
       		$num = $db->num_rows($resql);
       		$i = 0;
-      		
+
       		while ($i < $num)
       		{
       			$obj = $db->fetch_object($resql);
-      			
+
       			$uss[$obj->rowid] = $obj->nom;
       			$i++;
       		}
@@ -1337,7 +1337,7 @@ else
 				$text='<input size="12" maxlength="32" type="text" class="flat" name="password" value="'.$fuser->pass.'">';
 				if ($dolibarr_main_authentication && $dolibarr_main_authentication == 'http')
 				{
-					$text=$html->textwithpicto($text,$langs->trans("DolibarrInHttpAuthenticationSoPasswordUseless",$dolibarr_main_authentication),1,0,'warning');
+					$text=$html->textwithpicto($text,$langs->trans("DolibarrInHttpAuthenticationSoPasswordUseless",$dolibarr_main_authentication),1,'warning');
 				}
 			}
 			else
@@ -1366,7 +1366,7 @@ else
 				{
 					$yn = yn($fuser->admin);
 					print '<input type="hidden" name="admin" value="'.$fuser->admin.'">';
-					print $html->textwithpicto($yn,$langs->trans("DontChangeSuperAdmin"),1,0,'warning');
+					print $html->textwithpicto($yn,$langs->trans("DontChangeSuperAdmin"),1,'warning');
 				}
 				print '</td></tr>';
 			}