diff --git a/assets/encryption.png b/assets/encryption.png
deleted file mode 100644
index af2ba3c2..00000000
Binary files a/assets/encryption.png and /dev/null differ
diff --git a/assets/start_chat.png b/assets/start_chat.png
deleted file mode 100644
index bb9dd552..00000000
Binary files a/assets/start_chat.png and /dev/null differ
diff --git a/lib/pages/chat_encryption_settings/chat_encryption_settings_view.dart b/lib/pages/chat_encryption_settings/chat_encryption_settings_view.dart
index a6ca7808..b99efd08 100644
--- a/lib/pages/chat_encryption_settings/chat_encryption_settings_view.dart
+++ b/lib/pages/chat_encryption_settings/chat_encryption_settings_view.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
 import 'package:flutter_gen/gen_l10n/l10n.dart';
@@ -29,7 +30,7 @@ class ChatEncryptionSettingsView extends StatelessWidget {
             onPressed: () =>
                 VRouter.of(context).toSegments(['rooms', controller.roomId!]),
           ),
-          title: Text(L10n.of(context)!.endToEndEncryption),
+          title: Text(L10n.of(context)!.encryption),
           actions: [
             TextButton(
               onPressed: () => launchUrlString(AppConfig.encryptionTutorial),
@@ -50,13 +51,12 @@ class ChatEncryptionSettingsView extends StatelessWidget {
               value: room.encrypted,
               onChanged: controller.enableEncryption,
             ),
-            Center(
-              child: Image.asset(
-                'assets/encryption.png',
-                width: 212,
-              ),
+            Icon(
+              CupertinoIcons.lock_shield,
+              size: 128,
+              color: Theme.of(context).colorScheme.onInverseSurface,
             ),
-            const Divider(height: 1),
+            const Divider(),
             if (room.isDirectChat)
               Padding(
                 padding: const EdgeInsets.all(16.0),
diff --git a/lib/pages/chat_list/chat_list_body.dart b/lib/pages/chat_list/chat_list_body.dart
index e3fd9160..53b48a0c 100644
--- a/lib/pages/chat_list/chat_list_body.dart
+++ b/lib/pages/chat_list/chat_list_body.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
 import 'package:animations/animations.dart';
@@ -8,7 +9,6 @@ import 'package:fluffychat/pages/chat_list/chat_list.dart';
 import 'package:fluffychat/pages/chat_list/chat_list_item.dart';
 import 'package:fluffychat/pages/chat_list/search_title.dart';
 import 'package:fluffychat/pages/chat_list/space_view.dart';
-import 'package:fluffychat/pages/chat_list/start_chat_fab.dart';
 import 'package:fluffychat/pages/chat_list/stories_header.dart';
 import 'package:fluffychat/utils/adaptive_bottom_sheet.dart';
 import 'package:fluffychat/utils/matrix_sdk_extensions/client_stories_extension.dart';
@@ -197,22 +197,11 @@ class ChatListViewBody extends StatelessWidget {
                           !controller.isSearchMode) ...[
                         Padding(
                           padding: const EdgeInsets.all(32.0),
-                          child: Column(
-                            mainAxisAlignment: MainAxisAlignment.center,
-                            children: [
-                              Image.asset(
-                                'assets/start_chat.png',
-                                height: 256,
-                              ),
-                              const Divider(height: 1),
-                            ],
-                          ),
-                        ),
-                        Center(
-                          child: StartChatFloatingActionButton(
-                            activeFilter: controller.activeFilter,
-                            roomsIsEmpty: true,
-                            scrolledToTop: controller.scrolledToTop,
+                          child: Icon(
+                            CupertinoIcons.chat_bubble_2,
+                            size: 128,
+                            color:
+                                Theme.of(context).colorScheme.onInverseSurface,
                           ),
                         ),
                       ],
diff --git a/lib/pages/chat_list/chat_list_view.dart b/lib/pages/chat_list/chat_list_view.dart
index 6cb9d3f0..bf506e66 100644
--- a/lib/pages/chat_list/chat_list_view.dart
+++ b/lib/pages/chat_list/chat_list_view.dart
@@ -192,7 +192,6 @@ class ChatListView extends StatelessWidget {
                           VRouter.of(context).to('/newprivatechat'),
                       helpLabel: L10n.of(context)!.newChat,
                       child: selectMode == SelectMode.normal &&
-                              controller.filteredRooms.isNotEmpty &&
                               !controller.isSearchMode
                           ? StartChatFloatingActionButton(
                               activeFilter: controller.activeFilter,