diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index ab6653e3f7b..a74872d4a98 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -8059,7 +8059,7 @@ class Form
 		$ret .= $langs->trans("Filters");
 		$ret .= '</a>';
 		//$ret .= '<button type="submit" class="liste_titre button_search paddingleftonly" name="button_search_x" value="x"><span class="fa fa-search"></span></button>';
-		$ret .= '<div name="search_component_params" class="search_component_params inline-block minwidth500">';
+		$ret .= '<div name="search_component_params" class="search_component_params inline-block minwidth500 maxwidth300onsmartphone">';
 		$ret .= '<input type="text" name="search_component_params_input" class="search_component_params_input" placeholder="'.$langs->trans("Search").'" value="'.GETPOST("search_component_params_input").'">';
 		$ret .= '</div>';
 		foreach($arrayofcriterias as $criterias) {
diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index 31db8fe5447..575bbb759d3 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -237,7 +237,7 @@ if ($object->isextrafieldmanaged) {
     }
 }
 print '<div class="inline-block opacitymedium"><span class="fas fa-chart-line paddingright" title="'.$langs->trans("Measures").'"></span>'.$langs->trans("Measures").'</div> ';
-print $form->multiselectarray('search_measures', $arrayofmesures, $search_measures, 0, 0, 'minwidth500', 1);
+print $form->multiselectarray('search_measures', $arrayofmesures, $search_measures, 0, 0, 'maxwidth500', 1);
 print '</div>';
 
 // XAxis
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index fc633cbfbc3..679f2b7eb29 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -587,6 +587,7 @@ div.divsearchfield {
 .divadvancedsearchfield {
     float: left;
     padding-left: 15px;
+    padding-right: 15px;
     padding-bottom: 2px;
     padding-top: 2px;
 }
@@ -971,6 +972,10 @@ table[summary="list_of_modules"] .fa-cog {
 	div.refidno {
 		font-size: <?php print is_numeric($fontsize) ? ($fontsize + 3).'px' : $fontsize; ?> !important;
 	}
+	.divadvancedsearchfield {
+    	padding-left: 5px;
+    	padding-right: 5px;
+    }
 }
 
 /* Force values for small screen 570 */
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index ab860db6012..be1727d840c 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -793,6 +793,19 @@ div.divsearchfield {
     padding-bottom: 5px;
     opacity: 0.6;
 }
+.divadvancedsearchfield:first-child {
+    margin-top: 3px;
+}
+.divadvancedsearchfield {
+    float: left;
+    padding-left: 15px;
+    padding-right: 15px;
+    padding-bottom: 2px;
+    padding-top: 2px;
+}
+.divadvancedsearchfield span.select2.select2-container.select2-container--default {
+	padding-bottom: 4px;
+}
 <?php
 // Add a nowrap on smartphone, so long list of field used for filter are overflowed with clip
 if ($conf->browser->layout == 'phone') {