diff --git a/build/icons/128x128.png b/build/icons/128x128.png
new file mode 100644
index 000000000..557412e70
Binary files /dev/null and b/build/icons/128x128.png differ
diff --git a/build/icons/16x16.png b/build/icons/16x16.png
new file mode 100644
index 000000000..822537df2
Binary files /dev/null and b/build/icons/16x16.png differ
diff --git a/build/icons/256x256.png b/build/icons/256x256.png
new file mode 100644
index 000000000..0b73c6665
Binary files /dev/null and b/build/icons/256x256.png differ
diff --git a/build/icons/32x32.png b/build/icons/32x32.png
new file mode 100644
index 000000000..cca3b72ee
Binary files /dev/null and b/build/icons/32x32.png differ
diff --git a/build/icons/48x48.png b/build/icons/48x48.png
new file mode 100644
index 000000000..c0010273f
Binary files /dev/null and b/build/icons/48x48.png differ
diff --git a/build/icons/512x512.png b/build/icons/512x512.png
new file mode 100644
index 000000000..54d88ca1a
Binary files /dev/null and b/build/icons/512x512.png differ
diff --git a/build/icons/64x64.png b/build/icons/64x64.png
new file mode 100644
index 000000000..5d7e7fa89
Binary files /dev/null and b/build/icons/64x64.png differ
diff --git a/electron-builder.yml b/electron-builder.yml
index 179d2c48a..99f1ca38e 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -29,12 +29,11 @@ nsis:
   publish:
     - github
 linux:
-  icon: build/icon.icns
+  icon: build/icons
   category: Finance
   publish:
     - github
   target:
-    - snap
     - deb
     - AppImage
     - rpm
\ No newline at end of file
diff --git a/src/background.js b/src/background.js
index 3e8f742de..dcd2067bc 100644
--- a/src/background.js
+++ b/src/background.js
@@ -21,7 +21,9 @@ const isDevelopment = process.env.NODE_ENV !== 'production';
 const isMac = process.platform === 'darwin';
 const isLinux = process.platform === 'linux';
 const title = 'Frappe Books';
-const icon = path.resolve('./build/icon.png');
+const icon = isDevelopment
+  ? path.resolve('./build/icon.png')
+  : path.join(__dirname, 'icons', '512x512.png');
 
 // Global ref to prevent garbage collection.
 let mainWindow;
@@ -69,10 +71,16 @@ function createWindow() {
     resizable: true,
   };
 
-  if (isDevelopment) {
+  if (isDevelopment || isLinux) {
     Object.assign(options, { icon });
   }
 
+  if (isLinux) {
+    Object.assign(options, {
+      icon: path.join(__dirname, '/icons/512x512.png'),
+    });
+  }
+
   mainWindow = new BrowserWindow(options);
 
   if (process.env.WEBPACK_DEV_SERVER_URL) {
@@ -171,7 +179,7 @@ ipcMain.handle(IPC_ACTIONS.GET_PRIMARY_DISPLAY_SIZE, (event) => {
 
 ipcMain.handle(IPC_ACTIONS.GET_DIALOG_RESPONSE, async (event, options) => {
   const window = event.sender.getOwnerBrowserWindow();
-  if (isDevelopment) {
+  if (isDevelopment || isLinux) {
     Object.assign(options, { icon });
   }
   return await dialog.showMessageBox(window, options);
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index d7b70a65a..551ea0aa2 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -6,12 +6,14 @@
       px-2
       h-full
       block
-      window-drag
       flex
       justify-between
       flex-col
       bg-gray-100
     "
+    :class="{
+      'window-drag': platform !== 'Windows',
+    }"
   >
     <div class="window-no-drag">
       <WindowControls v-if="platform === 'Mac'" class="px-3 mb-6" />
@@ -70,7 +72,7 @@
         </div>
       </div>
     </div>
-    <div class="px-5">
+    <div class="px-5 window-no-drag">
       <button
         class="pb-1 text-sm text-gray-600 hover:text-gray-800 truncate"
         @click="$emit('change-db-file')"
@@ -111,9 +113,12 @@ export default {
   },
   async mounted() {
     this.companyName = await sidebarConfig.getTitle();
-    this.groups = sidebarConfig.groups.filter(group=>{
-      if(group.route === '/get-started' && frappe.SystemSettings.hideGetStarted) {
-        return false
+    this.groups = sidebarConfig.groups.filter((group) => {
+      if (
+        group.route === '/get-started' &&
+        frappe.SystemSettings.hideGetStarted
+      ) {
+        return false;
       }
       return true;
     });
diff --git a/src/pages/DatabaseSelector.vue b/src/pages/DatabaseSelector.vue
index 94b0dd866..7559f9cf5 100644
--- a/src/pages/DatabaseSelector.vue
+++ b/src/pages/DatabaseSelector.vue
@@ -1,7 +1,10 @@
 <template>
   <div
-    class="py-10 flex-1 bg-white window-drag"
-    :class="{ 'pointer-events-none': loadingDatabase }"
+    class="py-10 flex-1 bg-white"
+    :class="{
+      'pointer-events-none': loadingDatabase,
+      'window-drag': platform !== 'Windows',
+    }"
   >
     <div class="w-full">
       <div class="px-12">
@@ -189,11 +192,13 @@ export default {
     },
     async existingDatabase() {
       this.fileSelectedFrom = 'Existing File';
-      const filePath = (await ipcRenderer.invoke(IPC_ACTIONS.GET_OPEN_FILEPATH, {
-        title: this._('Select file'),
-        properties: ['openFile'],
-        filters: [{ name: 'SQLite DB File', extensions: ['db'] }],
-      }))?.filePaths?.[0];
+      const filePath = (
+        await ipcRenderer.invoke(IPC_ACTIONS.GET_OPEN_FILEPATH, {
+          title: this._('Select file'),
+          properties: ['openFile'],
+          filters: [{ name: 'SQLite DB File', extensions: ['db'] }],
+        })
+      )?.filePaths?.[0];
       this.connectToDatabase(filePath);
     },
     async selectFile(file) {
diff --git a/src/pages/SetupWizard/SetupWizard.vue b/src/pages/SetupWizard/SetupWizard.vue
index ddb138485..9d35b59f9 100644
--- a/src/pages/SetupWizard/SetupWizard.vue
+++ b/src/pages/SetupWizard/SetupWizard.vue
@@ -1,5 +1,10 @@
 <template>
-  <div class="flex-1 py-10 bg-white window-drag">
+  <div
+    class="flex-1 py-10 bg-white"
+    :class="{
+      'window-drag': platform !== 'Windows',
+    }"
+  >
     <div class="px-12">
       <h1 class="text-2xl font-semibold">{{ _('Setup your organization') }}</h1>
     </div>