diff --git a/lib/components/list_items/chat_list_item.dart b/lib/components/list_items/chat_list_item.dart
index d3b836ca..a13de37b 100644
--- a/lib/components/list_items/chat_list_item.dart
+++ b/lib/components/list_items/chat_list_item.dart
@@ -244,7 +244,7 @@ class ChatListItem extends StatelessWidget {
                   padding: EdgeInsets.only(
                       right: room.notificationCount > 0 ? 4.0 : 0.0),
                   child: Icon(
-                    Icons.favorite_rounded,
+                    Icons.push_pin_outlined,
                     size: 20,
                     color: Theme.of(context).primaryColor,
                   ),
diff --git a/lib/views/chat_list.dart b/lib/views/chat_list.dart
index a211db76..9a5ed918 100644
--- a/lib/views/chat_list.dart
+++ b/lib/views/chat_list.dart
@@ -208,6 +208,12 @@ class _ChatListState extends State<ChatList> {
                 if (selectMode == SelectMode.share) {
                   _selectedRoomIds.clear();
                 }
+                Room selectedRoom;
+                if (_selectedRoomIds.length == 1) {
+                  selectedRoom = Matrix.of(context)
+                      .client
+                      .getRoomById(_selectedRoomIds.single);
+                }
                 return Scaffold(
                   drawer:
                       selectMode != SelectMode.normal ? null : DefaultDrawer(),
@@ -234,18 +240,23 @@ class _ChatListState extends State<ChatList> {
                             if (_selectedRoomIds.length == 1)
                               IconButton(
                                 tooltip: L10n.of(context).toggleUnread,
-                                icon: Icon(Icons.mark_chat_unread_outlined),
+                                icon: Icon(selectedRoom.isUnread
+                                    ? Icons.mark_chat_read_outlined
+                                    : Icons.mark_chat_unread_outlined),
                                 onPressed: () => _toggleUnread(context),
                               ),
                             if (_selectedRoomIds.length == 1)
                               IconButton(
                                 tooltip: L10n.of(context).toggleFavorite,
-                                icon: Icon(Icons.favorite_border_outlined),
+                                icon: Icon(Icons.push_pin_outlined),
                                 onPressed: () => _toggleFavouriteRoom(context),
                               ),
                             if (_selectedRoomIds.length == 1)
                               IconButton(
-                                icon: Icon(Icons.notifications_none_outlined),
+                                icon: Icon(selectedRoom.pushRuleState ==
+                                        PushRuleState.notify
+                                    ? Icons.notifications_off_outlined
+                                    : Icons.notifications_outlined),
                                 tooltip: L10n.of(context).toggleMuted,
                                 onPressed: () => _toggleMuted(context),
                               ),