diff --git a/ChangeLog b/ChangeLog
index af90978b7a7..e2060cda330 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,7 @@ For developers:
 - More comments in code.
 - Uniformize some code. 
 - First delete of useless pre.inc.php files.
+- Fix W3C errors in page forging. 
 
 
 ***** ChangeLog for 2.8 compared to 2.7 *****
diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index 01f4e7b0509..899fb6d1cfc 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -181,7 +181,7 @@ if ($db->label == 'MySQL')
             {
 	            $fullpathofmysqldump=$conf->global->SYSTEMTOOLS_MYSQLDUMP;
             }
-        ?><br />
+        ?><br>
         <input type="text" name="mysqldump" size="80"
             value="<?php echo $fullpathofmysqldump; ?>" />
     </div>
@@ -240,7 +240,7 @@ if ($db->label == 'MySQL')
 
         <input type="checkbox" name="drop" value="1" id="checkbox_dump_drop"
              />
-        <label for="checkbox_dump_drop"><?php echo $langs->trans("AddDropTable"); ?></label><br />
+        <label for="checkbox_dump_drop"><?php echo $langs->trans("AddDropTable"); ?></label><br>
     </fieldset>
 
 	<br>
@@ -259,32 +259,32 @@ if ($db->label == 'MySQL')
             id="checkbox_dump_showcolumns"
              />
         <label for="checkbox_dump_showcolumns">
-            <?php echo $langs->trans("NameColumn"); ?></label><br />
+            <?php echo $langs->trans("NameColumn"); ?></label><br>
 
         <input type="checkbox" name="extended_ins" value="yes"
             id="checkbox_dump_extended_ins"
              />
         <label for="checkbox_dump_extended_ins">
-            <?php echo $langs->trans("ExtendedInsert"); ?></label><br />
+            <?php echo $langs->trans("ExtendedInsert"); ?></label><br>
 
         <input type="checkbox" name="delayed" value="yes"
             id="checkbox_dump_delayed"
              />
 
         <label for="checkbox_dump_delayed">
-            <?php echo $langs->trans("DelayedInsert"); ?></label><br />
+            <?php echo $langs->trans("DelayedInsert"); ?></label><br>
 
         <input type="checkbox" name="sql_ignore" value="yes"
             id="checkbox_dump_ignore"
              />
         <label for="checkbox_dump_ignore">
-            Ignorer les erreurs de doublons (INSERT IGNORE)</label><br />
+            Ignorer les erreurs de doublons (INSERT IGNORE)</label><br>
 
         <input type="checkbox" name="hexforbinary" value="yes"
             id="checkbox_hexforbinary"
              checked="checked" />
         <label for="checkbox_hexforbinary">
-            <?php echo $langs->trans("EncodeBinariesInHexa"); ?></label><br />
+            <?php echo $langs->trans("EncodeBinariesInHexa"); ?></label><br>
 
     </fieldset>
 </fieldset>
@@ -308,7 +308,7 @@ if ($db->label == 'PostgreSQL')
             {
 	            $fullpathofpgdump=$conf->global->SYSTEMTOOLS_POSTGRESQLDUMP;
             }
-        ?><br />
+        ?><br>
         <input type="text" name="postgresqldump" size="80"
             value="<?php echo $fullpathofpgdump; ?>" />
     </div>
@@ -359,7 +359,7 @@ if ($db->label == 'PostgreSQL')
             id="checkbox_dump_showcolumns"
              />
         <label for="checkbox_dump_showcolumns">
-            <?php echo $langs->trans("NameColumn"); ?></label><br />
+            <?php echo $langs->trans("NameColumn"); ?></label><br>
 
     </fieldset>
 </fieldset>
@@ -437,7 +437,7 @@ if ($db->label == 'PostgreSQL')
             id="ch_latex_showcolumns"
              checked="checked" />
         <label for="ch_latex_showcolumns">
-            Nom des colonnes</label><br />
+            Nom des colonnes</label><br>
         <table>
         <tr><td><label for="latex_data_caption">
                     Sous-titre de la table</label></td>
diff --git a/htdocs/admin/tools/eaccelerator.php b/htdocs/admin/tools/eaccelerator.php
index 22e09339f3f..ee44c42734f 100644
--- a/htdocs/admin/tools/eaccelerator.php
+++ b/htdocs/admin/tools/eaccelerator.php
@@ -332,10 +332,10 @@ if (function_exists('eaccelerator_get'))
 	create_key_table($res);
 }
 
-print "<br /><br />";
+print "<br><br>";
 print "<hr />";
 print '<table><tr><td class="center">';
-print '<strong>Eaccelerator is created by the eAccelerator team, <a href="http://eaccelerator.net">http://eaccelerator.net</a></strong><br /><br />';
+print '<strong>Eaccelerator is created by the eAccelerator team, <a href="http://eaccelerator.net">http://eaccelerator.net</a></strong><br><br>';
 print "</td></tr></table>";
 
 
diff --git a/htdocs/boutique/commande/fiche.php b/htdocs/boutique/commande/fiche.php
index b16102db243..19e6f47b126 100644
--- a/htdocs/boutique/commande/fiche.php
+++ b/htdocs/boutique/commande/fiche.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2003-2005 Éric Seigne <eric.seigne@ryxeo.com>
+ * Copyright (C) 2003-2005 �ric Seigne <eric.seigne@ryxeo.com>
  * Copyright (C) 2004-2006 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -58,7 +58,7 @@ if ($_GET['id'])
 
       print "</table>";
 
-      print "<br />";
+      print "<br>";
 
       /*
        * Produits
@@ -108,7 +108,7 @@ if ($_GET['id'])
        *
        *
        */
-      print "<br />";
+      print "<br>";
 
       print '<table border="1" width="100%" cellspacing="0" cellpadding="4">';
       print "<tr>";
diff --git a/htdocs/cashdesk/templates/liste_articles.tpl.php b/htdocs/cashdesk/templates/liste_articles.tpl.php
index 70b146c466e..4079ba529a0 100644
--- a/htdocs/cashdesk/templates/liste_articles.tpl.php
+++ b/htdocs/cashdesk/templates/liste_articles.tpl.php
@@ -68,7 +68,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 		$obj_facturation->calculTotaux();
 		$total_ttc = $obj_facturation->prix_total_ttc();
