diff --git a/templates/zephyr/index.html b/templates/zephyr/index.html
index 2650843464..25ce460719 100644
--- a/templates/zephyr/index.html
+++ b/templates/zephyr/index.html
@@ -65,10 +65,12 @@ var people_list = {{ people }};
               </tbody>
             </table>
             <br/><br/>
-            <div class="narrow">
-              <div class="input-prepend input-append">
-                <span class="add-on"><i class="icon-filter"></i><span id="narrow_indicator" class="badge"></span></span>
-                <button id="unhide" class="btn" disabled=disabled onclick="unhide()">Show all</button>
+            <div class="narrow row">
+              <div class="input-prepend input-append pull-left">
+                <button id="unhide" class="btn" disabled=disabled onclick="unhide()"><i class="icon-remove"></i></button>
+                <span class="add-on"><span id="narrow_indicator" class="badge"></span></span>
+                <input class="input-xlarge search-query" type="text" value="" placeholder="Search">
+                <button class="btn"><i class="icon-search"></i></button>
               </div>
             </div>
             <div id="bottom_whitespace"></div>
diff --git a/zephyr/static/styles/zephyr.css b/zephyr/static/styles/zephyr.css
index 1b4e55e82b..75b731edb8 100644
--- a/zephyr/static/styles/zephyr.css
+++ b/zephyr/static/styles/zephyr.css
@@ -211,10 +211,6 @@ div.narrow {
     top: 0px;
 }
 
-button#unhide.btn {
-    font-size: 12px;
-}
-
 div#bottom_whitespace {
   display: block;
   height: 60%;
@@ -224,3 +220,7 @@ td.selected_message_indicator {
     background-color: blue;
     width: 2px;
 }
+
+form#zephyr_searchbox {
+    margin: 0px;
+}