diff --git a/app/assets/javascripts/discourse/app/components/user-menu/items-list.hbs b/app/assets/javascripts/discourse/app/components/user-menu/items-list.hbs
index e54cd281f62..af8548d029a 100644
--- a/app/assets/javascripts/discourse/app/components/user-menu/items-list.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-menu/items-list.hbs
@@ -3,7 +3,7 @@
{{else if this.items.length}}
-
+
{{#each this.items as |item|}}
{{/each}}
diff --git a/app/assets/javascripts/discourse/app/components/user-menu/menu-tab.hbs b/app/assets/javascripts/discourse/app/components/user-menu/menu-tab.hbs
index 8e1e2c04eb2..860e83a12bb 100644
--- a/app/assets/javascripts/discourse/app/components/user-menu/menu-tab.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-menu/menu-tab.hbs
@@ -4,6 +4,7 @@
class={{this.classNames}}
id={{this.id}}
tabindex={{this.tabIndex}}
+ title={{@tab.title}}
aria-selected={{if this.isActive "true" "false"}}
aria-controls={{this.ariaControls}}
data-tab-number={{@tab.position}}
@@ -11,5 +12,8 @@
{{!-- template-lint-disable require-context-role --}}
>
{{d-icon @tab.icon}}
+ {{#if @tab.count}}
+ {{@tab.count}}
+ {{/if}}
{{yield}}
diff --git a/app/assets/javascripts/discourse/app/components/user-menu/menu.hbs b/app/assets/javascripts/discourse/app/components/user-menu/menu.hbs
index 2bd85ea2fc9..8663bf37d70 100644
--- a/app/assets/javascripts/discourse/app/components/user-menu/menu.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-menu/menu.hbs
@@ -1,25 +1,14 @@