-		echo ('<p class="cadre_prix_total">'.$langs->trans("Total").' : '.price2num($total_ttc, 'MT').' '.$conf->monnaie.'<br /></p>'."\n");
+		echo ('<p class="cadre_prix_total">'.$langs->trans("Total").' : '.price2num($total_ttc, 'MT').' '.$conf->monnaie.'<br></p>'."\n");
 
 	} else {
 
diff --git a/htdocs/cashdesk/templates/ticket.tpl.php b/htdocs/cashdesk/templates/ticket.tpl.php
index 5c9c0741282..ca7ba5a98d7 100644
--- a/htdocs/cashdesk/templates/ticket.tpl.php
+++ b/htdocs/cashdesk/templates/ticket.tpl.php
@@ -95,8 +95,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 	<?php print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode('/thumbs/'.$mysoc->logo_small).'">'; ?>
 	</div>
 	<div class="infos">
-		<p class="adresse"><?php echo $mysoc->nom; ?><br />
-		<?php echo $mysoc->adresse; ?><br />
+		<p class="adresse"><?php echo $mysoc->nom; ?><br>
+		<?php echo $mysoc->adresse; ?><br>
 		<?php echo $mysoc->cp.' '.$mysoc->ville; ?></p>
 
 		<?php
diff --git a/htdocs/cashdesk/templates/validation1.tpl.php b/htdocs/cashdesk/templates/validation1.tpl.php
index 0da9d7e4362..93cf5f5c0a3 100644
--- a/htdocs/cashdesk/templates/validation1.tpl.php
+++ b/htdocs/cashdesk/templates/validation1.tpl.php
@@ -67,7 +67,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 	<form id="frmValidation" class="formulaire2" method="post" action="validation_verif.php?action=valide_facture">
 		<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
 
-		<p class="note_label"><?php echo $langs->trans("Notes"); ?><br /><textarea class="textarea_note" name="txtaNotes"></textarea></p>
+		<p class="note_label"><?php echo $langs->trans("Notes"); ?><br><textarea class="textarea_note" name="txtaNotes"></textarea></p>
 
 		<span><input class="bouton_validation" type="submit" name="btnValider" value="<?php echo $langs->trans("ValidateInvoice"); ?>" /></span>
 		<p><a class="lien1" href="affIndex.php?menu=facturation"><?php echo $langs->trans("RestartSelling"); ?></a></p>
diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php
index d7a48b3e65f..2dd08098762 100644
--- a/htdocs/categories/photos.php
+++ b/htdocs/categories/photos.php
@@ -136,7 +136,7 @@ if ($_GET["id"] || $_GET["ref"])
 		print '<a href="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type.'">'.$langs->trans("Root").'</a> >> ';
 		foreach ($ways as $way)
 		{
-			print $way."<br />\n";
+			print $way."<br>\n";
 		}
 		print '</td></tr>';
 
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index e7a4f766fa3..0fd6a979135 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -123,7 +123,7 @@ print $langs->trans("Ref").'</td><td>';
 print '<a href="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type.'">'.$langs->trans("Root").'</a> >> ';
 foreach ($ways as $way)
 {
-	print $way."<br />\n";
+	print $way."<br>\n";
 }
 print '</td></tr>';
 
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index d0dcfa947ed..3bbd0a6eb04 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -113,7 +113,7 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
 	print '<tr '.$bc[$var].'><td nowrap>'.$langs->trans("Other").':</td><td><input type="text" class="flat" name="sall" size="18"></td>';
 	print '</tr>';
 	print "</table></form>\n";
-	print "<br />\n";
+	print "<br>\n";
 }
 
 /*
diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php
index 4284563eb36..e9d1ad7e6bd 100644
--- a/htdocs/comm/mailing/fiche.php
+++ b/htdocs/comm/mailing/fiche.php
@@ -713,7 +713,7 @@ else
 					print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&amp;id='.$mil->id.'">'.$langs->trans("DeleteMailing").'</a>';
 				}
 
-				print '<br /><br /></div>';
+				print '<br><br></div>';
 			}
 
 			// Affichage formulaire de TEST
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 715c8ddf6ef..fb33613f950 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -1687,7 +1687,7 @@ if ($id > 0 || ! empty($ref))
 				else print '&nbsp;';
 				print '</td>';
 				print '<td align="center" colspan="5" valign="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-				print '<br /><input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></td>';
+				print '<br><input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></td>';
 				print '</tr>' . "\n";
 				/*
 				 if ($conf->service->enabled)
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index 509a563cb80..8858d974fa7 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -1042,7 +1042,7 @@ if ($_GET['action'] == 'create' && $user->rights->commande->creer)
 			print '<input type="hidden" name="socid" value="'.$soc->id.'">' ."\n";
 			print '<input type="hidden" name="remise_percent" value="'.$soc->remise_client.'">';
 			print '<input name="facnumber" type="hidden" value="provisoire">';
-			
+
 			if (isset($_GET["origin"]) && $_GET["origin"] != 'project' && isset($_GET["originid"]))
 			{
 				print '<input type="hidden" name="origin" value="'.$_GET["origin"].'">';
@@ -1123,7 +1123,7 @@ if ($_GET['action'] == 'create' && $user->rights->commande->creer)
 			{
 				$projectid = 0;
 				if (isset($_GET["origin"]) && $_GET["origin"] == 'project') $projectid = ($_GET["originid"]?$_GET["originid"]:0);
-				
+
 				print '<tr><td>'.$langs->trans('Project').'</td><td colspan="2">';
 				$numprojet=select_projects($soc->id,$projectid);
 				if ($numprojet==0)
@@ -1892,7 +1892,7 @@ else
 						else print '&nbsp;';
 						print '</td>';
 						print '<td align="center" colspan="4"><input type="submit" class="button" name="save" value="'.$langs->trans('Save').'">';
-						print '<br /><input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'"></td>';
+						print '<br><input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'"></td>';
 						print '</tr>';
 
 						// Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
diff --git a/htdocs/compta/export/index.php b/htdocs/compta/export/index.php
index 0fb644c9e39..96206f993aa 100644
--- a/htdocs/compta/export/index.php
+++ b/htdocs/compta/export/index.php
@@ -49,17 +49,17 @@ $dir = $conf->compta->dir_output."/export/".$year."/";
 /*
  * Actions
  */
