diff --git a/templates/zephyr/left-sidebar.html b/templates/zephyr/left-sidebar.html
index d06e396a59..c8ebecc77d 100644
--- a/templates/zephyr/left-sidebar.html
+++ b/templates/zephyr/left-sidebar.html
@@ -20,8 +20,12 @@
                           <li data-name="starred"><i class="icon-vector-star"></i> <a href="#narrow/is/starred">Starred messages</a></li>
                           <li data-name="mentioned"><i class="icon-vector-tag"></i> <a href="#narrow/is/mentioned">@-mentions<span class="count">(<span class="value"></span>)</span></a></li>
                       </ul>
-                      <div id="streams_title">STREAMS</div>
-                      <ul id="stream_filters" class="filters scrolling_list"></ul>
+                      <div id="streams_list">
+                        <div id="streams_header"><h4 class="streams_title">STREAMS</h4>
+                          <a href=""><i id="streams_inline_cog" class='icon-vector-cog' data-toggle="tooltip" title="Subscribe, add, or configure streams"></i></a>
+                        </div>
+                        <ul id="stream_filters" class="filters scrolling_list"></ul>
+                      </div>
               </div>
             </div>
           </div>
diff --git a/zephyr/static/js/ui.js b/zephyr/static/js/ui.js
index 8a303cab08..c002448ca4 100644
--- a/zephyr/static/js/ui.js
+++ b/zephyr/static/js/ui.js
@@ -1170,6 +1170,15 @@ $(function () {
         popovers.hide_all();
     });
 
+    $('#streams_inline_cog').tooltip({ placement: 'left',
+                                       animation: false });
+
+    $('#streams_header a').click(function (e) {
+        exports.change_tab_to('#subscriptions');
+
+        e.preventDefault();
+    });
+
     $('#stream_filters li').on('click', 'a.subscription_name', function (e) {
         if (exports.home_tab_obscured()) {
             ui.change_tab_to('#home');
diff --git a/zephyr/static/styles/zephyr.css b/zephyr/static/styles/zephyr.css
index 84679eeae6..389219ecab 100644
--- a/zephyr/static/styles/zephyr.css
+++ b/zephyr/static/styles/zephyr.css
@@ -241,20 +241,46 @@ a:hover code {
     margin-top: 1em;
 }
 
-#streams_title {
-    font-size: 0.9em;
-    font-weight: 275;
-
+#streams_list {
     border-top: 1px solid #eee;
 
     margin-top: 5px;
     margin-left: 10px;
 }
 
+.streams_title {
+    font-size: 0.9em;
+    font-weight: normal;
+
+    display: inline;
+}
+
+#streams_list:hover #streams_inline_cog {
+   visibility: visible;
+   opacity: 0.5;
+}
+
+#streams_list #streams_inline_cog:hover {
+   opacity: 1.0;
+}
+
+#streams_inline_cog {
+    float: right;
+    color: #000;
+    text-decoration: none;
+    visibility: hidden;
+
+    margin-top: 3px;
+}
+
+.tooltip {
+    max-width: 10em;
+}
+
 #stream_filters {
     border-bottom: 1px solid #eee;
     overflow-y: hidden;
-    margin: 2px 0px 10px 10px;
+    margin: 2px 0px 10px 0px;
     padding: 2px 15px 10px 0;
 }