diff --git a/lib/config/themes.dart b/lib/config/themes.dart
index 2dcfe9dbb..f2335a005 100644
--- a/lib/config/themes.dart
+++ b/lib/config/themes.dart
@@ -77,9 +77,7 @@ abstract class FluffyThemes {
               ? Typography.material2018().black.merge(fallbackTextTheme)
               : Typography.material2018().white.merge(fallbackTextTheme)
           : null,
-      dividerColor: brightness == Brightness.light
-          ? Colors.blueGrey.shade50
-          : Colors.blueGrey.shade900,
+      dividerColor: colorScheme.surfaceContainer,
       popupMenuTheme: PopupMenuThemeData(
         shape: RoundedRectangleBorder(
           borderRadius: BorderRadius.circular(AppConfig.borderRadius),
diff --git a/lib/pages/chat/chat_event_list.dart b/lib/pages/chat/chat_event_list.dart
index 57ac404ab..e88bec3f2 100644
--- a/lib/pages/chat/chat_event_list.dart
+++ b/lib/pages/chat/chat_event_list.dart
@@ -51,7 +51,7 @@ class ChatEventList extends StatelessWidget {
       child: ListView.custom(
         padding: EdgeInsets.only(
           top: 16,
-          bottom: 8,
+          bottom: 0,
           left: horizontalPadding,
           right: horizontalPadding,
         ),
diff --git a/lib/pages/chat/chat_view.dart b/lib/pages/chat/chat_view.dart
index 14c70459f..7b8e3c3ea 100644
--- a/lib/pages/chat/chat_view.dart
+++ b/lib/pages/chat/chat_view.dart
@@ -290,14 +290,15 @@ class ChatView extends StatelessWidget {
                               child: ChatEventList(controller: controller),
                             ),
                           ),
+                          if (controller.showScrollDownButton)
+                            Divider(
+                              height: 1,
+                              color: theme.dividerColor,
+                            ),
                           if (controller.room.canSendDefaultMessages &&
                               controller.room.membership == Membership.join)
                             Container(
-                              margin: EdgeInsets.only(
-                                bottom: bottomSheetPadding,
-                                left: bottomSheetPadding,
-                                right: bottomSheetPadding,
-                              ),
+                              margin: EdgeInsets.all(bottomSheetPadding),
                               constraints: const BoxConstraints(
                                 maxWidth: FluffyThemes.columnWidth * 2.5,
                               ),
diff --git a/lib/pages/settings_style/settings_style_view.dart b/lib/pages/settings_style/settings_style_view.dart
index ed8e5289e..d73024ac9 100644
--- a/lib/pages/settings_style/settings_style_view.dart
+++ b/lib/pages/settings_style/settings_style_view.dart
@@ -282,15 +282,19 @@ class SettingsStyleView extends StatelessWidget {
                         ],
                       ),
                     ),
+                    Divider(
+                      color: theme.dividerColor,
+                    ),
                     ListTile(
-                      title: TextButton(
+                      title: TextButton.icon(
                         style: TextButton.styleFrom(
                           backgroundColor: theme.colorScheme.secondaryContainer,
                           foregroundColor:
                               theme.colorScheme.onSecondaryContainer,
                         ),
                         onPressed: controller.setWallpaper,
-                        child: Text(L10n.of(context).setWallpaper),
+                        icon: const Icon(Icons.edit_outlined),
+                        label: Text(L10n.of(context).setWallpaper),
                       ),
                       trailing: accountConfig.wallpaperUrl == null
                           ? null