diff --git a/desktop/package.json b/desktop/package.json
index 0c9fd277c..44983a544 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -11,9 +11,6 @@
     "asarUnpack": [
       "PortForwardingMacApp.app/**/*"
     ],
-    "deb": {
-      "icon": "icon.icns"
-    },
     "dmg": {
       "background": "dmgBackground.png",
       "contents": [
@@ -46,8 +43,7 @@
       }
     ],
     "linux": {
-      "category": "Development",
-      "icon": "icon.icns"
+      "category": "Development"
     },
     "mac": {
       "category": "public.app-category.developer-tools",
diff --git a/desktop/static/icons/app_64x64.png b/desktop/static/icons/app_64x64.png
new file mode 100644
index 000000000..1ca1c98bc
Binary files /dev/null and b/desktop/static/icons/app_64x64.png differ
diff --git a/desktop/static/main.ts b/desktop/static/main.ts
index ed7526505..2305ce80f 100644
--- a/desktop/static/main.ts
+++ b/desktop/static/main.ts
@@ -18,6 +18,7 @@ import {
   globalShortcut,
   session,
 } from 'electron';
+import os from 'os';
 import path from 'path';
 import url from 'url';
 import fs from 'fs';
@@ -279,6 +280,12 @@ function createWindow() {
     minWidth: 800,
     minHeight: 600,
     center: true,
+    // The app icon is defined in package.json by default.
+    // When building Linux zip, it must be defined here or else it won't work.
+    icon:
+      os.platform() === 'linux'
+        ? path.join(__dirname, 'icons/app_64x64.png')
+        : undefined,
     webPreferences: {
       enableRemoteModule: true,
       backgroundThrottling: false,