diff --git a/htdocs/about.php b/htdocs/about.php
index 2ddebbfd6d5..dec0492111d 100644
--- a/htdocs/about.php
+++ b/htdocs/about.php
@@ -30,13 +30,16 @@ require("./pre.inc.php");
 
 $langs->load("admin");
 
+
+/*
+ * View
+ */
+
 llxHeader();
 
 
 print_fiche_titre("Dolibarr",'','setup');
 
-print "<br>\n";
-
 print $langs->trans("Version").':';
 print '<ul>';
 print '<li>'.DOL_VERSION.'</li>';
diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php
index 9bbbc2ad8e8..f2f8669e931 100644
--- a/htdocs/admin/system/constall.php
+++ b/htdocs/admin/system/constall.php
@@ -21,10 +21,10 @@
  */
 
 /**
-		\file 		htdocs/admin/system/constall.php
-		\brief      Page d'info de toutes les constantes
-		\version    $Revision$
-*/
+ *		\file 		htdocs/admin/system/constall.php
+ *		\brief      Page d'info de toutes les constantes
+ *		\version    $Revision$
+ */
 
 require("./pre.inc.php");
 
@@ -35,11 +35,14 @@ if (!$user->admin)
   accessforbidden();
 
 
+/*
+ * View
+ */
+
 llxHeader();
 
 print_fiche_titre($langs->trans("SummaryConst"),'','setup');
 
-print '<br>';
 print '<table class="noborder">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
@@ -48,7 +51,7 @@ print "</tr>\n";
 
 $sql = "SELECT rowid, name, value, type, note FROM ".MAIN_DB_PREFIX."const ORDER BY name ASC";
 $result = $db->query($sql);
-if ($result) 
+if ($result)
 {
   $num = $db->num_rows();
   $i = 0;
diff --git a/htdocs/admin/system/database-tables-contraintes.php b/htdocs/admin/system/database-tables-contraintes.php
index f146cafbcba..f059bc52058 100644
--- a/htdocs/admin/system/database-tables-contraintes.php
+++ b/htdocs/admin/system/database-tables-contraintes.php
@@ -68,10 +68,9 @@ if (! $base)
 }
 else
 {
-	print '<br>';
 	print '<table class="noborder">';
 	print '<tr class="liste_titre">';
-	
+
 	if ($base==1)
 	{
 	    print '<td>'.$langs->trans("Tables").'</td>';
@@ -83,10 +82,10 @@ else
 	    print '<td>'.$langs->trans("Constraints").'</td>';
 	    print '<td>'.$langs->trans("ConstraintsType").'</td>';
 	}
-	
+
 	print "</tr>\n";
-	
-	
+
+
 	$result = $db->query($sql);
 	if ($result)
 	{
@@ -98,7 +97,7 @@ else
 	        $obj = $db->fetch_object($result);
 	        $var=!$var;
 	        print "<tr $bc[$var]>";
-	
+
 	        if ($base==1)
 	        {
 	            print '<td><a href="dbtable.php?table='.$obj->Name.'">'.$obj->Name.'</a></td>';
@@ -110,7 +109,7 @@ else
 	            print '<td>'.$obj->conname.'</td>';
 	            print '<td>'.$obj->contype.'</td>';
 	        }
-	
+
 	        print '</tr>';
 	        $i++;
 	    }
diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php
index eb94a29c243..40c90907219 100644
--- a/htdocs/admin/system/database-tables.php
+++ b/htdocs/admin/system/database-tables.php
@@ -63,7 +63,7 @@ else if ($conf->db->type == 'pgsql')
 }
 else if ($conf->db->type == 'mssql')
 {
-	//TODO: récupérer les infos du serveur
+	//TODO: r�cup�rer les infos du serveur
 	//$sqls[0] = "";
 	//$base=3;
 }
