diff --git a/packages/stream_chat_flutter/lib/src/gradient_avatar.dart b/packages/stream_chat_flutter/lib/src/gradient_avatar.dart
index dc97fb98..f6797924 100644
--- a/packages/stream_chat_flutter/lib/src/gradient_avatar.dart
+++ b/packages/stream_chat_flutter/lib/src/gradient_avatar.dart
@@ -3,6 +3,7 @@ import 'dart:ui';
 import 'dart:ui' as ui;
 
 import 'package:flutter/material.dart';
+import 'package:stream_chat_flutter/stream_chat_flutter.dart';
 
 /// Fallback user avatar with a polygon gradient overlayed with text
 class GradientAvatar extends StatefulWidget {
@@ -31,6 +32,7 @@ class _GradientAvatarState extends State<GradientAvatar> {
             painter: DemoPainter(
               widget.userId,
               getShortenedName(widget.name),
+              DefaultTextStyle.of(context).style.fontFamily ?? 'Roboto',
             ),
             child: const SizedBox.expand(),
           ),
@@ -60,6 +62,7 @@ class DemoPainter extends CustomPainter {
   DemoPainter(
     this.userId,
     this.username,
+    this.fontFamily,
   );
 
   /// Init grid row count
@@ -74,6 +77,9 @@ class DemoPainter extends CustomPainter {
   /// User name to display
   String username;
 
+  /// Font family to use
+  String fontFamily;
+
   @override
   void paint(Canvas canvas, Size size) {
     final rowUnit = size.width / columnCount;
@@ -121,6 +127,7 @@ class DemoPainter extends CustomPainter {
         text: TextSpan(
           text: username,
           style: TextStyle(
+            fontFamily: fontFamily,
             fontSize: fontSize,
             fontWeight: FontWeight.w500,
             color: Colors.white.withOpacity(0.7),
diff --git a/packages/stream_chat_flutter/test/src/goldens/gradient_avatar_0.png b/packages/stream_chat_flutter/test/src/goldens/gradient_avatar_0.png
index 8f33b13b..bf15f6af 100644
Binary files a/packages/stream_chat_flutter/test/src/goldens/gradient_avatar_0.png and b/packages/stream_chat_flutter/test/src/goldens/gradient_avatar_0.png differ
diff --git a/packages/stream_chat_flutter/test/src/goldens/gradient_avatar_1.png b/packages/stream_chat_flutter/test/src/goldens/gradient_avatar_1.png
index 56190e17..bd466f79 100644
Binary files a/packages/stream_chat_flutter/test/src/goldens/gradient_avatar_1.png and b/packages/stream_chat_flutter/test/src/goldens/gradient_avatar_1.png differ
diff --git a/packages/stream_chat_flutter/test/src/goldens/gradient_avatar_2.png b/packages/stream_chat_flutter/test/src/goldens/gradient_avatar_2.png
index 8f33b13b..d7d671c4 100644
Binary files a/packages/stream_chat_flutter/test/src/goldens/gradient_avatar_2.png and b/packages/stream_chat_flutter/test/src/goldens/gradient_avatar_2.png differ
diff --git a/packages/stream_chat_flutter/test/src/goldens/gradient_avatar_3.png b/packages/stream_chat_flutter/test/src/goldens/gradient_avatar_3.png
index 8f33b13b..5381c0f0 100644
Binary files a/packages/stream_chat_flutter/test/src/goldens/gradient_avatar_3.png and b/packages/stream_chat_flutter/test/src/goldens/gradient_avatar_3.png differ
diff --git a/packages/stream_chat_flutter/test/src/goldens/message_text.png b/packages/stream_chat_flutter/test/src/goldens/message_text.png
index ecd93721..dda158b2 100644
Binary files a/packages/stream_chat_flutter/test/src/goldens/message_text.png and b/packages/stream_chat_flutter/test/src/goldens/message_text.png differ
diff --git a/packages/stream_chat_flutter/test/src/gradient_avatar_test.dart b/packages/stream_chat_flutter/test/src/gradient_avatar_test.dart
index c74ef9a3..f8decfef 100644
--- a/packages/stream_chat_flutter/test/src/gradient_avatar_test.dart
+++ b/packages/stream_chat_flutter/test/src/gradient_avatar_test.dart
@@ -24,8 +24,8 @@ void main() {
             child: const Scaffold(
               body: Center(
                 child: SizedBox(
-                  width: 50,
-                  height: 50,
+                  width: 100,
+                  height: 100,
                   child: GradientAvatar(name: 'demo user', userId: 'demo123'),
                 ),
               ),
@@ -46,8 +46,8 @@ void main() {
           home: Scaffold(
             body: Center(
               child: SizedBox(
-                width: 50,
-                height: 50,
+                width: 100,
+                height: 100,
                 child: GradientAvatar(name: 'demo user', userId: 'demo123'),
               ),
             ),
@@ -67,8 +67,8 @@ void main() {
           home: Scaffold(
             body: Center(
               child: SizedBox(
-                width: 50,
-                height: 50,
+                width: 100,
+                height: 100,
                 child: GradientAvatar(name: 'demo', userId: 'demo1'),
               ),
             ),
@@ -88,10 +88,12 @@ void main() {
           home: Scaffold(
             body: Center(
               child: SizedBox(
-                width: 50,
-                height: 50,
-                child:
-                    GradientAvatar(name: 'd123@/d de:\$as', userId: 'demo123'),
+                width: 100,
+                height: 100,
+                child: GradientAvatar(
+                  name: 'd123@/d de:\$as',
+                  userId: 'demo123',
+                ),
               ),
             ),
           ),
@@ -110,8 +112,8 @@ void main() {
           home: Scaffold(
             body: Center(
               child: SizedBox(
-                width: 50,
-                height: 50,
+                width: 100,
+                height: 100,
                 child: GradientAvatar(name: '123@/d \$as', userId: 'demo123'),
               ),
             ),
diff --git a/packages/stream_chat_flutter/test/src/message_text_test.dart b/packages/stream_chat_flutter/test/src/message_text_test.dart
index f64e2bf1..765f7f2c 100644
--- a/packages/stream_chat_flutter/test/src/message_text_test.dart
+++ b/packages/stream_chat_flutter/test/src/message_text_test.dart
@@ -80,7 +80,7 @@ void main() {
       });
 
       const messageText = '''
-      a message.
+a message.
 with multiple lines
 and a list:
 - a. okasd
diff --git a/packages/stream_chat_flutter/test/src/reaction_bubble_test.dart b/packages/stream_chat_flutter/test/src/reaction_bubble_test.dart
index 1e3c9f5e..578d4bbb 100644
--- a/packages/stream_chat_flutter/test/src/reaction_bubble_test.dart
+++ b/packages/stream_chat_flutter/test/src/reaction_bubble_test.dart
@@ -9,29 +9,6 @@ import 'mocks.dart';
 import 'simple_frame.dart';
 
 void main() {
-  testGoldens(
-    'it should show no reactions',
-    (WidgetTester tester) async {
-      await tester.pumpWidgetBuilder(
-        SimpleFrame(
-          child: StreamChatTheme(
-            data: StreamChatThemeData(),
-            child: const SizedBox(
-              child: ReactionBubble(
-                reactions: [],
-                borderColor: Colors.black,
-                backgroundColor: Colors.white,
-                maskColor: Colors.white,
-              ),
-            ),
-          ),
-        ),
-        surfaceSize: const Size(100, 100),
-      );
-      await screenMatchesGolden(tester, 'reaction_bubble_0');
-    },
-  );
-
   testGoldens(
     'it should show a like - light theme',
     (WidgetTester tester) async {