diff --git a/zephyr/static/js/subs.js b/zephyr/static/js/subs.js
index b349011975..b3e31ab328 100644
--- a/zephyr/static/js/subs.js
+++ b/zephyr/static/js/subs.js
@@ -947,6 +947,20 @@ $(function () {
             }
         });
     });
+
+    // Change the down arrow to an up arrow on expansion, and back to a down
+    // arrow on collapse.
+    // FIXME: If there's a way, it may be better to do this in pure CSS.
+    $("#subscriptions_table").on("show", ".subscription_settings", function (e) {
+        var sub_arrow = $(e.target).closest('.subscription_row').find('.sub_arrow i');
+        sub_arrow.removeClass('icon-vector-chevron-down');
+        sub_arrow.addClass('icon-vector-chevron-up');
+    });
+    $("#subscriptions_table").on("hide", ".subscription_settings", function (e) {
+        var sub_arrow = $(e.target).closest('.subscription_row').find('.sub_arrow i');
+        sub_arrow.removeClass('icon-vector-chevron-up');
+        sub_arrow.addClass('icon-vector-chevron-down');
+    });
 });
 
 function focus_on_narrowed_stream() {
diff --git a/zephyr/static/styles/fonts.css b/zephyr/static/styles/fonts.css
index 99a545089b..cd524134c1 100644
--- a/zephyr/static/styles/fonts.css
+++ b/zephyr/static/styles/fonts.css
@@ -475,4 +475,5 @@ ul.icons li [class*=" icon-vector-"] {
 .icon-vector-question-sign:before        { content: "\f059"; }
 .icon-vector-remove:before               { content: "\f00d"; }
 .icon-vector-angle-down:before           { content: "\f107"; }
+.icon-vector-chevron-up:before           { content: "\f077"; }
 .icon-vector-chevron-down:before         { content: "\f078"; }
diff --git a/zephyr/static/styles/zephyr.css b/zephyr/static/styles/zephyr.css
index d7446e3bc2..ba1a9d3c6b 100644
--- a/zephyr/static/styles/zephyr.css
+++ b/zephyr/static/styles/zephyr.css
@@ -1412,6 +1412,11 @@ table.floating_recipient {
     float: right;
 }
 
+.sub_arrow {
+    float: right;
+    padding: 0 5px 0 10px;
+}
+
 #create_stream_row td {
     background-color: #f3f3f3;
     border-color: #BBB;
diff --git a/zephyr/static/templates/subscription.handlebars b/zephyr/static/templates/subscription.handlebars
index a2d1fa95d1..eaa9e6d434 100644
--- a/zephyr/static/templates/subscription.handlebars
+++ b/zephyr/static/templates/subscription.handlebars
@@ -9,6 +9,7 @@
       <span class="subscription_name">{{name}}</span>
       {{#if invite_only}}<i class="icon-lock"></i>{{/if}}
       </span>
+      <span class="sub_arrow"><i class="icon-vector-chevron-down"></i></span>
       <button class="btn sub_unsub_button {{^subscribed}}btn-primary{{/subscribed}}"
               type="button" name="subscription">
         {{#subscribed}}