@@ -77,7 +77,6 @@ else
 {
 	if ($base == 1)
 	{
-		print '<br>';
 		print '<table class="noborder">';
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans("TableName").'</td>';
@@ -92,9 +91,9 @@ else
 		print '<td>Last check</td>';
 		print '<td>Collation</td>';
 		print "</tr>\n";
-	  
+
 		$sql = "SHOW TABLE STATUS";
-	  
+
 		$resql = $db->query($sql);
 		if ($resql)
 		{
@@ -106,7 +105,7 @@ else
 				$obj = $db->fetch_object($resql);
 				$var=!$var;
 				print "<tr $bc[$var]>";
-				 
+
 				print '<td><a href="dbtable.php?table='.$obj->Name.'">'.$obj->Name.'</a></td>';
 				print '<td>'.$obj->Engine.'</td>';
 				if ($row[1] == "MyISAM")
@@ -146,7 +145,7 @@ else
 		print '<td>Nbre de tuple supprimer</td>';
 		print "</tr>\n";
 		$sql = "select relname,seq_tup_read,idx_tup_fetch,n_tup_ins,n_tup_upd,n_tup_del from pg_stat_user_tables;";
-		 
+
 		$resql = $db->query($sql);
 		if ($resql)
 		{
diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php
index 132a0374dc4..ec4c93e1a9c 100644
--- a/htdocs/admin/system/database.php
+++ b/htdocs/admin/system/database.php
@@ -44,7 +44,6 @@ $html=new Form($db);
 llxHeader();
 
 print_fiche_titre($langs->trans("DatabaseConfiguration"),'','setup');
-print '<br>';
 
 // Database
 print '<table class="noborder" width="100%">';
diff --git a/htdocs/admin/system/dbtable.php b/htdocs/admin/system/dbtable.php
index 8f7ff239c77..ab641b11113 100644
--- a/htdocs/admin/system/dbtable.php
+++ b/htdocs/admin/system/dbtable.php
@@ -65,8 +65,6 @@ if (! $base)
 }
 else
 {
-	print '<br>';
-
 	$result = $db->query($sql);
 	if ($result)
 	{
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index cefa3424539..eead7b5bd61 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -43,8 +43,6 @@ llxHeader();
 
 print_fiche_titre("Dolibarr",'','setup');
 
-print "<br>\n";
-
 // Version
 $var=true;
 print '<table class="noborder" width="100%">';
diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php
index c0086ac4436..d90dd5b80d9 100644
--- a/htdocs/admin/system/modules.php
+++ b/htdocs/admin/system/modules.php
@@ -41,7 +41,6 @@ llxHeader();
 
 print_fiche_titre($langs->trans("AvailableModules"),'','setup');
 
-print "<br>\n";
 print $langs->trans("ToActivateModule").'<br>';
 print "<br>\n";
 
diff --git a/htdocs/admin/system/os.php b/htdocs/admin/system/os.php
index 5a0e07a8069..16fd81eb694 100644
--- a/htdocs/admin/system/os.php
+++ b/htdocs/admin/system/os.php
@@ -14,15 +14,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
  */
 
 /**
-        \file       htdocs/admin/system/os.php
-		\brief      Page des infos système de l'OS
-		\version    $Revision$
-*/
+ *      \file       htdocs/admin/system/os.php
+ *		\brief      Page des infos syst�me de l'OS
+ *		\version    $Id$
+ */
 
 require("./pre.inc.php");
 
@@ -32,25 +30,26 @@ $langs->load("admin");
 if (!$user->admin)
   accessforbidden();
 
+/*
+ * View
+ */
 
 llxHeader();
 
 print_fiche_titre("OS",'','setup');
 
-print "<br>\n";
-
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 print "\n";
 
-// Récupère l'OS au sens PHP
+// R�cup�re l'OS au sens PHP
 print "<tr $bc[0]><td width=\"240\">".$langs->trans("PHP_OS")."</td><td>".PHP_OS."</td></tr>\n";
 
-// Récupère la version de l'OS
-ob_start(); 
+// R�cup�re la version de l'OS
+ob_start();
 phpinfo();
-$chaine = ob_get_contents(); 
-ob_end_clean(); 
+$chaine = ob_get_contents();
+ob_end_clean();
 eregi('System </td><td class="v">([^\/]*)</td>',$chaine,$reg);
 print "<tr $bc[1]><td width=\"240\">".$langs->trans("Version")."</td><td>".$reg[1]."</td></tr>\n";
 print '</table>';
diff --git a/htdocs/admin/system/web.php b/htdocs/admin/system/web.php
index 7435d798500..7687b4e67e1 100644
--- a/htdocs/admin/system/web.php
+++ b/htdocs/admin/system/web.php
@@ -14,16 +14,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
- * $Source$
  */
 
 /**
-	    \file       htdocs/admin/system/web.php
-		\brief      Page des infos système du serveur Web
-		\version    $Revision$
-*/
+ *	    \file       htdocs/admin/system/web.php
+ *		\brief      Page des infos syst�me du serveur Web
+ *		\version    $Id$
+ */
 
 require("./pre.inc.php");
 
@@ -32,13 +29,14 @@ $langs->load("admin");
 if (!$user->admin)
   accessforbidden();
 
+/*
+ * View
+ */
 
 llxHeader();
 
 print_fiche_titre($langs->trans("WebServer"),'','setup');
 
-print "<br>\n";
-
 print '<table class="noborder" width="100%">';
 print "<tr class=\"liste_titre\"><td>".$langs->trans("Parameter")."</td><td>".$langs->trans("Value")."</td></tr>\n";
 print "<tr $bc[0]><td width=\"240\">".$langs->trans("Version")."</td><td>".$_SERVER["SERVER_SOFTWARE"]."</td></tr>\n";
diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index b6fc2794065..d84ab0b24e3 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -38,13 +38,12 @@ $formfile = new FormFile($db);
 
 
 /*
-* Affichage page
+* View
 */
 
 llxHeader('','','EN:Backups|FR:Sauvegardes|ES:Copias_de_seguridad');
 
 print_fiche_titre($langs->trans("Backup"),'','setup');
-print '<br>';
 
 print $langs->trans("BackupDesc",DOL_DATA_ROOT).'<br><br>';
 print $langs->trans("BackupDesc2",DOL_DATA_ROOT).'<br>';
diff --git a/htdocs/admin/tools/dolibarr_import.php b/htdocs/admin/tools/dolibarr_import.php
index 690c61331d8..ad0e08faf7c 100644
--- a/htdocs/admin/tools/dolibarr_import.php
+++ b/htdocs/admin/tools/dolibarr_import.php
@@ -39,7 +39,6 @@ if (! $user->admin)
 llxHeader('','','EN:Restores|FR:Restaurations|ES:Restauraciones');
 
 print_fiche_titre($langs->trans("Restore"),'','setup');
-print '<br>';
 
 print $langs->trans("RestoreDesc",DOL_DATA_ROOT).'<br><br>';
 print $langs->trans("RestoreDesc2",DOL_DATA_ROOT).'<br><br>';
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index 704074093cb..363eeb48732 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -60,7 +60,6 @@ $html=new Form($db);
 $formfile = new FormFile($db);
 
 print_fiche_titre($langs->trans("Backup"),'','setup');
-print '<br>';
 
 /**
  * Increase time limit for script execution and initializes some variables
diff --git a/htdocs/admin/tools/index.php b/htdocs/admin/tools/index.php
index 0d42c76e9a1..1d1e3733a4d 100644
--- a/htdocs/admin/tools/index.php
+++ b/htdocs/admin/tools/index.php
@@ -15,16 +15,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
- * $Source$
  */
 
 /**
-    	\file       htdocs/admin/tools/index.php
-		\brief      Page d'accueil de l'espace outils admin
-		\version    $Revision$
-*/
+ *    	\file       htdocs/admin/tools/index.php
+ * 		\brief      Page d'accueil de l'espace outils admin
+ *		\version    $Id$
+ */
 
 require("./pre.inc.php");
 
@@ -37,7 +34,7 @@ if (!$user->admin)
 
 
 /*
- * Affichage page
+ * View
  */
 
 llxHeader();
@@ -47,7 +44,6 @@ $form = new Form($db);
 
 print_fiche_titre($langs->trans("SystemToolsArea"),'','setup');
 
-print "<br>";
 print $langs->trans("SystemToolsAreaDesc").'<br>';
 print "<br>";
 
diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php
index 81310100046..5fd6eac19b1 100644
--- a/htdocs/admin/tools/purge.php
+++ b/htdocs/admin/tools/purge.php
@@ -117,7 +117,6 @@ llxHeader();
 $html=new Form($db);
 
 print_fiche_titre($langs->trans("Purge"),'','setup');
-print '<br>';
 
 print $langs->trans("PurgeAreaDesc",$dolibarr_main_data_root).'<br>';
 print '<br>';
diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php
index 1db229a717d..bc3f250d931 100644
--- a/htdocs/admin/tools/update.php
+++ b/htdocs/admin/tools/update.php
@@ -60,7 +60,6 @@ $wikihelp='EN:Installation_/_Upgrade|FR:Installation_/_Mise_a_jour|ES:Instalaci
 llxHeader($langs->trans("Upgrade"),'',$wikihelp);
 
 print_fiche_titre($langs->trans("Upgrade"),'','setup');
-print '<br>';
 
 print $langs->trans("CurrentVersion").' : <b>'.DOL_VERSION.'</b><br>';
 print $langs->trans("LastStableVersion").' : <b>'.$langs->trans("FeatureNotYetAvailable").'</b><br>';
diff --git a/htdocs/admin/triggers.php b/htdocs/admin/triggers.php
index 0206fd42e70..409a93b463c 100644
--- a/htdocs/admin/triggers.php
+++ b/htdocs/admin/triggers.php
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
- 
+
 /**
  *       \file       htdocs/admin/triggers.php
  *       \brief      Page de configuration et activation des triggers
@@ -65,7 +65,7 @@ function Activate($value)
         $objMod->init();
     }
 
-    // Activation des modules dont le module dépend
+    // Activation des modules dont le module d�pend
     for ($i = 0; $i < sizeof($objMod->depends); $i++)
     {
         Activate($objMod->depends[$i]);
@@ -74,8 +74,8 @@ function Activate($value)
 }
 
 
-/**     \brief      Désactive un module
-        \param      value   Nom du module a désactiver
+/**     \brief      D�sactive un module
+        \param      value   Nom du module a d�sactiver
 */
 function UnActivate($value)
 {
@@ -103,6 +103,9 @@ function UnActivate($value)
 }
 
 
+/*
+ * View
+ */
 
 llxHeader("","");
 
@@ -110,7 +113,6 @@ $html = new Form($db);
 
 print_fiche_titre($langs->trans("TriggersAvailable"),'','setup');
 
-print "<br>\n";
 print $langs->trans("TriggersDesc")."<br>";
 print "<br>\n";
 
@@ -192,10 +194,10 @@ foreach ($orders as $key => $value)
 		if (strtolower($reg[1]) == 'all') $disabledbymodule=0;
 		else if (empty($conf->global->$constparam)) $disabledbymodule=2;
 	}
-    
+
 	// Show line for trigger file
     print "<tr $bc[$var]>\n";
-    
+
     print '<td valign="top" width="14" align="center">';
     print $objMod->picto?img_object('',$objMod->picto):img_object('','generic');
     print '</td>';
@@ -214,12 +216,12 @@ foreach ($orders as $key => $value)
         print img_tick();
     }
     print "</td>\n";
-	
+
     print '<td valign="top">';
 	$text ='<b>'.$langs->trans("Description").':</b><br>';
 	$text.=$objMod->getDesc().'<br>';
 	$text.='<br><b>'.$langs->trans("Status").':</b><br>';
-	if ($disabledbyname == 1) 
+	if ($disabledbyname == 1)
 	{
 		$text.=$langs->trans("TriggerDisabledByName").'<br>';
 		if ($disabledbymodule == 2) $text.=$langs->trans("TriggerDisabledAsModuleDisabled",$module).'<br>';
@@ -234,7 +236,7 @@ foreach ($orders as $key => $value)
 	print "</td>\n";
 
     print "</tr>\n";
-    
+
 }
 print "</table>\n";
 
diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php
index 423f614adf9..5494a9ccb70 100644
--- a/htdocs/lib/functions.lib.php
+++ b/htdocs/lib/functions.lib.php
@@ -1881,6 +1881,8 @@ function print_titre($titre)
 function print_fiche_titre($titre, $mesg='', $picto='title.png', $pictoisfullpath=0)
 {
 	global $conf;
+
+	if ($picto == 'setup') $picto='title.png';
 	if (empty($conf->browser->firefox) && $picto=='title.png') $picto='title.gif';
 
 	print "\n";
@@ -1913,6 +1915,8 @@ function print_fiche_titre($titre, $mesg='', $picto='title.png', $pictoisfullpat
 function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $sortorder='', $center='', $num=-1, $totalnboflines=0, $picto='title.png', $pictoisfullpath=0)
 {
 	global $conf,$langs;
+
+	if ($picto == 'setup') $picto='title.png';
 	if (empty($conf->browser->firefox) && $picto=='title.png') $picto='title.gif';
 
 	if ($num > $conf->liste_limit or $num == -1)