- 
+
 if ($_GET["action"] == 'export')
 {
   $modulename='Poivre';
-  
+
   include_once DOL_DOCUMENT_ROOT.'/compta/export/modules/compta.export.class.php';
-  
+
   create_exdir($dir);
-  
+
   $exc = new ComptaExport($db, $user, $modulename);
-  
+
   if($_GET["id"] > 0)
     {
       $exc->Export($_GET["id"], $dir);
@@ -68,14 +68,14 @@ if ($_GET["action"] == 'export')
     {
       $exc->Export(0, $dir);
     }
-  
-  /* Génération du journal des Paiements */
-  
+
+  /* G�n�ration du journal des Paiements */
+
   $jp= new ComptaJournalPaiement($db);
   $jp->GeneratePdf($user, $dir, $exc->id, $exc->ref);
-  
-  /* Génération du journal des Ventes */
-  
+
+  /* G�n�ration du journal des Ventes */
+
   $jp= new ComptaJournalVente($db);
   $jp->GeneratePdf($user, $dir, $exc->id, $exc->ref);
 }
@@ -83,7 +83,7 @@ if ($_GET["action"] == 'export')
 /*
  * Affichage page
  */
- 
+
 llxHeader('','Compta - Export');
 
 print_fiche_titre($langs->trans("AccountancyExport"));
@@ -125,7 +125,7 @@ $var=false;
 print '<tr '.$bc[$var].'><td>'.$langs->trans("Invoices").'</td><td align="right">'.$nbfac.'</td></tr>';
 $var=!$var;
 print '<tr '.$bc[$var].'><td>'.$langs->trans("Payments").'</td><td align="right">'.$nbp.'</td></tr>';
-print "</table><br />\n";
+print "</table><br>\n";
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
@@ -164,7 +164,7 @@ if ($handle)
     {
       if (is_readable($dir.$file) && is_file($dir.$file))
 	{
-	  print '<tr><td><a href="'.DOL_URL_ROOT.'/document.php?modulepart=export_compta&amp;file=export/'.$year.'/'.$file.'&amp;type=text/plain">'.$file.'</a><td>';  
+	  print '<tr><td><a href="'.DOL_URL_ROOT.'/document.php?modulepart=export_compta&amp;file=export/'.$year.'/'.$file.'&amp;type=text/plain">'.$file.'</a><td>';
 	  print '</tr>';
 	}
     }
diff --git a/htdocs/compta/paiement/cheque/fiche.php b/htdocs/compta/paiement/cheque/fiche.php
index 124b36c3b62..edb093977fc 100644
--- a/htdocs/compta/paiement/cheque/fiche.php
+++ b/htdocs/compta/paiement/cheque/fiche.php
@@ -227,7 +227,7 @@ if ($_GET['action'] == 'new')
 
 	print '<table class="border" width="100%">';
 	print '<tr><td width="30%">'.$langs->trans('Date').'</td><td width="70%">'.dol_print_date($now,'day').'</td></tr>';
-	print '</table><br />';
+	print '</table><br>';
 
 	$sql = "SELECT ba.rowid as bid, ".$db->pdate("b.dateo")." as date,";
 	$sql.= " b.amount, ba.label, b.emetteur, b.num_chq, b.banque";
@@ -303,7 +303,7 @@ if ($_GET['action'] == 'new')
 		{
 			print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('NewCheckDepositOn',$account_label).'</a>';
 		}
-		print '</div><br />';
+		print '</div><br>';
 	}
 
 }
@@ -343,7 +343,7 @@ else
 	print $remisecheque->getLibStatut(4);
 	print '</td></tr>';
 
-	print '</table><br />';
+	print '</table><br>';
 
 
 	// Liste des cheques
diff --git a/htdocs/compta/prelevement/bon.php b/htdocs/compta/prelevement/bon.php
index 4609c5ab57b..b55ca9e8a3e 100644
--- a/htdocs/compta/prelevement/bon.php
+++ b/htdocs/compta/prelevement/bon.php
@@ -16,11 +16,11 @@
  * 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/compta/prelevement/bon.php
         \ingroup    prelevement
-        \brief      Fiche aperçu du bon de prelevement
+        \brief      Fiche aper�u du bon de prelevement
         \version    $Id$
 */
 
@@ -29,41 +29,41 @@ require("./pre.inc.php");
 $langs->load("bills");
 
 /*
- * Sécurité accés client
+ * S�curit� acc�s client
  */
 if (!$user->rights->prelevement->bons->lire) accessforbidden();
 
 
-llxHeader('','Bon de prélèvement');
+llxHeader('','Bon de pr�l�vement');
 
 $h = 0;
 $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/fiche.php?id='.$_GET["id"];
 $head[$h][1] = $langs->trans("Card");
-$h++;      
+$h++;
 
 if ($conf->use_preview_tabs)
 {
     $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/bon.php?id='.$_GET["id"];
     $head[$h][1] = $langs->trans("Preview");
     $hselected = $h;
-    $h++;  
+    $h++;
 }
 
 $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/lignes.php?id='.$_GET["id"];
 $head[$h][1] = $langs->trans("Lines");
-$h++;  
+$h++;
 
 $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/factures.php?id='.$_GET["id"];
 $head[$h][1] = $langs->trans("Bills");
-$h++;  
+$h++;
 
 $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/fiche-rejet.php?id='.$_GET["id"];
 $head[$h][1] = $langs->trans("Rejets");
-$h++;  
+$h++;
 
 $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/fiche-stat.php?id='.$_GET["id"];
 $head[$h][1] = $langs->trans("Statistics");
-$h++;  
+$h++;
 
 $prev_id = $_GET["id"];
 
