diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 7a2f231879d..4df296d19da 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1445,7 +1445,7 @@ if ($id > 0)
 		print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
 		print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
 		//print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
-		print img_picto($langs->trans("ViewCal"),'object_calendarweek','class="hideonsmartphone pictoactionview"').' <input type="submit" style="min-width: 120px" class="button buttonactionview" name="viewweek" value="'.$langs->trans("ViewWeek").'">';
+		print img_picto($langs->trans("ViewWeek"),'object_calendarweek','class="hideonsmartphone pictoactionview"').' <input type="submit" style="min-width: 120px" class="button buttonactionview" name="viewweek" value="'.$langs->trans("ViewWeek").'">';
 		print '</form>'."\n";
 		print '<form name="listactionsfilterday" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST" style="float: left; padding-right: 10px;">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -1454,7 +1454,7 @@ if ($id > 0)
 		print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
 		print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
 		//print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
-		print img_picto($langs->trans("ViewCal"),'object_calendarday','class="hideonsmartphone pictoactionview"').' <input type="submit" style="min-width: 120px" class="button buttonactionview" name="viewday" value="'.$langs->trans("ViewDay").'">';
+		print img_picto($langs->trans("ViewDay"),'object_calendarday','class="hideonsmartphone pictoactionview"').' <input type="submit" style="min-width: 120px" class="button buttonactionview" name="viewday" value="'.$langs->trans("ViewDay").'">';
 		print '</form>'."\n";
 		print '<form name="listactionsfilterperuser" action="'.DOL_URL_ROOT.'/comm/action/peruser.php" method="POST" style="float: left; padding-right: 10px;">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -1463,7 +1463,7 @@ if ($id > 0)
 		print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
 		print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
 		//print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
-		print img_picto($langs->trans("ViewCal"),'object_calendarperuser','class="hideonsmartphone pictoactionview"').' <input type="submit" style="min-width: 120px" class="button buttonactionview" name="viewperuser" value="'.$langs->trans("ViewPerUser").'">';
+		print img_picto($langs->trans("ViewPerUser"),'object_calendarperuser','class="hideonsmartphone pictoactionview"').' <input type="submit" style="min-width: 120px" class="button buttonactionview" name="viewperuser" value="'.$langs->trans("ViewPerUser").'">';
 		print '</form>'."\n";
 		print '</div>';
 
