diff --git a/packages/stream_chat_flutter/lib/src/indicators/unread_indicator.dart b/packages/stream_chat_flutter/lib/src/indicators/unread_indicator.dart
index 0ed9d5dbc..2ae46f73c 100644
--- a/packages/stream_chat_flutter/lib/src/indicators/unread_indicator.dart
+++ b/packages/stream_chat_flutter/lib/src/indicators/unread_indicator.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:stream_chat_flutter/src/misc/empty_widget.dart';
 import 'package:stream_chat_flutter/stream_chat_flutter.dart';
+import 'package:stream_core_flutter/stream_core_flutter.dart';
 
 /// {@template streamUnreadIndicator}
 /// Shows different unread counts of the user.
@@ -31,7 +32,6 @@ class StreamUnreadIndicator extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final theme = StreamChatTheme.of(context);
     final client = StreamChat.of(context).client;
 
     final stream = switch (_unreadType) {
@@ -65,16 +65,12 @@ class StreamUnreadIndicator extends StatelessWidget {
         builder: (context, unreadCount) {
           if (unreadCount == 0) return const Empty();
 
-          return Badge(
-            textColor: Colors.white,
-            textStyle: theme.textTheme.footnoteBold,
-            backgroundColor: theme.channelPreviewTheme.unreadCounterColor,
-            label: Text(
-              switch (unreadCount) {
-                > 99 => '99+',
-                _ => '$unreadCount',
-              },
-            ),
+          return StreamBadgeNotification(
+            size: StreamBadgeNotificationSize.xs,
+            label: switch (unreadCount) {
+              > 99 => '99+',
+              _ => '$unreadCount',
+            },
           );
         },
       ),
diff --git a/packages/stream_chat_flutter/test/src/channel/goldens/ci/channel_header_bottom_widget.png b/packages/stream_chat_flutter/test/src/channel/goldens/ci/channel_header_bottom_widget.png
index 7f62afc9b..0bd5c7fbd 100644
Binary files a/packages/stream_chat_flutter/test/src/channel/goldens/ci/channel_header_bottom_widget.png and b/packages/stream_chat_flutter/test/src/channel/goldens/ci/channel_header_bottom_widget.png differ