diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/context-menu-open.png b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/dark/context-menu-open.png
similarity index 100%
rename from Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/context-menu-open.png
rename to Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/dark/context-menu-open.png
diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/context-menu-pause.png b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/dark/context-menu-pause.png
similarity index 100%
rename from Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/context-menu-pause.png
rename to Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/dark/context-menu-pause.png
diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/context-menu-quit.png b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/dark/context-menu-quit.png
similarity index 100%
rename from Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/context-menu-quit.png
rename to Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/dark/context-menu-quit.png
diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/context-menu-resume.png b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/dark/context-menu-resume.png
similarity index 100%
rename from Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/context-menu-resume.png
rename to Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/dark/context-menu-resume.png
diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/dark/normal-error.png b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/dark/normal-error.png
new file mode 100644
index 000000000..b99f7749c
Binary files /dev/null and b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/dark/normal-error.png differ
diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/dark/normal-pause.png b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/dark/normal-pause.png
new file mode 100644
index 000000000..54ab9241c
Binary files /dev/null and b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/dark/normal-pause.png differ
diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/dark/normal-running.png b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/dark/normal-running.png
new file mode 100644
index 000000000..42dc139df
Binary files /dev/null and b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/dark/normal-running.png differ
diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/dark/normal-warning.png b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/dark/normal-warning.png
new file mode 100644
index 000000000..ca0e6071b
Binary files /dev/null and b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/dark/normal-warning.png differ
diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/dark/normal.png b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/dark/normal.png
new file mode 100644
index 000000000..41b40e3ff
Binary files /dev/null and b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/dark/normal.png differ
diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/light/context-menu-open.png b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/light/context-menu-open.png
new file mode 100644
index 000000000..7c5890d39
Binary files /dev/null and b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/light/context-menu-open.png differ
diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/light/context-menu-pause.png b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/light/context-menu-pause.png
new file mode 100644
index 000000000..060d104bf
Binary files /dev/null and b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/light/context-menu-pause.png differ
diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/light/context-menu-quit.png b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/light/context-menu-quit.png
new file mode 100644
index 000000000..04cec0170
Binary files /dev/null and b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/light/context-menu-quit.png differ
diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/light/context-menu-resume.png b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/light/context-menu-resume.png
new file mode 100644
index 000000000..45cf30b6f
Binary files /dev/null and b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/light/context-menu-resume.png differ
diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/normal-error.png b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/light/normal-error.png
similarity index 100%
rename from Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/normal-error.png
rename to Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/light/normal-error.png
diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/normal-pause.png b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/light/normal-pause.png
similarity index 100%
rename from Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/normal-pause.png
rename to Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/light/normal-pause.png
diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/normal-running.png b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/light/normal-running.png
similarity index 100%
rename from Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/normal-running.png
rename to Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/light/normal-running.png
diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/normal-warning.png b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/light/normal-warning.png
similarity index 100%
rename from Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/normal-warning.png
rename to Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/light/normal-warning.png
diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/normal.png b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/light/normal.png
similarity index 100%
rename from Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/normal.png
rename to Duplicati/GUI/Duplicati.GUI.TrayIcon/Assets/icons/macos/light/normal.png
diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/AvaloniaRunner.cs b/Duplicati/GUI/Duplicati.GUI.TrayIcon/AvaloniaRunner.cs
index d9031039d..6c33ebb41 100644
--- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/AvaloniaRunner.cs
+++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/AvaloniaRunner.cs
@@ -209,10 +209,10 @@ namespace Duplicati.GUI.TrayIcon
 
         internal static string GetThemePath()
         {
-            // var isDark = string.Equals(Application.Current.ActualThemeVariant.ToString(), "Dark", StringComparison.OrdinalIgnoreCase);
+            var isDark = string.Equals(Application.Current.ActualThemeVariant.ToString(), "Dark", StringComparison.OrdinalIgnoreCase);
 
             if (OperatingSystem.IsMacOS())
-                return "macos";
+                return isDark ? "macos/dark" : "macos/light";
             if (OperatingSystem.IsWindows())
                 return "windows";