diff --git a/htdocs/core/class/html.formmargin.class.php b/htdocs/core/class/html.formmargin.class.php
index a52238be1b9..6678d87ca60 100644
--- a/htdocs/core/class/html.formmargin.class.php
+++ b/htdocs/core/class/html.formmargin.class.php
@@ -255,7 +255,7 @@ class FormMargin
 
 		if (! empty($conf->product->enabled) && ! empty($conf->service->enabled))
 		{
-			print '<tr class="impair">';
+			print '<tr class="liste_total">';
 			print '<td>'.$langs->trans('TotalMargin').'</td>';
 			print '<td align="right">'.price($marginInfo['pv_total'], null, null, null, null, $rounding).'</td>';
 			print '<td align="right">'.price($marginInfo['pa_total'], null, null, null, null, $rounding).'</td>';
diff --git a/htdocs/core/tpl/resource_view.tpl.php b/htdocs/core/tpl/resource_view.tpl.php
index dd775662db6..7b2a6f43f4d 100644
--- a/htdocs/core/tpl/resource_view.tpl.php
+++ b/htdocs/core/tpl/resource_view.tpl.php
@@ -5,34 +5,33 @@
 $form= new Form($db);
 
 
+print '<div class="tagtable centpercent noborder allwidth">';
+
+if($mode == 'edit' )
+{
+    print '<form class="tagtr liste_titre">';
+    print '<div class="tagtd">'.$langs->trans('Resource').'</div>';
+    print '<div class="tagtd">'.$langs->trans('Type').'</div>';
+    print '<div class="tagtd" align="center">'.$langs->trans('Busy').'</div>';
+    print '<div class="tagtd" align="center">'.$langs->trans('Mandatory').'</div>';
+    print '<div class="tagtd"></div>';
+    print '</form>';
+}
+else
+{
+    print '<form class="tagtr liste_titre">';
+    print '<div class="tagtd">'.$langs->trans('Resource').'</div>';
+    print '<div class="tagtd">'.$langs->trans('Type').'</div>';
+    print '<div class="tagtd" align="center">'.$langs->trans('Busy').'</div>';
+    print '<div class="tagtd" align="center">'.$langs->trans('Mandatory').'</div>';
+    print '<div class="tagtd"></div>';
+    print '</form>';
+}
+
 if( (array) $linked_resources && count($linked_resources) > 0)
 {
 	$var=true;
 
-	print '<div class="tagtable centpercent noborder allwidth">';
-	
-	if($mode == 'edit' )
-	{	
-		print '<form class="tagtr liste_titre">';
-		print '<div class="tagtd">'.$langs->trans('Resource').'</div>';
-		print '<div class="tagtd">'.$langs->trans('Type').'</div>';
-		print '<div class="tagtd" align="center">'.$langs->trans('Busy').'</div>';
-		print '<div class="tagtd" align="center">'.$langs->trans('Mandatory').'</div>';
-		print '<div class="tagtd"></div>';
-		print '</form>';
-	}
-	else
-	{
-		print '<form class="tagtr liste_titre">';
-		print '<div class="tagtd">'.$langs->trans('Resource').'</div>';
-		print '<div class="tagtd">'.$langs->trans('Type').'</div>';
-		print '<div class="tagtd" align="center">'.$langs->trans('Busy').'</div>';
-		print '<div class="tagtd" align="center">'.$langs->trans('Mandatory').'</div>';
-		print '<div class="tagtd"></div>';
-		print '</form>';
-	}
-
-
 	foreach ($linked_resources as $linked_resource)
 	{
 		$var=!$var;
@@ -56,7 +55,6 @@ if( (array) $linked_resources && count($linked_resources) > 0)
 			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 '</form>';
-
 		}
 		else
 		{
@@ -96,11 +94,13 @@ if( (array) $linked_resources && count($linked_resources) > 0)
 		}
 	}
 
-	print '</div>';
 }
 else {
-	print '<div class="warning">'.$langs->trans('NoResourceLinked').'</div>';
+	print '<div class="tagtr '.($var==true?"pair":"impair").'"><div class="tagtd opacitymedium">'.$langs->trans('NoResourceLinked').'</div></div>';
 
 }
