diff --git a/application/displayblock.class.inc.php b/application/displayblock.class.inc.php
index 49e28be05..ba0ce5b6e 100644
--- a/application/displayblock.class.inc.php
+++ b/application/displayblock.class.inc.php
@@ -1,20 +1,7 @@
 <?php
-/**
- * Copyright (C) 2013-2019 Combodo SARL
- *
- * This file is part of iTop.
- *
- * iTop is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * iTop is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
+/*
+ * @copyright   Copyright (C) 2010-2021 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
 use Combodo\iTop\Application\Search\SearchForm;
@@ -2128,8 +2115,8 @@ class MenuBlock extends DisplayBlock
 				}
 				if ($bToolkitMenu) {
 					$sLabel = Dict::S('UI:ConfigureThisList');
-					$aActions['iTop::ConfigureList'] = ['label' => $sLabel, 'url' => '#', 'onclick' => "$('#datatable_dlg_datatable_{$sId}').dialog('open');"];
-					$oRenderBlock->AddSubBlock(utils::GetPopupMenuItemsBlock(iPopupMenuExtension::MENU_OBJLIST_TOOLKIT, $param,$aActions, $sId));
+					$aActions['iTop::ConfigureList'] = ['label' => $sLabel, 'url' => '#', 'onclick' => "$('#datatable_dlg_datatable_{$sId}').dialog('open'); return false;"];
+					$oRenderBlock->AddSubBlock(utils::GetPopupMenuItemsBlock(iPopupMenuExtension::MENU_OBJLIST_TOOLKIT, $param, $aActions, $sId));
 				}
 				break;
 
diff --git a/css/backoffice/components/input/_input-select.scss b/css/backoffice/components/input/_input-select.scss
index 64818cda8..ef8f157c6 100644
--- a/css/backoffice/components/input/_input-select.scss
+++ b/css/backoffice/components/input/_input-select.scss
@@ -28,28 +28,31 @@ $ibo-input-select--action-button--color: $ibo-color-grey-800 !default;
 $ibo-input-select--action-button--padding-x: 2px !default;
 $ibo-input-select--action-button--padding-y: 0px !default;
 
-$ibo-input-select--action-button--padding-left: 5px !default;
+$ibo-input-select--action-button--padding-left: 6px !default;
+$ibo-input-select--action-button--padding-right: 2px !default;
 
-.ibo-input-select{
-	appearance: none;
-	display: inline-block;
+.ibo-input-select {
+  appearance: none;
+  display: inline-block;
   min-width: $ibo-input-select--value--min-midth;
-	&.ibo-input-selectize{
-    padding-right:0;
-    padding-left:0;
+
+  &.ibo-input-selectize {
+    padding-right: 0;
+    padding-left: 0;
     min-width: $ibo-input-select-selectize--value--min-midth !important;
-		input{
+
+    input {
       border-width: 0px;
       border-color: white;
-      padding-left:$ibo-input--padding-x;
-		}
-		>[data-value]
-		{
-			height: $ibo-input-select-selectize--value--height;
-			line-height: $ibo-input-select-selectize--value--line-height;
-      padding-left:$ibo-input--padding-x;
-		}
-	}
+      padding-left: $ibo-input--padding-x;
+    }
+
+    > [data-value] {
+      height: $ibo-input-select-selectize--value--height;
+      line-height: $ibo-input-select-selectize--value--line-height;
+      padding-left: $ibo-input--padding-x;
+    }
+  }
 }
 .ibo-input-select-autocomplete{
   min-width: $ibo-input-select-autocomplete--value--min-midth !important;
@@ -144,9 +147,10 @@ $ibo-input-select--action-button--padding-left: 5px !default;
 
 }
 
-.ibo-input-select--action-button{
+.ibo-input-select--action-button {
   padding-left: $ibo-input-select--action-button--padding-left;
-  float:right;
+  padding-right: $ibo-input-select--action-button--padding-right;
+  float: right;
 }
 
 .selectize-dropdown{
diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index b0b094564..041e12196 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -1,24 +1,7 @@
 <?php
-/**
- * Localized data
- *
- * @copyright Copyright (C) 2010-2018 Combodo SARL
- * @license    http://opensource.org/licenses/AGPL-3.0
- *
- * This file is part of iTop.
- *
- * iTop is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * iTop is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with iTop. If not, see <http://www.gnu.org/licenses/>
+/*
+ * @copyright   Copyright (C) 2010-2021 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
 
@@ -396,6 +379,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'UI:Button:Logoff' => 'Log off',
 	'UI:Button:GlobalSearch' => 'Search',
 	'UI:Button:Search' => ' Search ',
+	'UI:Button:Clear' => ' Clear ',
+	'UI:Button:SearchInHIerarchy' => ' Search in hierachy ',
 	'UI:Button:Query' => ' Query ',
 	'UI:Button:Ok' => 'Ok',
 	'UI:Button:Save' => 'Save',