diff --git a/packages/tauri-app/src-tauri/icons/linux/128x128.png b/packages/tauri-app/src-tauri/icons/linux/128x128.png
new file mode 100644
index 00000000..aa5e8c75
Binary files /dev/null and b/packages/tauri-app/src-tauri/icons/linux/128x128.png differ
diff --git a/packages/tauri-app/src-tauri/icons/linux/256x256.png b/packages/tauri-app/src-tauri/icons/linux/256x256.png
new file mode 100644
index 00000000..0ffb391e
Binary files /dev/null and b/packages/tauri-app/src-tauri/icons/linux/256x256.png differ
diff --git a/packages/tauri-app/src-tauri/icons/linux/32x32.png b/packages/tauri-app/src-tauri/icons/linux/32x32.png
new file mode 100644
index 00000000..308c1b5f
Binary files /dev/null and b/packages/tauri-app/src-tauri/icons/linux/32x32.png differ
diff --git a/packages/tauri-app/src-tauri/icons/linux/48x48.png b/packages/tauri-app/src-tauri/icons/linux/48x48.png
new file mode 100644
index 00000000..27f0582b
Binary files /dev/null and b/packages/tauri-app/src-tauri/icons/linux/48x48.png differ
diff --git a/packages/tauri-app/src-tauri/icons/linux/512x512.png b/packages/tauri-app/src-tauri/icons/linux/512x512.png
new file mode 100644
index 00000000..4d054a47
Binary files /dev/null and b/packages/tauri-app/src-tauri/icons/linux/512x512.png differ
diff --git a/packages/tauri-app/src-tauri/icons/linux/64x64.png b/packages/tauri-app/src-tauri/icons/linux/64x64.png
new file mode 100644
index 00000000..71076ed2
Binary files /dev/null and b/packages/tauri-app/src-tauri/icons/linux/64x64.png differ
diff --git a/packages/tauri-app/src-tauri/icons/linux/ai.neuralnomads.codenomad.client.desktop b/packages/tauri-app/src-tauri/icons/linux/ai.neuralnomads.codenomad.client.desktop
new file mode 100644
index 00000000..35acdfd6
--- /dev/null
+++ b/packages/tauri-app/src-tauri/icons/linux/ai.neuralnomads.codenomad.client.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Categories=
+Exec=codenomad-tauri
+StartupWMClass=codenomad-tauri
+Icon=codenomad-tauri
+Name=CodeNomad
+NoDisplay=true
+Terminal=false
+Type=Application
diff --git a/packages/tauri-app/src-tauri/tauri.conf.json b/packages/tauri-app/src-tauri/tauri.conf.json
index 0c08e1f3..86cd4913 100644
--- a/packages/tauri-app/src-tauri/tauri.conf.json
+++ b/packages/tauri-app/src-tauri/tauri.conf.json
@@ -9,6 +9,7 @@
     "frontendDist": "resources/ui-loading"
   },
   "app": {
+    "enableGTKAppId": true,
     "withGlobalTauri": true,
     "windows": [
       {
@@ -41,6 +42,35 @@
   },
   "bundle": {
     "active": true,
+    "linux": {
+      "appimage": {
+        "files": {
+          "/usr/share/applications/ai.neuralnomads.codenomad.client.desktop": "icons/linux/ai.neuralnomads.codenomad.client.desktop"
+        }
+      },
+      "deb": {
+        "files": {
+          "/usr/share/applications/ai.neuralnomads.codenomad.client.desktop": "icons/linux/ai.neuralnomads.codenomad.client.desktop",
+          "/usr/share/icons/hicolor/32x32/apps/codenomad-tauri.png": "icons/linux/32x32.png",
+          "/usr/share/icons/hicolor/48x48/apps/codenomad-tauri.png": "icons/linux/48x48.png",
+          "/usr/share/icons/hicolor/64x64/apps/codenomad-tauri.png": "icons/linux/64x64.png",
+          "/usr/share/icons/hicolor/128x128/apps/codenomad-tauri.png": "icons/linux/128x128.png",
+          "/usr/share/icons/hicolor/256x256/apps/codenomad-tauri.png": "icons/linux/256x256.png",
+          "/usr/share/icons/hicolor/512x512/apps/codenomad-tauri.png": "icons/linux/512x512.png"
+        }
+      },
+      "rpm": {
+        "files": {
+          "/usr/share/applications/ai.neuralnomads.codenomad.client.desktop": "icons/linux/ai.neuralnomads.codenomad.client.desktop",
+          "/usr/share/icons/hicolor/32x32/apps/codenomad-tauri.png": "icons/linux/32x32.png",
+          "/usr/share/icons/hicolor/48x48/apps/codenomad-tauri.png": "icons/linux/48x48.png",
+          "/usr/share/icons/hicolor/64x64/apps/codenomad-tauri.png": "icons/linux/64x64.png",
+          "/usr/share/icons/hicolor/128x128/apps/codenomad-tauri.png": "icons/linux/128x128.png",
+          "/usr/share/icons/hicolor/256x256/apps/codenomad-tauri.png": "icons/linux/256x256.png",
+          "/usr/share/icons/hicolor/512x512/apps/codenomad-tauri.png": "icons/linux/512x512.png"
+        }
+      }
+    },
     "resources": [
       "resources/server",
       "resources/ui-loading"