+
+print '</div>';
+
 ?>
 <!-- END TEMPLATE resource_view.tpl.php -->
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 2e78ea94bbf..2f45d2b782b 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -425,7 +425,7 @@ if ($resql)
 	print $hookmanager->resPrint;
 	if (! empty($arrayfields['p.datec']['checked']))  print_liste_field_titre($arrayfields['p.datec']['label'],$_SERVER["PHP_SELF"],"p.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 	if (! empty($arrayfields['p.tms']['checked']))    print_liste_field_titre($arrayfields['p.tms']['label'],$_SERVER["PHP_SELF"],"p.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-	if (! empty($arrayfields['p.fk_statut']['checked'])) print_liste_field_titre($arrayfields['p.fk_statut']['label'],$_SERVER["PHP_SELF"],"p.fk_statut","",$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['p.fk_statut']['checked'])) print_liste_field_titre($arrayfields['p.fk_statut']['label'],$_SERVER["PHP_SELF"],"p.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
 
diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php
index 59a95f6f57a..7cb5b74fac3 100644
--- a/htdocs/resource/element_resource.php
+++ b/htdocs/resource/element_resource.php
@@ -168,7 +168,7 @@ if($ret == -1) {
         dol_print_error($db,$object->error);
         exit;
 }
-if(!$ret) {
+if (!$ret) {
         print '<div class="warning">'.$langs->trans('NoResourceInDatabase').'</div>';
 }
 else
@@ -304,6 +304,7 @@ else
         //print load_fiche_titre($langs->trans('ResourcesLinkedToElement'),'','');
 
 
+	// Show list of resource links
 
         foreach ($object->available_resources as $modresources => $resources)
         {
diff --git a/htdocs/theme/eldy/img/object_calendargantt.png b/htdocs/theme/eldy/img/object_calendargantt.png
new file mode 100644
index 00000000000..4d727dd6f24
Binary files /dev/null and b/htdocs/theme/eldy/img/object_calendargantt.png differ
diff --git a/htdocs/theme/eldy/img/object_calendarpertype.png b/htdocs/theme/eldy/img/object_calendarpertype.png
new file mode 100644
index 00000000000..ba16a4ab6c0
Binary files /dev/null and b/htdocs/theme/eldy/img/object_calendarpertype.png differ
diff --git a/htdocs/theme/eldy/img/object_resource.png b/htdocs/theme/eldy/img/object_resource.png
index 8cda1f3f220..2d93019b62f 100644
Binary files a/htdocs/theme/eldy/img/object_resource.png and b/htdocs/theme/eldy/img/object_resource.png differ
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 20ee581f318..d7b0aeb1bb6 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -100,6 +100,7 @@ $fontsizesmaller='11';
 $usegradienttop=(isset($conf->global->THEME_ELDY_TOPMENU_BACK1)?0:1);
 $usegradienttitle=(isset($conf->global->THEME_ELDY_BACKTITLE1)?0:1);
 $useboldtitle=(isset($conf->global->THEME_ELDY_USEBOLDTITLE)?$conf->global->THEME_ELDY_USEBOLDTITLE:1);
+$borderwith=2;
 
 // Case of option always editable
 if (! isset($conf->global->THEME_ELDY_BACKBODY)) $conf->global->THEME_ELDY_BACKBODY=$colorbackbody;
@@ -800,7 +801,7 @@ img.photoref {
 .underrefbanner {
 }
 .underbanner {
-	border-bottom: 2px solid rgb(<?php echo $colortopbordertitle1 ?>);
+	border-bottom: <?php echo $borderwith ?>px solid rgb(<?php echo $colortopbordertitle1 ?>);
 }
 
 
@@ -2199,7 +2200,7 @@ table.liste, table.noborder, table.formdoc, div.noborder {
 	border-collapse: separate !important;
 	border-spacing: 0px;
 
-	border-top-width: 2px;
+	border-top-width: <?php echo $borderwith ?>px;
 	border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
 	border-top-style: solid;
 
@@ -2566,7 +2567,7 @@ div.liste_titre {
 	border-top-style: solid;
 }
 div.liste_titre_bydiv {
-	border-top-width: 2px;
+	border-top-width: <?php echo $borderwith ?>px;
     border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
     border-top-style: solid;
     
@@ -2654,6 +2655,12 @@ form.liste_total div {
 	border-bottom: none;
 }
 
+.margintable {
+	border-top-width: <?php echo $borderwith ?>px !important;
+	border-top-color: rgb(<?php echo $colortopbordertitle1 ?>) !important;
+	border-top-style: solid !important;
+}
+
 .margintable td {
 	border: 0px !important;
 }
diff --git a/htdocs/theme/md/img/object_calendargantt.png b/htdocs/theme/md/img/object_calendargantt.png
new file mode 100644
index 00000000000..b49fe7b2bfb
Binary files /dev/null and b/htdocs/theme/md/img/object_calendargantt.png differ
diff --git a/htdocs/theme/md/img/object_calendarpertype.png b/htdocs/theme/md/img/object_calendarpertype.png
new file mode 100644
index 00000000000..244da5bedd0
Binary files /dev/null and b/htdocs/theme/md/img/object_calendarpertype.png differ
diff --git a/htdocs/theme/md/img/object_calendarperuser.png b/htdocs/theme/md/img/object_calendarperuser.png
index 98a013a4014..244da5bedd0 100644
Binary files a/htdocs/theme/md/img/object_calendarperuser.png and b/htdocs/theme/md/img/object_calendarperuser.png differ
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 87b5b13fa6d..fd8dfff0c44 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -857,7 +857,7 @@ img.photoref {
 .underrefbanner {
 }
 .underbanner {
-	border-bottom: <?php echo $borderwith; ?>px solid rgb(<?php echo $colortopbordertitle1 ?>);;
+	border-bottom: <?php echo $borderwith; ?>px solid rgb(<?php echo $colortopbordertitle1 ?>);
 }