@@ -75,7 +75,7 @@ if ($_GET["id"])
 
   if ($bon->fetch($_GET["id"]) == 0)
     {
-      dol_fiche_head($head, $hselected, 'Prélèvement : '. $bon->ref);
+      dol_fiche_head($head, $hselected, 'Pr�l�vement : '. $bon->ref);
 
       print '<table class="border" width="100%">';
 
@@ -88,7 +88,7 @@ if ($_GET["id"])
       print '<a href="'.DOL_URL_ROOT.'/document.php?type=text/plain&amp;modulepart=prelevement&amp;file='.urlencode($relativepath).'">'.$bon->ref.'</a>';
 
       print '</td></tr>';
-      print '</table><br />';
+      print '</table><br>';
 
       $fileimage = $conf->prelevement->dir_output.'/receipts/'.$bon->ref.'.ps.png.0';
       $fileps = $conf->prelevement->dir_output.'/receipts/'.$bon->ref.'.ps';
@@ -101,25 +101,25 @@ if ($_GET["id"])
 	    {
 
 	      $handle = imagick_readimage( $fileps ) ;
-	      
+
 	      if ( imagick_iserror( $handle ) )
 		{
 		  $reason      = imagick_failedreason( $handle ) ;
 		  $description = imagick_faileddescription( $handle ) ;
-		  
+
 		  print "handle failed!<BR>\nReason: $reason<BR>\nDescription: $description<BR>\n";
 		}
-	      
+
 	      imagick_convert( $handle, "PNG" ) ;
-	      
+
 	      if ( imagick_iserror( $handle ) )
 		{
 		  $reason      = imagick_failedreason( $handle ) ;
 		  $description = imagick_faileddescription( $handle ) ;
-		  
+
 		  print "handle failed!<BR>\nReason: $reason<BR>\nDescription: $description<BR>\n";
 		}
-	      
+
 	      imagick_writeimage( $handle, $fileps .".png");
 	    }
 	  else
@@ -131,7 +131,7 @@ if ($_GET["id"])
       if (file_exists($fileimage))
 	{
 	  print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=prelevement&file='.urlencode(basename($fileimage)).'">';
-	  
+
 	}
     }
   else
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index 1844bb23636..9a11086ae74 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -20,7 +20,7 @@
 
 /**
  \file       htdocs/compta/prelevement/demandes.php
- \brief      Page de la liste des demandes de prélèvements
+ \brief      Page de la liste des demandes de pr�l�vements
  \version    $Id$
  */
 
@@ -153,7 +153,7 @@ if ( $db->query($sql) )
 		$i++;
 	}
 
-	print "</table><br />";
+	print "</table><br>";
 
 }
 else
diff --git a/htdocs/compta/prelevement/fiche.php b/htdocs/compta/prelevement/fiche.php
index 1bc8bedcb31..67e7b8ba71b 100644
--- a/htdocs/compta/prelevement/fiche.php
+++ b/htdocs/compta/prelevement/fiche.php
@@ -190,7 +190,7 @@ if ($_GET["id"])
 			print '</td></tr>';
 		}
 
-		print '</table><br />';
+		print '</table><br>';
 
 		if($bon->date_trans == 0)
 		{
@@ -206,7 +206,7 @@ if ($_GET["id"])
 			print '</td></tr>';
 			print '<tr><td width="20%">'.$langs->trans("File").'</td><td>';
 			print '<input type="hidden" name="max_file_size" value="'.$conf->maxfilesize.'">';
-			print '<input class="flat" type="file" name="userfile" size="80"><br />';
+			print '<input class="flat" type="file" name="userfile" size="80"><br>';
 			print '</td></tr>';
 			print '<tr><td colspan="2" align="center">';
 			print '<input type="submit" class="button" value="'.$langs->trans("Send").'">';
diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php
index 5485a43bd1f..4fdc6b6ceb6 100644
--- a/htdocs/compta/prelevement/ligne.php
+++ b/htdocs/compta/prelevement/ligne.php
@@ -129,7 +129,7 @@ if ($_GET["id"])
 		}
 
 
-		print '</table><br />';
+		print '</table><br>';
 	}
 	else
 	{
diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php
index b0c95ea11bc..031d0190698 100644
--- a/htdocs/compta/prelevement/stats.php
+++ b/htdocs/compta/prelevement/stats.php
@@ -135,7 +135,7 @@ else
  * Stats sur les rejets
  *
  */
-print '<br />';
+print '<br>';
 print_titre($langs->trans("WithdrawRejectStatistics"));
 
 
diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php
index 77b6f8c578c..58c9ea78e6f 100644
--- a/htdocs/contrat/fiche.php
+++ b/htdocs/contrat/fiche.php
@@ -831,7 +831,7 @@ else
 						print '<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->fk_product.'">';
 						print img_object($langs->trans("ShowService"),"service").' '.$objp->ref.'</a>';
 						print $objp->label?' - '.$objp->label:'';
-						if ($objp->description) print '<br />'.nl2br($objp->description);
+						if ($objp->description) print '<br>'.nl2br($objp->description);
 						print '</td>';
 					}
 					else
