diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 8b1469dd446..7b689814960 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -110,7 +110,7 @@ class FormFile
 
 			$maxlength = $size;
 
-			$out = "\n\n<!-- Start form attach new file -->\n";
+			$out = "\n\n".'<!-- Start form attach new file --><div class="formattachnewfile">'."\n";
 
 			if (empty($title)) $title = $langs->trans("AttachANewFile");
 			if ($title != 'none') $out .= load_fiche_titre($title, null, null);
@@ -220,11 +220,11 @@ class FormFile
 	       		if (empty($sectionid)) $out .= '<br>';
 			}
 
-			$out .= "\n<!-- End form attach new file -->\n";
+			$out .= "\n</div><!-- End form attach new file -->\n";
 
 			if ($linkfiles)
 			{
-				$out .= "\n<!-- Start form link new url -->\n";
+				$out .= "\n".'<!-- Start form link new url --><div class="formlinknewurl">'."\n";
 				$langs->load('link');
 				$title = $langs->trans("LinkANewFile");
 				$out .= load_fiche_titre($title, null, null);
@@ -260,7 +260,7 @@ class FormFile
                     $out .= '</form><br>';
 				}
 
-				$out .= "\n<!-- End form link new url -->\n";
+				$out .= "\n</div><!-- End form link new url -->\n";
 			}
 
 			$parameters = array('socid'=>(isset($GLOBALS['socid']) ? $GLOBALS['socid'] : ''), 'id'=>(isset($GLOBALS['id']) ? $GLOBALS['id'] : ''), 'url'=>$url, 'perm'=>$perm);
@@ -1174,7 +1174,7 @@ class FormFile
 			}
 
 			// Show list of existing files
-			if ((empty($useinecm) || $useinecm == 6) && $title != 'none') print load_fiche_titre($title ? $title : $langs->trans("AttachedFiles"));
+			if ((empty($useinecm) || $useinecm == 6) && $title != 'none') print load_fiche_titre($title ? $title : $langs->trans("AttachedFiles"), '', 'file-upload', 0, '', 'table-list-of-attached-files');
 			if (empty($url)) $url = $_SERVER["PHP_SELF"];
 
 			print '<!-- html.formfile::list_of_documents -->'."\n";
@@ -1790,7 +1790,7 @@ class FormFile
 		print '<!-- listOfLinks -->'."\n";
 
 		// Show list of associated links
-		print load_fiche_titre($langs->trans("LinkedFiles"));
+		print load_fiche_titre($langs->trans("LinkedFiles"), '', 'external-link-square-alt', 0, '', 'table-list-of-links');
 
 		print '<form action="'.$_SERVER['PHP_SELF'].($param ? '?'.$param : '').'" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 8679ba27743..0424ee54ee1 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1549,24 +1549,26 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 				}
 			}
 
-			if (!$phototoshow)      // Show No photo link (picto of pbject)
+			if (!$phototoshow)      // Show No photo link (picto of object)
 			{
 			    $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">';
 				if ($object->element == 'action')
 				{
 					$width = 80;
 					$cssclass = 'photorefcenter';
-					$nophoto = img_picto('', 'title_agenda', '', false, 1);
+					$nophoto = img_picto('No photo', 'title_agenda');
 				}
 				else
 				{
 					$width = 14; $cssclass = 'photorefcenter';
 					$picto = $object->picto;
 					if ($object->element == 'project' && !$object->public) $picto = 'project'; // instead of projectpub
-					$nophoto = img_picto('', 'object_'.$picto, '', false, 1);
+					$nophoto = img_picto('No photo', 'object_'.$picto);
 				}
 				$morehtmlleft .= '<!-- No photo to show -->';
-				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo"'.($width ? ' style="width: '.$width.'px"' : '').' src="'.$nophoto.'"></div></div>';
+				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';
+				$morehtmlleft .= $nophoto;
+				$morehtmlleft .= '</div></div>';
 
 				$morehtmlleft .= '</div>';
 			}
