From 6a60678186d75fc0974fe6336fd616042ca84914 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 9 Apr 2020 16:36:39 +0200
Subject: [PATCH] Look and feel v12

---
 htdocs/categories/class/categorie.class.php   |  7 +++---
 htdocs/categories/index.php                   |  2 +-
 htdocs/categories/viewcat.php                 |  6 ++---
 htdocs/compta/bank/bankentries_list.php       |  2 +-
 htdocs/compta/bank/budget.php                 |  2 +-
 htdocs/compta/bank/card.php                   |  4 ++--
 htdocs/compta/bank/categ.php                  |  2 +-
 htdocs/compta/bank/line.php                   |  2 +-
 htdocs/compta/bank/list.php                   |  3 +--
 htdocs/compta/bank/releve.php                 |  2 +-
 htdocs/compta/bank/transfer.php               |  3 ++-
 .../cashcontrol/class/cashcontrol.class.php   |  5 ++--
 htdocs/compta/paiement/cheque/card.php        |  3 ++-
 htdocs/compta/paiement/cheque/index.php       |  2 +-
 htdocs/compta/paiement/cheque/list.php        |  2 +-
 htdocs/core/boxes/box_task.php                |  2 +-
 htdocs/core/class/html.form.class.php         |  4 ++--
 htdocs/core/lib/functions.lib.php             | 24 ++++++++++++-------
 htdocs/expensereport/card.php                 |  4 ++--
 htdocs/expensereport/index.php                |  2 +-
 htdocs/expensereport/list.php                 |  2 +-
 htdocs/expensereport/stats/index.php          |  2 +-
 htdocs/holiday/list.php                       |  2 +-
 htdocs/langs/en_US/cashdesk.lang              |  1 +
 htdocs/theme/eldy/global.inc.php              | 11 +++++----
 htdocs/user/list.php                          |  2 +-
 26 files changed, 57 insertions(+), 46 deletions(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 2137fa76e04..a2dd6c679f3 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -1362,9 +1362,10 @@ class Categorie extends CommonObject
 	 * @param	string	$sep	     Separator
 	 * @param	string	$url	     Url
 	 * @param   int     $nocolor     0
+	 * @param	string	$addpicto	 Add picto into link
 	 * @return	array
 	 */
-	public function print_all_ways($sep = " &gt;&gt; ", $url = '', $nocolor = 0)
+	public function print_all_ways($sep = ' &gt;&gt; ', $url = '', $nocolor = 0, $addpicto = 0)
 	{
         // phpcs:enable
 		$ways = array();
@@ -1397,11 +1398,11 @@ class Categorie extends CommonObject
 				{
 			        $link = '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$cat->id.'&type='.$cat->type.'" class="'.$forced_color.'">';
 			        $linkend = '</a>';
-				    $w[] = $link.$cat->label.$linkend;
+			        $w[] = $link.($addpicto ? img_object('', 'category', 'class="paddingright"') : '').$cat->label.$linkend;
 				}
 				else
 				{
-					$w[] = "<a href='".DOL_URL_ROOT."/$url?catid=".$cat->id."'>".$cat->label."</a>";
+					$w[] = "<a href='".DOL_URL_ROOT."/".$url."?catid=".$cat->id."'>".($addpicto ? img_object('', 'category') : '').$cat->label."</a>";
 				}
 			}
 			$newcategwithpath = preg_replace('/toreplace/', $forced_color, implode($sep, $w));
diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index 4dfe52dafb6..cff970be7f1 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -86,7 +86,7 @@ print '<table class="noborder nohover centpercent">';
 print '<tr class="liste_titre">';
 print '<td colspan="3">'.$langs->trans("Search").'</td>';
 print '</tr>';
-print '<tr class="oddeven"><td>';
+print '<tr class="oddeven nohover"><td>';
 print $langs->trans("Name").':</td><td><input class="flat inputsearch" type="text" name="catname" value="'.$catname.'"/></td><td><input type="submit" class="button" value="'.$langs->trans("Search").'"></td></tr>';
 /*
 // faire une rech dans une sous categorie uniquement
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index dd45d7e59fe..f781268311a 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -313,7 +313,7 @@ if (! empty($user->rights->categorie->creer))
 
 print '<div class="fichecenter">';
 
-print load_fiche_titre($langs->trans("SubCats"), $newcardbutton);
+print load_fiche_titre($langs->trans("SubCats"), $newcardbutton, 'object_category');
 
 
 print '<table class="liste nohover" width="100%">';
@@ -784,7 +784,7 @@ if ($type == Categorie::TYPE_CONTACT)
 	}
 }
 
-// List of accounts
+// List of bank accounts
 if ($type == Categorie::TYPE_ACCOUNT)
 {
     require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
@@ -807,7 +807,7 @@ if ($type == Categorie::TYPE_ACCOUNT)
 
     	print '<br>';
     	$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($accounts); $nbtotalofrecords = ''; $newcardbutton = '';
-    	print_barre_liste($langs->trans("Account"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'bank', 0, $newcardbutton, '', $limit);
+    	print_barre_liste($langs->trans("Account"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'bank_account', 0, $newcardbutton, '', $limit);
 
     	print "<table class='noborder' width='100%'>\n";
         print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Ref").'</td></tr>'."\n";
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 0bf5bbc6ade..fddbcb24c52 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -817,7 +817,7 @@ if ($resql)
 
 	$morehtml .= $newcardbutton;
 
-	$picto = 'title_bank';
+	$picto = 'bank_account';
 	if ($id > 0 || !empty($ref)) $picto = '';
 
 	print_barre_liste($langs->trans("BankTransactions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $picto, 0, $morehtml, '', $limit);
diff --git a/htdocs/compta/bank/budget.php b/htdocs/compta/bank/budget.php
index 967227f9e89..a4c57a60fdd 100644
--- a/htdocs/compta/bank/budget.php
+++ b/htdocs/compta/bank/budget.php
@@ -44,7 +44,7 @@ $companystatic=new Societe($db);
 llxHeader();
 
 // List movements bu category for bank transactions
-print load_fiche_titre($langs->trans("BankTransactionByCategories"), '', 'title_bank.png');
+print load_fiche_titre($langs->trans("BankTransactionByCategories"), '', 'bank_account');
 
 print '<table class="noborder centpercent">';
 print "<tr class=\"liste_titre\">";
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index b80f050ba08..593893878e0 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -321,7 +321,7 @@ if ($action == 'create')
 {
 	$object = new Account($db);
 
-	print load_fiche_titre($langs->trans("NewFinancialAccount"), '', 'title_bank.png');
+	print load_fiche_titre($langs->trans("NewFinancialAccount"), '', 'bank_account');
 
 	if ($conf->use_javascript_ajax)
 	{
@@ -804,7 +804,7 @@ else
 		$object = new Account($db);
 		$object->fetch(GETPOST('id', 'int'));
 
-		print load_fiche_titre($langs->trans("EditFinancialAccount"), '', 'title_bank.png');
+		print load_fiche_titre($langs->trans("EditFinancialAccount"), '', 'bank_account');
 
 		if ($conf->use_javascript_ajax)
 		{
diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php
index e220df40e42..29701f57c59 100644
--- a/htdocs/compta/bank/categ.php
+++ b/htdocs/compta/bank/categ.php
@@ -79,7 +79,7 @@ if ($categid) {
 llxHeader();
 
 
-print load_fiche_titre($langs->trans("RubriquesTransactions"));
+print load_fiche_titre($langs->trans("RubriquesTransactions"), '', 'object_category');
 
 print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php
index c5c4464bf41..d98a37594b0 100644
--- a/htdocs/compta/bank/line.php
+++ b/htdocs/compta/bank/line.php
@@ -628,7 +628,7 @@ if ($result)
         // Releve rappro
         if ($acct->canBeConciliated() > 0)  // Si compte rapprochable
         {
-            print load_fiche_titre($langs->trans("Reconciliation"), '', 'title_bank.png');
+            print load_fiche_titre($langs->trans("Reconciliation"), '', 'bank_account');
             print '<hr>'."\n";
 
             print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?rowid='.$objp->rowid.'">';
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 6adc1e4ccd2..2d724ec2690 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -141,7 +141,6 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 }
 
 
-
 /*
  * View
  */
@@ -267,7 +266,7 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
 
-print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'bank', 0, $newcardbutton, '', $limit, 1);
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'bank_account', 0, $newcardbutton, '', $limit, 1);
 
 $topicmail = "Information";
 //$modelmail="subscription";
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 0350895ca0d..82cdd4e826a 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -383,7 +383,7 @@ else
 
     $title = $langs->trans("AccountStatement").' '.$numref.' - '.$langs->trans("BankAccount").' '.$object->getNomUrl(1, 'receipts');
 	print load_fiche_titre($title, $mesprevnext, '');
