diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 9ed0c8e1ae6..5fdc9ea155b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3632,7 +3632,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'cash-register', 'category', 'chart', 'check', 'clock', 'close_title', 'cog', 'collab', 'company', 'contact', 'country', 'contract', 'conversation', 'cron', 'cubes',
 				'multicurrency',
 				'delete', 'dolly', 'dollyrevert', 'donation', 'download', 'dynamicprice',
-				'edit', 'ellipsis-h', 'email', 'eraser', 'establishment', 'expensereport', 'external-link-alt', 'external-link-square-alt',
+				'edit', 'ellipsis-h', 'email', 'entity', 'eraser', 'establishment', 'expensereport', 'external-link-alt', 'external-link-square-alt',
 				'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'autofill', 'folder', 'folder-open', 'folder-plus',
 				'generate', 'globe', 'globe-americas', 'graph', 'grip', 'grip_title', 'group',
 				'help', 'holiday',
@@ -3678,8 +3678,8 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'accounting'=>'search-dollar', 'category'=>'tag', 'dollyrevert'=>'dolly',
 				'generate'=>'plus-square', 'hrm'=>'user-tie', 'incoterm'=>'truck-loading',
 				'margin'=>'calculator', 'members'=>'user-friends', 'ticket'=>'ticket-alt', 'globe'=>'external-link-alt', 'lot'=>'barcode',
-				'email'=>'at', 'establishment'=>'building',
-				'edit'=>'pencil-alt', 'graph'=>'chart-line', 'grip_title'=>'arrows-alt', 'grip'=>'arrows-alt', 'help'=>'question-circle',
+				'email'=>'at', 'establishment'=>'building', 'edit'=>'pencil-alt', 'entity'=>'globe',
+				'graph'=>'chart-line', 'grip_title'=>'arrows-alt', 'grip'=>'arrows-alt', 'help'=>'question-circle',
 				'generic'=>'file', 'holiday'=>'umbrella-beach',
 				'info'=>'info-circle', 'inventory'=>'boxes', 'intracommreport'=>'globe-europe', 'knowledgemanagement'=>'ticket-alt', 'label'=>'layer-group', 'loan'=>'money-bill-alt',
 				'member'=>'user-alt', 'meeting'=>'chalkboard-teacher', 'mrp'=>'cubes', 'next'=>'arrow-alt-circle-right',
diff --git a/htdocs/core/multicompany_page.php b/htdocs/core/multicompany_page.php
index 239e5c46392..5c55efc78db 100644
--- a/htdocs/core/multicompany_page.php
+++ b/htdocs/core/multicompany_page.php
@@ -109,13 +109,20 @@ if (empty($conf->multicompany->enabled)) {
 		$listofentities = $mc->getEntitiesList($user->login, false, true);
 	}
 
+	$multicompanyList .= '<ul class="ullistonly left" style="list-style: none;">';
 	foreach ($listofentities as $entityid => $entitycursor) {
 		$url = DOL_URL_ROOT.'/core/multicompany_page.php?action=switchentity&token='.newToken().'&entity='.((int) $entityid).($backtourl ? '&backtourl='.urlencode($backtourl) : '');
-		$multicompanyList .= '<a class="dropdown-item multicompany-item'.(strpos($url, 'http') === 0 ? ' multicompany-item-external' : '').'" id="multicompany-item-'.$id.'" data-id="'.$id.'" href="'.dol_escape_htmltag($url).'">';
+		$multicompanyList .= '<li class="lilistonly" style="height: 2.5em; font-size: 1.15em;">';
+		$multicompanyList .= '<a class="dropdown-item multicompany-item" id="multicompany-item-'.$entityid.'" data-id="'.$entityid.'" href="'.dol_escape_htmltag($url).'">';
+		$multicompanyList .= img_picto('', 'entity', 'class="pictofixedwidth"');
 		$multicompanyList .= dol_escape_htmltag($entitycursor);
+		if ($conf->entity == $entityid) {
+			$multicompanyList .= ' <span class="opacitymedium">('.$langs->trans("Currently").')</span>';
+		}
 		$multicompanyList .= '</a>';
+		$multicompanyList .= '</li>';
 	}
-	$multicompanyList .= '</div>';
+	$multicompanyList .= '</ul>';
 
 	$searchForm .= '<input name="bookmark" id="top-multicompany-search-input" class="dropdown-search-input" placeholder="'.$langs->trans('Entity').'" autocomplete="off" >';
 
diff --git a/htdocs/theme/eldy/dropdown.inc.php b/htdocs/theme/eldy/dropdown.inc.php
index cfd5415a90c..dcf7ca787b7 100644
--- a/htdocs/theme/eldy/dropdown.inc.php
+++ b/htdocs/theme/eldy/dropdown.inc.php
@@ -364,6 +364,10 @@ a.top-menu-dropdown-link {
 	content: "\f0da";
 	/* color: rgba(0,0,0,0.3); */
 }
+.multicompany-item::before {
+	content: none !important;
+}
+
 .dropdown-item.bookmark-item-external::before {
 	content: "\f35d";
 }
diff --git a/htdocs/theme/md/dropdown.inc.php b/htdocs/theme/md/dropdown.inc.php
index 2627a727a23..b61513acb91 100644
--- a/htdocs/theme/md/dropdown.inc.php
+++ b/htdocs/theme/md/dropdown.inc.php
@@ -370,7 +370,9 @@ a.top-menu-dropdown-link {
 	content: "\f0da";
 	color: rgba(0,0,0,0.3);
 }
-
+.multicompany-item::before {
+	content: none !important;
+}
 
 .dropdown-item.active, .dropdown-item:hover, .dropdown-item:focus  {
 	color: #<?php echo $colortextbackhmenu; ?> !important;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index c39bf34d74a..331c6add932 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2147,7 +2147,7 @@ img.hideonsmartphone.pictoactionview {
 }
 
 .pictofixedwidth {
-	text-align: left;
+	text-align: <?php echo $left; ?>;
 	width: 20px;
 	padding-right: 0;
 }