@@ -985,7 +985,6 @@ else
 			 */
 			if ($_REQUEST["action"] == 'move' && ! $_REQUEST["cancel"] && $user->rights->contrat->creer && $contrat->lignes[$cursorline-1]->id == $_GET["rowid"])
 			{
-				//print '<br />';
 				$arraycontractid=array();
 				foreach($arrayothercontracts as $contractcursor)
 				{
@@ -1006,7 +1005,6 @@ else
 			 */
 			if ($_REQUEST["action"] == 'active' && ! $_REQUEST["cancel"] && $user->rights->contrat->activer && $contrat->lignes[$cursorline-1]->id == $_GET["ligne"])
 			{
-				//print '<br />';
 				$dateactstart = dol_mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
 				$dateactend   = dol_mktime(12, 0 , 0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]);
 				$comment      = $_POST["comment"];
@@ -1019,7 +1017,6 @@ else
 			 */
 			if ($_REQUEST["action"] == 'closeline' && ! $_REQUEST["cancel"] && $user->rights->contrat->activer && $contrat->lignes[$cursorline-1]->id == $_GET["ligne"])
 			{
-				//print '<br />';
 				$dateactstart = dol_mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
 				$dateactend   = dol_mktime(12, 0 , 0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]);
 				$comment      = $_POST["comment"];
diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
index 0e6bad3b114..984ff6f8234 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -107,8 +107,8 @@ print '<form name="redim_file" action="'.$_SERVER["PHP_SELF"].'?id='.$_GET['id']
 print '<fieldset id="redim_file">';
 print '<legend>'.$langs->trans("Resize").'</legend>';
 print $langs->trans("ResizeDesc").'<br>';
-print $langs->trans("NewLength").': <input class="flat" name="sizex" size="10" type="text" > px <br /> ';
-print $langs->trans("NewHeight").': <input class="flat" name="sizey" size="10" type="text" > px &nbsp; <br />';
+print $langs->trans("NewLength").': <input class="flat" name="sizex" size="10" type="text" > px <br> ';
+print $langs->trans("NewHeight").': <input class="flat" name="sizey" size="10" type="text" > px &nbsp; <br>';
 print '<input type="hidden" name="file" value="'.$_GET['file'].'" />';
 print '<input type="hidden" name="action" value="confirm_resize" />';
 print '<input type="hidden" name="product" value="'.$_GET['id'].'" />';
diff --git a/htdocs/core/templates/passwordforgotten.tpl b/htdocs/core/templates/passwordforgotten.tpl
index c3c777306b4..88a5cdd5212 100644
--- a/htdocs/core/templates/passwordforgotten.tpl
+++ b/htdocs/core/templates/passwordforgotten.tpl
@@ -128,22 +128,22 @@ function donnefocus() {ldelim}
 </td></tr>
 </table>
 
-<br />
+<br>
 
 	{if $error_message}
 		<table width="90%"><tr><td align="center" style="font-size: 12px;>
 		{$error_message}
-		</td></tr></table><br />
+		</td></tr></table><br>
 	{/if}
 
-<br />
+<br>
 <a href="{$dol_url_root}/">
 	{$langs->trans('BackToLoginPage')}
 </a>
 </center>
 
-<br />
-<br />
+<br>
+<br>
 
 </body>
 </html>
diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php
index 6dea2c35065..312e87023e9 100644
--- a/htdocs/expedition/index.php
+++ b/htdocs/expedition/index.php
@@ -53,7 +53,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchASending").'</td></tr>';
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("Ref").':</td><td><input type="text" class="flat" name="sf_ref" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-print "</form></table><br />\n";
+print "</form></table><br>\n";
 
 /*
  * Shipments to validate
diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php
index a5aef4a75f6..8bd00bc23f1 100644
--- a/htdocs/fichinter/fiche.php
+++ b/htdocs/fichinter/fiche.php
@@ -784,7 +784,7 @@ elseif ($fichinterid)
 				print '</td>';
 
 				print '<td align="center" colspan="5" valign="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-				print '<br /><input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></td>';
+				print '<br><input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></td>';
 				print '</tr>' . "\n";
 
 				print "</form>\n";
diff --git a/htdocs/fichinter/rapport.php b/htdocs/fichinter/rapport.php
index 2542b6ca338..50d57ff5785 100644
--- a/htdocs/fichinter/rapport.php
+++ b/htdocs/fichinter/rapport.php
@@ -133,7 +133,7 @@ if ( $db->query($sql) )
 	}
 	print "</table>";
 	$db->free();
-	print "<br />".$langs->trans("Total")." $DureeTotal jour[s]";
+	print "<br>".$langs->trans("Total")." $DureeTotal jour[s]";
 }
 else
 {
diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index 4a069927982..db05ede3643 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -870,7 +870,7 @@ if ($id > 0 || ! empty($ref))
 				print '<td align="right"><input size="2" type="text" name="qty" value="'.$commandline->qty.'"></td>';
 				print '<td align="right" nowrap="nowrap"><input size="1" type="text" name="remise_percent" value="'.$commandline->remise_percent.'">%</td>';
 				print '<td align="center" colspan="3"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-				print '<br /><input	type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'"></td>';
+				print '<br><input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'"></td>';
 				print '</tr>' .	"\n";
 				print "</form>\n";
 			}
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index e1e8746139c..cdb08aef506 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -999,7 +999,7 @@ else
 					print '<td align="right" nowrap="nowrap">&nbsp;</td>';
 
 					print '<td align="center" colspan="2"><input type="submit" class="button" value="'.$langs->trans('Save').'">';
-					print '<br /><input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'"></td>';
+					print '<br><input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'"></td>';
 
 					print '</tr>';
 					print '</form>';
diff --git a/htdocs/fourn/product/fourn.php b/htdocs/fourn/product/fourn.php
index 157d5e6fa62..3a17c8a6deb 100644
--- a/htdocs/fourn/product/fourn.php
+++ b/htdocs/fourn/product/fourn.php
@@ -171,7 +171,7 @@ if ($_GET["id"])
 	  print '<form action="'.$action.'" method="post">';
 	  print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	  print '<input type="hidden" name="action" value="update">';
-	  print '<br /><table class="border" width="100%">';
+	  print '<br><table class="border" width="100%">';
 	  print '<tr><td width="20%">'.$langs->trans("Price").'</td>';
 	  print '<td><input name="price" size="20" value="'.$product->buyprice.'"></td></tr>';
 
diff --git a/htdocs/fourn/product/liste.php b/htdocs/fourn/product/liste.php
index 083e7ef3aa6..325608f3da5 100644
--- a/htdocs/fourn/product/liste.php
+++ b/htdocs/fourn/product/liste.php
@@ -169,8 +169,8 @@ if ($resql)
 		print "<div id='ways'>";
 		$c = new Categorie ($db, $catid);
 		$ways = $c->print_all_ways(' &gt; ','fourn/product/liste.php');
-		print " &gt; ".$ways[0]."<br />\n";
-		print "</div><br />";
+		print " &gt; ".$ways[0]."<br>\n";
+		print "</div><br>";
 	}
 
 
diff --git a/htdocs/fourn/product/photos.php b/htdocs/fourn/product/photos.php
index 316093ead9f..4acb7b50f3e 100644
--- a/htdocs/fourn/product/photos.php
+++ b/htdocs/fourn/product/photos.php
@@ -129,7 +129,7 @@ if ($_GET["id"])
 
 			print '<input type="submit" name="cancel" value="'.$langs->trans("Cancel").'"></td></tr>';
 			print '</table>';
-			print '</form><br />';
+			print '</form><br>';
 		}
 
 
diff --git a/htdocs/index.php b/htdocs/index.php
index 217468d866e..9934851b78b 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -78,7 +78,7 @@ if (file_exists(DOL_DOCUMENT_ROOT.'/logo.png'))
 	print '<table class="noborder" width="100%">';
 	print '<tr><td colspan="3" style="text-align:center;">';
 	print '<img src="/logo.png"></td></tr>';
-	print "</table><br />\n";
+	print "</table><br>\n";
 }
 
 
diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index 9469dd59532..51f98df52c8 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -208,9 +208,9 @@ if (! file_exists($conffile))
 {
 	//print '<img src="../theme/eldy/img/error.png" alt="Error"> '.$langs->trans("ConfFileDoesNotExistsAndCouldNotBeCreated",$conffile);
 	print '<img src="../theme/eldy/img/error.png" alt="Error"> '.$langs->trans("ConfFileDoesNotExistsAndCouldNotBeCreated",'conf.php');
-	print "<br /><br />";
+	print "<br><br>";
 	print $langs->trans("YouMustCreateWithPermission",'htdocs/conf/conf.php');
-	print "<br /><br />";
+	print "<br><br>";
 
 	print $langs->trans("CorrectProblemAndReloadPage",$_SERVER['PHP_SELF'].'?testget=ok');
 	$err++;
@@ -228,9 +228,9 @@ else
 		{
 			print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("ConfFileCouldBeCreated",'conf.php');
 		}
-		print "<br />";
+		print "<br>";
 		print '<img src="../theme/eldy/img/tick.png" alt="Warning"> '.$langs->trans("ConfFileIsNotWritable",'htdocs/conf/conf.php');
-		print "<br />\n";
+		print "<br>\n";
 
 		$allowinstall=0;
 	}
@@ -245,13 +245,13 @@ else
 		{
 			print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("ConfFileCouldBeCreated",'conf.php');
 		}
-		print "<br />";
+		print "<br>";
 		print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("ConfFileIsWritable",'conf.php');
-		print "<br />\n";
+		print "<br>\n";
 
 		$allowinstall=1;
 	}
-	print "<br />\n";
+	print "<br>\n";
 
 	// Si prerequis ok, on affiche le bouton pour passer a l'etape suivante
 	if ($checksok)
@@ -305,7 +305,7 @@ else
 			print '<br>';
 			print '<br>';
 		}
-		else print "<br />\n";
+		else print "<br>\n";
 
 		print $langs->trans("InstallEasy")." ";
 		print $langs->trans("ChooseYourSetupMode");
diff --git a/htdocs/install/default.css b/htdocs/install/default.css
index 0e948209557..2f6700f47a2 100644
--- a/htdocs/install/default.css
+++ b/htdocs/install/default.css
@@ -114,7 +114,7 @@ color: #550000; font-weight: bold;
 }
 
 /* Next button */
-div.barrebottom {
+div.nextbutton {
 text-align: right;
 margin-top: 10px;
 padding-top: 5px;
diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php
index f093449c92c..d38dc11ead4 100644
--- a/htdocs/install/etape1.php
+++ b/htdocs/install/etape1.php
@@ -481,9 +481,12 @@ function jsinfo()
 {
 	ok=true;
 
+	document.getElementById('nextbutton').style.display='hidden';
 	alert('<?php echo dol_escape_js($langs->transnoentities("NextStepMightLastALongTime")); ?>');
 
-	return ok;
+
+	//return ok;
+	return false;
 }
 </script>
 
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index e496d401005..085f403d873 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -312,7 +312,7 @@ function pFooter($nonext=0,$setuplang='',$jscheckfunction='')
 
 	if (! $nonext)
 	{
-		print '<div class="barrebottom"><input type="submit" value="'.$langs->trans("NextStep").' ->"';
+		print '<div class="nextbutton" id="nextbutton"><input type="submit" value="'.$langs->trans("NextStep").' ->"';
 		if ($jscheckfunction) print ' onClick="return '.$jscheckfunction.'();"';
 		print '></div>';
 	}
diff --git a/htdocs/lib/images.lib.php b/htdocs/lib/images.lib.php
index c8257ec193d..b66f6161cd0 100644
--- a/htdocs/lib/images.lib.php
+++ b/htdocs/lib/images.lib.php
@@ -534,10 +534,10 @@ function moneyMeter($actualValue=0, $pendingValue=0, $intentValue=0)
 	$htmlLegenda = '
 
         <table cellpadding="0" cellspacing="0" border="0">
-          <tr><td><img src="' . $imageColorActual . '" width="9" height="9">&nbsp;</td><td><font size="1" face="Verdana, Arial, Helvetica, sans-serif"><b>'.$langs->trans("Paid").':<br />' . $legendaActual . '</b></font></td></tr>
-          <tr><td><img src="' . $imageColorPending . '" width="9" height="9">&nbsp;</td><td><font size="1" face="Verdana, Arial, Helvetica, sans-serif">'.$langs->trans("Waiting").':<br />' . $legendaPending . '</font></td></tr>
-          <tr><td><img src="' . $imageColorIntent . '" width="9" height="9">&nbsp;</td><td><font size="1" face="Verdana, Arial, Helvetica, sans-serif">'.$langs->trans("Promesses").':<br />' . $legendaIntent . '</font></td></tr>
-          <tr><td>&nbsp;</td><td><font size="1" face="Verdana, Arial, Helvetica, sans-serif">Total:<br />' . $legendaTotal . '</font></td></tr>
+          <tr><td><img src="' . $imageColorActual . '" width="9" height="9">&nbsp;</td><td><font size="1" face="Verdana, Arial, Helvetica, sans-serif"><b>'.$langs->trans("Paid").':<br>' . $legendaActual . '</b></font></td></tr>
+          <tr><td><img src="' . $imageColorPending . '" width="9" height="9">&nbsp;</td><td><font size="1" face="Verdana, Arial, Helvetica, sans-serif">'.$langs->trans("Waiting").':<br>' . $legendaPending . '</font></td></tr>
+          <tr><td><img src="' . $imageColorIntent . '" width="9" height="9">&nbsp;</td><td><font size="1" face="Verdana, Arial, Helvetica, sans-serif">'.$langs->trans("Promesses").':<br>' . $legendaIntent . '</font></td></tr>
+          <tr><td>&nbsp;</td><td><font size="1" face="Verdana, Arial, Helvetica, sans-serif">Total:<br>' . $legendaTotal . '</font></td></tr>
         </table>
 
         <!-- Thermometer End -->';
diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php
index ab067f5ccaa..a57ec2a58e6 100644
--- a/htdocs/product/liste.php
+++ b/htdocs/product/liste.php
@@ -182,7 +182,7 @@ if ($resql)
 	// Displays product removal confirmation
 	if (!empty($_GET['delprod']))
 	{
-		print '<div class="warning">'.$langs->trans("ProductDeleted",$_GET['delprod']).'</div><br />';
+		print '<div class="warning">'.$langs->trans("ProductDeleted",$_GET['delprod']).'</div><br>';
 	}
 
 	$param="&amp;sref=".$sref.($sbarcode?"&amp;sbarcode=".$sbarcode:"")."&amp;snom=".$snom."&amp;sall=".$sall."&amp;envente=".$envente;
@@ -195,8 +195,8 @@ if ($resql)
 		print "<div id='ways'>";
 		$c = new Categorie ($db, $catid);
 		$ways = $c->print_all_ways(' &gt; ','product/liste.php');
-		print " &gt; ".$ways[0]."<br />\n";
-		print "</div><br />";
+		print " &gt; ".$ways[0]."<br>\n";
+		print "</div><br>";
 	}
 
 	if ($conf->droitpret->enabled && isset($_GET["canvas"]))
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index c42b0912452..817c53626f6 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -168,8 +168,8 @@ if ($resql)
 		print "<div id='ways'>";
 		$c = new Categorie ($db, $catid);
 		$ways = $c->print_all_ways(' &gt; ','product/reassort.php');
-		print " &gt; ".$ways[0]."<br />\n";
-		print "</div><br />";
+		print " &gt; ".$ways[0]."<br>\n";
+		print "</div><br>";
 	}
 
 	print '<form action="reassort.php" method="post" name="formulaire">';
diff --git a/htdocs/product/stock/fiche-valo.php b/htdocs/product/stock/fiche-valo.php
index 96af41f77e2..b13bd4187c6 100644
--- a/htdocs/product/stock/fiche-valo.php
+++ b/htdocs/product/stock/fiche-valo.php
@@ -128,7 +128,7 @@ if ($_GET["id"])
 		if (file_exists(DOL_DATA_ROOT.'/entrepot/temp/entrepot-'.$entrepot->id.'-'.($year-1).'.png'))
 		{
 			$url=DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&amp;file=entrepot-'.$entrepot->id.'-'.($year-1).'.png';
-			print '<br /><img src="'.$url.'" alt="Valorisation du stock annee '.($year-1).'">';
+			print '<br><img src="'.$url.'" alt="Valorisation du stock annee '.($year-1).'">';
 		}
 	}
 	else
diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php
index 00ff111e9c5..32c215971d7 100644
--- a/htdocs/product/stock/valo.php
+++ b/htdocs/product/stock/valo.php
@@ -125,20 +125,20 @@ if ($result)
 	$db->free($result);
 	print "</table>";
 
-	print '<br />';
+	print '<br>';
 
 	$file='entrepot-'.$year.'.png';
 	if (file_exists(DOL_DATA_ROOT.'/entrepot/temp/'.$file))
 	{
 		$url=DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&amp;file='.$file;
-		print '<img src="'.$url.'" alt="Valorisation du stock ann�e '.($year).'">';
+		print '<img src="'.$url.'">';
 	}
 
 	$file='entrepot-'.($year-1).'.png';
 	if (file_exists(DOL_DATA_ROOT.'/entrepot/temp/'.$file))
 	{
 		$url=DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&amp;file='.$file;
-		print '<br /><img src="'.$url.'" alt="Valorisation du stock ann�e '.($year-1).'">';
+		print '<br><img src="'.$url.'">';
 	}
 
 }
