diff --git a/app/images/icon.icns b/app/assets/icon.icns
similarity index 100%
rename from app/images/icon.icns
rename to app/assets/icon.icns
diff --git a/app/images/ollama_icon_birhgt_16x16.png b/app/assets/ollama_icon_birhgt_16x16.png
similarity index 100%
rename from app/images/ollama_icon_birhgt_16x16.png
rename to app/assets/ollama_icon_birhgt_16x16.png
diff --git a/app/images/ollama_icon_bright_16x16@2x.png b/app/assets/ollama_icon_bright_16x16@2x.png
similarity index 100%
rename from app/images/ollama_icon_bright_16x16@2x.png
rename to app/assets/ollama_icon_bright_16x16@2x.png
diff --git a/app/images/ollama_icon_dark_16x16.png b/app/assets/ollama_icon_dark_16x16.png
similarity index 100%
rename from app/images/ollama_icon_dark_16x16.png
rename to app/assets/ollama_icon_dark_16x16.png
diff --git a/app/images/ollama_icon_dark_16x16@2x.png b/app/assets/ollama_icon_dark_16x16@2x.png
similarity index 100%
rename from app/images/ollama_icon_dark_16x16@2x.png
rename to app/assets/ollama_icon_dark_16x16@2x.png
diff --git a/app/forge.config.ts b/app/forge.config.ts
index 85a27150b..26b6d5c13 100644
--- a/app/forge.config.ts
+++ b/app/forge.config.ts
@@ -18,8 +18,13 @@ const config: ForgeConfig = {
   packagerConfig: {
     appVersion: process.env.VERSION || packageJson.version,
     asar: true,
-    icon: './images/icon',
-    extraResource: ['./images/ollama_icon_dark_16x16.png', './images/ollama_icon_bright_16x16.png', '../ollama', '../ggml-metal.metal'],
+    icon: './assets/icon.icns',
+    extraResource: [
+      '../ollama', 
+      '../ggml-metal.metal',
+      path.join(__dirname, './assets/ollama_icon_dark_16x16@2x.png'), 
+      path.join(__dirname, './assets/ollama_icon_bright_16x16@2x.png')
+    ],
     ...(process.env.SIGN
       ? {
           osxSign: {
diff --git a/app/src/index.ts b/app/src/index.ts
index d5671aebc..78c865fd0 100644
--- a/app/src/index.ts
+++ b/app/src/index.ts
@@ -7,12 +7,13 @@ require('@electron/remote/main').initialize()
 
 let tray: Tray | null = null
 const createSystemtray = () => {
-  // const baseURL = path.join(__dirname, 'src')
-  const resources = process.resourcesPath
-  const brightModeIconPath = path.join(resources, 'ollama_icon_dark_16x16.png')
-  const darkModeIconPath = path.join(resources, 'ollama_icon_bright_16x16.png')
-  // const brightModeIconPath = path.join(__dirname, '..', '..', 'src', 'ollama_icon_dark_16x16.png')
-  // const darkModeIconPath = path.join(__dirname, '..', '..', 'src', 'ollama_icon_bright_16x16.png')
+  let brightModeIconPath = path.join(__dirname, '..', '..', 'assets', 'ollama_icon_dark_16x16.png')
+  let darkModeIconPath = path.join(__dirname, '..', '..', 'assets', 'ollama_icon_bright_16x16.png')
+  
+  if (app.isPackaged) {
+    brightModeIconPath = path.join(process.resourcesPath, 'ollama_icon_dark_16x16@2x.png');
+    darkModeIconPath = path.join(process.resourcesPath, 'ollama_icon_bright_16x16@2x.png');
+}
   
   tray = new Tray(brightModeIconPath)
 
@@ -31,7 +32,7 @@ const createSystemtray = () => {
 
   tray.setContextMenu(contextMenu);  
   tray.setToolTip('Ollama')
- })
+ }
 
 
 // Handle creating/removing shortcuts on Windows when installing/uninstalling.