diff --git a/app/assets/javascripts/discourse/app/components/user-menu/profile-tab-content.hbs b/app/assets/javascripts/discourse/app/components/user-menu/profile-tab-content.hbs
index 07c391f7c18..1754c594c45 100644
--- a/app/assets/javascripts/discourse/app/components/user-menu/profile-tab-content.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-menu/profile-tab-content.hbs
@@ -23,16 +23,28 @@
     </li>
   {{/if}}
 
-  <li class="online" title={{i18n "presence_toggle.title"}}>
+  <li
+    class={{concat-class
+      "presence-toggle"
+      (unless this.isPresenceHidden "enabled")
+    }}
+    title={{i18n "presence_toggle.title"}}
+  >
     <DButton @action={{this.togglePresence}} class="btn-flat profile-tab-btn">
-      {{d-icon (if this.isPresenceHidden "toggle-on" "toggle-off")}}
+      {{d-icon (if this.isPresenceHidden "toggle-off" "toggle-on")}}
       <span class="item-label">
-        {{i18n "presence_toggle.label"}}
+        {{#if this.isPresenceHidden}}
+          {{i18n "presence_toggle.offline"}}
+        {{else}}
+          {{i18n "presence_toggle.online"}}
+        {{/if}}
       </span>
     </DButton>
   </li>
 
-  <li class="do-not-disturb">
+  <li
+    class={{concat-class "do-not-disturb" (if this.isInDoNotDisturb "enabled")}}
+  >
     <DButton
       @action={{this.doNotDisturbClick}}
       class="btn-flat profile-tab-btn"
diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss
index cfae08346da..c47dc918518 100644
--- a/app/assets/stylesheets/common/base/menu-panel.scss
+++ b/app/assets/stylesheets/common/base/menu-panel.scss
@@ -208,6 +208,9 @@
       .d-icon {
         padding-top: 0;
       }
+      &.enabled .d-icon {
+        color: var(--tertiary);
+      }
     }
 
     .set-user-status {
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 05730fe0014..97d0b8ebeb2 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -2147,7 +2147,8 @@ en:
       remove_status: "Remove status"
 
     presence_toggle:
-      label: "Online"
+      online: "Online"
+      offline: "Offline"
       title: "Toggle presence features"
 
     user_tips: