diff --git a/lib/components/default_app_bar_search_field.dart b/lib/components/default_app_bar_search_field.dart
index 4df93706..e31f48b3 100644
--- a/lib/components/default_app_bar_search_field.dart
+++ b/lib/components/default_app_bar_search_field.dart
@@ -59,7 +59,7 @@ class _DefaultAppBarSearchFieldState extends State<DefaultAppBarSearchField> {
   Widget build(BuildContext context) {
     return Container(
       height: 40,
-      padding: EdgeInsets.only(right: 16),
+      padding: EdgeInsets.only(right: 12),
       child: Material(
         color: Theme.of(context).secondaryHeaderColor,
         borderRadius: BorderRadius.circular(32),
diff --git a/lib/views/chat_list.dart b/lib/views/chat_list.dart
index aab8ec7d..897c006d 100644
--- a/lib/views/chat_list.dart
+++ b/lib/views/chat_list.dart
@@ -308,23 +308,8 @@ class _ChatListState extends State<ChatList> {
                                 );
                               }
                               final totalCount = rooms.length;
-                              return ListView.separated(
+                              return ListView.builder(
                                 controller: _scrollController,
-                                separatorBuilder:
-                                    (BuildContext context, int i) =>
-                                        i == totalCount
-                                            ? ListTile(
-                                                title: Text(
-                                                  L10n.of(context).publicRooms +
-                                                      ':',
-                                                  style: TextStyle(
-                                                    fontWeight: FontWeight.bold,
-                                                    color: Theme.of(context)
-                                                        .primaryColor,
-                                                  ),
-                                                ),
-                                              )
-                                            : Container(),
                                 itemCount: totalCount,
                                 itemBuilder: (BuildContext context, int i) =>
                                     ChatListItem(
diff --git a/lib/views/discover_view.dart b/lib/views/discover_view.dart
index 74d11126..78e1fc8d 100644
--- a/lib/views/discover_view.dart
+++ b/lib/views/discover_view.dart
@@ -154,7 +154,7 @@ class _DiscoverPageState extends State<DiscoverPage> {
             );
           }
           return GridView.builder(
-            padding: EdgeInsets.all(16),
+            padding: EdgeInsets.all(12),
             gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
               crossAxisCount: 2,
               childAspectRatio: 1,