@@ -3140,8 +3142,8 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
         if (empty($srconly) && in_array($pictowithouttext, array(
         		'1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',
         		'address', 'bank_account', 'barcode', 'bank', 'bookmark', 'bom', 'building', 'cash-register', 'check', 'close_title', 'company', 'contact', 'cubes',
-        		'delete', 'dolly', 'edit', 'ellipsis-h',
-        		'filter', 'file-code', 'folder', 'folder-open', 'grip', 'grip_title', 'help', 'language', 'list', 'listlight', 'lot', 'mrp', 'note', 'stock',
+        		'delete', 'dolly', 'edit', 'ellipsis-h', 'external-link-alt', 'external-link-square-alt',
+        		'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'folder', 'folder-open', 'grip', 'grip_title', 'help', 'language', 'list', 'listlight', 'lot', 'mrp', 'note', 'stock',
         		'object_accounting', 'object_action', 'object_account', 'object_barcode', 'object_bom',
         		'object_category', 'object_bookmark', 'object_bug', 'object_generic', 'object_list-alt', 'object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser',
         		'object_cash-register', 'object_company', 'object_contact', 'object_contract', 'object_dynamicprice',
diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/holiday/public/agenda/agendaexport.php
similarity index 100%
rename from htdocs/public/agenda/agendaexport.php
rename to htdocs/holiday/public/agenda/agendaexport.php
diff --git a/htdocs/public/agenda/index.php b/htdocs/holiday/public/agenda/index.php
similarity index 100%
rename from htdocs/public/agenda/index.php
rename to htdocs/holiday/public/agenda/index.php
diff --git a/htdocs/public/cron/cron_run_jobs.php b/htdocs/holiday/public/cron/cron_run_jobs.php
similarity index 100%
rename from htdocs/public/cron/cron_run_jobs.php
rename to htdocs/holiday/public/cron/cron_run_jobs.php
diff --git a/htdocs/public/cron/index.html b/htdocs/holiday/public/cron/index.html
similarity index 100%
rename from htdocs/public/cron/index.html
rename to htdocs/holiday/public/cron/index.html
diff --git a/htdocs/public/demo/demo-profile-all.jpg b/htdocs/holiday/public/demo/demo-profile-all.jpg
similarity index 100%
rename from htdocs/public/demo/demo-profile-all.jpg
rename to htdocs/holiday/public/demo/demo-profile-all.jpg
diff --git a/htdocs/public/demo/demo-profile-foundation.jpg b/htdocs/holiday/public/demo/demo-profile-foundation.jpg
similarity index 100%
rename from htdocs/public/demo/demo-profile-foundation.jpg
rename to htdocs/holiday/public/demo/demo-profile-foundation.jpg
diff --git a/htdocs/public/demo/demo-profile-health.jpg b/htdocs/holiday/public/demo/demo-profile-health.jpg
similarity index 100%
rename from htdocs/public/demo/demo-profile-health.jpg
rename to htdocs/holiday/public/demo/demo-profile-health.jpg
diff --git a/htdocs/public/demo/demo-profile-manufacturing.jpg b/htdocs/holiday/public/demo/demo-profile-manufacturing.jpg
similarity index 100%
rename from htdocs/public/demo/demo-profile-manufacturing.jpg
rename to htdocs/holiday/public/demo/demo-profile-manufacturing.jpg
diff --git a/htdocs/public/demo/demo-profile-product.jpg b/htdocs/holiday/public/demo/demo-profile-product.jpg
similarity index 100%
rename from htdocs/public/demo/demo-profile-product.jpg
rename to htdocs/holiday/public/demo/demo-profile-product.jpg
diff --git a/htdocs/public/demo/demo-profile-service.jpg b/htdocs/holiday/public/demo/demo-profile-service.jpg
similarity index 100%
rename from htdocs/public/demo/demo-profile-service.jpg
rename to htdocs/holiday/public/demo/demo-profile-service.jpg
diff --git a/htdocs/public/demo/demo.css b/htdocs/holiday/public/demo/demo.css
similarity index 100%
rename from htdocs/public/demo/demo.css
rename to htdocs/holiday/public/demo/demo.css
diff --git a/htdocs/public/demo/dolibarr_demo_ban.jpg b/htdocs/holiday/public/demo/dolibarr_demo_ban.jpg
similarity index 100%
rename from htdocs/public/demo/dolibarr_demo_ban.jpg
rename to htdocs/holiday/public/demo/dolibarr_demo_ban.jpg
diff --git a/htdocs/public/demo/index.php b/htdocs/holiday/public/demo/index.php
similarity index 100%
rename from htdocs/public/demo/index.php
rename to htdocs/holiday/public/demo/index.php
diff --git a/htdocs/public/donations/donateurs_code.php b/htdocs/holiday/public/donations/donateurs_code.php
similarity index 100%
rename from htdocs/public/donations/donateurs_code.php
rename to htdocs/holiday/public/donations/donateurs_code.php
diff --git a/htdocs/public/donations/index.php b/htdocs/holiday/public/donations/index.php
similarity index 100%
rename from htdocs/public/donations/index.php
rename to htdocs/holiday/public/donations/index.php
diff --git a/htdocs/public/emailing/index.html b/htdocs/holiday/public/emailing/index.html
similarity index 100%
rename from htdocs/public/emailing/index.html
rename to htdocs/holiday/public/emailing/index.html
diff --git a/htdocs/public/emailing/mailing-read.php b/htdocs/holiday/public/emailing/mailing-read.php
similarity index 100%
rename from htdocs/public/emailing/mailing-read.php
rename to htdocs/holiday/public/emailing/mailing-read.php
diff --git a/htdocs/public/emailing/mailing-unsubscribe.php b/htdocs/holiday/public/emailing/mailing-unsubscribe.php
similarity index 100%
rename from htdocs/public/emailing/mailing-unsubscribe.php
rename to htdocs/holiday/public/emailing/mailing-unsubscribe.php
diff --git a/htdocs/public/error-401.php b/htdocs/holiday/public/error-401.php
similarity index 100%
rename from htdocs/public/error-401.php
rename to htdocs/holiday/public/error-401.php
diff --git a/htdocs/public/error-404.php b/htdocs/holiday/public/error-404.php
similarity index 100%
rename from htdocs/public/error-404.php
rename to htdocs/holiday/public/error-404.php
diff --git a/htdocs/public/index.php b/htdocs/holiday/public/index.php
similarity index 100%
rename from htdocs/public/index.php
rename to htdocs/holiday/public/index.php
diff --git a/htdocs/public/members/index.php b/htdocs/holiday/public/members/index.php
similarity index 100%
rename from htdocs/public/members/index.php
rename to htdocs/holiday/public/members/index.php
diff --git a/htdocs/public/members/new.php b/htdocs/holiday/public/members/new.php
similarity index 100%
rename from htdocs/public/members/new.php
rename to htdocs/holiday/public/members/new.php
diff --git a/htdocs/public/members/public_card.php b/htdocs/holiday/public/members/public_card.php
similarity index 100%
rename from htdocs/public/members/public_card.php
rename to htdocs/holiday/public/members/public_card.php
diff --git a/htdocs/public/members/public_list.php b/htdocs/holiday/public/members/public_list.php
similarity index 100%
rename from htdocs/public/members/public_list.php
rename to htdocs/holiday/public/members/public_list.php
diff --git a/htdocs/public/notice.php b/htdocs/holiday/public/notice.php
similarity index 100%
rename from htdocs/public/notice.php
rename to htdocs/holiday/public/notice.php
diff --git a/htdocs/public/onlinesign/index.html b/htdocs/holiday/public/onlinesign/index.html
similarity index 100%
rename from htdocs/public/onlinesign/index.html
rename to htdocs/holiday/public/onlinesign/index.html
diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/holiday/public/onlinesign/newonlinesign.php
similarity index 100%
rename from htdocs/public/onlinesign/newonlinesign.php
rename to htdocs/holiday/public/onlinesign/newonlinesign.php
diff --git a/htdocs/public/opensurvey/index.html b/htdocs/holiday/public/opensurvey/index.html
similarity index 100%
rename from htdocs/public/opensurvey/index.html
rename to htdocs/holiday/public/opensurvey/index.html
diff --git a/htdocs/public/opensurvey/studs.php b/htdocs/holiday/public/opensurvey/studs.php
similarity index 100%
rename from htdocs/public/opensurvey/studs.php
rename to htdocs/holiday/public/opensurvey/studs.php
diff --git a/htdocs/public/payment/index.php b/htdocs/holiday/public/payment/index.php
similarity index 100%
rename from htdocs/public/payment/index.php
rename to htdocs/holiday/public/payment/index.php
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/holiday/public/payment/newpayment.php
similarity index 100%
rename from htdocs/public/payment/newpayment.php
rename to htdocs/holiday/public/payment/newpayment.php
diff --git a/htdocs/public/payment/paymentko.php b/htdocs/holiday/public/payment/paymentko.php
similarity index 100%
rename from htdocs/public/payment/paymentko.php
rename to htdocs/holiday/public/payment/paymentko.php
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/holiday/public/payment/paymentok.php
similarity index 100%
rename from htdocs/public/payment/paymentok.php
rename to htdocs/holiday/public/payment/paymentok.php
diff --git a/htdocs/public/stripe/confirm_payment.php b/htdocs/holiday/public/stripe/confirm_payment.php
similarity index 100%
rename from htdocs/public/stripe/confirm_payment.php
rename to htdocs/holiday/public/stripe/confirm_payment.php
diff --git a/htdocs/public/stripe/index.php b/htdocs/holiday/public/stripe/index.php
similarity index 100%
rename from htdocs/public/stripe/index.php
rename to htdocs/holiday/public/stripe/index.php
diff --git a/htdocs/public/stripe/ipn.php b/htdocs/holiday/public/stripe/ipn.php
similarity index 100%
rename from htdocs/public/stripe/ipn.php
rename to htdocs/holiday/public/stripe/ipn.php
diff --git a/htdocs/public/test/index.html b/htdocs/holiday/public/test/index.html
similarity index 100%
rename from htdocs/public/test/index.html
rename to htdocs/holiday/public/test/index.html
diff --git a/htdocs/public/test/test_arrays.php b/htdocs/holiday/public/test/test_arrays.php
similarity index 100%
rename from htdocs/public/test/test_arrays.php
rename to htdocs/holiday/public/test/test_arrays.php
diff --git a/htdocs/public/test/test_csrf.php b/htdocs/holiday/public/test/test_csrf.php
similarity index 100%
rename from htdocs/public/test/test_csrf.php
rename to htdocs/holiday/public/test/test_csrf.php
diff --git a/htdocs/public/test/test_forms.php b/htdocs/holiday/public/test/test_forms.php
similarity index 100%
rename from htdocs/public/test/test_forms.php
rename to htdocs/holiday/public/test/test_forms.php
diff --git a/htdocs/public/test/test_sessionlock.php b/htdocs/holiday/public/test/test_sessionlock.php
similarity index 100%
rename from htdocs/public/test/test_sessionlock.php
rename to htdocs/holiday/public/test/test_sessionlock.php
diff --git a/htdocs/public/theme/common/company.png b/htdocs/holiday/public/theme/common/company.png
similarity index 100%
rename from htdocs/public/theme/common/company.png
rename to htdocs/holiday/public/theme/common/company.png
diff --git a/htdocs/public/theme/common/index.php b/htdocs/holiday/public/theme/common/index.php
similarity index 100%
rename from htdocs/public/theme/common/index.php
rename to htdocs/holiday/public/theme/common/index.php
diff --git a/htdocs/public/theme/common/nophoto.png b/htdocs/holiday/public/theme/common/nophoto.png
similarity index 100%
rename from htdocs/public/theme/common/nophoto.png
rename to htdocs/holiday/public/theme/common/nophoto.png
diff --git a/htdocs/public/theme/common/user_anonymous.png b/htdocs/holiday/public/theme/common/user_anonymous.png
similarity index 100%
rename from htdocs/public/theme/common/user_anonymous.png
rename to htdocs/holiday/public/theme/common/user_anonymous.png
diff --git a/htdocs/public/theme/common/user_man.png b/htdocs/holiday/public/theme/common/user_man.png
similarity index 100%
rename from htdocs/public/theme/common/user_man.png
rename to htdocs/holiday/public/theme/common/user_man.png
diff --git a/htdocs/public/theme/common/user_woman.png b/htdocs/holiday/public/theme/common/user_woman.png
similarity index 100%
rename from htdocs/public/theme/common/user_woman.png
rename to htdocs/holiday/public/theme/common/user_woman.png
diff --git a/htdocs/public/theme/index.php b/htdocs/holiday/public/theme/index.php
similarity index 100%
rename from htdocs/public/theme/index.php
rename to htdocs/holiday/public/theme/index.php
diff --git a/htdocs/public/ticket/create_ticket.php b/htdocs/holiday/public/ticket/create_ticket.php
similarity index 100%
rename from htdocs/public/ticket/create_ticket.php
rename to htdocs/holiday/public/ticket/create_ticket.php
diff --git a/htdocs/public/ticket/img/bg_ticket.png b/htdocs/holiday/public/ticket/img/bg_ticket.png
similarity index 100%
rename from htdocs/public/ticket/img/bg_ticket.png
rename to htdocs/holiday/public/ticket/img/bg_ticket.png
diff --git a/htdocs/public/ticket/img/index.html b/htdocs/holiday/public/ticket/img/index.html
similarity index 100%
rename from htdocs/public/ticket/img/index.html
rename to htdocs/holiday/public/ticket/img/index.html
diff --git a/htdocs/public/ticket/index.php b/htdocs/holiday/public/ticket/index.php
similarity index 100%
rename from htdocs/public/ticket/index.php
rename to htdocs/holiday/public/ticket/index.php
diff --git a/htdocs/public/ticket/list.php b/htdocs/holiday/public/ticket/list.php
similarity index 100%
rename from htdocs/public/ticket/list.php
rename to htdocs/holiday/public/ticket/list.php
diff --git a/htdocs/public/ticket/view.php b/htdocs/holiday/public/ticket/view.php
similarity index 100%
rename from htdocs/public/ticket/view.php
rename to htdocs/holiday/public/ticket/view.php
diff --git a/htdocs/public/website/index.php b/htdocs/holiday/public/website/index.php
similarity index 100%
rename from htdocs/public/website/index.php
rename to htdocs/holiday/public/website/index.php
diff --git a/htdocs/public/website/styles.css.php b/htdocs/holiday/public/website/styles.css.php
similarity index 100%
rename from htdocs/public/website/styles.css.php
rename to htdocs/holiday/public/website/styles.css.php
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 6e70f01a0f1..8be4ae11cc4 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -4415,9 +4415,9 @@ class Product extends CommonObject
         if ($maxlength) { $newref = dol_trunc($newref, $maxlength, 'middle');
         }
 
-        if ($this->type == Product::TYPE_PRODUCT) { $label = '<u>'.$langs->trans("ShowProduct").'</u>';
+        if ($this->type == Product::TYPE_PRODUCT) { $label = '<u>'.$langs->trans("Product").'</u>';
         }
-        if ($this->type == Product::TYPE_SERVICE) { $label = '<u>'.$langs->trans("ShowService").'</u>';
+        if ($this->type == Product::TYPE_SERVICE) { $label = '<u>'.$langs->trans("Service").'</u>';
         }
         if (!empty($this->ref)) {
             $label .= '<br><b>'.$langs->trans('ProductRef').':</b> '.$this->ref;
diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php
index 152a572a737..b403c0516f9 100644
--- a/htdocs/resource/card.php
+++ b/htdocs/resource/card.php
@@ -225,7 +225,7 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0)
 {
 	if ($action == 'create')
 	{
-		print load_fiche_titre($title, '', 'generic');
+		print load_fiche_titre($title, '', 'object_resource');
 		dol_fiche_head('');
 	}
 	else
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index e987ef474f6..033d49ae8c8 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -144,6 +144,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$filter = array();
 }
 
+
 /*
  * Action
  */
@@ -203,7 +204,7 @@ if ($ret == -1) {
         $newcardbutton .= dolGetButtonTitle($langs->trans('MenuResourceAdd'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/resource/card.php?action=create');
     }
 
-	print_barre_liste($pagetitle, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $ret + 1, $nbtotalofrecords, 'generic', 0, $newcardbutton, '', $limit, 0, 0, 1);
+	print_barre_liste($pagetitle, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $ret + 1, $nbtotalofrecords, 'object_resource', 0, $newcardbutton, '', $limit, 0, 0, 1);
 }
 
 $moreforfilter = '';
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 3bf20f74c4e..025e7417ccb 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1575,6 +1575,14 @@ td.nobordernopadding.widthpictotitle.col-picto {
     color: var(--colortexttitlenotab);
     opacity: 0.85;
 }
+.table-list-of-attached-files .col-picto, .table-list-of-links .col-picto {
+    opacity: 0.7 !important;
+    font-size: 0.7em;
+    width: 20px;
+}
+.table-list-of-attached-files .col-picto .widthpictotitle, .table-list-of-links .col-picto .widthpictotitle {
+	width: unset;
+}
 .pictotitle {
 	margin-<?php echo $right; ?>: 8px;
 	/* margin-bottom: 4px; */