diff --git a/src/sunstone/public/app/sunstone/tab.hbs b/src/sunstone/public/app/sunstone/tab.hbs
index f5aa2cabb3..77deafa190 100644
--- a/src/sunstone/public/app/sunstone/tab.hbs
+++ b/src/sunstone/public/app/sunstone/tab.hbs
@@ -40,8 +40,8 @@
     </div>
     {{#if buttons}}
     <div class="actions_row">
-      <div class="medium-12 large-9 columns action_blocks"></div>
-      <div class="medium-4 large-3 columns">
+      <div class="medium-12 large-10 columns action_blocks"></div>
+      <div class="medium-4 large-2 columns">
         <div class="only-sunstone-list">
           {{#if dataTable.searchInputHTML}}
             {{{dataTable.searchInputHTML}}}
diff --git a/src/sunstone/public/app/utils/tab-datatable/search-input.hbs b/src/sunstone/public/app/utils/tab-datatable/search-input.hbs
index 0f9e3101d6..aff22b057d 100644
--- a/src/sunstone/public/app/utils/tab-datatable/search-input.hbs
+++ b/src/sunstone/public/app/utils/tab-datatable/search-input.hbs
@@ -18,9 +18,7 @@
 <div id="{{dataTableSearchId}}-wrapper" class="input-group">
   <input class="input-group-field" id="{{dataTableSearchId}}" type="search" placeholder="{{tr "Search"}}" />
   <div class="input-group-button">
-    <button type="button" class="button search-dropdown secondary" data-toggle="{{dataTableSearchId}}-dropdown">
-      <i class="fas fa-fw fa-caret-down"/>
-    </button>
+    <i class="fas fa-filter search-button" data-toggle="{{dataTableSearchId}}-dropdown"></i>
   </div>
   <div class="dropdown-pane left large" id="{{dataTableSearchId}}-dropdown" data-dropdown data-auto-focus="true">
     {{{searchDropdownHTML}}}
diff --git a/src/sunstone/public/css/custom.css b/src/sunstone/public/css/custom.css
index e2a895ecd0..21413edab2 100644
--- a/src/sunstone/public/css/custom.css
+++ b/src/sunstone/public/css/custom.css
@@ -203,4 +203,9 @@ meter {
 
 .tabs-content.vertical.disks-container {
   min-height: 400px;
+}
+
+.search-button {
+  color: #8a8a8a;
+  padding: 0.6em;
 }
\ No newline at end of file