diff --git a/htdocs/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php
index 0e8066f7a68..ee175a50588 100644
--- a/htdocs/core/modules/modHoliday.class.php
+++ b/htdocs/core/modules/modHoliday.class.php
@@ -61,7 +61,7 @@ class modHoliday extends DolibarrModules
 		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
 		$this->description = "Leave management";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'experimental';
+		$this->version = 'dolibarr';
 		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		// Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
diff --git a/htdocs/holiday/admin/holiday.php b/htdocs/holiday/admin/holiday.php
index 2b602118781..e14b1a2bba9 100644
--- a/htdocs/holiday/admin/holiday.php
+++ b/htdocs/holiday/admin/holiday.php
@@ -260,14 +260,13 @@ elseif($action && isset($_POST['delete_event']))
         print $langs->trans('ErrorDeleteEventCP');
         print '</div>';
     }
-
 }
 
+print '<br>';
 
-// Affichage de la page de configuation
-print '<div class="tabBar">';
+print_fiche_titre($langs->trans('TitleOptionMainCP'),'','');
 
-print '<h3>'.$langs->trans('TitleOptionMainCP').'</h3>';
+dol_fiche_head(array(),'','');
 
 print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?leftmenu=setup" name="config">'."\n";
 print '<input type="hidden" name="action" value="add" />'."\n";
@@ -290,52 +289,59 @@ print '</tr>'."\n";
 $var=!$var;
 print '<tr '.$bc[$var].'>'."\n";
 print '<td style="padding:5px;">'.$langs->trans('DelayForSubmitCP').'</td>'."\n";
-print '<td style="padding:5px;"><input type="text" name="delayForRequest" value="'.$cp->getConfCP('delayForRequest').'" size="2" /> '.$langs->trans('Jours').'</td>'."\n";
+print '<td style="padding:5px;"><input class="flat" type="text" name="delayForRequest" value="'.$cp->getConfCP('delayForRequest').'" size="2" /> '.$langs->trans('Jours').'</td>'."\n";
 print '</tr>'."\n";
 
 $var=!$var;
 print '<tr '.$bc[$var].'>'."\n";
 print '<td style="padding:5px;">'.$langs->trans('AlertValidatorDelayCP').'</td>'."\n";
-print '<td style="padding:5px;"><input type="checkbox" name="AlertValidatorDelay" '.$cp->getCheckOption('AlertValidatorDelay').'/></td>'."\n";
+print '<td style="padding:5px;"><input class="flat" type="checkbox" name="AlertValidatorDelay" '.$cp->getCheckOption('AlertValidatorDelay').'/></td>'."\n";
 print '</tr>'."\n";
 
 $var=!$var;
 print '<tr '.$bc[$var].'>'."\n";
 print '<td style="padding:5px;">'.$langs->trans('AlertValidorSoldeCP').'</td>'."\n";
-print '<td style="padding:5px;"><input type="checkbox" name="AlertValidatorSolde" '.$cp->getCheckOption('AlertValidatorSolde').'/></td>'."\n";
+print '<td style="padding:5px;"><input class="flat" type="checkbox" name="AlertValidatorSolde" '.$cp->getCheckOption('AlertValidatorSolde').'/></td>'."\n";
 print '</tr>'."\n";
 
 $var=!$var;
 print '<tr '.$bc[$var].'>'."\n";
 print '<td style="padding:5px;">'.$langs->trans('nbHolidayEveryMonthCP').'</td>'."\n";
-print '<td style="padding:5px;"><input type="text" name="nbHolidayEveryMonth" value="'.$cp->getConfCP('nbHolidayEveryMonth').'" size="5"/> '.$langs->trans('Jours').'</td>'."\n";
+print '<td style="padding:5px;"><input class="flat" type="text" name="nbHolidayEveryMonth" value="'.$cp->getConfCP('nbHolidayEveryMonth').'" size="5"/> '.$langs->trans('Jours').'</td>'."\n";
 print '</tr>'."\n";
 
 $var=!$var;
 print '<tr '.$bc[$var].'>'."\n";
 print '<td style="padding:5px;">'.$langs->trans('nbHolidayDeductedCP').'</td>'."\n";
-print '<td style="padding:5px;"><input type="text" name="nbHolidayDeducted" value="'.$cp->getConfCP('nbHolidayDeducted').'" size="2"/> '.$langs->trans('Jours').'</td>'."\n";
+print '<td style="padding:5px;"><input class="flat" type="text" name="nbHolidayDeducted" value="'.$cp->getConfCP('nbHolidayDeducted').'" size="2"/> '.$langs->trans('Jours').'</td>'."\n";
 print '</tr>'."\n";
 
 $var=!$var;
 print '<tr '.$bc[$var].'>'."\n";
 print '<td style="padding:5px;">'.$langs->trans('nbUserCP').'</td>'."\n";