diff --git a/htdocs/product/templates/livre/livre-create.tpl b/htdocs/product/templates/livre/livre-create.tpl
index eaa5dc8aa72..11f93797cdf 100644
--- a/htdocs/product/templates/livre/livre-create.tpl
+++ b/htdocs/product/templates/livre/livre-create.tpl
@@ -127,7 +127,7 @@
  </tr>
 </table>
 
-<br />
+<br>
 
 <table class="border" width="100%">
  <tr>
@@ -159,7 +159,7 @@
  </tr>
 </table>
 
-<br />
+<br>
 
 <table class="border" width="100%">
  <tr>
@@ -198,7 +198,7 @@
 </tr>
 </table>
 
-<br />
+<br>
 
 <table class="border" width="100%">
  <tr>
diff --git a/htdocs/product/templates/livre/livre-edit.tpl b/htdocs/product/templates/livre/livre-edit.tpl
index 0937be23bf0..366c0050632 100644
--- a/htdocs/product/templates/livre/livre-edit.tpl
+++ b/htdocs/product/templates/livre/livre-edit.tpl
@@ -122,7 +122,7 @@
 </tr>
 </table>
 
-<br />
+<br>
 
 <table class="border" width="100%">
  <tr>
@@ -137,7 +137,7 @@
  </tr>
 </table>
 
