From 54e6ffd61b0c726e0d5cfa0f15e661e7942f6368 Mon Sep 17 00:00:00 2001
From: Jacob Shandling <61553566+jacobshandling@users.noreply.github.com>
Date: Thu, 24 Aug 2023 10:03:54 -0700
Subject: [PATCH] Fleet desktop: On Windows, replace light/dark icons with
 colorful icon (#13457)

---
 orbit/changes/12955-windows-desktop-icon-colors | 1 +
 orbit/cmd/desktop/desktop_windows.go            | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 orbit/changes/12955-windows-desktop-icon-colors

diff --git a/orbit/changes/12955-windows-desktop-icon-colors b/orbit/changes/12955-windows-desktop-icon-colors
new file mode 100644
index 0000000000..9bc7739e04
--- /dev/null
+++ b/orbit/changes/12955-windows-desktop-icon-colors
@@ -0,0 +1 @@
+* Replace the black and white Fleet desktop icons with a single colorful icon on Windows.
diff --git a/orbit/cmd/desktop/desktop_windows.go b/orbit/cmd/desktop/desktop_windows.go
index b9673fae4a..a4a8405f5c 100644
--- a/orbit/cmd/desktop/desktop_windows.go
+++ b/orbit/cmd/desktop/desktop_windows.go
@@ -18,10 +18,12 @@ import (
 // For Windows we must use ico format for the icon,
 // see https://github.com/getlantern/systray/blob/6065fda28be8c8d91aeb5e20de25e1600b8664a3/systray_windows.go#L850-L856.
 
-//go:embed icon_light.ico
+// since watchSystemTheme is currently buggy, we are using the same icon for both themes
+//
+//go:embed windows_app.ico
 var iconLight []byte
 
-//go:embed icon_dark.ico
+//go:embed windows_app.ico
 var iconDark []byte
 
 // Adapted from MIT licensed code in
@@ -63,6 +65,7 @@ func getSystemTheme() (theme, error) {
 	}
 }
 
+// since this logic is currently buggy, we are currently using the same icon for both themes
 func watchSystemTheme(iconManager *iconManager) {
 	for {
 		// Function call for proper defer semantics.