diff --git a/lib/pages/views/chat_list_view.dart b/lib/pages/views/chat_list_view.dart
index 9b5e161f..4da82aea 100644
--- a/lib/pages/views/chat_list_view.dart
+++ b/lib/pages/views/chat_list_view.dart
@@ -240,11 +240,17 @@ class ChatListView extends StatelessWidget {
                                               return Container();
                                             }
                                             return Material(
-                                              color: Colors.orange,
+                                              color: Theme.of(context)
+                                                  .secondaryHeaderColor,
                                               child: ListTile(
                                                 leading: CircleAvatar(
-                                                  backgroundColor: Colors.white,
-                                                  foregroundColor: Colors.black,
+                                                  backgroundColor: Theme.of(
+                                                          context)
+                                                      .scaffoldBackgroundColor,
+                                                  foregroundColor:
+                                                      Theme.of(context)
+                                                          .colorScheme
+                                                          .secondaryVariant,
                                                   child: Icon(Icons.cloud),
                                                 ),
                                                 trailing: IconButton(
diff --git a/lib/pages/views/chat_view.dart b/lib/pages/views/chat_view.dart
index 85305f60..babca681 100644
--- a/lib/pages/views/chat_view.dart
+++ b/lib/pages/views/chat_view.dart
@@ -270,12 +270,7 @@ class ChatView extends StatelessWidget {
                               (BuildContext context, int i) {
                                 return i == controller.filteredEvents.length + 1
                                     ? controller.timeline.isRequestingHistory
-                                        ? Container(
-                                            height: 50,
-                                            alignment: Alignment.center,
-                                            padding: EdgeInsets.all(8),
-                                            child: CircularProgressIndicator(),
-                                          )
+                                        ? LinearProgressIndicator()
                                         : controller.canLoadMore
                                             ? Center(
                                               child: OutlinedButton(