diff --git a/lib/src/message_widget.dart b/lib/src/message_widget.dart
index 967fb72b..10298436 100644
--- a/lib/src/message_widget.dart
+++ b/lib/src/message_widget.dart
@@ -498,8 +498,8 @@ class _MessageWidgetState extends State<MessageWidget> {
         });
   }
 
-  ContinuousRectangleBorder _getDefaultShape(BuildContext context) {
-    return ContinuousRectangleBorder(
+  ShapeBorder _getDefaultShape(BuildContext context) {
+    return RoundedRectangleBorder(
       side: widget.attachmentBorderSide ??
           widget.borderSide ??
           BorderSide(
@@ -718,7 +718,7 @@ class _MessageWidgetState extends State<MessageWidget> {
       onLongPress: () => onLongPress(context),
       child: Material(
         shape: widget.shape ??
-            ContinuousRectangleBorder(
+            RoundedRectangleBorder(
               side: widget.borderSide ??
                   BorderSide(
                     color: Theme.of(context).brightness == Brightness.dark
diff --git a/lib/src/reaction_bubble.dart b/lib/src/reaction_bubble.dart
index 0d37d87f..a166e4da 100644
--- a/lib/src/reaction_bubble.dart
+++ b/lib/src/reaction_bubble.dart
@@ -40,6 +40,7 @@ class ReactionBubble extends StatelessWidget {
               borderRadius: BorderRadius.all(Radius.circular(14)),
             ),
             child: Wrap(
+              spacing: 8,
               children: [
                 ...reactions.map((reaction) {
                   final reactionIcon = reactionIcons.firstWhere(
diff --git a/lib/src/reaction_picker.dart b/lib/src/reaction_picker.dart
index 5855b59f..f954902b 100644
--- a/lib/src/reaction_picker.dart
+++ b/lib/src/reaction_picker.dart
@@ -45,7 +45,7 @@ class ReactionPicker extends StatelessWidget {
                   reactionIcon.iconData,
                   color: ownReactionIndex != -1
                       ? StreamChatTheme.of(context).accentColor
-                      : Theme.of(context).iconTheme.color,
+                      : Theme.of(context).iconTheme.color.withOpacity(.5),
                 ),
                 onPressed: () {
                   if (ownReactionIndex != -1) {