diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 059b0f45993..0775afdf83f 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -700,7 +700,7 @@ if ($_POST['action'] == "addline" && $user->rights->propale->creer)
 			}
 
 			$desc = $prod->description;
-			$desc.= ($prod->description && $_POST['np_desc']) ? ((dol_textishtml($prod->description) || dol_textishtml($_POST['np_desc']))?"<br />\n":"\n") : "";
+			$desc.= ($prod->description && $_POST['np_desc']) ? ((dol_textishtml($prod->description) || dol_textishtml($_POST['np_desc']))?"<br>\n":"\n") : "";
 			$desc.= $_POST['np_desc'];
 			$type = $prod->type;
 		}
@@ -1398,7 +1398,7 @@ if ($id > 0 || ! empty($ref))
 		}
 		print '</tr>';
 	}
-	
+
 	// Insert hooks
 	$parameters=array('colspan'=>' colspan="3"');
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
index a8880f35773..60779d92ab3 100644
--- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
@@ -24,7 +24,7 @@
 $langs = $GLOBALS['langs'];
 $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
 
-echo '<br />';
+echo '<br>';
 print_titre($langs->trans('RelatedCommercialProposals'));
 ?>
 <table class="noborder" width="100%">
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index fe9850c8ec8..13e012ba97c 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -546,7 +546,7 @@ if ($action == 'addline' && $user->rights->commande->creer)
             }
 
             $desc = $prod->description;
-            $desc.= ($prod->description && $_POST['np_desc']) ? ((dol_textishtml($prod->description) || dol_textishtml($_POST['np_desc']))?"<br />\n":"\n") : "";
+            $desc.= ($prod->description && $_POST['np_desc']) ? ((dol_textishtml($prod->description) || dol_textishtml($_POST['np_desc']))?"<br>\n":"\n") : "";
             $desc.= $_POST['np_desc'];
             $type = $prod->type;
         }
diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php
index 228198927f1..9823a2b7f53 100644
--- a/htdocs/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php
@@ -25,7 +25,7 @@ $langs = $GLOBALS['langs'];
 $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
 
 $langs->load("orders");
-echo '<br />';
+echo '<br>';
 print_titre($langs->trans('RelatedOrders'));
 
 ?>
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 5cf3cd0e91d..54ac2810be2 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -918,7 +918,7 @@ if (($action == 'addline' || $action == 'addline_predef') && $user->rights->fact
             }
 
             $desc = $prod->description;
-            $desc.= ($prod->description && $_POST['np_desc']) ? ((dol_textishtml($prod->description) || dol_textishtml($_POST['np_desc']))?"<br />\n":"\n") : "";
+            $desc.= ($prod->description && $_POST['np_desc']) ? ((dol_textishtml($prod->description) || dol_textishtml($_POST['np_desc']))?"<br>\n":"\n") : "";
             $desc.= $_POST['np_desc'];
             if (! empty($prod->customcode) || ! empty($prod->country_code))
             {
@@ -927,7 +927,7 @@ if (($action == 'addline' || $action == 'addline_predef') && $user->rights->fact
                 if (! empty($prod->customcode) && ! empty($prod->country_code)) $tmptxt.=' - ';
                 if (! empty($prod->country_code)) $tmptxt.=$langs->transnoentitiesnoconv("CountryOrigin").': '.getCountry($prod->country_code,0,$db,$langs,0);
                 $tmptxt.=')';
-                $desc.= (dol_textishtml($desc)?"<br />\n":"\n").$tmptxt;
+                $desc.= (dol_textishtml($desc)?"<br>\n":"\n").$tmptxt;
             }
             $type = $prod->type;
         }
@@ -1630,13 +1630,13 @@ if ($action == 'create')
     // Credit note
     print '<tr height="18"><td valign="middle">';
     print '<input type="radio" name="type" value="2"'.(GETPOST('type')==2?' checked=true':'');
-    if (! $optionsav) print ' disabled="true"';
+    if (! $optionsav) print ' disabled="disabled"';
     print '>';
     print '</td><td valign="middle">';
     $text=$langs->transnoentities("InvoiceAvoirAsk").' ';
     //	$text.='<input type="text" value="">';
     $text.='<select class="flat" name="fac_avoir" id="fac_avoir"';
-    if (! $optionsav) $text.=' disabled="true"';
+    if (! $optionsav) $text.=' disabled="disabled"';
     $text.='>';
     if ($optionsav)
     {
diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
index 6ebdaf3f5bd..a4cd0a7cf30 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
@@ -25,7 +25,7 @@ $langs = $GLOBALS['langs'];
 $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
 
 $langs->load("bills");
-echo '<br />';
+echo '<br>';
 if ($num > 1) print_titre($langs->trans("RelatedBills"));
 else print_titre($langs->trans("RelatedBill"));
 ?>
diff --git a/htdocs/contrat/tpl/linkedobjectblock.tpl.php b/htdocs/contrat/tpl/linkedobjectblock.tpl.php
index 16b5078ecf7..c05ad0aeb13 100644
--- a/htdocs/contrat/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/contrat/tpl/linkedobjectblock.tpl.php
@@ -25,7 +25,7 @@ $langs = $GLOBALS['langs'];
 $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
 
 $langs->load("contracts");
-echo '<br />';
+echo '<br>';
 print_titre($langs->trans('RelatedContracts'));
 ?>
 <table class="noborder" width="100%">
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 3d6749c6c53..88bb5aedab7 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -919,7 +919,7 @@ class Form
             $this->select_produits_do($selected,$htmlname,$filtertype,$limit,$price_level,'',$status,$finished,0);
         }
 
