diff --git a/lib/src/channel_list_view.dart b/lib/src/channel_list_view.dart
index 4b77f784..11f4b402 100644
--- a/lib/src/channel_list_view.dart
+++ b/lib/src/channel_list_view.dart
@@ -283,6 +283,10 @@ class _ChannelListViewState extends State<ChannelListView>
                 ],
               );
             } else {
+              final backgroundColor =
+                  Theme.of(context).brightness == Brightness.light
+                      ? Color(0xffEBEBEB)
+                      : Color(0xff141414);
               child = Slidable(
                 enabled: widget.swipeToAction,
                 actionPane: SlidableBehindActionPane(),
@@ -290,7 +294,7 @@ class _ChannelListViewState extends State<ChannelListView>
                 closeOnScroll: true,
                 secondaryActions: <Widget>[
                   IconSlideAction(
-                    color: Color(0xffEBEBEB),
+                    color: backgroundColor,
                     icon: Icons.more_horiz,
                     onTap: () {
                       showModalBottomSheet(
@@ -309,7 +313,7 @@ class _ChannelListViewState extends State<ChannelListView>
                     },
                   ),
                   IconSlideAction(
-                    color: Color(0xffEBEBEB),
+                    color: backgroundColor,
                     icon: LineAwesomeIcons.volume_off,
                     onTap: () async {
                       if (!channel.isMuted) {
@@ -321,10 +325,12 @@ class _ChannelListViewState extends State<ChannelListView>
                   ),
                   if (channel.isGroup && !channel.isDistinct)
                     IconSlideAction(
-                      color: Color(0xffEBEBEB),
+                      color: backgroundColor,
                       iconWidget: SvgPicture.asset(
                         'assets/icon_user_minus.svg',
                         package: 'stream_chat_flutter',
+                        color:
+                            StreamChatTheme.of(context).primaryIconTheme.color,
                         width: 22,
                       ),
                       onTap: () async {
@@ -343,7 +349,7 @@ class _ChannelListViewState extends State<ChannelListView>
                     ),
                   if (!channel.isGroup && !channel.isDistinct)
                     IconSlideAction(
-                      color: Color(0xffEBEBEB),
+                      color: backgroundColor,
                       icon: Icons.delete_outline,
                       onTap: () async {
                         final confirm = await showConfirmationDialog(
diff --git a/lib/src/date_divider.dart b/lib/src/date_divider.dart
index 13f755d7..8fbe5f77 100644
--- a/lib/src/date_divider.dart
+++ b/lib/src/date_divider.dart
@@ -39,7 +39,10 @@ class DateDivider extends StatelessWidget {
       child: Container(
         padding: const EdgeInsets.symmetric(horizontal: 8),
         decoration: BoxDecoration(
-          color: Colors.black.withOpacity(0.5),
+          color: (Theme.of(context).brightness == Brightness.light
+                  ? Colors.black
+                  : Colors.white)
+              .withOpacity(0.5),
           borderRadius: BorderRadius.circular(
             8,
           ),
diff --git a/lib/src/stream_chat_theme.dart b/lib/src/stream_chat_theme.dart
index 7df9eb7c..23dfa90a 100644
--- a/lib/src/stream_chat_theme.dart
+++ b/lib/src/stream_chat_theme.dart
@@ -287,7 +287,7 @@ class StreamChatThemeData {
           fontWeight: FontWeight.bold,
           fontSize: 12,
         ),
-        messageBackgroundColor: Color(0xffE6E6E6),
+        messageBackgroundColor: isDark ? Color(0xff191919) : Color(0xffE6E6E6),
         avatarTheme: AvatarTheme(
           borderRadius: BorderRadius.circular(20),
           constraints: BoxConstraints.tightFor(