-<br />
+<br>
 
 <table class="border" width="100%">
  <tr>
@@ -167,7 +167,7 @@
  </tr>
 </table>
 
-<br />
+<br>
 
 <table class="border" width="100%">
 
@@ -235,7 +235,7 @@
 
 </table>
 
-<br />
+<br>
 
 <table class="border" width="100%">
 
diff --git a/htdocs/product/templates/livre/livre-view.tpl b/htdocs/product/templates/livre/livre-view.tpl
index 861b39d8203..251b8f34391 100644
--- a/htdocs/product/templates/livre/livre-view.tpl
+++ b/htdocs/product/templates/livre/livre-view.tpl
@@ -138,7 +138,7 @@
 
 </table>
 
-<br />
+<br>
 
 <table class="border" width="100%">
 
diff --git a/htdocs/product/templates/livrecontrat/livrecontrat-edit.tpl b/htdocs/product/templates/livrecontrat/livrecontrat-edit.tpl
index f7a2dfbc24e..845c49be2bb 100644
--- a/htdocs/product/templates/livrecontrat/livrecontrat-edit.tpl
+++ b/htdocs/product/templates/livrecontrat/livrecontrat-edit.tpl
@@ -41,7 +41,7 @@
 
 </table>
 
-<br />
+<br>
 
 <table class="border" width="100%">
  <tr>
