diff --git a/skins/elastic/styles/widgets/searchbar.less b/skins/elastic/styles/widgets/searchbar.less
index 3e167be7a..42eef453f 100644
--- a/skins/elastic/styles/widgets/searchbar.less
+++ b/skins/elastic/styles/widgets/searchbar.less
@@ -26,6 +26,10 @@
         &:before {
             line-height: @layout-header-height;
         }
+
+        span.inner {
+            display: none;
+        }
     }
 
     .input-group {
@@ -57,6 +61,7 @@
         &.reset:before {
             content: @fa-var-trash-alt;
         }
+
         &.options:before {
             content: @fa-var-angle-down;
         }
@@ -84,6 +89,10 @@
             display: none;
         }
     }
+
+    a.button.search {
+        padding: 0 .5rem;
+    }
 }
 
 .searchfilterbar {
diff --git a/skins/elastic/ui.js b/skins/elastic/ui.js
index b0dbb001b..0539352f9 100644
--- a/skins/elastic/ui.js
+++ b/skins/elastic/ui.js
@@ -1736,14 +1736,10 @@ function rcube_elastic_ui()
 
         env.got_smart_toolbar = true;
 
-        // TODO: a way to inject buttons to the menu from content iframe
-        //       or automatically add all buttons except Save and Cancel
-        //       (example QR Code button in contact frame)
-
         var items = [];
 
         // convert toolbar to a popup list
-        $('.header > .toolbar', layout.content).each(function() {
+        $('.header > .toolbar:not(.searchbar)', layout.content).each(function() {
             var toolbar = $(this);
 
             toolbar.children().each(function() {