diff --git a/lib/src/message_actions_modal.dart b/lib/src/message_actions_modal.dart
index 582e8496..4b6c4d4f 100644
--- a/lib/src/message_actions_modal.dart
+++ b/lib/src/message_actions_modal.dart
@@ -48,88 +48,91 @@ class MessageActionsModal extends StatelessWidget {
       onTap: () {
         Navigator.pop(context);
       },
-      child: SingleChildScrollView(
-        padding: const EdgeInsets.only(top: 160),
-        child: Stack(
-          children: [
-            Positioned.fill(
-              child: BackdropFilter(
-                filter: ImageFilter.blur(
-                  sigmaX: 10,
-                  sigmaY: 10,
-                ),
-                child: Container(
-                  color: Colors.transparent,
+      child: Center(
+        child: SingleChildScrollView(
+          child: Stack(
+            children: [
+              Positioned.fill(
+                child: BackdropFilter(
+                  filter: ImageFilter.blur(
+                    sigmaX: 10,
+                    sigmaY: 10,
+                  ),
+                  child: Container(
+                    color: Colors.transparent,
+                  ),
                 ),
               ),
-            ),
-            Padding(
-              padding: const EdgeInsets.symmetric(vertical: 8.0),
-              child: Column(
-                mainAxisAlignment: MainAxisAlignment.center,
-                crossAxisAlignment: CrossAxisAlignment.stretch,
-                children: <Widget>[
-                  if (showReactions &&
-                      (message.status == MessageSendingStatus.SENT ||
-                          message.status == null))
-                    Center(
-                      child: ReactionPicker(
-                        message: message,
+              Padding(
+                padding: const EdgeInsets.symmetric(vertical: 8.0),
+                child: Column(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  crossAxisAlignment: CrossAxisAlignment.stretch,
+                  children: <Widget>[
+                    if (showReactions &&
+                        (message.status == MessageSendingStatus.SENT ||
+                            message.status == null))
+                      Center(
+                        child: ReactionPicker(
+                          message: message,
+                          messageTheme: messageTheme,
+                        ),
+                      ),
+                    IgnorePointer(
+                      child: MessageWidget(
+                        key: Key('MessageWidget'),
+                        reverse: reverse,
+                        message: message.copyWith(
+                          text: message.text.length > 200
+                              ? '${message.text.substring(0, 200)}...'
+                              : message.text,
+                        ),
                         messageTheme: messageTheme,
+                        showReactions: false,
+                        showUsername: false,
+                        showReplyIndicator: false,
+                        showTimestamp: false,
+                        showSendingIndicator: DisplayWidget.gone,
+                        shape: messageShape,
                       ),
                     ),
-                  IgnorePointer(
-                    child: MessageWidget(
-                      key: Key('MessageWidget'),
-                      reverse: reverse,
-                      message: message.copyWith(
-                        text: message.text.length > 200
-                            ? '${message.text.substring(0, 200)}...'
-                            : message.text,
-                      ),
-                      messageTheme: messageTheme,
-                      showReactions: false,
-                      showUsername: false,
-                      showReplyIndicator: false,
-                      showTimestamp: false,
-                      showSendingIndicator: DisplayWidget.gone,
-                      shape: messageShape,
+                    SizedBox(
+                      height: 8,
                     ),
-                  ),
-                  SizedBox(
-                    height: 8,
-                  ),
-                  Padding(
-                    padding: const EdgeInsets.symmetric(
-                      horizontal: 48.0,
-                    ),
-                    child: Material(
-                      clipBehavior: Clip.hardEdge,
-                      shape: RoundedRectangleBorder(
-                        borderRadius: BorderRadius.circular(16),
+                    Padding(
+                      padding: const EdgeInsets.symmetric(
+                        horizontal: 48.0,
                       ),
-                      child: Column(
-                        crossAxisAlignment: CrossAxisAlignment.stretch,
-                        children: ListTile.divideTiles(
-                          context: context,
-                          tiles: [
-                            if (showReply &&
-                                (message.status == MessageSendingStatus.SENT ||
-                                    message.status == null) &&
-                                message.parentId == null)
-                              _buildReplyButton(context),
-                            if (showEditMessage) _buildEditMessage(context),
-                            if (showDeleteMessage) _buildDeleteButton(context),
-                            if (showCopyMessage) _buildCopyButton(context),
-                          ],
-                        ).toList(),
+                      child: Material(
+                        clipBehavior: Clip.hardEdge,
+                        shape: RoundedRectangleBorder(
+                          borderRadius: BorderRadius.circular(16),
+                        ),
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.stretch,
+                          children: ListTile.divideTiles(
+                            context: context,
+                            tiles: [
+                              if (showReply &&
+                                  (message.status ==
+                                          MessageSendingStatus.SENT ||
+                                      message.status == null) &&
+                                  message.parentId == null)
+                                _buildReplyButton(context),
+                              if (showEditMessage) _buildEditMessage(context),
+                              if (showDeleteMessage)
+                                _buildDeleteButton(context),
+                              if (showCopyMessage) _buildCopyButton(context),
+                            ],
+                          ).toList(),
+                        ),
                       ),
-                    ),
-                  )
-                ],
+                    )
+                  ],
+                ),
               ),
-            ),
-          ],
+            ],
+          ),
         ),
       ),
     );
diff --git a/lib/src/message_reactions_modal.dart b/lib/src/message_reactions_modal.dart
index 7db22ee1..0582eb79 100644
--- a/lib/src/message_reactions_modal.dart
+++ b/lib/src/message_reactions_modal.dart
@@ -39,63 +39,64 @@ class MessageReactionsModal extends StatelessWidget {
       onTap: () {
         Navigator.pop(context);
       },
-      child: SingleChildScrollView(
-        padding: const EdgeInsets.only(top: 160),
-        child: Stack(
-          children: [
-            Positioned.fill(
-              child: BackdropFilter(
-                filter: ImageFilter.blur(
-                  sigmaX: 10,
-                  sigmaY: 10,
-                ),
-                child: Container(
-                  color: Colors.transparent,
+      child: Center(
+        child: SingleChildScrollView(
+          child: Stack(
+            children: [
+              Positioned.fill(
+                child: BackdropFilter(
+                  filter: ImageFilter.blur(
+                    sigmaX: 10,
+                    sigmaY: 10,
+                  ),
+                  child: Container(
+                    color: Colors.transparent,
+                  ),
                 ),
               ),
-            ),
-            Padding(
-              padding: const EdgeInsets.symmetric(vertical: 8.0),
-              child: Column(
-                mainAxisAlignment: MainAxisAlignment.center,
-                crossAxisAlignment: CrossAxisAlignment.stretch,
-                children: <Widget>[
-                  if (showReactions &&
-                      (message.status == MessageSendingStatus.SENT ||
-                          message.status == null))
-                    Center(
-                      child: ReactionPicker(
-                        message: message,
+              Padding(
+                padding: const EdgeInsets.symmetric(vertical: 8.0),
+                child: Column(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  crossAxisAlignment: CrossAxisAlignment.stretch,
+                  children: <Widget>[
+                    if (showReactions &&
+                        (message.status == MessageSendingStatus.SENT ||
+                            message.status == null))
+                      Center(
+                        child: ReactionPicker(
+                          message: message,
+                          messageTheme: messageTheme,
+                        ),
+                      ),
+                    IgnorePointer(
+                      child: MessageWidget(
+                        key: Key('MessageWidget'),
+                        reverse: reverse,
+                        message: message.copyWith(
+                          text: message.text.length > 200
+                              ? '${message.text.substring(0, 200)}...'
+                              : message.text,
+                        ),
                         messageTheme: messageTheme,
+                        showReactions: false,
+                        showUsername: false,
+                        showReplyIndicator: false,
+                        showTimestamp: false,
+                        showSendingIndicator: DisplayWidget.gone,
+                        shape: messageShape,
                       ),
                     ),
-                  IgnorePointer(
-                    child: MessageWidget(
-                      key: Key('MessageWidget'),
-                      reverse: reverse,
-                      message: message.copyWith(
-                        text: message.text.length > 200
-                            ? '${message.text.substring(0, 200)}...'
-                            : message.text,
-                      ),
-                      messageTheme: messageTheme,
-                      showReactions: false,
-                      showUsername: false,
-                      showReplyIndicator: false,
-                      showTimestamp: false,
-                      showSendingIndicator: DisplayWidget.gone,
-                      shape: messageShape,
+                    SizedBox(
+                      height: 16,
                     ),
-                  ),
-                  SizedBox(
-                    height: 16,
-                  ),
-                  if (message.latestReactions?.isNotEmpty == true)
-                    _buildReactionCard(context),
-                ],
+                    if (message.latestReactions?.isNotEmpty == true)
+                      _buildReactionCard(context),
+                  ],
+                ),
               ),
-            ),
-          ],
+            ],
+          ),
         ),
       ),
     );
diff --git a/lib/src/message_widget.dart b/lib/src/message_widget.dart
index c3fa4c6e..0e703fa0 100644
--- a/lib/src/message_widget.dart
+++ b/lib/src/message_widget.dart
@@ -241,7 +241,7 @@ class _MessageWidgetState extends State<MessageWidget> {
                         Flexible(
                           child: PortalEntry(
                             portal: Container(
-                              transform: Matrix4.translationValues(-16, 0, 0),
+                              transform: Matrix4.translationValues(-16, 2, 0),
                               child: _buildReactionIndicator(context),
                               constraints: BoxConstraints(maxWidth: 22 * 6.0),
                             ),