diff --git a/app/forge.config.ts b/app/forge.config.ts
index 9fe59a97..3214ce1a 100644
--- a/app/forge.config.ts
+++ b/app/forge.config.ts
@@ -20,7 +20,12 @@ const config: ForgeConfig = {
     appVersion: process.env.VERSION || packageJson.version,
     asar: true,
     icon: './images/icon',
-    extraResource: ['../ollama', ...(process.platform === 'darwin' ? ['../ggml-metal.metal'] : [])],
+    extraResource: [
+      '../ollama',
+      './images/ollama_icon_dark_16x16.png',
+      './images/ollama_icon_bright_16x16.png',
+      ...(process.platform === 'darwin' ? ['../ggml-metal.metal'] : []),
+    ],
     ...(process.env.SIGN
       ? {
           osxSign: {
@@ -36,7 +41,7 @@ const config: ForgeConfig = {
       : {}),
   },
   rebuildConfig: {},
-  makers: [new MakerSquirrel({}), new MakerZIP({}, ['darwin']), new MakerRpm({}), new MakerDeb({})],
+  makers: [new MakerSquirrel({}), new MakerZIP({}, ['darwin'])],
   publishers: [
     new PublisherGithub({
       repository: {
diff --git a/app/icon.icns b/app/icon.icns
deleted file mode 100644
index 308592aa..00000000
Binary files a/app/icon.icns and /dev/null differ
diff --git a/app/icon.iconset/icon_128x128.png b/app/icon.iconset/icon_128x128.png
deleted file mode 100644
index f0e3ae70..00000000
Binary files a/app/icon.iconset/icon_128x128.png and /dev/null differ
diff --git a/app/icon.iconset/icon_128x128@2x.png b/app/icon.iconset/icon_128x128@2x.png
deleted file mode 100644
index b1b550bc..00000000
Binary files a/app/icon.iconset/icon_128x128@2x.png and /dev/null differ
diff --git a/app/icon.iconset/icon_16x16.png b/app/icon.iconset/icon_16x16.png
deleted file mode 100644
index 79ada2c4..00000000
Binary files a/app/icon.iconset/icon_16x16.png and /dev/null differ
diff --git a/app/icon.iconset/icon_16x16@2x.png b/app/icon.iconset/icon_16x16@2x.png
deleted file mode 100644
index 13fff286..00000000
Binary files a/app/icon.iconset/icon_16x16@2x.png and /dev/null differ
diff --git a/app/icon.iconset/icon_256x256.png b/app/icon.iconset/icon_256x256.png
deleted file mode 100644
index b1b550bc..00000000
Binary files a/app/icon.iconset/icon_256x256.png and /dev/null differ
diff --git a/app/icon.iconset/icon_256x256@2x.png b/app/icon.iconset/icon_256x256@2x.png
deleted file mode 100644
index f132cdb4..00000000
Binary files a/app/icon.iconset/icon_256x256@2x.png and /dev/null differ
diff --git a/app/icon.iconset/icon_32x32.png b/app/icon.iconset/icon_32x32.png
deleted file mode 100644
index 13fff286..00000000
Binary files a/app/icon.iconset/icon_32x32.png and /dev/null differ
diff --git a/app/icon.iconset/icon_32x32@2x.png b/app/icon.iconset/icon_32x32@2x.png
deleted file mode 100644
index 8ba2791e..00000000
Binary files a/app/icon.iconset/icon_32x32@2x.png and /dev/null differ
diff --git a/app/icon.iconset/icon_512x512.png b/app/icon.iconset/icon_512x512.png
deleted file mode 100644
index f132cdb4..00000000
Binary files a/app/icon.iconset/icon_512x512.png and /dev/null differ
diff --git a/app/icon.iconset/icon_512x512@2x.png b/app/icon.iconset/icon_512x512@2x.png
deleted file mode 100644
index 9d2f82d9..00000000
Binary files a/app/icon.iconset/icon_512x512@2x.png and /dev/null differ
diff --git a/app/images/icon.icns b/app/images/icon.icns
index e4c55199..308592aa 100644
Binary files a/app/images/icon.icns and b/app/images/icon.icns differ
diff --git a/app/src/ollama_icon_birhgt_16x16.png b/app/images/ollama_icon_birhgt_16x16.png
similarity index 100%
rename from app/src/ollama_icon_birhgt_16x16.png
rename to app/images/ollama_icon_birhgt_16x16.png
diff --git a/app/src/ollama_icon_bright_16x16@2x.png b/app/images/ollama_icon_bright_16x16@2x.png
similarity index 100%
rename from app/src/ollama_icon_bright_16x16@2x.png
rename to app/images/ollama_icon_bright_16x16@2x.png
diff --git a/app/src/ollama_icon_dark_16x16.png b/app/images/ollama_icon_dark_16x16.png
similarity index 100%
rename from app/src/ollama_icon_dark_16x16.png
rename to app/images/ollama_icon_dark_16x16.png
diff --git a/app/src/ollama_icon_dark_16x16@2x.png b/app/images/ollama_icon_dark_16x16@2x.png
similarity index 100%
rename from app/src/ollama_icon_dark_16x16@2x.png
rename to app/images/ollama_icon_dark_16x16@2x.png
diff --git a/app/package.json b/app/package.json
index f46b8485..1536ee5a 100644
--- a/app/package.json
+++ b/app/package.json
@@ -8,7 +8,6 @@
     "start": "electron-forge start",
     "package": "electron-forge package",
     "package:sign": "SIGN=1 electron-forge package",
-    "dist": "electron-builder",
     "make": "electron-forge make",
     "make:sign": "SIGN=1 electron-forge make",
     "publish": "SIGN=1 electron-forge publish",
@@ -20,17 +19,6 @@
     "email": "jmorganca@gmail.com"
   },
   "license": "MIT",
-  "build" : {
-    "appId": "com.ollama.app",
-    "mac": {
-      "category": "public.app-category.productivity",
-      "target": [
-        "dmg",
-        "zip"
-      ],
-      "icon": "icon.icns"
-    }
-  },
   "devDependencies": {
     "@babel/core": "^7.22.5",
     "@babel/preset-react": "^7.22.5",
diff --git a/app/src/index.ts b/app/src/index.ts
index cfaa2263..31e54fec 100644
--- a/app/src/index.ts
+++ b/app/src/index.ts
@@ -7,8 +7,13 @@ require('@electron/remote/main').initialize()
 
 let tray: Tray | null = null
 const createSystemtray = () => {
-  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)