-        print '<br />';
+        print '<br>';
     }
 
     /**
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 1dc8abcde3e..6e2642c0cb1 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -356,7 +356,7 @@ class FormMail
                     $out.= ' &lt;'.$this->tomail.'&gt;';
                     if ($this->withtofree)
                     {
-                        $out.= '<br />'.$langs->trans("or").' <input size="'.(is_array($this->withto)?"30":"60").'" id="sendto" name="sendto" value="'.(! is_array($this->withto) && ! is_numeric($this->withto)? (isset($_REQUEST["sendto"])?$_REQUEST["sendto"]:$this->withto) :"").'" />';
+                        $out.= '<br>'.$langs->trans("or").' <input size="'.(is_array($this->withto)?"30":"60").'" id="sendto" name="sendto" value="'.(! is_array($this->withto) && ! is_numeric($this->withto)? (isset($_REQUEST["sendto"])?$_REQUEST["sendto"]:$this->withto) :"").'" />';
                     }
                 }
                 else
@@ -523,7 +523,7 @@ class FormMail
                         $out.= ' <input type="image" style="border: 0px;" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" value="'.($key+1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';
                         //$out.= ' <a href="'.$_SERVER["PHP_SELF"].'?removedfile='.($key+1).' id="removedfile_'.$key.'">'.img_delete($langs->trans("Delete").'</a>';
                     }
-                    $out.= '<br /></div>';
+                    $out.= '<br></div>';
                 }
             }
             else
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 02cc7879be6..912ea58e1c0 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -25,11 +25,8 @@ header("Content-type: text/html; charset=".$conf->file->character_set_client);
 <!-- <!DOCTYPE html> -->
 <!-- Ce DTD est KO car inhibe document.body.scrollTop -->
 <!-- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -->
-
 <!-- BEGIN PHP TEMPLATE -->
-
 <html>
-<!-- <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr"> -->
 <head>
 <meta name="robots" content="noindex,nofollow" />
 <title><?php echo $langs->trans('Login'); ?></title>
@@ -143,7 +140,7 @@ jQuery(document).ready(function () {
 
 <tr><td colspan="3">&nbsp;</td></tr>
 
-<tr><td colspan="3" style="text-align:center;"><br />
+<tr><td colspan="3" style="text-align:center;"><br>
 <input type="submit" class="button" value="&nbsp; <?php echo $langs->trans('Connection'); ?> &nbsp;" tabindex="5" />
 </td></tr>
 
@@ -186,7 +183,7 @@ jQuery(document).ready(function () {
 		<center><table summary="info" cellpadding="0" cellspacing="0" border="0" align="center" width="750">
 		<tr><td align="center">
 		<?php echo $main_home; ?>
-		</td></tr></table></center><br />
+		</td></tr></table></center><br>
 	<?php } ?>
 
 	<?php
diff --git a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php b/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
index 6853af91845..30f5255b54d 100755
--- a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
@@ -25,7 +25,7 @@ $langs = $GLOBALS['langs'];
 $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
 
 $langs->load("interventions");
-echo '<br />';
+echo '<br>';
 print_titre($langs->trans('RelatedInterventions'));
 
 ?>
diff --git a/htdocs/lib/pdf.lib.php b/htdocs/lib/pdf.lib.php
index 401568c7e56..e0d2f0566b7 100644
--- a/htdocs/lib/pdf.lib.php
+++ b/htdocs/lib/pdf.lib.php
@@ -763,7 +763,7 @@ function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issuppl
     // Description long of product line
     if ($desc && ($desc != $label))
     {
-        if ( $libelleproduitservice && empty($hidedesc) ) $libelleproduitservice.="<br />";
+        if ( $libelleproduitservice && empty($hidedesc) ) $libelleproduitservice.="<br>";
 
         if ($desc == '(CREDIT_NOTE)' && $object->lines[$i]->fk_remise_except)
         {
diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index 9a03ae43a37..2700320b062 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -77,7 +77,7 @@ llxHeader('',$langs->trans("PaypalSetup"));
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print_fiche_titre(' - '.$langs->trans("ModuleSetup"),$linkback,'paypal_logo@paypal');
-print '<br />';
+print '<br>';
 
 $head=paypaladmin_prepare_head();
 
@@ -94,7 +94,7 @@ if ($conf->use_javascript_ajax)
                 $("#apidoca").hide();
                 $("#apidoc").show();
             });
-            
+
             $("#generate_token").click(function() {
             	$.get( "'.DOL_URL_ROOT.'/core/ajaxsecurity.php", {
             		action: \'getrandompassword\',