diff --git a/example/lib/group_info_screen.dart b/example/lib/group_info_screen.dart
index 304619d6..33102de9 100644
--- a/example/lib/group_info_screen.dart
+++ b/example/lib/group_info_screen.dart
@@ -81,7 +81,9 @@ class _GroupInfoScreenState extends State<GroupInfoScreen> {
           },
           child: Padding(
             padding: const EdgeInsets.only(left: 12.0),
-            child: StreamSvgIcon.left(),
+            child: StreamSvgIcon.left(
+              color: StreamChatTheme.of(context).colorTheme.black,
+            ),
           ),
         ),
         leadingWidth: 36.0,
diff --git a/lib/src/channel_file_display_screen.dart b/lib/src/channel_file_display_screen.dart
index 79645f73..6feac224 100644
--- a/lib/src/channel_file_display_screen.dart
+++ b/lib/src/channel_file_display_screen.dart
@@ -53,14 +53,16 @@ class _ChannelFileDisplayScreenState extends State<ChannelFileDisplayScreen> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      backgroundColor: Colors.white,
+      backgroundColor: StreamChatTheme.of(context).colorTheme.white,
       appBar: AppBar(
         brightness: Theme.of(context).brightness,
         elevation: 1,
         centerTitle: true,
         title: Text(
           'Files',
-          style: TextStyle(color: Colors.black, fontSize: 16.0),
+          style: TextStyle(
+              color: StreamChatTheme.of(context).colorTheme.black,
+              fontSize: 16.0),
         ),
         leading: Center(
           child: InkWell(
@@ -69,7 +71,7 @@ class _ChannelFileDisplayScreenState extends State<ChannelFileDisplayScreen> {
             },
             child: Container(
               child: StreamSvgIcon.left(
-                color: Colors.black,
+                color: StreamChatTheme.of(context).colorTheme.black,
                 size: 24.0,
               ),
               width: 24.0,
@@ -104,14 +106,14 @@ class _ChannelFileDisplayScreenState extends State<ChannelFileDisplayScreen> {
               children: [
                 StreamSvgIcon.files(
                   size: 136.0,
-                  color: Color(0xffdbdbdb),
+                  color: StreamChatTheme.of(context).colorTheme.greyGainsboro,
                 ),
                 SizedBox(height: 16.0),
                 Text(
                   'No Files',
                   style: TextStyle(
                     fontSize: 14.0,
-                    color: Color(0xff000000),
+                    color: StreamChatTheme.of(context).colorTheme.black,
                   ),
                 ),
                 SizedBox(height: 8.0),
@@ -120,7 +122,10 @@ class _ChannelFileDisplayScreenState extends State<ChannelFileDisplayScreen> {
                   textAlign: TextAlign.center,
                   style: TextStyle(
                     fontSize: 14.0,
-                    color: Color(0xff000000).withOpacity(0.5),
+                    color: StreamChatTheme.of(context)
+                        .colorTheme
+                        .black
+                        .withOpacity(0.5),
                   ),
                 ),
               ],
diff --git a/lib/src/channel_media_display_screen.dart b/lib/src/channel_media_display_screen.dart
index 506a46b9..09d2a8a8 100644
--- a/lib/src/channel_media_display_screen.dart
+++ b/lib/src/channel_media_display_screen.dart
@@ -55,14 +55,17 @@ class _ChannelMediaDisplayScreenState extends State<ChannelMediaDisplayScreen> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      backgroundColor: Colors.white,
+      backgroundColor: StreamChatTheme.of(context).colorTheme.white,
       appBar: AppBar(
         brightness: Theme.of(context).brightness,
         elevation: 1,
         centerTitle: true,
         title: Text(
           'Photos & Videos',
-          style: TextStyle(color: Colors.black, fontSize: 16.0),
+          style: TextStyle(
+            color: StreamChatTheme.of(context).colorTheme.black,
+            fontSize: 16.0,
+          ),
         ),
         leading: Center(
           child: InkWell(
@@ -71,7 +74,7 @@ class _ChannelMediaDisplayScreenState extends State<ChannelMediaDisplayScreen> {
             },
             child: Container(
               child: StreamSvgIcon.left(
-                color: Colors.black,
+                color: StreamChatTheme.of(context).colorTheme.black,
                 size: 24.0,
               ),
               width: 24.0,
@@ -106,14 +109,14 @@ class _ChannelMediaDisplayScreenState extends State<ChannelMediaDisplayScreen> {
               children: [
                 StreamSvgIcon.pictures(
                   size: 136.0,
-                  color: Color(0xffdbdbdb),
+                  color: StreamChatTheme.of(context).colorTheme.greyGainsboro,
                 ),
                 SizedBox(height: 16.0),
                 Text(
                   'No Media',
                   style: TextStyle(
                     fontSize: 14.0,
-                    color: Color(0xff000000),
+                    color: StreamChatTheme.of(context).colorTheme.black,
                   ),
                 ),
                 SizedBox(height: 8.0),
@@ -122,7 +125,10 @@ class _ChannelMediaDisplayScreenState extends State<ChannelMediaDisplayScreen> {
                   textAlign: TextAlign.center,
                   style: TextStyle(
                     fontSize: 14.0,
-                    color: Color(0xff000000).withOpacity(0.5),
+                    color: StreamChatTheme.of(context)
+                        .colorTheme
+                        .black
+                        .withOpacity(0.5),
                   ),
                 ),
               ],