diff --git a/web/backend/main.go b/web/backend/main.go
index 2f181603e..6987a4515 100644
--- a/web/backend/main.go
+++ b/web/backend/main.go
@@ -98,7 +98,7 @@ func main() {
 		defer logger.DisableFileLogging()
 	}
 
-	logger.InfoC("web", "PicoClaw Launcher starting...")
+	logger.InfoC("web", fmt.Sprintf("%s Launcher %s starting...", appName, appVersion))
 	logger.InfoC("web", fmt.Sprintf("PicoClaw Home: %s", picoHome))
 
 	// Set language from command line or auto-detect
diff --git a/web/backend/systray.go b/web/backend/systray.go
index fde2e115e..9dcc025df 100644
--- a/web/backend/systray.go
+++ b/web/backend/systray.go
@@ -3,7 +3,6 @@
 package main
 
 import (
-	_ "embed"
 	"fmt"
 
 	"fyne.io/systray"
@@ -93,8 +92,3 @@ func onReady() {
 func onExit() {
 	logger.Info(T(Exiting))
 }
-
-// getIcon returns the system tray icon
-func getIcon() []byte {
-	return iconData
-}
diff --git a/web/backend/systray_icon_nonwindows.go b/web/backend/systray_icon_nonwindows.go
new file mode 100644
index 000000000..0117a9ae8
--- /dev/null
+++ b/web/backend/systray_icon_nonwindows.go
@@ -0,0 +1,12 @@
+//go:build !windows && ((!darwin && !freebsd) || cgo)
+
+package main
+
+import _ "embed"
+
+//go:embed icon.png
+var iconPNG []byte
+
+func getIcon() []byte {
+	return iconPNG
+}
diff --git a/web/backend/systray_windows.go b/web/backend/systray_icon_windows.go
similarity index 53%
rename from web/backend/systray_windows.go
rename to web/backend/systray_icon_windows.go
index cc1885155..c265e2f9c 100644
--- a/web/backend/systray_windows.go
+++ b/web/backend/systray_icon_windows.go
@@ -5,4 +5,8 @@ package main
 import _ "embed"
 
 //go:embed icon.ico
-var iconData []byte
+var iconICO []byte
+
+func getIcon() []byte {
+	return iconICO
+}
diff --git a/web/backend/tray_stub_nocgo.go b/web/backend/systray_stub_nocgo.go
similarity index 88%
rename from web/backend/tray_stub_nocgo.go
rename to web/backend/systray_stub_nocgo.go
index 13ecfd2cb..9e75e112a 100644
--- a/web/backend/tray_stub_nocgo.go
+++ b/web/backend/systray_stub_nocgo.go
@@ -13,6 +13,7 @@ import (
 	"github.com/sipeed/picoclaw/pkg/logger"
 )
 
+// runTray falls back to a headless mode on platforms where systray requires cgo.
 func runTray() {
 	logger.Infof("System tray is unavailable in %s builds without cgo; running without tray", runtime.GOOS)
 
diff --git a/web/backend/systray_unix.go b/web/backend/systray_unix.go
deleted file mode 100644
index 0f9d2bb51..000000000
--- a/web/backend/systray_unix.go
+++ /dev/null
@@ -1,8 +0,0 @@
-//go:build !windows
-
-package main
-
-import _ "embed"
-
-//go:embed icon.png
-var iconData []byte