diff --git a/static/js/message_list.js b/static/js/message_list.js
index dd27b34180..05d698f1fa 100644
--- a/static/js/message_list.js
+++ b/static/js/message_list.js
@@ -343,15 +343,15 @@ exports.MessageList.prototype = {
     },
 
     subscribed_bookend_content: function (stream_name) {
-        return "--- Subscribed to stream " + stream_name + " ---";
+        return "You subscribed to stream " + stream_name;
     },
 
     unsubscribed_bookend_content: function (stream_name) {
-        return "--- Unsubscribed from stream " + stream_name + " ---";
+        return "You unsubscribed from stream " + stream_name;
     },
 
     not_subscribed_bookend_content: function (stream_name) {
-        return "--- Not subscribed to stream " + stream_name + " ---";
+        return "You are not subscribed to stream " + stream_name;
     },
 
     // Maintains a trailing bookend element explaining any changes in
diff --git a/static/styles/zulip.css b/static/styles/zulip.css
index 3f6302a12a..0a890f15c9 100644
--- a/static/styles/zulip.css
+++ b/static/styles/zulip.css
@@ -2186,12 +2186,6 @@ div.floating_recipient {
     cursor: pointer;
 }
 
-.stream_sub_unsub_button {
-    min-width: 140px;
-    margin-top: 9px;
-    margin-right: 10px;
-}
-
 .sub_button_row {
     text-align: center;
 }
@@ -2439,6 +2433,7 @@ img.emoji {
     margin: 0px 5px 0px 5px;
 }
 
+.sub-unsub-message span,
 .date_row span {
     display: block;
     background: inherit;
@@ -2450,6 +2445,13 @@ img.emoji {
     text-shadow: 1px 1px 0px #fff;
 }
 
+.sub-unsub-message span {
+    font-size: 1em;
+    text-transform: none;
+}
+
+.sub-unsub-message span:before,
+.sub-unsub-message span:after,
 .date_row span:before,
 .date_row span:after {
     display: inline-block;
@@ -2462,11 +2464,13 @@ img.emoji {
     border-bottom: 1px solid #fff;
 }
 
+.sub-unsub-message span:before,
 .date_row span:before {
     right: 0.5em;
     margin-left: -50%;
 }
 
+.sub-unsub-message span:after,
 .date_row span:after {
     left: 0.5em;
     margin-right: -50%;
diff --git a/static/templates/bookend.handlebars b/static/templates/bookend.handlebars
index bdf02d3d94..3c2983851d 100644
--- a/static/templates/bookend.handlebars
+++ b/static/templates/bookend.handlebars
@@ -4,8 +4,8 @@
 <div class="{{#if trailing}}trailing_bookend{{/if}} bookend sub-unsub-message">
     <span>{{bookend_content}}</span>
     {{#if trailing}}
-    <div class="sub_button_row">
-        <button class="btn stream_sub_unsub_button btn-default" type="button" name="subscription">
+    <div class="sub_button_row new-style">
+        <button class="button white sea-green rounded stream_sub_unsub_button {{#unless subscribed}}unsubscribed{{/unless}}" type="button" name="subscription">
             {{#if subscribed}}
             {{t 'Unsubscribe' }}
             {{else}}