diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index 46dc8820..6c4ae4dc 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -1,6 +1,6 @@
 name: example
 description: A new Flutter project.
-version: 1.1.0+2
+version: 1.1.0+3
 
 environment:
   sdk: ">=2.2.2 <3.0.0"
diff --git a/lib/src/reaction_picker.dart b/lib/src/reaction_picker.dart
index bca74a99..804b1559 100644
--- a/lib/src/reaction_picker.dart
+++ b/lib/src/reaction_picker.dart
@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:stream_chat_flutter/src/stream_svg_icon.dart';
 
 import '../stream_chat_flutter.dart';
+import 'extension.dart';
 
 /// ![screenshot](https://raw.githubusercontent.com/GetStream/stream-chat-flutter/master/screenshots/reaction_picker.png)
 /// ![screenshot](https://raw.githubusercontent.com/GetStream/stream-chat-flutter/master/screenshots/reaction_picker_paint.png)
@@ -57,67 +58,83 @@ class _ReactionPickerState extends State<ReactionPicker>
           return Transform.scale(
             scale: val,
             child: Material(
+              borderRadius: BorderRadius.circular(24),
               color: StreamChatTheme.of(context).colorTheme.white,
               clipBehavior: Clip.hardEdge,
-              shape: RoundedRectangleBorder(
-                borderRadius: BorderRadius.circular(24),
-              ),
               child: Padding(
-                padding: const EdgeInsets.symmetric(horizontal: 8.0),
+                padding: const EdgeInsets.symmetric(
+                  horizontal: 16.0,
+                  vertical: 8.0,
+                ),
                 child: Row(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   mainAxisAlignment: MainAxisAlignment.end,
                   mainAxisSize: MainAxisSize.min,
-                  children: reactionIcons.map((reactionIcon) {
-                    final ownReactionIndex = widget.message.ownReactions
-                            ?.indexWhere((reaction) =>
-                                reaction.type == reactionIcon.type) ??
-                        -1;
-                    var index = reactionIcons.indexOf(reactionIcon);
+                  children: reactionIcons
+                      .map<Widget>((reactionIcon) {
+                        final ownReactionIndex = widget.message.ownReactions
+                                ?.indexWhere((reaction) =>
+                                    reaction.type == reactionIcon.type) ??
+                            -1;
+                        var index = reactionIcons.indexOf(reactionIcon);
 
-                    return IconButton(
-                      iconSize: 24,
-                      icon: AnimatedBuilder(
-                          animation: animations[index],
-                          builder: (context, val) {
-                            return Transform.scale(
-                              scale: animations[index].value,
-                              child: StreamSvgIcon(
-                                assetName: reactionIcon.assetName,
-                                height: max(
-                                  0,
-                                  animations[index].value * 24.0,
-                                ),
-                                width: max(
-                                  0,
-                                  animations[index].value * 24.0,
-                                ),
-                                color: ownReactionIndex != -1
-                                    ? StreamChatTheme.of(context)
-                                        .colorTheme
-                                        .accentBlue
-                                    : Theme.of(context)
-                                        .iconTheme
-                                        .color
-                                        .withOpacity(.5),
-                              ),
-                            );
-                          }),
-                      onPressed: () {
-                        if (ownReactionIndex != -1) {
-                          removeReaction(
-                            context,
-                            widget.message.ownReactions[ownReactionIndex],
-                          );
-                        } else {
-                          sendReaction(
-                            context,
-                            reactionIcon.type,
-                          );
-                        }
-                      },
-                    );
-                  }).toList(),
+                        return RawMaterialButton(
+                          elevation: 0,
+                          padding: const EdgeInsets.all(0),
+                          clipBehavior: Clip.none,
+                          shape: ContinuousRectangleBorder(
+                            borderRadius: BorderRadius.circular(16),
+                          ),
+                          constraints: BoxConstraints.tightFor(
+                            height: 24,
+                            width: 24,
+                          ),
+                          child: AnimatedBuilder(
+                              animation: animations[index],
+                              builder: (context, val) {
+                                return Transform.scale(
+                                  alignment: Alignment.center,
+                                  scale: animations[index].value,
+                                  child: StreamSvgIcon(
+                                    assetName: reactionIcon.assetName,
+                                    height: max(
+                                      0,
+                                      animations[index].value * 24.0,
+                                    ),
+                                    width: max(
+                                      0,
+                                      animations[index].value * 24.0,
+                                    ),
+                                    color: ownReactionIndex != -1
+                                        ? StreamChatTheme.of(context)
+                                            .colorTheme
+                                            .accentBlue
+                                        : Theme.of(context)
+                                            .iconTheme
+                                            .color
+                                            .withOpacity(.5),
+                                  ),
+                                );
+                              }),
+                          onPressed: () {
+                            if (ownReactionIndex != -1) {
+                              removeReaction(
+                                context,
+                                widget.message.ownReactions[ownReactionIndex],
+                              );
+                            } else {
+                              sendReaction(
+                                context,
+                                reactionIcon.type,
+                              );
+                            }
+                          },
+                        );
+                      })
+                      .insertBetween(SizedBox(
+                        width: 16,
+                      ))
+                      .toList(),
                 ),
               ),
             ),