diff --git a/htdocs/core/tpl/advtarget.tpl.php b/htdocs/core/tpl/advtarget.tpl.php
index dadfff3e62e..2c351996632 100644
--- a/htdocs/core/tpl/advtarget.tpl.php
+++ b/htdocs/core/tpl/advtarget.tpl.php
@@ -541,7 +541,7 @@ print '<script type="text/javascript" language="javascript">
 		print load_fiche_titre($langs->trans("ToClearAllRecipientsClickHere"));
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td class="liste_titre" align="right"><input type="submit" class="button" value="' . $langs->trans("TargetsReset") . '"></td>';
+		print '<td class="liste_titre right"><input type="submit" class="button" value="' . $langs->trans("TargetsReset") . '"></td>';
 		print '</tr>';
 		print '</table>';
 		print '</form>';
diff --git a/htdocs/core/tpl/bloc_comment.tpl.php b/htdocs/core/tpl/bloc_comment.tpl.php
index 58019148f7e..acf1aad36ce 100644
--- a/htdocs/core/tpl/bloc_comment.tpl.php
+++ b/htdocs/core/tpl/bloc_comment.tpl.php
@@ -48,7 +48,7 @@ print $doleditor->Create(1);
 
 print '</td>';
 
-print '<td align="center">';
+print '<td class="center">';
 print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
 print '</td></tr>';
 print '</table></form>';
diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index 330ba78dc34..e3060f34bde 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -175,11 +175,11 @@ if ($permission) {
 	?>
 
 	<form class="tagtr oddeven <?php echo ($var?'impair':'pair') ?>">
-		<div class="tagtd" align="left">
+		<div class="tagtd left">
 			<?php if ($tab[$i]['source']=='internal') echo $langs->trans("User"); ?>
 			<?php if ($tab[$i]['source']=='external') echo $langs->trans("ThirdPartyContact"); ?>
 		</div>
-		<div class="tagtd" align="left">
+		<div class="tagtd left">
 			<?php
 			if ($tab[$i]['socid'] > 0)
 			{
diff --git a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
index 6b6d22cf822..3071257839e 100644
--- a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
@@ -20,7 +20,7 @@ if (! empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_
 			{
 				$align=$extrafields->getAlignFlag($key, $extrafieldsobjectkey);
 				print '<td';
-				if ($align) print ' align="'.$align.'"';
+                if ($align) print ' class="'.$align.'"';
 				print '>';
 				$tmpkey='options_'.$key;
 				if (in_array($extrafields->attributes[$extrafieldsobjectkey]['type'][$key], array('date', 'datetime', 'timestamp')) && !is_numeric($obj->$tmpkey))
diff --git a/htdocs/core/tpl/extrafields_list_search_param.tpl.php b/htdocs/core/tpl/extrafields_list_search_param.tpl.php
index aa161ed3571..d514fdf6acd 100644
--- a/htdocs/core/tpl/extrafields_list_search_param.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_param.tpl.php
@@ -10,10 +10,10 @@ if (empty($conf) || ! is_object($conf))
 // Loop to complete $param for extrafields
 if (! empty($search_array_options))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
 {
-foreach ($search_array_options as $key => $val)
-{
-	$crit=$val;
-	$tmpkey=preg_replace('/search_options_/', '', $key);
-	if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
-}
+    foreach ($search_array_options as $key => $val)
+    {
+        $crit=$val;
+        $tmpkey=preg_replace('/search_options_/', '', $key);
+        if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
+    }
 }
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index 5c7476a7cfd..db0d6a4897d 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -122,7 +122,7 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 			{
 			    $fieldid='id';
 			    if ($object->table_element == 'societe') $fieldid='socid';
-				print '<td align="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?'.$fieldid.'=' . $object->id . '&action=edit_extras&attribute=' . $key . '">' . img_edit().'</a></td>';
+				print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?'.$fieldid.'=' . $object->id . '&action=edit_extras&attribute=' . $key . '">' . img_edit().'</a></td>';
 			}
 			print '</tr></table>';
 			print '</td>';
diff --git a/htdocs/core/tpl/filemanager.tpl.php b/htdocs/core/tpl/filemanager.tpl.php
index a819bb12996..c0eff19fa84 100644
--- a/htdocs/core/tpl/filemanager.tpl.php
+++ b/htdocs/core/tpl/filemanager.tpl.php
@@ -149,7 +149,7 @@ if (empty($action) || $action == 'editfile' || $action == 'file_manager' || preg
 
 	print '<!-- Title for manual directories -->'."\n";
 	print '<tr class="liste_titre">'."\n";
-    print '<th class="liste_titre" align="left">';
+    print '<th class="liste_titre left">';
     print '&nbsp;'.$langs->trans("ECMSections");
 	print '</th></tr>';
 
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index 1797cc2fe7e..acfd6c5c4d3 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -143,7 +143,7 @@ $coldisplay=-1; // We remove first td
 
 	$coldisplay++;
 	if ($line->fk_prev_id == null) {
-		print '<td align="right">' . $form->load_tva('tva_tx', $line->tva_tx.($line->vat_src_code?(' ('.$line->vat_src_code.')'):''), $seller, $buyer, 0, $line->info_bits, $line->product_type, false, 1) . '</td>';
+		print '<td class="right">' . $form->load_tva('tva_tx', $line->tva_tx.($line->vat_src_code?(' ('.$line->vat_src_code.')'):''), $seller, $buyer, 0, $line->info_bits, $line->product_type, false, 1) . '</td>';
 	} else {
 		print '<td class="right"><input size="1" type="text" class="flat right" name="tva_tx" value="' . price($line->tva_tx) . '" readonly />%</td>';
 	}
diff --git a/htdocs/core/tpl/originproductline.tpl.php b/htdocs/core/tpl/originproductline.tpl.php
index ed16cec17f1..2f0accd6306 100644
--- a/htdocs/core/tpl/originproductline.tpl.php
+++ b/htdocs/core/tpl/originproductline.tpl.php
@@ -30,16 +30,16 @@ if (empty($conf) || ! is_object($conf))
 print '<tr class="oddeven'.(empty($this->tpl['strike'])?'':' strikefordisabled').'">';
 print '<td>'.$this->tpl['label'].'</td>';
 print '<td>'.$this->tpl['description'].'</td>';
-print '<td align="right">'.$this->tpl['vat_rate'].'</td>';
-print '<td align="right">'.$this->tpl['price'].'</td>';
+print '<td class="right">'.$this->tpl['vat_rate'].'</td>';
+print '<td class="right">'.$this->tpl['price'].'</td>';
 if (!empty($conf->multicurrency->enabled))
-	print '<td align="right">'.$this->tpl['multicurrency_price'].'</td>';
+	print '<td class="right">'.$this->tpl['multicurrency_price'].'</td>';
 
-print '<td align="right">'.$this->tpl['qty'].'</td>';
+print '<td class="right">'.$this->tpl['qty'].'</td>';
 if($conf->global->PRODUCT_USE_UNITS)
 	print '<td class="left">'.$langs->trans($this->tpl['unit']).'</td>';
 
-print '<td align="right">'.$this->tpl['remise_percent'].'</td>';
+print '<td class="right">'.$this->tpl['remise_percent'].'</td>';
 print '</tr>'."\n";
 ?>
 <!-- END PHP TEMPLATE originproductline.tpl.php -->
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index 9fb1009569a..f1e61100389 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -165,7 +165,7 @@ if (! empty($morelogincontent)) {
 <br><input type="submit" <?php echo $disabled; ?> class="button" name="button_password" value="<?php echo $langs->trans('SendNewPassword'); ?>" tabindex="4" />
 
 <br>
-<div align="center" style="margin-top: 15px;">
+<div class="center" style="margin-top: 15px;">
 	<?php
 	$moreparam='';
 	if (! empty($conf->dol_hide_topmenu))   $moreparam.=(strpos($moreparam, '?')===false?'?':'&').'dol_hide_topmenu='.$conf->dol_hide_topmenu;
diff --git a/htdocs/core/tpl/resource_add.tpl.php b/htdocs/core/tpl/resource_add.tpl.php
index 1936b89c771..2bd413deb70 100644
--- a/htdocs/core/tpl/resource_add.tpl.php
+++ b/htdocs/core/tpl/resource_add.tpl.php
@@ -34,7 +34,7 @@ $out .= '</div>';
 $out .= '<div class="tagtd"><label>'.$langs->trans('Busy').'</label> '.$form->selectyesno('busy', (isset($_POST['busy'])?$_POST['busy']:1), 1).'</div>';
 $out .= '<div class="tagtd"><label>'.$langs->trans('Mandatory').'</label> '.$form->selectyesno('mandatory', (isset($_POST['mandatory'])?$_POST['mandatory']:0), 1).'</div>';
 
-$out .= '<div class="tagtd" align="right">';
+$out .= '<div class="tagtd right">';
 $out .='<input type="submit" id="add-resource-place" class="button" value="'.$langs->trans("Add").'"/>';
 $out .= '</div>';
 
diff --git a/htdocs/core/tpl/resource_view.tpl.php b/htdocs/core/tpl/resource_view.tpl.php
index 9b11ece39f5..673045afddc 100644
--- a/htdocs/core/tpl/resource_view.tpl.php
+++ b/htdocs/core/tpl/resource_view.tpl.php
@@ -18,8 +18,8 @@ if($mode == 'edit' )
     print '<form class="tagtr liste_titre">';
     print '<div class="tagtd liste_titre">'.$langs->trans('Resource').'</div>';
     print '<div class="tagtd liste_titre">'.$langs->trans('Type').'</div>';
-    print '<div class="tagtd liste_titre" align="center">'.$langs->trans('Busy').'</div>';
-    print '<div class="tagtd liste_titre" align="center">'.$langs->trans('Mandatory').'</div>';
+    print '<div class="tagtd liste_titre center">'.$langs->trans('Busy').'</div>';
+    print '<div class="tagtd liste_titre center">'.$langs->trans('Mandatory').'</div>';
     print '<div class="tagtd liste_titre"></div>';
     print '</form>';
 }
@@ -28,8 +28,8 @@ else
     print '<form class="tagtr liste_titre">';
     print '<div class="tagtd liste_titre">'.$langs->trans('Resource').'</div>';
     print '<div class="tagtd liste_titre">'.$langs->trans('Type').'</div>';
-    print '<div class="tagtd liste_titre" align="center">'.$langs->trans('Busy').'</div>';
-    print '<div class="tagtd liste_titre" align="center">'.$langs->trans('Mandatory').'</div>';
+    print '<div class="tagtd liste_titre center">'.$langs->trans('Busy').'</div>';
+    print '<div class="tagtd liste_titre center">'.$langs->trans('Mandatory').'</div>';
     print '<div class="tagtd liste_titre"></div>';
     print '</form>';
 }
@@ -56,9 +56,9 @@ if( (array) $linked_resources && count($linked_resources) > 0)
 
 			print '<div class="tagtd">'.$object_resource->getNomUrl(1).'</div>';
 			print '<div class="tagtd">'.$object_resource->type_label.'</div>';
-			print '<div class="tagtd" align="center">'.$form->selectyesno('busy', $linked_resource['busy']?1:0, 1).'</div>';
-			print '<div class="tagtd" align="center">'.$form->selectyesno('mandatory', $linked_resource['mandatory']?1:0, 1).'</div>';
-			print '<div class="tagtd" align="right"><input type="submit" class="button" value="'.$langs->trans("Update").'"></div>';
+			print '<div class="tagtd center">'.$form->selectyesno('busy', $linked_resource['busy']?1:0, 1).'</div>';
+			print '<div class="tagtd center">'.$form->selectyesno('mandatory', $linked_resource['mandatory']?1:0, 1).'</div>';
+			print '<div class="tagtd right"><input type="submit" class="button" value="'.$langs->trans("Update").'"></div>';
 			print '</form>';
 		}
 		else
@@ -77,15 +77,15 @@ if( (array) $linked_resources && count($linked_resources) > 0)
 			print $object_resource->type_label;
 			print '</div>';
 
-			print '<div class="tagtd" align="center">';
+			print '<div class="tagtd center">';
 			print yn($linked_resource['busy']);
 			print '</div>';
 
-			print '<div class="tagtd" align="center">';
+			print '<div class="tagtd center">';
 			print yn($linked_resource['mandatory']);
 			print '</div>';
 
-			print '<div class="tagtd" align="right">';
+			print '<div class="tagtd right">';
 			print '<a href="'.$_SERVER['PHP_SELF'].'?mode=edit&resource_type='.$linked_resource['resource_type'].'&element='.$element.'&element_id='.$element_id.'&lineid='.$linked_resource['rowid'].'">';
 			print img_edit();
 			print '</a>';