-	//print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, 0, $nbtotalofrecords, 'title_bank.png', 0, '', '', 0, 1);
+	//print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, 0, $nbtotalofrecords, 'bank_account', 0, '', '', 0, 1);
 
 	print "<form method=\"post\" action=\"releve.php\">";
 	print '<input type="hidden" name="token" value="'.newToken().'">';
diff --git a/htdocs/compta/bank/transfer.php b/htdocs/compta/bank/transfer.php
index 2a32e173d3b..611d2fc42b0 100644
--- a/htdocs/compta/bank/transfer.php
+++ b/htdocs/compta/bank/transfer.php
@@ -152,6 +152,7 @@ if ($action == 'add')
  */
 
 llxHeader();
+
 print '		<script type="text/javascript">
         	$(document).ready(function () {
     	  		$(".selectbankaccount").change(function() {
@@ -228,7 +229,7 @@ if ($error)
 	$amount = GETPOST('amount', 'alpha');
 }
 
-print load_fiche_titre($langs->trans("MenuBankInternalTransfer"), '', 'title_bank.png');
+print load_fiche_titre($langs->trans("MenuBankInternalTransfer"), '', 'bank_account');
 
 print $langs->trans("TransferDesc");
 print "<br><br>";
diff --git a/htdocs/compta/cashcontrol/class/cashcontrol.class.php b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
index f30410d187f..5b58f98565a 100644
--- a/htdocs/compta/cashcontrol/class/cashcontrol.class.php
+++ b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
@@ -52,7 +52,8 @@ class CashControl extends CommonObject
 	/**
 	 * @var string String with name of icon for pos_cash_fence. Must be the part after the 'object_' into object_pos_cash_fence.png
 	 */
-	public $picto = 'account';
+	public $picto = 'cash-register';
+
 
 	public $fields=array(
 	'rowid' =>array('type'=>'integer', 'label'=>'ID', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>10),
@@ -372,7 +373,7 @@ class CashControl extends CommonObject
 
 		$newref=($this->ref?$this->ref:$this->id);
 
-		$label = '<u>' . $langs->trans("ShowCashFence") . '</u>';
+		$label = '<u>' . $langs->trans("CashFence") . '</u>';
 		$label.= '<br>';
 		$label.= '<b>' . $langs->trans('Ref') . ':</b> ' . ($this->ref?$this->ref:$this->id);
 
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index 89445e1ec74..eeb578ad731 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -306,13 +306,14 @@ $formfile = new FormFile($db);
 
 if ($action == 'new')
 {
+	$head = array();
 	$h = 0;
 	$head[$h][0] = $_SERVER["PHP_SELF"].'?action=new';
 	$head[$h][1] = $langs->trans("MenuChequeDeposits");
 	$hselected = $h;
 	$h++;
 
-	print load_fiche_titre($langs->trans("Cheques"));
+	print load_fiche_titre($langs->trans("Cheques"), '', 'bank_account');
 }
 else
 {
diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php
index 8d2104303fe..479447a923e 100644
--- a/htdocs/compta/paiement/cheque/index.php
+++ b/htdocs/compta/paiement/cheque/index.php
@@ -46,7 +46,7 @@ $accountstatic=new Account($db);
 
 llxHeader('', $langs->trans("ChequesArea"));
 
-print load_fiche_titre($langs->trans("ChequesArea"), '', 'bank');
+print load_fiche_titre($langs->trans("ChequesArea"), '', 'bank_account');
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index 4534f08dbb1..fa07d4cccf3 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -139,7 +139,7 @@ if ($resql)
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
 
-	print_barre_liste($langs->trans("MenuChequeDeposits"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_bank.png', 0, $newcardbutton, '', $limit);
+	print_barre_liste($langs->trans("MenuChequeDeposits"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'bank_account', 0, $newcardbutton, '', $limit);
 
 	$moreforfilter = '';
 
diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php
index 6e25fb934ad..f8888c71a4b 100644
--- a/htdocs/core/boxes/box_task.php
+++ b/htdocs/core/boxes/box_task.php
@@ -124,7 +124,7 @@ class box_task extends ModeleBoxes
             $boxcontent .= '<input type="hidden" name="token" value="'.newToken().'">'."\n";
             $selectArray = array('all' => $langs->trans("NoFilter"), 'im_task_contact' => $langs->trans("WhichIamLinkedTo"), 'im_project_contact' => $langs->trans("WhichIamLinkedToProject"));
             $boxcontent .= $form->selectArray($cookie_name, $selectArray, $filterValue);
-            $boxcontent .= '<button type="submit" class="button">'.$langs->trans("Refresh").'</button>';
+            $boxcontent .= '<button type="submit" class="button buttongen">'.$langs->trans("Refresh").'</button>';
             $boxcontent .= '</form>'."\n";
             $boxcontent .= '</div>'."\n";
             if (! empty($conf->use_javascript_ajax)) {
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index fc845dee245..5aa82f9a411 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6823,10 +6823,10 @@ class Form
 			$toprint = array();
 			foreach ($categories as $c)
 			{
-				$ways = $c->print_all_ways(); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formated text
+				$ways = $c->print_all_ways(' &gt;&gt; ', '', 0, 1); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formated text
 				foreach ($ways as $way)
 				{
-					$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"'.($c->color ? ' style="background: #'.$c->color.';"' : ' style="background: #aaa"').'>'.img_object('', 'category').' '.$way.'</li>';
+					$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"'.($c->color ? ' style="background: #'.$c->color.';"' : ' style="background: #aaa"').'>'.$way.'</li>';
 				}
 			}
 			return '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index b8513c54865..cc59d0198c0 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3132,13 +3132,13 @@ 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', 'barcode', 'bank', 'bookmark', 'building', 'cash-register', 'check', 'close_title', 'cubes', 'delete', 'dolly', 'edit', 'ellipsis-h',
+        		'address', 'bank_account', 'barcode', 'bank', 'bookmark', 'building', 'cash-register', 'check', 'close_title', 'cubes', 'delete', 'dolly', 'edit', 'ellipsis-h',
         		'filter', 'file-code', 'folder', 'folder-open', 'grip', 'grip_title', 'help', 'language', 'list', 'listlight', 'note',
         		'object_action', 'object_account', 'object_barcode', 'object_phoning', 'object_phoning_fax', 'object_email',
         		'object_bookmark', 'object_bug', 'object_generic', 'object_list-alt', 'object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser',
         		'object_cash-register', 'object_holiday', 'object_hrm', 'object_accounting', 'object_category', 'object_multicurrency',
         		'object_printer', 'object_resource', 'object_technic', 'object_trip', 'object_user', 'object_group', 'object_member', 'object_other',
-        		'off', 'on', 'play', 'playdisabled', 'printer', 'resize', 'stats',
+        		'off', 'on', 'play', 'playdisabled', 'printer', 'resize', 'stats', 'trip',
 				'note', 'setup', 'sign-out', 'split', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'wrench', 'globe',
 				'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',
 				'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top',
@@ -3160,8 +3160,9 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 			$pictowithouttext = str_replace('object_', '', $pictowithouttext);
 
 		    $arrayconvpictotofa = array(
-		    	'action'=>'calendar-alt', 'address'=> 'address-book', 'setup'=>'cog', 'companies'=>'building', 'products'=>'cube', 'commercial'=>'suitcase', 'invoicing'=>'coins', 'accountancy'=>'money-check-alt',
-		    	'account'=>'university', 'accounting'=>'chart-line', 'category'=>'tag',
+		    	'account'=>'university', 'action'=>'calendar-alt', 'address'=> 'address-book', 'bank_account'=>'university',
+		    	'setup'=>'cog', 'companies'=>'building', 'products'=>'cube', 'commercial'=>'suitcase', 'invoicing'=>'coins', 'accountancy'=>'money-check-alt',
+		    	'accounting'=>'chart-line', 'category'=>'tag',
 		    	'hrm'=>'umbrella-beach', 'members'=>'users', 'ticket'=>'ticket-alt', 'globe'=>'external-link-alt',
 		    	'email'=>'at',
 		    	'edit'=>'pencil-alt', 'grip_title'=>'arrows-alt', 'grip'=>'arrows-alt', 'help'=>'info-circle',
@@ -3173,7 +3174,8 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 		    	'multicurrency'=>'dollar-sign', 'other'=>'square', 'resource'=>'laptop-house',
 		    	'error'=>'exclamation-triangle', 'warning'=>'exclamation-triangle',
 		    	'phoning'=>'phone', 'phoning_fax'=>'fax', 'printer'=>'print', 'technic'=>'cogs',
-		    	'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach', 'title_agenda'=>'calendar-alt',
+		    	'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach',
+		    	'title_agenda'=>'calendar-alt',
 		    	'playdisabled'=>'play', 'preview'=>'binoculars', 'project'=>'sitemap', 'resize'=>'crop',
 		    	'uparrow'=>'mail-forward',
 		    	'jabber'=>'comment-o'
@@ -3224,10 +3226,14 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 
 			// Add CSS
 			$arrayconvpictotomorcess = array(
-				'action'=>'bg-infoxbox-action', 'account'=>'bg-infoxbox-bank_account', 'multicurrency'=>'bg-infoxbox-bank_account',
-				'check'=>'font-status4', 'hrm'=>'bg-infoxbox-adherent', 'group'=>'bg-infoxbox-adherent', 'member'=>'bg-infoxbox-adherent', 'user'=>'bg-infoxbox-adherent', 'users'=>'bg-infoxbox-adherent',
+				'action'=>'bg-infoxbox-action', 'account'=>'bg-infoxbox-bank_account', 'bank_account'=>'bg-infoxbox-bank_account', 'cash-register'=>'bg-infoxbox-bank_account',
+				'multicurrency'=>'bg-infoxbox-bank_account',
+				'check'=>'font-status4',
+				'hrm'=>'bg-infoxbox-adherent', 'group'=>'bg-infoxbox-adherent',
+				'members'=>'bg-infoxbox-adherent', 'member'=>'bg-infoxbox-adherent', 'user'=>'bg-infoxbox-adherent', 'users'=>'bg-infoxbox-adherent',
 				'error'=>'pictoerror', 'warning'=>'pictowarning', 'switch_on'=>'font-status4',
-				'holiday'=>'bg-infoxbox-holiday', 'resource'=>'bg-infoxbox-action', 'trip'=>'bg-infoxbox-expensereport',
+				'holiday'=>'bg-infoxbox-holiday', 'resource'=>'bg-infoxbox-action', 'title_hrm'=>'bg-infoxbox-holiday', 'trip'=>'bg-infoxbox-expensereport',
+				'title_agenda'=>'bg-infoxbox-action',
 				'list-alt'=>'imgforviewmode', 'calendar'=>'imgforviewmode', 'calendarweek'=>'imgforviewmode', 'calendarmonth'=>'imgforviewmode', 'calendarday'=>'imgforviewmode', 'calendarperuser'=>'imgforviewmode'
 			);
 			if (! empty($arrayconvpictotomorcess[$pictowithouttext])) {
@@ -3236,7 +3242,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 
 			// Define $color
 			$arrayconvpictotocolor = array(
-				'category'=>'#666', 'edit'=>'#444', 'note'=>'#999', 'error'=>'', 'listlight'=>'#999',
+				'edit'=>'#444', 'note'=>'#999', 'error'=>'', 'listlight'=>'#999',
 				'other'=>'#ddd',
 				'playdisabled'=>'#ccc', 'printer'=>'#444', 'resize'=>'#444',
 				'stats'=>'#444', 'switch_off'=>'#999', 'uparrow'=>'#555', 'warning'=>''
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 77c2cf07f8e..6c587025209 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1450,7 +1450,7 @@ $ecmfilesstatic = new EcmFiles($db);
 // Create
 if ($action == 'create')
 {
-	print load_fiche_titre($langs->trans("NewTrip"));
+	print load_fiche_titre($langs->trans("NewTrip"), '', 'trip');
 
 	print '<form action="'.$_SERVER['PHP_SELF'].'" method="post" name="create">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -1574,7 +1574,7 @@ else
 				if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)
 				    && (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance)))
 				{
-					print load_fiche_titre($langs->trans('TripCard'));
+					print load_fiche_titre($langs->trans('TripCard'), '', 'trip');
 
 					print '<div class="tabBar">';
 					print $langs->trans('NotUserRightToView');
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index 945c2387dc5..accea8f8251 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -110,7 +110,7 @@ if ($result)
 }
 
 
-print load_fiche_titre($langs->trans("ExpensesArea"));
+print load_fiche_titre($langs->trans("ExpensesArea"), '', 'trip');
 
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 7689c5e172f..9b8918600e1 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -477,7 +477,7 @@ if ($resql)
             $newcardbutton .= dolGetButtonTitle($langs->trans('NewTrip'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/expensereport/card.php?action=create');
 		}
 
-		print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'generic', 0, $newcardbutton, '', $limit);
+		print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'trip', 0, $newcardbutton, '', $limit);
 	}
 
 	$topicmail = "SendExpenseReport";
diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php
index 359f49f2dea..aaca4d57580 100644
--- a/htdocs/expensereport/stats/index.php
+++ b/htdocs/expensereport/stats/index.php
@@ -70,7 +70,7 @@ $dir = $conf->expensereport->dir_temp;
 
 llxHeader('', $title);
 
-print load_fiche_titre($title, $mesg);
+print load_fiche_titre($title, '', 'trip');
 
 dol_mkdir($dir);
 
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 4aad973d1e9..6850a12c7c0 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -441,7 +441,7 @@ if ($resql)
 			$newcardbutton .= dolGetButtonTitle($langs->trans('MenuAddCP'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/holiday/card.php?action=request');
 	    }
 
-		print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_hrm.png', 0, $newcardbutton, '', $limit);
+		print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_hrm', 0, $newcardbutton, '', $limit);
 	}
 
 	$topicmail = "Information";
diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index 85bdc978865..d363d7f03b5 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -49,6 +49,7 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
+CashFence=Cash fence
 CashFenceDone=Cash fence done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 38614911ef4..d96726ef7e6 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -115,7 +115,8 @@ a:link, a:visited, a:hover, a:active { font-family: <?php print $fontlist ?>; co
 a:hover { text-decoration: underline; color: var(--colortextlink); }
 a.commonlink { color: var(--colortextlink) !important; text-decoration: none; }
 th.liste_titre a div div:hover, th.liste_titre_sel a div div:hover { text-decoration: underline; }
-th.liste_titre_sel, td.liste_titre_sel, th.liste_titre, td.liste_titre { opacity: 0.9; }
+tr.liste_titre th.liste_titre_sel:not(.maxwidthsearch), tr.liste_titre td.liste_titre_sel:not(.maxwidthsearch),
+tr.liste_titre th.liste_titre:not(.maxwidthsearch), tr.liste_titre td.liste_titre:not(.maxwidthsearch) { opacity: 0.8; }
 /* th.liste_titre_sel a, th.liste_titre a, td.liste_titre_sel a, td.liste_titre a { color: #766; } */
 input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
 	background-color: var(--inputbackgroundcolor);
@@ -182,8 +183,8 @@ input, select {
     border-collapse: collapse;
     border: none;
 }
-#mainbody input.buttongen {
-	padding: 4px 4px;
+#mainbody input.buttongen, #mainbody button.buttongen {
+	padding: 3px 4px;
 }
 
 input.button:focus {
@@ -1569,7 +1570,7 @@ div.nopadding {
 
 td.nobordernopadding.widthpictotitle.opacityhigh.valignmiddle.col-picto {
     color: var(--colortexttitlenotab);
-    opacity: 0.45;
+    opacity: 0.6;
 }
 .pictotitle {
 	margin-<?php echo $right; ?>: 8px;
@@ -3823,7 +3824,7 @@ div.boximport {
 .fieldrequired { font-weight: bold; color: var(--fieldrequiredcolor); }
 
 .widthpictotitle { width: 32px; text-align: <?php echo $left; ?>; }
-span.widthpictotitle { font-size: 2.1em; };
+span.widthpictotitle { font-size: 2em; };
 
 .dolgraphtitle { margin-top: 6px; margin-bottom: 4px; }
 .dolgraphtitlecssboxes { /* margin: 0px; */ }
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index f779818140f..e81d50f077f 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -323,7 +323,7 @@ print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 $morehtmlright .= dolGetButtonTitle($langs->trans("HierarchicView"), '', 'fa fa-sitemap paddingleft', DOL_URL_ROOT.'/user/hierarchy.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : ''));
 
 
-print_barre_liste($text, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, "", $num, $nbtotalofrecords, 'generic', 0, $morehtmlright.' '.$newcardbutton, '', $limit);
+print_barre_liste($text, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, "", $num, $nbtotalofrecords, 'user', 0, $morehtmlright.' '.$newcardbutton, '', $limit);
 
 if (!empty($catid))
 {