@@ -55,7 +55,7 @@
  </tr>
 </table>
 
-<br />
+<br>
 
 <table class="border" width="100%">
 <tr>
@@ -82,7 +82,7 @@
  </tr>
 </table>
 
-<br />
+<br>
 
 <table class="border" width="100%">
  <tr>
diff --git a/htdocs/product/templates/livrecontrat/livrecontrat-view.tpl b/htdocs/product/templates/livrecontrat/livrecontrat-view.tpl
index 4111bf1b6fc..980f6ad364f 100644
--- a/htdocs/product/templates/livrecontrat/livrecontrat-view.tpl
+++ b/htdocs/product/templates/livrecontrat/livrecontrat-view.tpl
@@ -56,7 +56,7 @@
 
 </table>
 
-<br />
+<br>
 
 <table class="border" width="100%">
 
@@ -76,7 +76,7 @@
 
 </table>
 
-<br />
+<br>
 
 <table class="border" width="100%">
 
diff --git a/htdocs/product/templates/livrecouverture/livrecouverture-edit.tpl b/htdocs/product/templates/livrecouverture/livrecouverture-edit.tpl
index da12ff9ab1e..6be048a553c 100644
--- a/htdocs/product/templates/livrecouverture/livrecouverture-edit.tpl
+++ b/htdocs/product/templates/livrecouverture/livrecouverture-edit.tpl
@@ -99,7 +99,7 @@
 </tr>
 </table>
 
-<br />
+<br>
 
 <table class="border" width="100%">
  <tr>
@@ -116,7 +116,7 @@
  </tr>
 </table>
 
-<br />
+<br>
 
 <table class="border" width="100%">
  <tr>
@@ -147,7 +147,7 @@
  </tr>
 </table>
 
-<br />
+<br>
 
 <table class="border" width="100%">
 <tr>
diff --git a/htdocs/product/templates/livrecouverture/livrecouverture-view.tpl b/htdocs/product/templates/livrecouverture/livrecouverture-view.tpl
index 32f038802dd..c17e6832961 100644
--- a/htdocs/product/templates/livrecouverture/livrecouverture-view.tpl
+++ b/htdocs/product/templates/livrecouverture/livrecouverture-view.tpl
@@ -34,7 +34,7 @@
 </tr>
 </table>
 
-<br />
+<br>
 
 <table class="border" width="100%">
 
@@ -54,6 +54,6 @@
 
 </table>
 
-<br />
+<br>
 
 <!-- END SMARTY TEMPLATE -->
\ No newline at end of file
diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index 9bc46cd4a90..ea2758ebe00 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -124,7 +124,7 @@ print "</tr>\n";
 print "</table>";
 
 /* Affichage de la liste des projets d'hier */
-print '<br /><table class="noborder" width="100%">';
+print '<br><table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans('Yesterday').'</td>';
 print '<td align="right">'.$langs->trans("Time").'</td>';
@@ -223,7 +223,7 @@ print '<tr class="liste_total">';
 print '<td>'.$langs->trans('Total').'</td>';
 print '<td align="right">'.$total.'</td>';
 print "</tr>\n";
-print "</table><br />";
+print "</table><br>";
 
 /* Affichage de la liste des projets du mois */
 print '<table class="noborder" width="100%">';
@@ -269,7 +269,7 @@ else
 print "</table>";
 
 /* Affichage de la liste des projets de l'annee */
-print '<br /><table class="noborder" width="100%">';
+print '<br><table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("ActivityOnProjectThisYear").': '.strftime("%Y", $now).'</td>';
 print '<td align="right">'.$langs->trans("Time").'</td>';
diff --git a/htdocs/theme/phones/iphone/templates/login.tpl b/htdocs/theme/phones/iphone/templates/login.tpl
index 4acda126f08..687404d1913 100644
--- a/htdocs/theme/phones/iphone/templates/login.tpl
+++ b/htdocs/theme/phones/iphone/templates/login.tpl
@@ -53,7 +53,7 @@
 		<img src="{$dol_url_root}/theme/phones/iphone/theme/{$theme}/thumbs/dolibarr.png">
 	</div>
 	
-	<br />
+	<br>
 	
 	<span class="graytitle">{$langs->trans('Identification')}</span>
 	<ul class="pageitem">
diff --git a/htdocs/theme/phones/iphone/templates/user/passwordforgotten.tpl b/htdocs/theme/phones/iphone/templates/user/passwordforgotten.tpl
index 0922b49a614..20772f20cef 100644
--- a/htdocs/theme/phones/iphone/templates/user/passwordforgotten.tpl
+++ b/htdocs/theme/phones/iphone/templates/user/passwordforgotten.tpl
@@ -57,7 +57,7 @@
 		<img src="{$dol_url_root}/theme/phones/iphone/theme/{$theme}/thumbs/dolibarr.png">
 	</div>
 	
-	<br />
+	<br>
 	
 	<span class="graytitle">{$langs->trans('Identification')}</span>
 	<ul class="pageitem">