diff --git a/lib/src/channel_avatar.dart b/lib/src/channel_avatar.dart
deleted file mode 100644
index 0246ba29..00000000
--- a/lib/src/channel_avatar.dart
+++ /dev/null
@@ -1,29 +0,0 @@
-import 'package:cached_network_image/cached_network_image.dart';
-import 'package:flutter/material.dart';
-import 'package:stream_chat/stream_chat.dart';
-
-class ChannelAvatar extends StatelessWidget {
-  const ChannelAvatar({
-    Key key,
-    @required this.channel,
-    this.radius = 20,
-  }) : super(key: key);
-
-  final Channel channel;
-  final double radius;
-
-  @override
-  Widget build(BuildContext context) {
-    return CircleAvatar(
-      radius: radius,
-      backgroundImage: channel.extraData.containsKey('image')
-          ? CachedNetworkImageProvider(channel.extraData['image'])
-          : null,
-      child: channel.extraData.containsKey('image')
-          ? null
-          : Text(channel.extraData.containsKey('name')
-              ? channel.extraData['name'][0]
-              : ''),
-    );
-  }
-}
diff --git a/lib/src/channel_image.dart b/lib/src/channel_image.dart
index f28db180..834eda11 100644
--- a/lib/src/channel_image.dart
+++ b/lib/src/channel_image.dart
@@ -6,20 +6,24 @@ class ChannelImage extends StatelessWidget {
   const ChannelImage({
     Key key,
     @required this.channel,
+    this.radius = 20,
   }) : super(key: key);
 
   final Channel channel;
+  final double radius;
 
   @override
   Widget build(BuildContext context) {
     return CircleAvatar(
-      radius: 20,
+      radius: radius,
       backgroundImage: channel.extraData.containsKey('image')
-          ? CachedNetworkImageProvider(channel.extraData['image'] as String)
+          ? CachedNetworkImageProvider(channel.extraData['image'])
           : null,
       child: channel.extraData.containsKey('image')
           ? null
-          : Text(channel.config.name[0]),
+          : Text(channel.extraData.containsKey('name')
+              ? channel.extraData['name'][0]
+              : ''),
     );
   }
 }
diff --git a/pubspec.yaml b/pubspec.yaml
index 00831e3c..32cf32e8 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -19,8 +19,7 @@ dependencies:
   video_player: ^0.10.7
   chewie: ^0.9.8+1
   animations: ^1.0.0+3
-  stream_chat:
-    path: ../stream_chat_dart
+  stream_chat: ^0.1.6
 
 dev_dependencies:
   pedantic: ^1.8.0+1