diff --git a/.github/workflows/jan-electron-build.yml b/.github/workflows/jan-electron-build.yml
index 3ca4a1fe2..7d69a5c12 100644
--- a/.github/workflows/jan-electron-build.yml
+++ b/.github/workflows/jan-electron-build.yml
@@ -40,6 +40,8 @@ jobs:
     with:
       ref: ${{ github.ref }}
       public_provider: github
+      beta: false
+      nightly: false
       new_version: ${{ needs.get-update-version.outputs.new_version }}
 
   build-windows-x64:
@@ -49,6 +51,8 @@ jobs:
     with:
       ref: ${{ github.ref }}
       public_provider: github
+      beta: false
+      nightly: false
       new_version: ${{ needs.get-update-version.outputs.new_version }}
 
   build-linux-x64:
@@ -58,6 +62,8 @@ jobs:
     with:
       ref: ${{ github.ref }}
       public_provider: github
+      beta: false
+      nightly: false
       new_version: ${{ needs.get-update-version.outputs.new_version }}
 
   update_release_draft:
@@ -82,4 +88,4 @@ jobs:
         #   config-name: my-config.yml
         #   disable-autolabeler: true
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/template-build-linux-x64.yml b/.github/workflows/template-build-linux-x64.yml
index e2fcc80dd..58b566931 100644
--- a/.github/workflows/template-build-linux-x64.yml
+++ b/.github/workflows/template-build-linux-x64.yml
@@ -55,55 +55,26 @@ jobs:
         if: inputs.beta == true && inputs.nightly != true
         shell: bash
         run: |
