diff --git a/templates/zephyr/index.html b/templates/zephyr/index.html
index 05be914faf..191e3753a3 100644
--- a/templates/zephyr/index.html
+++ b/templates/zephyr/index.html
@@ -67,8 +67,8 @@ var people_list = {{ people }};
             <br/><br/>
             <div class="row" id="narrowbox">
               <div class="input-prepend input-append pull-left">
-                <button id="show_all_messages" class="btn" disabled=disabled onclick="show_all_messages()"><i class="icon-remove"></i></button>
-                <span class="add-on"><span id="currently_narrowed_to" class="badge"></span></span>
+                <button id="show_all_messages" class="btn" disabled=disabled onclick="show_all_messages()"><i class="icon-arrow-left"></i></button>
+                <span class="add-on"><span class="badge"><span id="currently_narrowed_to"></span><i class="badge_close_button icon-remove-sign icon-white" onclick="show_all_messages()"></i></span></span>
               </div>
             </div>
             <div id="bottom_whitespace"></div>
diff --git a/zephyr/static/styles/zephyr.css b/zephyr/static/styles/zephyr.css
index fd6fc5fc22..7ebf6f1dc1 100644
--- a/zephyr/static/styles/zephyr.css
+++ b/zephyr/static/styles/zephyr.css
@@ -217,6 +217,11 @@ input.send_zephyr {
     top: 0px;
 }
 
+.badge_close_button {
+    margin-left: 0.3em;
+    cursor: pointer;
+}
+
 #bottom_whitespace {
   display: block;
   height: 60%;