diff --git a/lib/components/list_items/presence_list_item.dart b/lib/components/list_items/presence_list_item.dart
index e41d36b..c9c9fb1 100644
--- a/lib/components/list_items/presence_list_item.dart
+++ b/lib/components/list_items/presence_list_item.dart
@@ -30,6 +30,7 @@ class PresenceListItem extends StatelessWidget {
         Matrix.of(context).client.presences[room.directChatMatrixID];
     final hasStatus = presence?.presence?.statusMsg != null;
     return InkWell(
+      borderRadius: BorderRadius.circular(8),
       onTap: () => presence?.presence?.statusMsg == null
           ? _startChatAction(context, user.id)
           : showDialog(
@@ -41,10 +42,10 @@ class PresenceListItem extends StatelessWidget {
               ),
             ),
       child: Container(
-        width: 80,
+        width: 76,
         child: Column(
           children: <Widget>[
-            SizedBox(height: 16),
+            SizedBox(height: 10),
             Container(
               child: Stack(
                 children: [
diff --git a/lib/views/chat_list.dart b/lib/views/chat_list.dart
index 0028428..528cae3 100644
--- a/lib/views/chat_list.dart
+++ b/lib/views/chat_list.dart
@@ -289,7 +289,7 @@ class _ChatListState extends State<ChatList> {
                           ),
                         ),
                   appBar: AppBar(
-                    //elevation: _scrolledToTop ? 0 : null,
+                    elevation: _scrolledToTop ? 0 : null,
                     leading: selectMode != SelectMode.share
                         ? null
                         : IconButton(
@@ -303,23 +303,28 @@ class _ChatListState extends State<ChatList> {
                         : Padding(
                             padding:
                                 EdgeInsets.only(top: 8, bottom: 8, right: 8),
-                            child: TextField(
-                              autocorrect: false,
-                              controller: searchController,
-                              focusNode: _searchFocusNode,
-                              decoration: InputDecoration(
-                                contentPadding: EdgeInsets.all(9),
-                                border: InputBorder.none,
-                                hintText: L10n.of(context).searchForAChat,
-                                suffixIcon: searchMode
-                                    ? IconButton(
-                                        icon: Icon(Icons.backspace),
-                                        onPressed: () => setState(() {
-                                          searchController.clear();
-                                          _searchFocusNode.unfocus();
-                                        }),
-                                      )
-                                    : null,
+                            child: Material(
+                              color: Theme.of(context).secondaryHeaderColor,
+                              borderRadius: BorderRadius.circular(32),
+                              child: TextField(
+                                autocorrect: false,
+                                controller: searchController,
+                                focusNode: _searchFocusNode,
+                                decoration: InputDecoration(
+                                  contentPadding: EdgeInsets.symmetric(
+                                      vertical: 9, horizontal: 16),
+                                  border: InputBorder.none,
+                                  hintText: L10n.of(context).searchForAChat,
+                                  suffixIcon: searchMode
+                                      ? IconButton(
+                                          icon: Icon(Icons.backspace),
+                                          onPressed: () => setState(() {
+                                            searchController.clear();
+                                            _searchFocusNode.unfocus();
+                                          }),
+                                        )
+                                      : null,
+                                ),
                               ),
                             ),
                           ),
@@ -434,9 +439,9 @@ class _ChatListState extends State<ChatList> {
                                                     ? Container()
                                                     : PreferredSize(
                                                         preferredSize:
-                                                            Size.fromHeight(90),
+                                                            Size.fromHeight(82),
                                                         child: Container(
-                                                          height: 82,
+                                                          height: 78,
                                                           child:
                                                               ListView.builder(
                                                             scrollDirection:
diff --git a/lib/views/settings_ignore_list.dart b/lib/views/settings_ignore_list.dart
index 4154a93..d7af91c 100644
--- a/lib/views/settings_ignore_list.dart
+++ b/lib/views/settings_ignore_list.dart
@@ -3,16 +3,16 @@ import 'package:fluffychat/components/adaptive_page_layout.dart';
 import 'package:fluffychat/components/avatar.dart';
 import 'package:fluffychat/components/dialogs/simple_dialogs.dart';
 import 'package:fluffychat/l10n/l10n.dart';
-import 'package:fluffychat/views/settings.dart';
 import 'package:flutter/material.dart';
 import '../components/matrix.dart';
+import 'chat_list.dart';
 
 class SettingsIgnoreListView extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return AdaptivePageLayout(
       primaryPage: FocusPage.SECOND,
-      firstScaffold: Settings(),
+      firstScaffold: ChatList(),
       secondScaffold: SettingsIgnoreList(),
     );
   }