diff --git a/zephyr/static/styles/zephyr.css b/zephyr/static/styles/zephyr.css
index 3f5c0eb6af..eb8edf5af0 100644
--- a/zephyr/static/styles/zephyr.css
+++ b/zephyr/static/styles/zephyr.css
@@ -1174,7 +1174,7 @@ table.floating_recipient {
     vertical-align: middle;
 }
 
-.subscription_name {
+#subscriptions_table .subscription_block {
     padding-left: 0.5em;
     vertical-align: middle;
     display: inline-block;
@@ -1182,8 +1182,8 @@ table.floating_recipient {
     height: 16px;
 }
 
-#stream_filters .subscription_name {
-    padding: 0px;
+#stream_filters .subscription_block {
+    padding-bottom: 4px;
     display: inline-block;
     line-height: 12px;
     width: 100%;
@@ -1193,6 +1193,15 @@ table.floating_recipient {
     text-overflow: ellipsis;
 }
 
+#stream_filters .subscription_block .icon-lock {
+    display: inline-block;
+    vertical-align: middle;
+    margin-top: 0px;
+    margin-left: 3px;
+    position: absolute;
+    top: 2px;
+}
+
 .subscription_settings {
     margin-left: 35px;
     margin-right: 35px;
diff --git a/zephyr/static/templates/stream_sidebar_row.handlebars b/zephyr/static/templates/stream_sidebar_row.handlebars
index da19b59b15..f36fba47f4 100644
--- a/zephyr/static/templates/stream_sidebar_row.handlebars
+++ b/zephyr/static/templates/stream_sidebar_row.handlebars
@@ -10,12 +10,14 @@
     <span id="stream_sidebar_swatch_{{id}}" class="streamlist_swatch"
      style="background-color: {{color}}">&nbsp;</span>
 
-    <a href="{{uri}}" class="subscription_name">{{name}}<span class="count">(<span class="value"></span>)</span></a>
-
+    <span class="subscription_block">
+      <a href="{{uri}}" class="subscription_name">{{name}}
+        <span class="count">(<span class="value"></span>)</span>
+      </a>
+      {{#if invite_only}}
+      <i class="icon-lock"></i>
+      {{/if}}
+    </span>
     <span class="arrow"><i class="icon-vector-chevron-down"></i></span>
 
-    {{#if invite_only}}
-    <i class="icon-lock"></i>
-    {{/if}}
-
 </li>
diff --git a/zephyr/static/templates/subscription.handlebars b/zephyr/static/templates/subscription.handlebars
index 90228431ee..a2d1fa95d1 100644
--- a/zephyr/static/templates/subscription.handlebars
+++ b/zephyr/static/templates/subscription.handlebars
@@ -5,8 +5,10 @@
   <td>
     <div class="subscription_table_elem subscription_header" data-toggle="collapse" data-target="#subscription_settings_{{id}}">
       <span class="color_swatch fade {{#subscribed}}in{{/subscribed}}" style="background-color: {{color}}"></span>
+      <span class="subscription_block">
       <span class="subscription_name">{{name}}</span>
       {{#if invite_only}}<i class="icon-lock"></i>{{/if}}
+      </span>
       <button class="btn sub_unsub_button {{^subscribed}}btn-primary{{/subscribed}}"
               type="button" name="subscription">
         {{#subscribed}}