-print '<td style="padding:5px;"><input type="text" name="nbUser" value="'.$cp->getConfCP('nbUser').'" disabled="disabled" size="4"/></td>'."\n";
+print '<td style="padding:5px;"><input class="flat" type="text" name="nbUser" value="'.$cp->getConfCP('nbUser').'" disabled="disabled" size="4"/></td>'."\n";
 print '</tr>'."\n";
 
 $var=!$var;
 print '<tr '.$bc[$var].'>'."\n";
 print '<td style="padding:5px;">'.$langs->trans('LastUpdateCP').'</td>'."\n";
-print '<td style="padding:5px;"><input type="text" name="lastUpdate" value="'.date('d-m-Y à H:i:s',$cp->getConfCP('lastUpdate')).'" disabled="disabled"/></td>'."\n";
+print '<td style="padding:5px;"><input class="flat" type="text" name="lastUpdate" value="'.date('d-m-Y à H:i:s',$cp->getConfCP('lastUpdate')).'" disabled="disabled"/></td>'."\n";
 print '</tr>'."\n";
 
 print '</tbody>'."\n";
 print '</table>'."\n";
 
-print '<br /><input type="submit" value="'.$langs->trans("ConfirmConfigCP").'" name="bouton" class="button"/>'."\n";
+print '<div align="center"><input type="submit" value="'.$langs->trans("ConfirmConfigCP").'" name="bouton" class="button"/></div>'."\n";
 print '</form>'."\n\n";
 
-print '<br /><h3>'.$langs->trans('TitleOptionEventCP').'</h3>'."\n\n";
+dol_fiche_end();
+
+print '<br>';
+
+print_fiche_titre($langs->trans('TitleOptionEventCP'),'','');
+
+dol_fiche_head(array(),'','');
+
 
 $cp_events = $cp->fetchEventsCP();
 
