diff --git a/src/main/tray.ts b/src/main/tray.ts
index 0b2152e..ef1e3de 100644
--- a/src/main/tray.ts
+++ b/src/main/tray.ts
@@ -37,10 +37,8 @@ export async function setTrayIcon(iconName: string) {
     if (iconName === "icon" && lastBadgeCount && lastBadgeCount > 0) {
         var trayImage: NativeImage;
         if (isCustomIcon("icon")) {
-            console.log("setting badge and CUSTOM icon");
             trayImage = nativeImage.createFromPath(join(ICONS_DIR, "icon_custom.png"));
         } else {
-            console.log("setting badge and stock icon");
             trayImage = nativeImage.createFromPath(join(ICONS_DIR, "icon.png"));
         }
 
diff --git a/src/renderer/components/settings/TraySettings.tsx b/src/renderer/components/settings/TraySettings.tsx
index e502fa4..cab83ff 100644
--- a/src/renderer/components/settings/TraySettings.tsx
+++ b/src/renderer/components/settings/TraySettings.tsx
@@ -134,7 +134,9 @@ function TrayModalComponent({ modalProps, close }: { modalProps: any; close: ()
                                 {Settings[key] && (
                                     <Button
                                         onClick={() => {
-                                            Settings.trayMainOverride = false;
+                                            const iconKey =
+                                                statusToSettingsKey[iconName as keyof typeof statusToSettingsKey].key;
+                                            Settings[iconKey] = false;
                                             setCurrentTrayIcon();
                                         }}
                                         look={Button.Looks.LINK}