-          echo "Icons before replacement:"
-          ls -la electron/icons/
-          
-          echo "Setting up beta icons"
-          
-          # Replace the key icon files with move operations (no need for rm first)
-          mv electron/icons/jan-beta-512x512.png electron/icons/512x512.png
-          mv electron/icons/jan-beta.ico electron/icons/icon.ico
-          mv electron/icons/jan-beta.png electron/icons/icon.png
-          mv electron/icons/jan-beta-tray@2x.png electron/icons/icon-tray@2x.png
-          mv electron/icons/jan-beta-tray.png electron/icons/icon-tray.png
-          
-          # Remove any remaining nightly icon files
-          rm -f electron/icons/jan-nightly-512x512.png
-          rm -f electron/icons/jan-nightly.ico
-          rm -f electron/icons/jan-nightly.png
-          rm -f electron/icons/jan-nightly-tray@2x.png
-          rm -f electron/icons/jan-nightly-tray.png
-          
-          # Verify the replacement
-          echo "Icons after replacement:"
-          ls -la electron/icons/
+          rm -rf electron/icons/*
+
+          cp electron/icons_dev/jan-beta-512x512.png electron/icons/512x512.png
+          cp electron/icons_dev/jan-beta.ico electron/icons/icon.ico
+          cp electron/icons_dev/jan-beta.png electron/icons/icon.png
+          cp electron/icons_dev/jan-beta-tray@2x.png electron/icons/icon-tray@2x.png
+          cp electron/icons_dev/jan-beta-tray.png electron/icons/icon-tray.png
 
       - name: Replace Icons for Nightly Build
         if: inputs.nightly == true && inputs.beta != true
         shell: bash
         run: |
-          echo "Icons before replacement:"
-          ls -la electron/icons/
-          
-          echo "Setting up nightly icons"
-          
-          # Replace the key icon files with move operations (no need for rm first)
-          mv electron/icons/jan-nightly-512x512.png electron/icons/512x512.png
-          mv electron/icons/jan-nightly.ico electron/icons/icon.ico
-          mv electron/icons/jan-nightly.png electron/icons/icon.png
-          mv electron/icons/jan-nightly-tray@2x.png electron/icons/icon-tray@2x.png
-          mv electron/icons/jan-nightly-tray.png electron/icons/icon-tray.png
-          
-          # Remove any remaining beta icon files
-          rm -f electron/icons/jan-beta-512x512.png
-          rm -f electron/icons/jan-beta.ico
-          rm -f electron/icons/jan-beta.png
-          rm -f electron/icons/jan-beta-tray@2x.png
-          rm -f electron/icons/jan-beta-tray.png
-          
-          # Verify the replacement
-          echo "Icons after replacement:"
-          ls -la electron/icons/
+          rm -rf electron/icons/*
+
+          cp electron/icons_dev/jan-nightly-512x512.png electron/icons/512x512.png
+          cp electron/icons_dev/jan-nightly.ico electron/icons/icon.ico
+          cp electron/icons_dev/jan-nightly.png electron/icons/icon.png
+          cp electron/icons_dev/jan-nightly-tray@2x.png electron/icons/icon-tray@2x.png
+          cp electron/icons_dev/jan-nightly-tray.png electron/icons/icon-tray.png
+
 
       - name: Installing node
         uses: actions/setup-node@v1
@@ -213,4 +184,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: jan-linux-amd64-${{ inputs.new_version }}-AppImage
-          path: ./electron/dist/*.AppImage
+          path: ./electron/dist/*.AppImage
\ No newline at end of file
diff --git a/.github/workflows/template-build-macos.yml b/.github/workflows/template-build-macos.yml
index 338871836..a5e5cc724 100644
--- a/.github/workflows/template-build-macos.yml
+++ b/.github/workflows/template-build-macos.yml
@@ -65,31 +65,25 @@ jobs:
         if: inputs.beta == true && inputs.nightly != true
         shell: bash
         run: |
-          rm -f electron/icons/512x512.png
-          rm -f electron/icons/icon.ico
-          rm -f electron/icons/icon.png
-          rm -f electron/icons/icon-tray@2x.png
-          rm -f electron/icons/icon-tray.png
-          mv electron/icons/jan-beta-512x512.png electron/icons/512x512.png
-          mv electron/icons/jan-beta.ico electron/icons/icon.ico
-          mv electron/icons/jan-beta.png electron/icons/icon.png
-          mv electron/icons/jan-beta-tray@2x.png electron/icons/icon-tray@2x.png
-          mv electron/icons/jan-beta-tray.png electron/icons/icon-tray.png
+          rm -rf electron/icons/*
+
+          cp electron/icons_dev/jan-beta-512x512.png electron/icons/512x512.png
+          cp electron/icons_dev/jan-beta.ico electron/icons/icon.ico
+          cp electron/icons_dev/jan-beta.png electron/icons/icon.png
+          cp electron/icons_dev/jan-beta-tray@2x.png electron/icons/icon-tray@2x.png
+          cp electron/icons_dev/jan-beta-tray.png electron/icons/icon-tray.png
 
       - name: Replace Icons for Nightly Build
         if: inputs.nightly == true && inputs.beta != true
         shell: bash
         run: |
-          rm -f electron/icons/512x512.png
-          rm -f electron/icons/icon.ico
-          rm -f electron/icons/icon.png
-          rm -f electron/icons/icon-tray@2x.png
-          rm -f electron/icons/icon-tray.png
-          mv electron/icons/jan-nightly-512x512.png electron/icons/512x512.png
-          mv electron/icons/jan-nightly.ico electron/icons/icon.ico
-          mv electron/icons/jan-nightly.png electron/icons/icon.png
-          mv electron/icons/jan-nightly-tray@2x.png electron/icons/icon-tray@2x.png
-          mv electron/icons/jan-nightly-tray.png electron/icons/icon-tray.png
+          rm -rf electron/icons/*
+
+          cp electron/icons_dev/jan-nightly-512x512.png electron/icons/512x512.png
+          cp electron/icons_dev/jan-nightly.ico electron/icons/icon.ico
+          cp electron/icons_dev/jan-nightly.png electron/icons/icon.png
+          cp electron/icons_dev/jan-nightly-tray@2x.png electron/icons/icon-tray@2x.png
+          cp electron/icons_dev/jan-nightly-tray.png electron/icons/icon-tray.png
 
       - name: Installing node
         uses: actions/setup-node@v1
@@ -236,4 +230,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: jan-mac-universal-${{ inputs.new_version }}
-          path: ./electron/dist/*.dmg
+          path: ./electron/dist/*.dmg
\ No newline at end of file
diff --git a/.github/workflows/template-build-windows-x64.yml b/.github/workflows/template-build-windows-x64.yml
index 2d5f28cb9..9be028e15 100644
--- a/.github/workflows/template-build-windows-x64.yml
+++ b/.github/workflows/template-build-windows-x64.yml
@@ -64,31 +64,25 @@ jobs:
         if: inputs.beta == true && inputs.nightly != true
         shell: bash
         run: |
-          rm -f electron/icons/512x512.png
-          rm -f electron/icons/icon.ico
-          rm -f electron/icons/icon.png
-          rm -f electron/icons/icon-tray@2x.png
-          rm -f electron/icons/icon-tray.png
-          mv electron/icons/jan-beta-512x512.png electron/icons/512x512.png
-          mv electron/icons/jan-beta.ico electron/icons/icon.ico
-          mv electron/icons/jan-beta.png electron/icons/icon.png
-          mv electron/icons/jan-beta-tray@2x.png electron/icons/icon-tray@2x.png
-          mv electron/icons/jan-beta-tray.png electron/icons/icon-tray.png
+          rm -rf electron/icons/*
+
+          cp electron/icons_dev/jan-beta-512x512.png electron/icons/512x512.png
+          cp electron/icons_dev/jan-beta.ico electron/icons/icon.ico
+          cp electron/icons_dev/jan-beta.png electron/icons/icon.png
+          cp electron/icons_dev/jan-beta-tray@2x.png electron/icons/icon-tray@2x.png
+          cp electron/icons_dev/jan-beta-tray.png electron/icons/icon-tray.png
 
       - name: Replace Icons for Nightly Build
         if: inputs.nightly == true && inputs.beta != true
         shell: bash
         run: |
-          rm -f electron/icons/512x512.png
-          rm -f electron/icons/icon.ico
-          rm -f electron/icons/icon.png
-          rm -f electron/icons/icon-tray@2x.png
-          rm -f electron/icons/icon-tray.png
-          mv electron/icons/jan-nightly-512x512.png electron/icons/512x512.png
-          mv electron/icons/jan-nightly.ico electron/icons/icon.ico
-          mv electron/icons/jan-nightly.png electron/icons/icon.png
-          mv electron/icons/jan-nightly-tray@2x.png electron/icons/icon-tray@2x.png
-          mv electron/icons/jan-nightly-tray.png electron/icons/icon-tray.png
+          rm -rf electron/icons/*
+
+          cp electron/icons_dev/jan-nightly-512x512.png electron/icons/512x512.png
+          cp electron/icons_dev/jan-nightly.ico electron/icons/icon.ico
+          cp electron/icons_dev/jan-nightly.png electron/icons/icon.png
+          cp electron/icons_dev/jan-nightly-tray@2x.png electron/icons/icon-tray@2x.png
+          cp electron/icons_dev/jan-nightly-tray.png electron/icons/icon-tray.png
 
       - name: Installing node
         uses: actions/setup-node@v1
@@ -232,4 +226,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: jan-win-x64-${{ inputs.new_version }}
-          path: ./electron/dist/*.exe
+          path: ./electron/dist/*.exe
\ No newline at end of file
diff --git a/electron/icons/jan-beta-512x512.png b/electron/icons_dev/jan-beta-512x512.png
similarity index 100%
rename from electron/icons/jan-beta-512x512.png
rename to electron/icons_dev/jan-beta-512x512.png
diff --git a/electron/icons/jan-beta-tray.png b/electron/icons_dev/jan-beta-tray.png
similarity index 100%
rename from electron/icons/jan-beta-tray.png
rename to electron/icons_dev/jan-beta-tray.png
diff --git a/electron/icons/jan-beta-tray@2x.png b/electron/icons_dev/jan-beta-tray@2x.png
similarity index 100%
rename from electron/icons/jan-beta-tray@2x.png
rename to electron/icons_dev/jan-beta-tray@2x.png
diff --git a/electron/icons/jan-beta.ico b/electron/icons_dev/jan-beta.ico
similarity index 100%
rename from electron/icons/jan-beta.ico
rename to electron/icons_dev/jan-beta.ico
diff --git a/electron/icons/jan-beta.png b/electron/icons_dev/jan-beta.png
similarity index 100%
rename from electron/icons/jan-beta.png
rename to electron/icons_dev/jan-beta.png
diff --git a/electron/icons/jan-nightly-512x512.png b/electron/icons_dev/jan-nightly-512x512.png
similarity index 100%
rename from electron/icons/jan-nightly-512x512.png
rename to electron/icons_dev/jan-nightly-512x512.png
diff --git a/electron/icons/jan-nightly-tray.png b/electron/icons_dev/jan-nightly-tray.png
similarity index 100%
rename from electron/icons/jan-nightly-tray.png
rename to electron/icons_dev/jan-nightly-tray.png
diff --git a/electron/icons/jan-nightly-tray@2x.png b/electron/icons_dev/jan-nightly-tray@2x.png
similarity index 100%
rename from electron/icons/jan-nightly-tray@2x.png
rename to electron/icons_dev/jan-nightly-tray@2x.png
diff --git a/electron/icons/jan-nightly.ico b/electron/icons_dev/jan-nightly.ico
similarity index 100%
rename from electron/icons/jan-nightly.ico
rename to electron/icons_dev/jan-nightly.ico
diff --git a/electron/icons/jan-nightly.png b/electron/icons_dev/jan-nightly.png
similarity index 100%
rename from electron/icons/jan-nightly.png
rename to electron/icons_dev/jan-nightly.png