diff --git a/assets/chat_wallpaper_dark.png b/assets/chat_wallpaper_dark.png
deleted file mode 100644
index 88d1cf80..00000000
Binary files a/assets/chat_wallpaper_dark.png and /dev/null differ
diff --git a/assets/chat_wallpaper_light.png b/assets/chat_wallpaper_light.png
deleted file mode 100644
index 781491c4..00000000
Binary files a/assets/chat_wallpaper_light.png and /dev/null differ
diff --git a/lib/pages/chat/chat_event_list.dart b/lib/pages/chat/chat_event_list.dart
index 50b0c570..d4614af1 100644
--- a/lib/pages/chat/chat_event_list.dart
+++ b/lib/pages/chat/chat_event_list.dart
@@ -9,6 +9,7 @@ import 'package:fluffychat/pages/chat/events/message.dart';
 import 'package:fluffychat/pages/chat/seen_by_row.dart';
 import 'package:fluffychat/pages/chat/typing_indicators.dart';
 import 'package:fluffychat/pages/user_bottom_sheet/user_bottom_sheet.dart';
+import 'package:fluffychat/utils/account_config.dart';
 import 'package:fluffychat/utils/adaptive_bottom_sheet.dart';
 import 'package:fluffychat/utils/matrix_sdk_extensions/filtered_timeline_extension.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
@@ -33,6 +34,10 @@ class ChatEventList extends StatelessWidget {
     for (var i = 0; i < events.length; i++) {
       thisEventsKeyMap[events[i].eventId] = i;
     }
+
+    final hasWallpaper =
+        controller.room.client.applicationAccountConfig.wallpaperUrl != null;
+
     return SelectionArea(
       child: ListView.custom(
         padding: EdgeInsets.only(
@@ -137,7 +142,8 @@ class ChatEventList extends StatelessWidget {
                     i > 0 && controller.readMarkerEventId == event.eventId,
                 nextEvent: i + 1 < events.length ? events[i + 1] : null,
                 previousEvent: i > 0 ? events[i - 1] : null,
-                avatarPresenceBackgroundColor: Colors.transparent,
+                avatarPresenceBackgroundColor:
+                    hasWallpaper ? Colors.transparent : null,
               ),
             );
           },
diff --git a/lib/pages/chat/chat_view.dart b/lib/pages/chat/chat_view.dart
index c4240eda..221153d2 100644
--- a/lib/pages/chat/chat_view.dart
+++ b/lib/pages/chat/chat_view.dart
@@ -260,30 +260,18 @@ class ChatView extends StatelessWidget {
                 onDragExited: controller.onDragExited,
                 child: Stack(
                   children: <Widget>[
-                    accountConfig.wallpaperUrl != null
-                        ? Opacity(
-                            opacity: accountConfig.wallpaperOpacity ?? 1,
-                            child: MxcImage(
-                              uri: accountConfig.wallpaperUrl,
-                              fit: BoxFit.cover,
-                              isThumbnail: true,
-                              width: FluffyThemes.columnWidth * 4,
-                              height: FluffyThemes.columnWidth * 4,
-                              placeholder: (_) => Container(),
-                            ),
-                          )
-                        : ColorFiltered(
-                            colorFilter: ColorFilter.mode(
-                              theme.colorScheme.surfaceContainerHighest,
-                              BlendMode.color,
-                            ),
-                            child: Image.asset(
-                              'assets/chat_wallpaper_${theme.brightness.name}.png',
-                              fit: BoxFit.cover,
-                              width: double.infinity,
-                              height: double.infinity,
-                            ),
-                          ),
+                    if (accountConfig.wallpaperUrl != null)
+                      Opacity(
+                        opacity: accountConfig.wallpaperOpacity ?? 1,
+                        child: MxcImage(
+                          uri: accountConfig.wallpaperUrl,
+                          fit: BoxFit.cover,
+                          isThumbnail: true,
+                          width: FluffyThemes.columnWidth * 4,
+                          height: FluffyThemes.columnWidth * 4,
+                          placeholder: (_) => Container(),
+                        ),
+                      ),
                     SafeArea(
                       child: Column(
                         children: <Widget>[
@@ -320,7 +308,10 @@ class ChatView extends StatelessWidget {
                               alignment: Alignment.center,
                               child: Material(
                                 clipBehavior: Clip.hardEdge,
-                                color: theme.colorScheme.surfaceBright,
+                                color: theme
+                                    .colorScheme
+                                    // ignore: deprecated_member_use
+                                    .surfaceVariant,
                                 borderRadius: const BorderRadius.all(
                                   Radius.circular(24),
                                 ),
diff --git a/lib/pages/chat/events/message.dart b/lib/pages/chat/events/message.dart
index 5d1631fe..032e8967 100644
--- a/lib/pages/chat/events/message.dart
+++ b/lib/pages/chat/events/message.dart
@@ -84,7 +84,7 @@ class Message extends StatelessWidget {
     final ownMessage = event.senderId == client.userID;
     final alignment = ownMessage ? Alignment.topRight : Alignment.topLeft;
     // ignore: deprecated_member_use
-    var color = theme.colorScheme.surfaceBright;
+    var color = theme.colorScheme.surfaceVariant;
     final displayTime = event.type == EventTypes.RoomCreate ||
         nextEvent == null ||
         !event.originServerTs.sameEnvironment(nextEvent!.originServerTs);
diff --git a/lib/pages/chat/events/room_creation_state_event.dart b/lib/pages/chat/events/room_creation_state_event.dart
index 9362fd3d..8960a801 100644
--- a/lib/pages/chat/events/room_creation_state_event.dart
+++ b/lib/pages/chat/events/room_creation_state_event.dart
@@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:matrix/matrix.dart';
 
-import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/utils/date_time_extension.dart';
 import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
 import 'package:fluffychat/widgets/avatar.dart';
@@ -28,27 +27,11 @@ class RoomCreationStateEvent extends StatelessWidget {
         ),
         Text(
           roomName,
-          style: TextStyle(
-            fontSize: 24 * AppConfig.fontSizeFactor,
-            shadows: [
-              Shadow(
-                color: theme.colorScheme.surface,
-                blurRadius: 3,
-              ),
-            ],
-          ),
+          style: theme.textTheme.headlineSmall,
         ),
         Text(
           '${event.originServerTs.localizedTime(context)} | ${l10n.countParticipants((event.room.summary.mJoinedMemberCount ?? 1) + (event.room.summary.mInvitedMemberCount ?? 0))}',
-          style: TextStyle(
-            fontSize: 12 * AppConfig.fontSizeFactor,
-            shadows: [
-              Shadow(
-                color: theme.colorScheme.surface,
-                blurRadius: 3,
-              ),
-            ],
-          ),
+          style: theme.textTheme.labelSmall,
         ),
         const SizedBox(height: 48),
       ],
diff --git a/lib/pages/chat/typing_indicators.dart b/lib/pages/chat/typing_indicators.dart
index 13949f4a..a58138a9 100644
--- a/lib/pages/chat/typing_indicators.dart
+++ b/lib/pages/chat/typing_indicators.dart
@@ -81,7 +81,9 @@ class TypingIndicators extends StatelessWidget {
                 ),
                 const SizedBox(width: 8),
                 Material(
-                  color: theme.colorScheme.surfaceBright,
+                  color:
+                      // ignore: deprecated_member_use
+                      theme.colorScheme.surfaceVariant,
                   borderRadius: const BorderRadius.all(
                     Radius.circular(AppConfig.borderRadius),
                   ),