diff --git a/lib/pages/chat/chat_input_row.dart b/lib/pages/chat/chat_input_row.dart
index 62f737f73..db58beda7 100644
--- a/lib/pages/chat/chat_input_row.dart
+++ b/lib/pages/chat/chat_input_row.dart
@@ -5,7 +5,6 @@ import 'package:matrix/matrix.dart';
 
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/l10n/l10n.dart';
-import 'package:fluffychat/pages/chat/encryption_button.dart';
 import 'package:fluffychat/utils/other_party_can_receive.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
 import 'package:fluffychat/widgets/avatar.dart';
diff --git a/lib/pages/chat/chat_view.dart b/lib/pages/chat/chat_view.dart
index 2fd8e20ac..eb9b0e234 100644
--- a/lib/pages/chat/chat_view.dart
+++ b/lib/pages/chat/chat_view.dart
@@ -1,6 +1,5 @@
 import 'dart:ui' as ui;
 
-import 'package:fluffychat/pages/chat/encryption_button.dart';
 import 'package:flutter/material.dart';
 
 import 'package:badges/badges.dart';
@@ -14,6 +13,7 @@ import 'package:fluffychat/pages/chat/chat.dart';
 import 'package:fluffychat/pages/chat/chat_app_bar_list_tile.dart';
 import 'package:fluffychat/pages/chat/chat_app_bar_title.dart';
 import 'package:fluffychat/pages/chat/chat_event_list.dart';
+import 'package:fluffychat/pages/chat/encryption_button.dart';
 import 'package:fluffychat/pages/chat/pinned_events.dart';
 import 'package:fluffychat/pages/chat/reply_display.dart';
 import 'package:fluffychat/utils/account_config.dart';
diff --git a/lib/pages/chat_list/status_msg_list.dart b/lib/pages/chat_list/status_msg_list.dart
index 474f899e0..f49da939d 100644
--- a/lib/pages/chat_list/status_msg_list.dart
+++ b/lib/pages/chat_list/status_msg_list.dart
@@ -76,7 +76,12 @@ class StatusMessageList extends StatelessWidget {
               return SizedBox(
                 height: StatusMessageList.height,
                 child: ListView.builder(
-                  padding: const EdgeInsets.all(8),
+                  padding: const EdgeInsets.only(
+                    left: 8.0,
+                    right: 8.0,
+                    top: 8.0,
+                    bottom: 6.0,
+                  ),
                   scrollDirection: Axis.horizontal,
                   itemCount: presences.length,
                   itemBuilder: (context, i) => PresenceAvatar(
@@ -108,7 +113,7 @@ class PresenceAvatar extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final avatarSize = height - 16 - 16 - 8;
+    final avatarSize = height - 16 - 16 - 6;
     final client = Matrix.of(context).client;
     return FutureBuilder<Profile>(
       future: client.getProfileFromUserId(presence.userid),