diff --git a/lib/src/message_actions_modal.dart b/lib/src/message_actions_modal.dart
index f0e228c9..6294ef6a 100644
--- a/lib/src/message_actions_modal.dart
+++ b/lib/src/message_actions_modal.dart
@@ -313,8 +313,8 @@ class MessageActionsModal extends StatelessWidget {
       backgroundColor: StreamChatTheme.of(context).colorTheme.white,
       shape: RoundedRectangleBorder(
         borderRadius: BorderRadius.only(
-          topLeft: Radius.circular(32),
-          topRight: Radius.circular(32),
+          topLeft: Radius.circular(16),
+          topRight: Radius.circular(16),
         ),
       ),
       builder: (context) {
@@ -326,39 +326,26 @@ class MessageActionsModal extends StatelessWidget {
             mainAxisSize: MainAxisSize.min,
             children: <Widget>[
               Padding(
-                padding: const EdgeInsets.only(
-                  top: 16.0,
-                  left: 16.0,
-                  right: 16.0,
-                ),
+                padding: const EdgeInsets.fromLTRB(8, 8, 8, 0),
                 child: Row(
                   mainAxisAlignment: MainAxisAlignment.spaceBetween,
                   children: <Widget>[
-                    IconButton(
-                      icon: StreamSvgIcon.edit(
-                        size: 22,
-                        color:
-                            StreamChatTheme.of(context).primaryIconTheme.color,
+                    Padding(
+                      padding: const EdgeInsets.all(8.0),
+                      child: StreamSvgIcon.edit(
+                        color: StreamChatTheme.of(context)
+                            .colorTheme
+                            .greyGainsboro,
                       ),
-                      onPressed: () {},
                     ),
                     Text(
-                      'Edit message',
-                      style: Theme.of(context)
-                          .textTheme
-                          .headline6
-                          .copyWith(fontWeight: FontWeight.bold),
+                      'Edit Message',
+                      style: TextStyle(fontWeight: FontWeight.bold),
                     ),
                     IconButton(
-                      icon: Icon(
-                        Icons.cancel_outlined,
-                        size: 22,
-                        color:
-                            StreamChatTheme.of(context).primaryIconTheme.color,
-                      ),
-                      onPressed: () {
-                        Navigator.of(context).pop();
-                      },
+                      visualDensity: VisualDensity.compact,
+                      icon: StreamSvgIcon.close_small(),
+                      onPressed: Navigator.of(context).pop,
                     ),
                   ],
                 ),
diff --git a/lib/src/message_input.dart b/lib/src/message_input.dart
index 72c5f70d..52d91d45 100644
--- a/lib/src/message_input.dart
+++ b/lib/src/message_input.dart
@@ -227,26 +227,30 @@ class MessageInputState extends State<MessageInput> {
           mainAxisSize: MainAxisSize.min,
           children: [
             if (_hasQuotedMessage)
-              Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  Padding(
-                    padding: const EdgeInsets.all(8.0),
-                    child: StreamSvgIcon.reply(
-                      color:
-                          StreamChatTheme.of(context).colorTheme.greyGainsboro,
+              Padding(
+                padding: const EdgeInsets.fromLTRB(8, 8, 8, 0),
+                child: Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  children: [
+                    Padding(
+                      padding: const EdgeInsets.all(8.0),
+                      child: StreamSvgIcon.reply(
+                        color: StreamChatTheme.of(context)
+                            .colorTheme
+                            .greyGainsboro,
+                      ),
                     ),
-                  ),
-                  Text(
-                    'Reply to Message',
-                    style: TextStyle(fontWeight: FontWeight.bold),
-                  ),
-                  IconButton(
-                    visualDensity: VisualDensity.compact,
-                    icon: StreamSvgIcon.close_small(),
-                    onPressed: widget.onQuotedMessageCleared,
-                  ),
-                ],
+                    Text(
+                      'Reply to Message',
+                      style: TextStyle(fontWeight: FontWeight.bold),
+                    ),
+                    IconButton(
+                      visualDensity: VisualDensity.compact,
+                      icon: StreamSvgIcon.close_small(),
+                      onPressed: widget.onQuotedMessageCleared,
+                    ),
+                  ],
+                ),
               ),
             Padding(
               padding: const EdgeInsets.all(8.0),
diff --git a/lib/src/stream_svg_icon.dart b/lib/src/stream_svg_icon.dart
index d00448bd..e7ef46c3 100644
--- a/lib/src/stream_svg_icon.dart
+++ b/lib/src/stream_svg_icon.dart
@@ -10,9 +10,9 @@ class StreamSvgIcon extends StatelessWidget {
 
   const StreamSvgIcon({
     this.assetName,
-    this.width,
-    this.height,
     this.color,
+    this.width = 24,
+    this.height = 24,
   });
 
   @override