diff --git a/TODO.md b/TODO.md
index fd3f1a1c..210db5f4 100644
--- a/TODO.md
+++ b/TODO.md
@@ -12,6 +12,7 @@
 
 - lag when switching accounts
 - update glass theme
+- improve room highlight
 
 - if last room event is a membership change, it won't be visible in timeline
 - use uiState instead of open_room
diff --git a/src/gui/MainPane/AccountsBar.qml b/src/gui/MainPane/AccountsBar.qml
index c44a025c..f55ed13b 100644
--- a/src/gui/MainPane/AccountsBar.qml
+++ b/src/gui/MainPane/AccountsBar.qml
@@ -84,8 +84,7 @@ HColumnLayout {
                     anchors.right: parent.right
                     anchors.bottom: parent.bottom
 
-                    indicatorTheme:
-                        theme.accountView.roomList.room.unreadIndicator
+                    indicatorTheme: theme.accountView.account.unreadIndicator
                     unreads: model.total_unread
                     mentions: model.total_mentions
                 }
diff --git a/src/themes/Midnight.qpl b/src/themes/Midnight.qpl
index ad8da3e7..e72ea77a 100644
--- a/src/themes/Midnight.qpl
+++ b/src/themes/Midnight.qpl
@@ -297,6 +297,10 @@ accountView:
         color background: colors.strongBackground
         color name:       colors.text
 
+        unreadIndicator:
+            color background:        colors.accentBackground
+            color mentionBackground: colors.alertBackground
+
     roomList:
         color background: colors.mediumBackground