@@ -356,7 +362,7 @@ if($cp_events == 1) {
     print '<td class="liste_titre" width="40%">'.$langs->trans('NameEventCP').'</td>'."\n";
     print '<td class="liste_titre">'.$langs->trans('ValueOptionCP').'</td>'."\n";
     print '<td class="liste_titre">'.$langs->trans('UpdateEventOptionCP').'</td>'."\n";
-    print '<td class="liste_titre">'.$langs->trans('DeleteEventOptionCP').'</td>'."\n";
+    print '<td class="liste_titre" align="right">'.$langs->trans('DeleteEventOptionCP').'</td>'."\n";
 
     print '</tr>'."\n";
 
@@ -365,10 +371,10 @@ if($cp_events == 1) {
         $var=!$var;
 
         print '<tr '.$bc[$var].'>'."\n";
-        print '<td style="padding: 5px;"><input type="text" size="40" name="optName['.$infos_event['rowid'].']" value="'.$infos_event['name'].'" /></td>'."\n";
-        print '<td width="10%"><input type="text" size="2" name="optValue['.$infos_event['rowid'].']" value="'.$infos_event['value'].'" /> '.$langs->trans('Jours').'</td>'."\n";
-        print '<td width="10%"><input type="submit" class="button" name="update_event['.$infos_event['rowid'].']" value="'.dol_escape_htmltag($langs->trans("Update")).'"/></td>'."\n";
-        print '<td width="10%"><input type="image" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" name="delete_event['.$infos_event['rowid'].']" style="border:0;"/></td>'."\n";
+        print '<td><input class="flat" type="text" size="40" name="optName['.$infos_event['rowid'].']" value="'.$infos_event['name'].'" /></td>'."\n";
+        print '<td><input class="flat" type="text" size="2" name="optValue['.$infos_event['rowid'].']" value="'.$infos_event['value'].'" /> '.$langs->trans('Jours').'</td>'."\n";
+        print '<td><input type="submit" class="button" name="update_event['.$infos_event['rowid'].']" value="'.dol_escape_htmltag($langs->trans("Update")).'"/></td>'."\n";
+        print '<td width="20px" align="right"><input type="image" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" name="delete_event['.$infos_event['rowid'].']" style="border:0;"/></td>'."\n";
         print '</tr>';
 
         $i++;
@@ -383,7 +389,7 @@ if($cp_events == 1) {
 
 print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?leftmenu=setup" name="event_create">'."\n";
 
-print '<h5>'.$langs->trans('TitleCreateEventCP').'</h5>';
+print $langs->trans('TitleCreateEventCP');
 
 print '<table class="noborder" width="100%">';
 print '<tbody>';
@@ -399,8 +405,8 @@ print '</tr>';
 print '<input type="hidden" name="action" value="create_event" />'."\n";
 
 print '<tr class="pair">';
-print '<td style="padding: 5px;"><input type="text" size="40" name="optName" value="" /></td>'."\n";
-print '<td><input type="text" size="2" name="optValue" value="" /> '.$langs->trans('Jours').'</td>'."\n";
+print '<td><input class="flat" type="text" size="40" name="optName" value="" /></td>'."\n";
+print '<td><input class="flat" type="text" size="2" name="optValue" value="" /> '.$langs->trans('Jours').'</td>'."\n";
 print '<td><input type="submit" class="button" name="button" value="'.$langs->trans('ValidEventCP').'" /></td>'."\n";
 print '</tr>'."\n";
 
@@ -409,7 +415,7 @@ print '</table>';
 
 print '</form>';
 
-print '</div>';
+dol_fiche_end();
 
 
 // Fin de page
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 3a4e3cc151a..7204d730bc9 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -455,6 +455,8 @@ Module2900Name= GeoIPMaxmind
 Module2900Desc= GeoIP Maxmind conversions capabilities
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
+Module20000Name=Holidays
+Module20000Desc=Declare and follow employees holidays
 Module50000Name=PayBox
 Module50000Desc=Module to offer an online payment page by credit card with PayBox
 Module50100Name=Point of sales
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index f0b7708c540..bf2f81b0b57 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -457,12 +457,14 @@ Module2900Name= GeoIPMaxmind
 Module2900Desc= Capacités de conversion GeoIP Maxmind 
 Module5000Name= Multi-société
 Module5000Desc= Permet de gérer plusieurs sociétés
-Module50000Name= PayBox
-Module50000Desc= Module permettant d'offrir en ligne une page de paiement par carte de crédit avec PayBox
-Module50100Name= Point de vente
-Module50100Desc= Caisse enregistreuse de point de vente
-Module50200Name= Paypal
-Module50200Desc= Module permettant d'offrir en ligne une page de paiement par carte de crédit avec Paypal
+Module20000Name=Congès
+Module20000Desc=Déclaration et suivi des congès des employés
+Module50000Name=PayBox
+Module50000Desc=Module permettant d'offrir en ligne une page de paiement par carte de crédit avec PayBox
+Module50100Name=Point de vente
+Module50100Desc=Caisse enregistreuse de point de vente
+Module50200Name=Paypal
+Module50200Desc=Module permettant d'offrir en ligne une page de paiement par carte de crédit avec Paypal
 Module59000Name=Marges
 Module59000Desc=Module pour gérer les marges
 Module60000Name=Commissions
diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index 646b84fee88..d14ce8dd4fc 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -106,20 +106,20 @@ if ($id > 0 || ! empty($ref))
 		print '</td></tr>';
 
 		// Total Margin
-		print '<tr style="font-weight: bold"><td>'.$langs->trans("TotalMargin").'</td><td colspan="3">';
+		print '<tr><td>'.$langs->trans("TotalMargin").'</td><td colspan="3">';
 		print '<span id="totalMargin"></span>'; // set by jquery (see below)
 		print '</td></tr>';
 
 		// Margin Rate
 		if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
-			print '<tr style="font-weight: bold"><td>'.$langs->trans("MarginRate").'</td><td colspan="3">';
+			print '<tr><td>'.$langs->trans("MarginRate").'</td><td colspan="3">';
 			print '<span id="marginRate"></span>'; // set by jquery (see below)
 			print '</td></tr>';
 		}
 
 		// Mark Rate
 		if (! empty($conf->global->DISPLAY_MARK_RATES)) {
-			print '<tr style="font-weight: bold"><td>'.$langs->trans("MarkRate").'</td><td colspan="3">';
+			print '<tr><td>'.$langs->trans("MarkRate").'</td><td colspan="3">';
 			print '<span id="markRate"></span>'; // set by jquery (see below)
 			print '</td></tr>';
 		}
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index 3689afd240f..26f5983f264 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -104,20 +104,20 @@ if ($socid > 0)
     }
 
 		// Total Margin
-		print '<tr style="font-weight: bold"><td>'.$langs->trans("TotalMargin").'</td><td colspan="3">';
+		print '<tr><td>'.$langs->trans("TotalMargin").'</td><td colspan="3">';
 		print '<span id="totalMargin"></span>'; // set by jquery (see below)
 		print '</td></tr>';
 
 		// Margin Rate
 		if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
-			print '<tr style="font-weight: bold"><td>'.$langs->trans("MarginRate").'</td><td colspan="3">';
+			print '<tr><td>'.$langs->trans("MarginRate").'</td><td colspan="3">';
 			print '<span id="marginRate"></span>'; // set by jquery (see below)
 			print '</td></tr>';
 		}
 
 		// Mark Rate
 		if (! empty($conf->global->DISPLAY_MARK_RATES)) {
-			print '<tr style="font-weight: bold"><td>'.$langs->trans("MarkRate").'</td><td colspan="3">';
+			print '<tr><td>'.$langs->trans("MarkRate").'</td><td colspan="3">';
 			print '<span id="markRate"></span>'; // set by jquery (see below)
 			print '</td></tr>';
 		}