diff --git a/lib/src/message_actions_modal.dart b/lib/src/message_actions_modal.dart
index e8e0d6e1..0f5e6c0d 100644
--- a/lib/src/message_actions_modal.dart
+++ b/lib/src/message_actions_modal.dart
@@ -191,7 +191,7 @@ class MessageActionsModal extends StatelessWidget {
                   children: <Widget>[
                     IconButton(
                       icon: Icon(
-                        StreamIcons.form_edit,
+                        StreamIcons.edit,
                         size: 22,
                         color:
                         StreamChatTheme.of(context).primaryIconTheme.color,
diff --git a/lib/src/message_input.dart b/lib/src/message_input.dart
index dd0b3133..c5650c66 100644
--- a/lib/src/message_input.dart
+++ b/lib/src/message_input.dart
@@ -309,7 +309,7 @@ class MessageInputState extends State<MessageInput> {
             decoration: InputDecoration(
               hintText: 'Write a message',
               prefixText: _commandEnabled ? null : '   ',
-              border: OutlineInputBorder(
+              border: widget.editMessage == null ? null : OutlineInputBorder(
                 borderRadius: BorderRadius.circular(32),
               ),
               contentPadding: EdgeInsets.all(8),