diff --git a/App/Client/Resource/icons/rabbit-black/svg/app-invert.svg b/App/Client/Resource/icons/rabbit-black/svg/app-invert.svg
new file mode 100644
index 000000000..701e169b2
--- /dev/null
+++ b/App/Client/Resource/icons/rabbit-black/svg/app-invert.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#ffffff" d="M440 90.5v176H136v-176h304m0-72H136c-39.8 0-72 32.2-72 72v176c0 39.8 32.2 72 72 72h304c39.8 0 72-32.2 72-72v-176c0-39.8-32.2-72-72-72zM888 658.8v176H584v-176h304m0-72H584c-39.8 0-72 32.2-72 72v176c0 39.8 32.2 72 72 72h304c39.8 0 72-32.2 72-72v-176c0-39.8-32.2-72-72-72z m-64.2-131.1c0 12.1-0.7 24-2 35.7-2.4 20.8 13.9 39.1 34.9 39.1 17.8 0 32.9-13.3 34.9-30.9 1.6-14.4 2.5-29 2.5-43.8 0-211.6-172.5-383.6-384.1-383-21.1 0.1-41.7 1.8-61.9 5.2v71.4c20.4-4.2 41.4-6.3 63-6.3C683.7 143 823.8 283 823.8 455.7zM512 768.5h-1c-172.7 0-312.8-140-312.8-312.8 0-5.5 0.1-41.9 0.4-47.3 1-20.1-15-36.9-35.1-36.9-18.7 0-34.1 14.7-35.1 33.4-0.3 6.6-0.5 44.2-0.5 50.8 0 211.9 172 383.5 384 383v-70.2z m-64-367c0-19.9-16.1-36-36-36H164c-19.9 0-36 16.1-36 36s16.1 36 36 36h248c19.9 0 36-16.1 36-36z m448 568c0-19.9-16.1-36-36-36H612c-19.9 0-36 16.1-36 36s16.1 36 36 36h248c19.9 0 36-16.1 36-36z" /></svg>
\ No newline at end of file
diff --git a/App/Client/mainwindow.cpp b/App/Client/mainwindow.cpp
index b604c2edf..e27e56dc6 100644
--- a/App/Client/mainwindow.cpp
+++ b/App/Client/mainwindow.cpp
@@ -45,6 +45,9 @@
 #include <QFileDialog>
 #include <QLoggingCategory>
 #include <QThread>
+#include <QGuiApplication>
+#include <QPalette>
+#include <QStyleHints>
 
 static Q_LOGGING_CATEGORY(log, "App.MainWindow")
 static Q_LOGGING_CATEGORY(logRecord, "App.MainWindow.Record")
@@ -1498,7 +1501,35 @@ void MainWindow::slotSystemTrayIconTypeChanged()
             this,
             SLOT(slotSystemTrayIconActivated(QSystemTrayIcon::ActivationReason)));
         Q_ASSERT(check);
-        m_TrayIcon->setIcon(this->windowIcon());
+
+        QSettings set(RabbitCommon::CDir::Instance()->GetFileUserConfigure(),
+                      QSettings::IniFormat);
+        QString szThemeName = set.value("Style/Icon/Theme").toString();
+
+        #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+            const auto scheme = QGuiApplication::styleHints()->colorScheme();
+            bool isDarkMode = scheme == Qt::ColorScheme::Dark;
+        #else
+            const QPalette defaultPalette;
+            const auto text = defaultPalette.color(QPalette::WindowText);
+            const auto window = defaultPalette.color(QPalette::Window);
+            bool isDarkMode = text.lightness() > window.lightness();
+        #endif // QT_VERSION
+
+        #ifdef Q_OS_MACOS
+            // Load white icon on macOS
+            if (szThemeName == "rabbit-black") {
+                m_TrayIcon->setIcon(QIcon::fromTheme("app-invert"));
+            }
+        #elif
+            if (isDarkMode && szThemeName == "rabbit-black") {
+                // Load white icon on dark system themes
+                m_TrayIcon->setIcon(QIcon::fromTheme("app-invert"));
+            } else {
+                m_TrayIcon->setIcon(this->windowIcon());
+            }
+        #endif
+
         m_TrayIcon->setToolTip(windowTitle());
         m_TrayIcon->show();
     } else