diff --git a/packages/stream_chat_flutter/lib/src/attachment/giphy_attachment.dart b/packages/stream_chat_flutter/lib/src/attachment/giphy_attachment.dart
index ed5a5750..8247661c 100644
--- a/packages/stream_chat_flutter/lib/src/attachment/giphy_attachment.dart
+++ b/packages/stream_chat_flutter/lib/src/attachment/giphy_attachment.dart
@@ -202,24 +202,26 @@ class GiphyAttachment extends AttachmentWidget {
                 crossAxisAlignment: CrossAxisAlignment.center,
                 children: [
                   Expanded(
-                    child: FlatButton(
+                    child: Container(
                       height: 50,
-                      onPressed: () {
-                        streamChannel.channel.sendAction(message, {
-                          'image_action': 'cancel',
-                        });
-                      },
-                      child: Text(
-                        'Cancel',
-                        style: StreamChatTheme.of(context)
-                            .textTheme
-                            .bodyBold
-                            .copyWith(
-                              color: StreamChatTheme.of(context)
-                                  .colorTheme
-                                  .black
-                                  .withOpacity(0.5),
-                            ),
+                      child: TextButton(
+                        onPressed: () {
+                          streamChannel.channel.sendAction(message, {
+                            'image_action': 'cancel',
+                          });
+                        },
+                        child: Text(
+                          'Cancel',
+                          style: StreamChatTheme.of(context)
+                              .textTheme
+                              .bodyBold
+                              .copyWith(
+                                color: StreamChatTheme.of(context)
+                                    .colorTheme
+                                    .black
+                                    .withOpacity(0.5),
+                              ),
+                        ),
                       ),
                     ),
                   ),
@@ -232,20 +234,22 @@ class GiphyAttachment extends AttachmentWidget {
                     height: 50.0,
                   ),
                   Expanded(
-                    child: FlatButton(
+                    child: Container(
                       height: 50,
-                      onPressed: () {
-                        streamChannel.channel.sendAction(message, {
-                          'image_action': 'send',
-                        });
-                      },
-                      child: Text(
-                        'Send',
-                        style: TextStyle(
-                            color: StreamChatTheme.of(context)
-                                .colorTheme
-                                .accentBlue,
-                            fontWeight: FontWeight.bold),
+                      child: TextButton(
+                        onPressed: () {
+                          streamChannel.channel.sendAction(message, {
+                            'image_action': 'send',
+                          });
+                        },
+                        child: Text(
+                          'Send',
+                          style: TextStyle(
+                              color: StreamChatTheme.of(context)
+                                  .colorTheme
+                                  .accentBlue,
+                              fontWeight: FontWeight.bold),
+                        ),
                       ),
                     ),
                   ),
diff --git a/packages/stream_chat_flutter/lib/src/channel_list_view.dart b/packages/stream_chat_flutter/lib/src/channel_list_view.dart
index 3bab76b2..1fb9885a 100644
--- a/packages/stream_chat_flutter/lib/src/channel_list_view.dart
+++ b/packages/stream_chat_flutter/lib/src/channel_list_view.dart
@@ -284,7 +284,7 @@ class _ChannelListViewState extends State<ChannelListView> {
                   left: 0,
                   bottom: 32,
                   child: Center(
-                    child: FlatButton(
+                    child: TextButton(
                       onPressed: widget.onStartChatPressed,
                       child: Text(
                         'Start a chat',
@@ -445,7 +445,7 @@ class _ChannelListViewState extends State<ChannelListView> {
             ),
             style: Theme.of(context).textTheme.headline6,
           ),
-          FlatButton(
+          TextButton(
             onPressed: () => _channelListController.loadData(),
             child: Text('Retry'),
           ),
diff --git a/packages/stream_chat_flutter/lib/src/message_actions_modal.dart b/packages/stream_chat_flutter/lib/src/message_actions_modal.dart
index d914afba..1546e66b 100644
--- a/packages/stream_chat_flutter/lib/src/message_actions_modal.dart
+++ b/packages/stream_chat_flutter/lib/src/message_actions_modal.dart
@@ -348,7 +348,7 @@ class _MessageActionsModalState extends State<MessageActionsModal> {
             Row(
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
-                FlatButton(
+                TextButton(
                   child: Text(
                     'OK',
                     style: StreamChatTheme.of(context)
@@ -413,7 +413,7 @@ class _MessageActionsModalState extends State<MessageActionsModal> {
             Row(
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
-                FlatButton(
+                TextButton(
                   child: Text(
                     'OK',
                     style: StreamChatTheme.of(context)
diff --git a/packages/stream_chat_flutter/lib/src/message_input.dart b/packages/stream_chat_flutter/lib/src/message_input.dart
index ec6b9574..21424c2e 100644
--- a/packages/stream_chat_flutter/lib/src/message_input.dart
+++ b/packages/stream_chat_flutter/lib/src/message_input.dart
@@ -2139,7 +2139,7 @@ class MessageInputState extends State<MessageInput> {
             Row(
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
-                FlatButton(
+                TextButton(
                   child: Text(
                     'OK',
                     style: StreamChatTheme.of(context)
diff --git a/packages/stream_chat_flutter/lib/src/user_list_view.dart b/packages/stream_chat_flutter/lib/src/user_list_view.dart
index 4b50559b..77537e59 100644
--- a/packages/stream_chat_flutter/lib/src/user_list_view.dart
+++ b/packages/stream_chat_flutter/lib/src/user_list_view.dart
@@ -242,7 +242,7 @@ class _UserListViewState extends State<UserListView>
             ),
             child: Text(message),
           ),
-          FlatButton(
+          TextButton(
             onPressed: () {
               _userListController.loadData();
             },
diff --git a/packages/stream_chat_flutter/lib/src/utils.dart b/packages/stream_chat_flutter/lib/src/utils.dart
index 424f1880..7a88ee6c 100644
--- a/packages/stream_chat_flutter/lib/src/utils.dart
+++ b/packages/stream_chat_flutter/lib/src/utils.dart
@@ -59,7 +59,7 @@ Future<bool> showConfirmationDialog(
             Row(
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: [
-                FlatButton(
+                TextButton(
                   child: Text(
                     cancelText,
                     style: StreamChatTheme.of(context)
@@ -75,7 +75,7 @@ Future<bool> showConfirmationDialog(
                     Navigator.of(context).pop(false);
                   },
                 ),
-                FlatButton(
+                TextButton(
                   child: Text(
                     okText,
                     style: StreamChatTheme.of(context)
@@ -145,7 +145,7 @@ Future<bool> showInfoDialog(
           Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
-              FlatButton(
+              TextButton(
                 child: Text(
                   okText,
                   style: TextStyle(