diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 2bb44c8a99c..9fd385b2d3b 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -1217,7 +1217,7 @@ if ($action == 'edit') {
 		// References
 		if (!empty($user->admin)) {
 			print '<br><br>';
-			print '<span class="opacitymedium">'.$langs->trans("EMailsWillHaveMessageID").': ';
+			print '<span class="opacitymedium wordwrap">'.$langs->trans("EMailsWillHaveMessageID").': ';
 			print dol_escape_htmltag('<timestamp.*@'.dol_getprefix('email').'>');
 			print '</span>';
 		}
diff --git a/htdocs/core/tpl/formlayoutai.tpl.php b/htdocs/core/tpl/formlayoutai.tpl.php
index c27fe7c2b9c..fa357f8270e 100644
--- a/htdocs/core/tpl/formlayoutai.tpl.php
+++ b/htdocs/core/tpl/formlayoutai.tpl.php
@@ -65,7 +65,7 @@ if (!isset($out)) {	// Init to empty string if not defined
 if ($showlinktolayout) {	// May be set only if MAIN_EMAIL_USE_LAYOUT is set
 	$out .= '<a href="#" id="linkforlayouttemplates" class="notasortlink inline-block alink marginrightonly">';
 	$out .= img_picto($showlinktolayoutlabel, 'layout', 'class="paddingrightonly"');
-	$out .= $showlinktolayoutlabel.'...';
+	$out .= '<span class="hideobject hideonsmartphone">'.$showlinktolayoutlabel.'...</span>';
 	$out .= '</a> &nbsp; &nbsp; ';
 
 	$out .= '<script>
@@ -85,7 +85,7 @@ if ($showlinktolayout) {	// May be set only if MAIN_EMAIL_USE_LAYOUT is set
 if ($showlinktoai) {
 	$out .= '<a href="#" id="linkforaiprompt'.$showlinktoai.'" class="notasortlink inline-block alink marginrightonly">';
 	$out .= img_picto($showlinktoailabel, 'ai', 'class="paddingrightonly"');
-	$out .= $showlinktoailabel.'...';
+	$out .= '<span class="hideobject hideonsmartphone">'.$showlinktoailabel.'...</span>';
 	$out .= '</a>';
 
 	$out .= '<script>
diff --git a/htdocs/theme/eldy/dropdown.inc.php b/htdocs/theme/eldy/dropdown.inc.php
index 3f8c7d9a0ac..fe649fb1350 100644
--- a/htdocs/theme/eldy/dropdown.inc.php
+++ b/htdocs/theme/eldy/dropdown.inc.php
@@ -134,7 +134,7 @@ button.dropdown-item.global-search-item {
 	background-color: #fff;
 	-webkit-background-clip: padding-box;
 	background-clip: padding-box;
-	border: 1px solid rgba(0,0,0,.15);
+	border: 1px solid rgba(128, 128, 128, .15);
 	border-radius: 4px;
 	-webkit-box-shadow: 0 6px 12px rgba(0,0,0,.175);
 	box-shadow: 0 6px 12px rgba(0,0,0,.175);
@@ -700,7 +700,7 @@ div.quickaddblock:focus {
 	.side-nav-vert .user-menu .dropdown-menu, .topnav .user-menu .dropdown-menu {
 		width: 300px;
 	}
-	.dropdown-menu {
+	.dropdown-menu:not(#ai_dropdownmessage) {
 		border: none;
 		-webkit-box-shadow: none;
 		box-shadow: none;
diff --git a/htdocs/theme/eldy/emaillayout.inc.php b/htdocs/theme/eldy/emaillayout.inc.php
index 486efe15acc..9c926430049 100644
--- a/htdocs/theme/eldy/emaillayout.inc.php
+++ b/htdocs/theme/eldy/emaillayout.inc.php
@@ -19,8 +19,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 	text-align: center;
 	padding: 10px;
 	margin: 0 5px;
-	background: #e9e9e9;
-	border: 1px solid #ccc;
+	background: var(--colorbackgrey);
 	border-radius: 5px;
 	cursor: pointer;
 	height: 60px;
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 29b0816657a..7c39c594a90 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -8615,13 +8615,14 @@ table.jPicker {
 	padding: 12px;
 	left: inherit !important;
 	top: inherit !important;
+	border-radius: 5px !important;
 }
 .ai_feature {
 	background-color: var(--colorbackgrey);
 	padding: 10px;
 	padding-bottom: 6px;
 	padding-top: 6px;
-	border-radius: 4px;
+	border-radius: 5px;
 }
 
 
diff --git a/htdocs/theme/md/dropdown.inc.php b/htdocs/theme/md/dropdown.inc.php
index d5c4315648f..9946a0f463b 100644
--- a/htdocs/theme/md/dropdown.inc.php
+++ b/htdocs/theme/md/dropdown.inc.php
@@ -150,7 +150,7 @@ button.dropdown-item.global-search-item {
 	-webkit-background-clip: padding-box;
 	background-clip: padding-box;
 	border: 1px solid #ccc;
-	border: 1px solid rgba(0,0,0,.15);
+	border: 1px solid rgba(128, 128, 128, .15);
 	border-radius: 4px;
 	-webkit-box-shadow: 0 6px 12px rgba(0,0,0,.175);
 	box-shadow: 0 6px 12px rgba(0,0,0,.175);
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 8720e1d92eb..69735885c7b 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -8449,17 +8449,18 @@ table.jPicker {
 /* ============================================================================== */
 
 .ai_dropdown {
-	min-width: 400px;
+	min-width: 400px !important;
 	padding: 12px;
 	left: inherit !important;
 	top: inherit !important;
+	border-radius: 5px !important;
 }
 .ai_feature {
 	background-color: var(--colorbackgrey);
 	padding: 10px;
 	padding-bottom: 6px;
 	padding-top: 6px;
-	border-radius: 4px;
+	border-radius: 5px;
 }