diff --git a/app/SystemTrayService.ts b/app/SystemTrayService.ts
index 4a60360b56..b072efa2e1 100644
--- a/app/SystemTrayService.ts
+++ b/app/SystemTrayService.ts
@@ -8,7 +8,6 @@ import { join } from 'node:path';
 import { readFileSync } from 'node:fs';
 import * as log from '../ts/logging/log';
 import type { LocalizerType } from '../ts/types/I18N';
-import { SystemThemeType } from '../ts/types/Util';
 
 export type SystemTrayServiceOptionsType = Readonly<{
   i18n: LocalizerType;
@@ -276,23 +275,19 @@ function getVariantForScaleFactor(scaleFactor: number) {
   return match ?? Variant.Size32;
 }
 
-function getTrayIconImagePath(
-  size: number,
-  theme: SystemThemeType,
-  unreadCount: number
-): string {
+function getTrayIconImagePath(size: number, unreadCount: number): string {
   let dirName: string;
   let fileName: string;
 
   if (unreadCount === 0) {
     dirName = 'base';
-    fileName = `signal-tray-icon-${size}x${size}-${theme}-base.png`;
+    fileName = `signal-tray-icon-${size}x${size}-base.png`;
   } else if (unreadCount < 10) {
     dirName = 'alert';
-    fileName = `signal-tray-icon-${size}x${size}-${theme}-alert-${unreadCount}.png`;
+    fileName = `signal-tray-icon-${size}x${size}-alert-${unreadCount}.png`;
   } else {
     dirName = 'alert';
-    fileName = `signal-tray-icon-${size}x${size}-${theme}-alert-9+.png`;
+    fileName = `signal-tray-icon-${size}x${size}-alert-9+.png`;
   }
 
   const iconPath = join(
@@ -310,11 +305,7 @@ function getTrayIconImagePath(
 const TrayIconCache = new Map<string, NativeImage>();
 
 function getIcon(unreadCount: number) {
-  const theme = nativeTheme.shouldUseDarkColors
-    ? SystemThemeType.dark
-    : SystemThemeType.light;
-
-  const cacheKey = `${theme}-${unreadCount}`;
+  const cacheKey = `${Math.min(unreadCount, 10)}`;
 
   const cached = TrayIconCache.get(cacheKey);
   if (cached != null) {
@@ -331,7 +322,7 @@ function getIcon(unreadCount: number) {
     // We choose the best icon based on the highest display scale factor.
     const scaleFactor = getDisplaysMaxScaleFactor();
     const variant = getVariantForScaleFactor(scaleFactor);
-    const iconPath = getTrayIconImagePath(variant.size, theme, unreadCount);
+    const iconPath = getTrayIconImagePath(variant.size, unreadCount);
     const buffer = readFileSync(iconPath);
     image = nativeImage.createFromBuffer(buffer, {
       scaleFactor: 1.0, // Must be 1.0 for Linux
@@ -343,7 +334,7 @@ function getIcon(unreadCount: number) {
     image = nativeImage.createEmpty();
 
     for (const variant of Variants) {
-      const iconPath = getTrayIconImagePath(variant.size, theme, unreadCount);
+      const iconPath = getTrayIconImagePath(variant.size, unreadCount);
       const buffer = readFileSync(iconPath);
       image.addRepresentation({
         buffer,
diff --git a/build/icon.ico b/build/icon.ico
index e2222cd593..68c5119aa7 100644
Binary files a/build/icon.ico and b/build/icon.ico differ
diff --git a/images/tray-icons/alert/signal-tray-icon-16x16-alert-1.png b/images/tray-icons/alert/signal-tray-icon-16x16-alert-1.png
new file mode 100644
index 0000000000..c383620ebe
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-16x16-alert-1.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-16x16-alert-2.png b/images/tray-icons/alert/signal-tray-icon-16x16-alert-2.png
new file mode 100644
index 0000000000..b8fac57969
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-16x16-alert-2.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-16x16-alert-3.png b/images/tray-icons/alert/signal-tray-icon-16x16-alert-3.png
new file mode 100644
index 0000000000..4ad6580d1b
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-16x16-alert-3.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-16x16-alert-4.png b/images/tray-icons/alert/signal-tray-icon-16x16-alert-4.png
new file mode 100644
index 0000000000..a3635c3800
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-16x16-alert-4.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-16x16-alert-5.png b/images/tray-icons/alert/signal-tray-icon-16x16-alert-5.png
new file mode 100644
index 0000000000..e4131ef7b9
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-16x16-alert-5.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-16x16-alert-6.png b/images/tray-icons/alert/signal-tray-icon-16x16-alert-6.png
new file mode 100644
index 0000000000..a7fa7527ae
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-16x16-alert-6.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-16x16-alert-7.png b/images/tray-icons/alert/signal-tray-icon-16x16-alert-7.png
new file mode 100644
index 0000000000..734e840397
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-16x16-alert-7.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-16x16-alert-8.png b/images/tray-icons/alert/signal-tray-icon-16x16-alert-8.png
new file mode 100644
index 0000000000..8345a248c1
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-16x16-alert-8.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-16x16-alert-9+.png b/images/tray-icons/alert/signal-tray-icon-16x16-alert-9+.png
new file mode 100644
index 0000000000..1341373d37
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-16x16-alert-9+.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-16x16-alert-9.png b/images/tray-icons/alert/signal-tray-icon-16x16-alert-9.png
new file mode 100644
index 0000000000..d8449a34f5
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-16x16-alert-9.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-16x16-dark-alert-1.png b/images/tray-icons/alert/signal-tray-icon-16x16-dark-alert-1.png
deleted file mode 100644
index 097ab8bda4..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-16x16-dark-alert-1.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-16x16-dark-alert-2.png b/images/tray-icons/alert/signal-tray-icon-16x16-dark-alert-2.png
deleted file mode 100644
index 62ea4a6c87..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-16x16-dark-alert-2.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-16x16-dark-alert-3.png b/images/tray-icons/alert/signal-tray-icon-16x16-dark-alert-3.png
deleted file mode 100644
index c1738383ba..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-16x16-dark-alert-3.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-16x16-dark-alert-4.png b/images/tray-icons/alert/signal-tray-icon-16x16-dark-alert-4.png
deleted file mode 100644
index 6019eefe32..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-16x16-dark-alert-4.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-16x16-dark-alert-5.png b/images/tray-icons/alert/signal-tray-icon-16x16-dark-alert-5.png
deleted file mode 100644
index 94ae43ec2d..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-16x16-dark-alert-5.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-16x16-dark-alert-6.png b/images/tray-icons/alert/signal-tray-icon-16x16-dark-alert-6.png
deleted file mode 100644
index 020263f410..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-16x16-dark-alert-6.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-16x16-dark-alert-7.png b/images/tray-icons/alert/signal-tray-icon-16x16-dark-alert-7.png
deleted file mode 100644
index 3ae81daf13..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-16x16-dark-alert-7.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-16x16-dark-alert-8.png b/images/tray-icons/alert/signal-tray-icon-16x16-dark-alert-8.png
deleted file mode 100644
index 170275a702..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-16x16-dark-alert-8.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-16x16-dark-alert-9+.png b/images/tray-icons/alert/signal-tray-icon-16x16-dark-alert-9+.png
deleted file mode 100644
index 31c3a2be2c..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-16x16-dark-alert-9+.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-16x16-dark-alert-9.png b/images/tray-icons/alert/signal-tray-icon-16x16-dark-alert-9.png
deleted file mode 100644
index 6fd82b88c1..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-16x16-dark-alert-9.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-16x16-light-alert-1.png b/images/tray-icons/alert/signal-tray-icon-16x16-light-alert-1.png
deleted file mode 100644
index da82757581..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-16x16-light-alert-1.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-16x16-light-alert-2.png b/images/tray-icons/alert/signal-tray-icon-16x16-light-alert-2.png
deleted file mode 100644
index 96c9c8478d..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-16x16-light-alert-2.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-16x16-light-alert-3.png b/images/tray-icons/alert/signal-tray-icon-16x16-light-alert-3.png
deleted file mode 100644
index 0124d7a5d5..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-16x16-light-alert-3.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-16x16-light-alert-4.png b/images/tray-icons/alert/signal-tray-icon-16x16-light-alert-4.png
deleted file mode 100644
index f1de8b3086..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-16x16-light-alert-4.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-16x16-light-alert-5.png b/images/tray-icons/alert/signal-tray-icon-16x16-light-alert-5.png
deleted file mode 100644
index bfcdec1824..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-16x16-light-alert-5.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-16x16-light-alert-6.png b/images/tray-icons/alert/signal-tray-icon-16x16-light-alert-6.png
deleted file mode 100644
index 58a092fdc0..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-16x16-light-alert-6.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-16x16-light-alert-7.png b/images/tray-icons/alert/signal-tray-icon-16x16-light-alert-7.png
deleted file mode 100644
index 3b64576361..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-16x16-light-alert-7.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-16x16-light-alert-8.png b/images/tray-icons/alert/signal-tray-icon-16x16-light-alert-8.png
deleted file mode 100644
index 52b26b08b7..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-16x16-light-alert-8.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-16x16-light-alert-9+.png b/images/tray-icons/alert/signal-tray-icon-16x16-light-alert-9+.png
deleted file mode 100644
index 6de775b2e9..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-16x16-light-alert-9+.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-16x16-light-alert-9.png b/images/tray-icons/alert/signal-tray-icon-16x16-light-alert-9.png
deleted file mode 100644
index ce857845b0..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-16x16-light-alert-9.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-256x256-alert-1.png b/images/tray-icons/alert/signal-tray-icon-256x256-alert-1.png
new file mode 100644
index 0000000000..bc4910cf35
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-256x256-alert-1.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-256x256-alert-2.png b/images/tray-icons/alert/signal-tray-icon-256x256-alert-2.png
new file mode 100644
index 0000000000..b9d37cb70b
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-256x256-alert-2.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-256x256-alert-3.png b/images/tray-icons/alert/signal-tray-icon-256x256-alert-3.png
new file mode 100644
index 0000000000..1fc79d542c
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-256x256-alert-3.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-256x256-alert-4.png b/images/tray-icons/alert/signal-tray-icon-256x256-alert-4.png
new file mode 100644
index 0000000000..e8a668406f
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-256x256-alert-4.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-256x256-alert-5.png b/images/tray-icons/alert/signal-tray-icon-256x256-alert-5.png
new file mode 100644
index 0000000000..4abfee7b3c
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-256x256-alert-5.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-256x256-alert-6.png b/images/tray-icons/alert/signal-tray-icon-256x256-alert-6.png
new file mode 100644
index 0000000000..01f10ad849
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-256x256-alert-6.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-256x256-alert-7.png b/images/tray-icons/alert/signal-tray-icon-256x256-alert-7.png
new file mode 100644
index 0000000000..23fa4a94f5
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-256x256-alert-7.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-256x256-alert-8.png b/images/tray-icons/alert/signal-tray-icon-256x256-alert-8.png
new file mode 100644
index 0000000000..cf579ec55c
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-256x256-alert-8.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-256x256-alert-9+.png b/images/tray-icons/alert/signal-tray-icon-256x256-alert-9+.png
new file mode 100644
index 0000000000..e0fa685dbb
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-256x256-alert-9+.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-256x256-alert-9.png b/images/tray-icons/alert/signal-tray-icon-256x256-alert-9.png
new file mode 100644
index 0000000000..a128619619
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-256x256-alert-9.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-256x256-dark-alert-1.png b/images/tray-icons/alert/signal-tray-icon-256x256-dark-alert-1.png
deleted file mode 100644
index e20cc7f49f..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-256x256-dark-alert-1.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-256x256-dark-alert-2.png b/images/tray-icons/alert/signal-tray-icon-256x256-dark-alert-2.png
deleted file mode 100644
index 9dc572498d..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-256x256-dark-alert-2.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-256x256-dark-alert-3.png b/images/tray-icons/alert/signal-tray-icon-256x256-dark-alert-3.png
deleted file mode 100644
index 8e2e154e7a..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-256x256-dark-alert-3.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-256x256-dark-alert-4.png b/images/tray-icons/alert/signal-tray-icon-256x256-dark-alert-4.png
deleted file mode 100644
index 737e95e83d..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-256x256-dark-alert-4.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-256x256-dark-alert-5.png b/images/tray-icons/alert/signal-tray-icon-256x256-dark-alert-5.png
deleted file mode 100644
index 5c1aa6ebe7..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-256x256-dark-alert-5.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-256x256-dark-alert-6.png b/images/tray-icons/alert/signal-tray-icon-256x256-dark-alert-6.png
deleted file mode 100644
index b9dc763e36..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-256x256-dark-alert-6.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-256x256-dark-alert-7.png b/images/tray-icons/alert/signal-tray-icon-256x256-dark-alert-7.png
deleted file mode 100644
index 3a0c145465..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-256x256-dark-alert-7.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-256x256-dark-alert-8.png b/images/tray-icons/alert/signal-tray-icon-256x256-dark-alert-8.png
deleted file mode 100644
index f6ec1c70da..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-256x256-dark-alert-8.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-256x256-dark-alert-9+.png b/images/tray-icons/alert/signal-tray-icon-256x256-dark-alert-9+.png
deleted file mode 100644
index c1c724be8d..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-256x256-dark-alert-9+.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-256x256-dark-alert-9.png b/images/tray-icons/alert/signal-tray-icon-256x256-dark-alert-9.png
deleted file mode 100644
index 7739bbf460..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-256x256-dark-alert-9.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-256x256-light-alert-1.png b/images/tray-icons/alert/signal-tray-icon-256x256-light-alert-1.png
deleted file mode 100644
index eb9383e560..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-256x256-light-alert-1.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-256x256-light-alert-2.png b/images/tray-icons/alert/signal-tray-icon-256x256-light-alert-2.png
deleted file mode 100644
index 66cacef667..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-256x256-light-alert-2.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-256x256-light-alert-3.png b/images/tray-icons/alert/signal-tray-icon-256x256-light-alert-3.png
deleted file mode 100644
index 54d3d417bb..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-256x256-light-alert-3.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-256x256-light-alert-4.png b/images/tray-icons/alert/signal-tray-icon-256x256-light-alert-4.png
deleted file mode 100644
index 4801f9bdea..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-256x256-light-alert-4.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-256x256-light-alert-5.png b/images/tray-icons/alert/signal-tray-icon-256x256-light-alert-5.png
deleted file mode 100644
index 0cfe4de19c..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-256x256-light-alert-5.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-256x256-light-alert-6.png b/images/tray-icons/alert/signal-tray-icon-256x256-light-alert-6.png
deleted file mode 100644
index ce83d02db9..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-256x256-light-alert-6.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-256x256-light-alert-7.png b/images/tray-icons/alert/signal-tray-icon-256x256-light-alert-7.png
deleted file mode 100644
index 0ff553dbde..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-256x256-light-alert-7.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-256x256-light-alert-8.png b/images/tray-icons/alert/signal-tray-icon-256x256-light-alert-8.png
deleted file mode 100644
index 3149bd6917..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-256x256-light-alert-8.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-256x256-light-alert-9+.png b/images/tray-icons/alert/signal-tray-icon-256x256-light-alert-9+.png
deleted file mode 100644
index 9fc7c4d399..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-256x256-light-alert-9+.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-256x256-light-alert-9.png b/images/tray-icons/alert/signal-tray-icon-256x256-light-alert-9.png
deleted file mode 100644
index 8bc39230e7..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-256x256-light-alert-9.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-32x32-alert-1.png b/images/tray-icons/alert/signal-tray-icon-32x32-alert-1.png
new file mode 100644
index 0000000000..7f389b4772
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-32x32-alert-1.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-32x32-alert-2.png b/images/tray-icons/alert/signal-tray-icon-32x32-alert-2.png
new file mode 100644
index 0000000000..dab95e5669
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-32x32-alert-2.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-32x32-alert-3.png b/images/tray-icons/alert/signal-tray-icon-32x32-alert-3.png
new file mode 100644
index 0000000000..bd7998b28d
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-32x32-alert-3.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-32x32-alert-4.png b/images/tray-icons/alert/signal-tray-icon-32x32-alert-4.png
new file mode 100644
index 0000000000..913ff9b56f
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-32x32-alert-4.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-32x32-alert-5.png b/images/tray-icons/alert/signal-tray-icon-32x32-alert-5.png
new file mode 100644
index 0000000000..f8a48d02b6
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-32x32-alert-5.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-32x32-alert-6.png b/images/tray-icons/alert/signal-tray-icon-32x32-alert-6.png
new file mode 100644
index 0000000000..c17ebe0194
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-32x32-alert-6.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-32x32-alert-7.png b/images/tray-icons/alert/signal-tray-icon-32x32-alert-7.png
new file mode 100644
index 0000000000..649eaa921b
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-32x32-alert-7.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-32x32-alert-8.png b/images/tray-icons/alert/signal-tray-icon-32x32-alert-8.png
new file mode 100644
index 0000000000..78b65a868d
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-32x32-alert-8.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-32x32-alert-9+.png b/images/tray-icons/alert/signal-tray-icon-32x32-alert-9+.png
new file mode 100644
index 0000000000..9f6b7ca854
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-32x32-alert-9+.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-32x32-alert-9.png b/images/tray-icons/alert/signal-tray-icon-32x32-alert-9.png
new file mode 100644
index 0000000000..59a9f97b86
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-32x32-alert-9.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-32x32-dark-alert-1.png b/images/tray-icons/alert/signal-tray-icon-32x32-dark-alert-1.png
deleted file mode 100644
index 7e5fed8c09..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-32x32-dark-alert-1.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-32x32-dark-alert-2.png b/images/tray-icons/alert/signal-tray-icon-32x32-dark-alert-2.png
deleted file mode 100644
index 94e13c9fbe..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-32x32-dark-alert-2.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-32x32-dark-alert-3.png b/images/tray-icons/alert/signal-tray-icon-32x32-dark-alert-3.png
deleted file mode 100644
index 218fe72ce0..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-32x32-dark-alert-3.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-32x32-dark-alert-4.png b/images/tray-icons/alert/signal-tray-icon-32x32-dark-alert-4.png
deleted file mode 100644
index 994918717b..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-32x32-dark-alert-4.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-32x32-dark-alert-5.png b/images/tray-icons/alert/signal-tray-icon-32x32-dark-alert-5.png
deleted file mode 100644
index 0e801dae30..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-32x32-dark-alert-5.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-32x32-dark-alert-6.png b/images/tray-icons/alert/signal-tray-icon-32x32-dark-alert-6.png
deleted file mode 100644
index 7e9964c21a..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-32x32-dark-alert-6.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-32x32-dark-alert-7.png b/images/tray-icons/alert/signal-tray-icon-32x32-dark-alert-7.png
deleted file mode 100644
index 0890ba653a..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-32x32-dark-alert-7.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-32x32-dark-alert-8.png b/images/tray-icons/alert/signal-tray-icon-32x32-dark-alert-8.png
deleted file mode 100644
index e0c729595e..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-32x32-dark-alert-8.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-32x32-dark-alert-9+.png b/images/tray-icons/alert/signal-tray-icon-32x32-dark-alert-9+.png
deleted file mode 100644
index a85d27cee9..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-32x32-dark-alert-9+.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-32x32-dark-alert-9.png b/images/tray-icons/alert/signal-tray-icon-32x32-dark-alert-9.png
deleted file mode 100644
index 206faec1b5..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-32x32-dark-alert-9.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-32x32-light-alert-1.png b/images/tray-icons/alert/signal-tray-icon-32x32-light-alert-1.png
deleted file mode 100644
index 54950c6e85..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-32x32-light-alert-1.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-32x32-light-alert-2.png b/images/tray-icons/alert/signal-tray-icon-32x32-light-alert-2.png
deleted file mode 100644
index e99ca3e765..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-32x32-light-alert-2.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-32x32-light-alert-3.png b/images/tray-icons/alert/signal-tray-icon-32x32-light-alert-3.png
deleted file mode 100644
index 782ea967f7..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-32x32-light-alert-3.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-32x32-light-alert-4.png b/images/tray-icons/alert/signal-tray-icon-32x32-light-alert-4.png
deleted file mode 100644
index e21495b084..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-32x32-light-alert-4.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-32x32-light-alert-5.png b/images/tray-icons/alert/signal-tray-icon-32x32-light-alert-5.png
deleted file mode 100644
index 1dfa2a122f..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-32x32-light-alert-5.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-32x32-light-alert-6.png b/images/tray-icons/alert/signal-tray-icon-32x32-light-alert-6.png
deleted file mode 100644
index 2312bfb628..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-32x32-light-alert-6.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-32x32-light-alert-7.png b/images/tray-icons/alert/signal-tray-icon-32x32-light-alert-7.png
deleted file mode 100644
index 8b12a24b0f..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-32x32-light-alert-7.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-32x32-light-alert-8.png b/images/tray-icons/alert/signal-tray-icon-32x32-light-alert-8.png
deleted file mode 100644
index 269b62b211..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-32x32-light-alert-8.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-32x32-light-alert-9+.png b/images/tray-icons/alert/signal-tray-icon-32x32-light-alert-9+.png
deleted file mode 100644
index e9ff89ef40..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-32x32-light-alert-9+.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-32x32-light-alert-9.png b/images/tray-icons/alert/signal-tray-icon-32x32-light-alert-9.png
deleted file mode 100644
index 34b90e8726..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-32x32-light-alert-9.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-48x48-alert-1.png b/images/tray-icons/alert/signal-tray-icon-48x48-alert-1.png
new file mode 100644
index 0000000000..31dc3c09ba
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-48x48-alert-1.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-48x48-alert-2.png b/images/tray-icons/alert/signal-tray-icon-48x48-alert-2.png
new file mode 100644
index 0000000000..f39a90954e
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-48x48-alert-2.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-48x48-alert-3.png b/images/tray-icons/alert/signal-tray-icon-48x48-alert-3.png
new file mode 100644
index 0000000000..8f45811cd0
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-48x48-alert-3.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-48x48-alert-4.png b/images/tray-icons/alert/signal-tray-icon-48x48-alert-4.png
new file mode 100644
index 0000000000..c1e14b23f2
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-48x48-alert-4.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-48x48-alert-5.png b/images/tray-icons/alert/signal-tray-icon-48x48-alert-5.png
new file mode 100644
index 0000000000..89b535fece
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-48x48-alert-5.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-48x48-alert-6.png b/images/tray-icons/alert/signal-tray-icon-48x48-alert-6.png
new file mode 100644
index 0000000000..0e8577b20a
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-48x48-alert-6.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-48x48-alert-7.png b/images/tray-icons/alert/signal-tray-icon-48x48-alert-7.png
new file mode 100644
index 0000000000..36c88150ba
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-48x48-alert-7.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-48x48-alert-8.png b/images/tray-icons/alert/signal-tray-icon-48x48-alert-8.png
new file mode 100644
index 0000000000..bc49a98556
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-48x48-alert-8.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-48x48-alert-9+.png b/images/tray-icons/alert/signal-tray-icon-48x48-alert-9+.png
new file mode 100644
index 0000000000..15cc80c790
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-48x48-alert-9+.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-48x48-alert-9.png b/images/tray-icons/alert/signal-tray-icon-48x48-alert-9.png
new file mode 100644
index 0000000000..d04d748f62
Binary files /dev/null and b/images/tray-icons/alert/signal-tray-icon-48x48-alert-9.png differ
diff --git a/images/tray-icons/alert/signal-tray-icon-48x48-dark-alert-1.png b/images/tray-icons/alert/signal-tray-icon-48x48-dark-alert-1.png
deleted file mode 100644
index 8f53724220..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-48x48-dark-alert-1.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-48x48-dark-alert-2.png b/images/tray-icons/alert/signal-tray-icon-48x48-dark-alert-2.png
deleted file mode 100644
index a313afd044..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-48x48-dark-alert-2.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-48x48-dark-alert-3.png b/images/tray-icons/alert/signal-tray-icon-48x48-dark-alert-3.png
deleted file mode 100644
index 017daa4190..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-48x48-dark-alert-3.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-48x48-dark-alert-4.png b/images/tray-icons/alert/signal-tray-icon-48x48-dark-alert-4.png
deleted file mode 100644
index 97bb35b045..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-48x48-dark-alert-4.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-48x48-dark-alert-5.png b/images/tray-icons/alert/signal-tray-icon-48x48-dark-alert-5.png
deleted file mode 100644
index 04ddb3edb4..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-48x48-dark-alert-5.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-48x48-dark-alert-6.png b/images/tray-icons/alert/signal-tray-icon-48x48-dark-alert-6.png
deleted file mode 100644
index 1ac7948738..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-48x48-dark-alert-6.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-48x48-dark-alert-7.png b/images/tray-icons/alert/signal-tray-icon-48x48-dark-alert-7.png
deleted file mode 100644
index 2c560c8b49..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-48x48-dark-alert-7.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-48x48-dark-alert-8.png b/images/tray-icons/alert/signal-tray-icon-48x48-dark-alert-8.png
deleted file mode 100644
index 2cbe8ff6b0..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-48x48-dark-alert-8.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-48x48-dark-alert-9+.png b/images/tray-icons/alert/signal-tray-icon-48x48-dark-alert-9+.png
deleted file mode 100644
index d257218cc6..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-48x48-dark-alert-9+.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-48x48-dark-alert-9.png b/images/tray-icons/alert/signal-tray-icon-48x48-dark-alert-9.png
deleted file mode 100644
index 353a8f6276..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-48x48-dark-alert-9.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-48x48-light-alert-1.png b/images/tray-icons/alert/signal-tray-icon-48x48-light-alert-1.png
deleted file mode 100644
index a478fbf0bf..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-48x48-light-alert-1.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-48x48-light-alert-2.png b/images/tray-icons/alert/signal-tray-icon-48x48-light-alert-2.png
deleted file mode 100644
index 37278b99b8..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-48x48-light-alert-2.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-48x48-light-alert-3.png b/images/tray-icons/alert/signal-tray-icon-48x48-light-alert-3.png
deleted file mode 100644
index 6c89cd251e..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-48x48-light-alert-3.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-48x48-light-alert-4.png b/images/tray-icons/alert/signal-tray-icon-48x48-light-alert-4.png
deleted file mode 100644
index d3d31b1469..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-48x48-light-alert-4.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-48x48-light-alert-5.png b/images/tray-icons/alert/signal-tray-icon-48x48-light-alert-5.png
deleted file mode 100644
index 3c17b095a5..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-48x48-light-alert-5.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-48x48-light-alert-6.png b/images/tray-icons/alert/signal-tray-icon-48x48-light-alert-6.png
deleted file mode 100644
index 87988cc08c..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-48x48-light-alert-6.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-48x48-light-alert-7.png b/images/tray-icons/alert/signal-tray-icon-48x48-light-alert-7.png
deleted file mode 100644
index 072fcc2470..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-48x48-light-alert-7.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-48x48-light-alert-8.png b/images/tray-icons/alert/signal-tray-icon-48x48-light-alert-8.png
deleted file mode 100644
index 934959ac8d..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-48x48-light-alert-8.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-48x48-light-alert-9+.png b/images/tray-icons/alert/signal-tray-icon-48x48-light-alert-9+.png
deleted file mode 100644
index 5aa59e392b..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-48x48-light-alert-9+.png and /dev/null differ
diff --git a/images/tray-icons/alert/signal-tray-icon-48x48-light-alert-9.png b/images/tray-icons/alert/signal-tray-icon-48x48-light-alert-9.png
deleted file mode 100644
index cc5a59f8e6..0000000000
Binary files a/images/tray-icons/alert/signal-tray-icon-48x48-light-alert-9.png and /dev/null differ
diff --git a/images/tray-icons/base/signal-tray-icon-16x16-base.png b/images/tray-icons/base/signal-tray-icon-16x16-base.png
new file mode 100644
index 0000000000..12b3cdd724
Binary files /dev/null and b/images/tray-icons/base/signal-tray-icon-16x16-base.png differ
diff --git a/images/tray-icons/base/signal-tray-icon-16x16-dark-base.png b/images/tray-icons/base/signal-tray-icon-16x16-dark-base.png
deleted file mode 100644
index 7a4f014d3b..0000000000
Binary files a/images/tray-icons/base/signal-tray-icon-16x16-dark-base.png and /dev/null differ
diff --git a/images/tray-icons/base/signal-tray-icon-16x16-light-base.png b/images/tray-icons/base/signal-tray-icon-16x16-light-base.png
deleted file mode 100644
index 178d2f8191..0000000000
Binary files a/images/tray-icons/base/signal-tray-icon-16x16-light-base.png and /dev/null differ
diff --git a/images/tray-icons/base/signal-tray-icon-256x256-base.png b/images/tray-icons/base/signal-tray-icon-256x256-base.png
new file mode 100644
index 0000000000..5bb556872a
Binary files /dev/null and b/images/tray-icons/base/signal-tray-icon-256x256-base.png differ
diff --git a/images/tray-icons/base/signal-tray-icon-256x256-dark-base.png b/images/tray-icons/base/signal-tray-icon-256x256-dark-base.png
deleted file mode 100644
index ecd766a8e7..0000000000
Binary files a/images/tray-icons/base/signal-tray-icon-256x256-dark-base.png and /dev/null differ
diff --git a/images/tray-icons/base/signal-tray-icon-256x256-light-base.png b/images/tray-icons/base/signal-tray-icon-256x256-light-base.png
deleted file mode 100644
index e9b31110f5..0000000000
Binary files a/images/tray-icons/base/signal-tray-icon-256x256-light-base.png and /dev/null differ
diff --git a/images/tray-icons/base/signal-tray-icon-32x32-base.png b/images/tray-icons/base/signal-tray-icon-32x32-base.png
new file mode 100644
index 0000000000..d08ec070f8
Binary files /dev/null and b/images/tray-icons/base/signal-tray-icon-32x32-base.png differ
diff --git a/images/tray-icons/base/signal-tray-icon-32x32-dark-base.png b/images/tray-icons/base/signal-tray-icon-32x32-dark-base.png
deleted file mode 100644
index 1ed18a4aa6..0000000000
Binary files a/images/tray-icons/base/signal-tray-icon-32x32-dark-base.png and /dev/null differ
diff --git a/images/tray-icons/base/signal-tray-icon-32x32-light-base.png b/images/tray-icons/base/signal-tray-icon-32x32-light-base.png
deleted file mode 100644
index e84cbd1ba5..0000000000
Binary files a/images/tray-icons/base/signal-tray-icon-32x32-light-base.png and /dev/null differ
diff --git a/images/tray-icons/base/signal-tray-icon-48x48-base.png b/images/tray-icons/base/signal-tray-icon-48x48-base.png
new file mode 100644
index 0000000000..e1ea6c6a80
Binary files /dev/null and b/images/tray-icons/base/signal-tray-icon-48x48-base.png differ
diff --git a/images/tray-icons/base/signal-tray-icon-48x48-dark-base.png b/images/tray-icons/base/signal-tray-icon-48x48-dark-base.png
deleted file mode 100644
index c4e1dbea73..0000000000
Binary files a/images/tray-icons/base/signal-tray-icon-48x48-dark-base.png and /dev/null differ
diff --git a/images/tray-icons/base/signal-tray-icon-48x48-light-base.png b/images/tray-icons/base/signal-tray-icon-48x48-light-base.png
deleted file mode 100644
index 94babc3af6..0000000000
Binary files a/images/tray-icons/base/signal-tray-icon-48x48-light-base.png and /dev/null differ
diff --git a/ts/scripts/generate-tray-icons.ts b/ts/scripts/generate-tray-icons.ts
index b06eb83b13..3408bca542 100644
--- a/ts/scripts/generate-tray-icons.ts
+++ b/ts/scripts/generate-tray-icons.ts
@@ -5,7 +5,6 @@ import { createCanvas, GlobalFonts, loadImage } from '@napi-rs/canvas';
 import { join } from 'node:path';
 import { mkdir, rm, writeFile } from 'node:fs/promises';
 import { strictAssert } from '../util/assert';
-import { SystemThemeType } from '../types/Util';
 
 const cwd = __dirname;
 const fontsDir = join(cwd, '..', '..', 'fonts');
@@ -25,7 +24,6 @@ type TrayIconValue = number | string | null;
 
 type TrayIconImageRequest = Readonly<{
   size: TrayIconSize;
-  theme: SystemThemeType;
   value: TrayIconValue;
 }>;
 
@@ -38,7 +36,7 @@ type TrayIconVariant = {
   fontOffsetY: number;
   badgeShadowBlur: number;
   badgeShadowOffsetY: number;
-  images: Record<SystemThemeType, string>;
+  image: string;
 };
 
 GlobalFonts.loadFontsFromDir(fontsDir);
@@ -65,10 +63,7 @@ const Variants: Record<TrayIconSize, TrayIconVariant> = {
     fontOffsetY: 0,
     badgeShadowBlur: 0,
     badgeShadowOffsetY: 0,
-    images: {
-      light: join(trayIconsBaseDir, 'signal-tray-icon-16x16-light-base.png'),
-      dark: join(trayIconsBaseDir, 'signal-tray-icon-16x16-dark-base.png'),
-    },
+    image: join(trayIconsBaseDir, 'signal-tray-icon-16x16-base.png'),
   },
   [TrayIconSize.Size32]: {
     size: 32,
@@ -79,10 +74,7 @@ const Variants: Record<TrayIconSize, TrayIconVariant> = {
     fontOffsetY: 0,
     badgeShadowBlur: 1,
     badgeShadowOffsetY: 1,
-    images: {
-      light: join(trayIconsBaseDir, 'signal-tray-icon-32x32-light-base.png'),
-      dark: join(trayIconsBaseDir, 'signal-tray-icon-32x32-dark-base.png'),
-    },
+    image: join(trayIconsBaseDir, 'signal-tray-icon-32x32-base.png'),
   },
   [TrayIconSize.Size48]: {
     size: 48,
@@ -93,10 +85,7 @@ const Variants: Record<TrayIconSize, TrayIconVariant> = {
     fontOffsetY: -1,
     badgeShadowBlur: 1,
     badgeShadowOffsetY: 1,
-    images: {
-      light: join(trayIconsBaseDir, 'signal-tray-icon-48x48-light-base.png'),
-      dark: join(trayIconsBaseDir, 'signal-tray-icon-48x48-dark-base.png'),
-    },
+    image: join(trayIconsBaseDir, 'signal-tray-icon-48x48-base.png'),
   },
   [TrayIconSize.Size256]: {
     size: 256,
@@ -107,10 +96,7 @@ const Variants: Record<TrayIconSize, TrayIconVariant> = {
     badgePadding: 32,
     badgeShadowBlur: 8,
     badgeShadowOffsetY: 8,
-    images: {
-      light: join(trayIconsBaseDir, 'signal-tray-icon-256x256-light-base.png'),
-      dark: join(trayIconsBaseDir, 'signal-tray-icon-256x256-dark-base.png'),
-    },
+    image: join(trayIconsBaseDir, 'signal-tray-icon-256x256-base.png'),
   },
 };
 
@@ -152,14 +138,9 @@ async function generateTrayIconImage(
     throw new TypeError(`Invalid variant size (${request.size})`);
   }
 
-  const imagePath = variant.images[request.theme];
-  if (imagePath == null) {
-    throw new TypeError(`Invalid theme (theme: ${request.theme})`);
-  }
-
   const text = trayIconValueToText(request.value, variant);
 
-  const image = await loadImage(imagePath);
+  const image = await loadImage(variant.image);
   const canvas = createCanvas(variant.size, variant.size);
   const context = canvas.getContext('2d');
 
@@ -263,23 +244,21 @@ async function main() {
     const variant = Variants[size];
     const { maxCount } = variant;
     const values = range(1, maxCount + 1);
-    for (const theme of Object.values(SystemThemeType)) {
-      for (const value of values) {
-        requests.push({ size, theme, value });
-      }
+    for (const value of values) {
+      requests.push({ size, value });
     }
   }
 
   await Promise.all(
-    requests.map(async ({ size, theme, value }) => {
+    requests.map(async ({ size, value }) => {
       const variant = Variants[size];
       const text = trayIconValueToText(value, variant);
 
       const fileDir = join(trayIconsAlertsDir);
-      const fileName = `signal-tray-icon-${size}x${size}-${theme}-alert-${text}.png`;
+      const fileName = `signal-tray-icon-${size}x${size}-alert-${text}.png`;
       const filePath = join(fileDir, fileName);
 
-      const fileContents = await generateTrayIconImage({ size, theme, value });
+      const fileContents = await generateTrayIconImage({ size, value });
 
       console.log(`Writing "${fileName}"`);
       await mkdir(fileDir, { recursive: true });