diff --git a/web/shared/icons/follow.svg b/web/shared/icons/follow.svg
index 208151efcb..17c368f92a 100644
Binary files a/web/shared/icons/follow.svg and b/web/shared/icons/follow.svg differ
diff --git a/web/shared/icons/inherit.svg b/web/shared/icons/inherit.svg
new file mode 100644
index 0000000000..408b67c56b
Binary files /dev/null and b/web/shared/icons/inherit.svg differ
diff --git a/web/shared/icons/mute-new.svg b/web/shared/icons/mute-new.svg
index 91b0dcbfc6..9022567f92 100644
Binary files a/web/shared/icons/mute-new.svg and b/web/shared/icons/mute-new.svg differ
diff --git a/web/shared/icons/unmute-new.svg b/web/shared/icons/unmute-new.svg
index 1a739a0dab..dd6906e3f6 100644
Binary files a/web/shared/icons/unmute-new.svg and b/web/shared/icons/unmute-new.svg differ
diff --git a/web/templates/topic_sidebar_actions.hbs b/web/templates/topic_sidebar_actions.hbs
index 4a458444b3..e00e2a44c9 100644
--- a/web/templates/topic_sidebar_actions.hbs
+++ b/web/templates/topic_sidebar_actions.hbs
@@ -14,9 +14,14 @@
                 <div class="tab-option tippy-zulip-tooltip {{#if (eq visibility_policy all_visibility_policies.MUTED)}}selected-tab{{/if}}" data-visibility-policy="{{all_visibility_policies.MUTED}}" data-tippy-content="{{t 'Mute' }}" aria-label="{{t 'Mute' }}">
                     <i class="zulip-icon zulip-icon-mute-new"></i>
                 </div>
-                <div class="tab-option tippy-zulip-tooltip {{#if (eq visibility_policy all_visibility_policies.UNMUTED)}}selected-tab{{/if}}" data-visibility-policy="{{all_visibility_policies.UNMUTED}}" data-tippy-content="{{t 'Unmute' }}" aria-label="{{t 'Unmute' }}">
-                    <i class="zulip-icon zulip-icon-unmute-new"></i>
+                <div class="tab-option tippy-zulip-tooltip {{#if (eq visibility_policy all_visibility_policies.INHERIT)}}selected-tab{{/if}}" data-visibility-policy="{{all_visibility_policies.INHERIT}}" data-tippy-content="{{t 'Default' }}" aria-label="{{t 'Default' }}">
+                    <i class="zulip-icon zulip-icon-inherit"></i>
                 </div>
+                {{#if (or stream_muted topic_unmuted)}}
+                    <div class="tab-option tippy-zulip-tooltip {{#if (eq visibility_policy all_visibility_policies.UNMUTED)}}selected-tab{{/if}}" data-visibility-policy="{{all_visibility_policies.UNMUTED}}" data-tippy-content="{{t 'Unmute' }}" aria-label="{{t 'Unmute' }}">
+                        <i class="zulip-icon zulip-icon-unmute-new"></i>
+                    </div>
+                {{/if}}
                 <div class="tab-option tippy-zulip-tooltip {{#if (eq visibility_policy all_visibility_policies.FOLLOWED)}}selected-tab{{/if}}" data-visibility-policy="{{all_visibility_policies.FOLLOWED}}" data-tippy-content="{{t 'Follow' }}" aria-label="{{t 'Follow' }}">
                     <i class="zulip-icon zulip-icon-follow"></i>
                 </div>