diff --git a/lib/widgets/inbox.dart b/lib/widgets/inbox.dart
index 61e218a202..42232f2547 100644
--- a/lib/widgets/inbox.dart
+++ b/lib/widgets/inbox.dart
@@ -281,7 +281,7 @@ abstract class _HeaderItem extends StatelessWidget {
               overflow: TextOverflow.ellipsis,
               title))),
           const SizedBox(width: 12),
-          if (hasMention) const _AtMentionMarker(),
+          if (hasMention) const AtMentionMarker(),
           Padding(padding: const EdgeInsetsDirectional.only(end: 16),
             child: UnreadCountBadge(
               backgroundColor: unreadCountBadgeBackgroundColor(context),
@@ -404,7 +404,7 @@ class _DmItem extends StatelessWidget {
                 overflow: TextOverflow.ellipsis,
                 title))),
             const SizedBox(width: 12),
-            if (hasMention) const  _AtMentionMarker(),
+            if (hasMention) const  AtMentionMarker(),
             Padding(padding: const EdgeInsetsDirectional.only(end: 16),
               child: UnreadCountBadge(backgroundColor: null,
                 count: count)),
@@ -529,7 +529,7 @@ class _TopicItem extends StatelessWidget {
                 overflow: TextOverflow.ellipsis,
                 topic))),
             const SizedBox(width: 12),
-            if (hasMention) const _AtMentionMarker(),
+            if (hasMention) const AtMentionMarker(),
             Padding(padding: const EdgeInsetsDirectional.only(end: 16),
               child: UnreadCountBadge(
                 backgroundColor: colorSwatchFor(context, subscription),
@@ -537,17 +537,3 @@ class _TopicItem extends StatelessWidget {
           ]))));
   }
 }
-
-class _AtMentionMarker extends StatelessWidget {
-  const _AtMentionMarker();
-
-  @override
-  Widget build(BuildContext context) {
-    final designVariables = DesignVariables.of(context);
-    // Design for at-mention marker based on Figma screen:
-    //   https://www.figma.com/file/1JTNtYo9memgW7vV6d0ygq/Zulip-Mobile?type=design&node-id=224-16386&mode=design&t=JsNndFQ8fKFH0SjS-0
-    return Padding(
-      padding: const EdgeInsetsDirectional.only(end: 4),
-      child: Icon(ZulipIcons.at_sign, size: 14, color: designVariables.atMentionMarker));
-  }
-}
diff --git a/lib/widgets/unread_count_badge.dart b/lib/widgets/unread_count_badge.dart
index 5c09e156cd..505b39c653 100644
--- a/lib/widgets/unread_count_badge.dart
+++ b/lib/widgets/unread_count_badge.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/widgets.dart';
 
 import 'channel_colors.dart';
+import 'icons.dart';
 import 'text.dart';
 import 'theme.dart';
 
@@ -72,3 +73,17 @@ class MutedUnreadBadge extends StatelessWidget {
         shape: BoxShape.circle));
   }
 }
+
+class AtMentionMarker extends StatelessWidget {
+  const AtMentionMarker({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final designVariables = DesignVariables.of(context);
+    // Design for at-mention marker based on Figma screen:
+    //   https://www.figma.com/file/1JTNtYo9memgW7vV6d0ygq/Zulip-Mobile?type=design&node-id=224-16386&mode=design&t=JsNndFQ8fKFH0SjS-0
+    return Padding(
+      padding: const EdgeInsetsDirectional.only(end: 4),
+      child: Icon(ZulipIcons.at_sign, size: 14, color: designVariables.atMentionMarker));
+  }
+}