diff --git a/src/calibre/gui2/progress_indicator/CalibreIconEngine.cpp b/src/calibre/gui2/progress_indicator/CalibreIconEngine.cpp
index eb39b6b5c2..53a40f02e2 100644
--- a/src/calibre/gui2/progress_indicator/CalibreIconEngine.cpp
+++ b/src/calibre/gui2/progress_indicator/CalibreIconEngine.cpp
@@ -421,11 +421,17 @@ class CalibreIconEngine : public QIconEngine {
         used_theme_key.store(current_theme_key.load());
         if (theme.using_dark_colors) {
             if (theme.has_dark_user_theme && try_with_key("calibre-user-dark"_L1)) return;
-            if (theme.has_any_user_theme && try_with_key("calibre-user-any"_L1)) return;
+            if (theme.has_any_user_theme) {
+                if (try_with_key("calibre-user-any-dark"_L1)) return;
+                if (try_with_key("calibre-user-any"_L1)) return;
+            }
             if (try_with_key("calibre-default-dark"_L1)) return;
         } else {
             if (theme.has_light_user_theme && try_with_key("calibre-user-light"_L1)) return;
-            if (theme.has_any_user_theme && try_with_key("calibre-user-any"_L1)) return;
+            if (theme.has_any_user_theme) {
+                if (try_with_key("calibre-user-any-light"_L1)) return;
+                if (try_with_key("calibre-user-any"_L1)) return;
+            }
             if (try_with_key("calibre-default-light"_L1)) return;
         }
         if (try_with_key("calibre-default"_L1)) return;