diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php
index 39b376216d0..ca4e6567721 100644
--- a/htdocs/admin/menus.php
+++ b/htdocs/admin/menus.php
@@ -149,13 +149,18 @@ print '<input type="hidden" name="action" value="update">';
 
 print dol_get_fiche_head($head, 'handler', '', -1);
 
-print '<span class="opacitymedium">'.$langs->trans("MenusDesc")."</span><br>\n";
-print "<br><br>\n";
+print '<div class="opacitymedium justify hideonsmartphone">'.$langs->trans("MenusDesc")."</div>\n";
+print '<br class="hideonsmartphone">';
+print "<br>\n";
 
 
 clearstatcache();
 
-// Gestionnaires de menu
+// Menu manager choice
+
+print "\n";
+print '<div class="div-table-responsive-no-min">';
+
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre"><td>'.$langs->trans("Menu").'</td>';
 print '<td>';
@@ -182,7 +187,7 @@ print '<td>';
 $formadmin->select_menu(getDolGlobalString('MAIN_MENU_SMARTPHONE_FORCED', getDolGlobalString('MAIN_MENU_SMARTPHONE')), 'MAIN_MENU_SMARTPHONE', array_merge($dirstandard, $dirsmartphone), !getDolGlobalString('MAIN_MENU_SMARTPHONE_FORCED') ? '' : ' disabled');
 
 if (getDolGlobalString('MAIN_MENU_SMARTPHONE_FORCED') && preg_match('/smartphone/', $conf->global->MAIN_MENU_SMARTPHONE_FORCED)
-	|| (!getDolGlobalString('MAIN_MENU_SMARTPHONE_FORCED') && getDolGlobalString('MAIN_MENU_SMARTPHONE') && preg_match('/smartphone/', $conf->global->MAIN_MENU_SMARTPHONE))) {
+	|| (!getDolGlobalString('MAIN_MENU_SMARTPHONE_FORCED') && getDolGlobalString('MAIN_MENU_SMARTPHONE') && preg_match('/smartphone/', getDolGlobalString('MAIN_MENU_SMARTPHONE')))) {
 	print ' '.img_warning($langs->transnoentitiesnoconv("ThisForceAlsoTheme"));
 }
 
@@ -191,7 +196,7 @@ print '<td>';
 $formadmin->select_menu(getDolGlobalString('MAIN_MENUFRONT_SMARTPHONE_FORCED', getDolGlobalString('MAIN_MENUFRONT_SMARTPHONE')), 'MAIN_MENUFRONT_SMARTPHONE', array_merge($dirstandard, $dirsmartphone), !getDolGlobalString('MAIN_MENUFRONT_SMARTPHONE_FORCED') ? '' : ' disabled');
 
 if (getDolGlobalString('MAIN_MENU_SMARTPHONE_FORCED') && preg_match('/smartphone/', $conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED)
-	|| (!getDolGlobalString('MAIN_MENUFRONT_SMARTPHONE_FORCED') && getDolGlobalString('MAIN_MENU_SMARTPHONE') && preg_match('/smartphone/', $conf->global->MAIN_MENUFRONT_SMARTPHONE))) {
+	|| (!getDolGlobalString('MAIN_MENUFRONT_SMARTPHONE_FORCED') && getDolGlobalString('MAIN_MENU_SMARTPHONE') && preg_match('/smartphone/', getDolGlobalString('MAIN_MENUFRONT_SMARTPHONE')))) {
 	print ' '.img_warning($langs->transnoentitiesnoconv("ThisForceAlsoTheme"));
 }
 
@@ -199,6 +204,7 @@ print '</td>';
 print '</tr>';
 
 print '</table>';
+print '</div>';
 
 print dol_get_fiche_end();
 
diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index e686b426523..0ad6f60a42f 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -223,7 +223,8 @@ $h++;
 
 print dol_get_fiche_head($head, 'editor', '', -1);
 
-print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("MenusEditorDesc")."</span><br>\n";
+print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("MenusEditorDesc")."</span>";
+print '<br class="hideonsmartphone">'."\n";
 print "<br>\n";
 
 
diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php
index a62ab3f9866..f0a7b099c4a 100644
--- a/htdocs/core/class/html.formadmin.class.php
+++ b/htdocs/core/class/html.formadmin.class.php
@@ -224,7 +224,8 @@ class FormAdmin
 									continue; // We exclude all menu manager files
 								}
 
-								$filelib = preg_replace('/\.php$/i', '', $file);
+								$filetoshow = preg_replace('/\.php$/i', '', $file);
+								$filetoshow = ucfirst(preg_replace('/_menu$/i', '', $filetoshow));
 								$prefix = '';
 								// 0=Recommended, 1=Experimental, 2=Development, 3=Other
 								if (preg_match('/^eldy/i', $file)) {
@@ -240,10 +241,12 @@ class FormAdmin
 									$morelabel .= ' <span class="opacitymedium">('.$langs->trans("Unstable").')</span>';
 								}
 								if ($file == $selected) {
-									$menuarray[$prefix.'_'.$file] = '<option value="'.$file.'" selected data-html="'.dol_escape_htmltag($filelib.$morelabel).'">'.$filelib.$morelabel;
+									$menuarray[$prefix.'_'.$file] = '<option value="'.$file.'" selected data-html="'.dol_escape_htmltag($filetoshow.$morelabel).'">';
+									$menuarray[$prefix.'_'.$file] .= $filetoshow.$morelabel;
 									$menuarray[$prefix.'_'.$file] .= '</option>';
 								} else {
-									$menuarray[$prefix.'_'.$file] = '<option value="'.$file.'" data-html="'.dol_escape_htmltag($filelib.$morelabel).'">'.$filelib.$morelabel;
+									$menuarray[$prefix.'_'.$file] = '<option value="'.$file.'" data-html="'.dol_escape_htmltag($filetoshow.$morelabel).'">';
+									$menuarray[$prefix.'_'.$file] .= $filetoshow.$morelabel;
 									$menuarray[$prefix.'_'.$file] .= '</option>';
 								}
 							}
@@ -256,7 +259,7 @@ class FormAdmin
 		ksort($menuarray);
 
 		// Output combo list of menus
-		print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
+		print '<select class="flat minwidth150" id="'.$htmlname.'" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
 		$oldprefix = '';
 		foreach ($menuarray as $key => $val) {
 			$tab = explode('_', $key);
@@ -287,7 +290,7 @@ class FormAdmin
 				$oldprefix = $newprefix;
 			}
 
-			print $val."\n"; // Show menu entry ($val contains the <option> tags
+			print $val."\n"; // Show menu entry ($val contains the <option> tags)
 		}
 		print '</select>';
 
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index afa04f17b48..a0d468a78ec 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -247,7 +247,6 @@ function print_text_menu_entry_auguria($text, $showmode, $url, $id, $idsel, $cla
 	if ($showmode == 1) {
 		print '<a '.$classnameimg.' tabindex="-1" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').' title="'.dol_escape_htmltag($text).'">';
 		print '<div class="'.$id.' '.$idsel.' topmenuimage">';
-
 		if (!empty($menuval['prefix']) && strpos($menuval['prefix'], '<span') === 0) {
 			print $menuval['prefix'];
 		} elseif (!empty($menuval['prefix']) && strpos($menuval['prefix'], 'fa-') === 0) {