diff --git a/.github/workflows/jan-electron-build-beta.yml b/.github/workflows/jan-electron-build-beta.yml
index 4f9886010..d0534058a 100644
--- a/.github/workflows/jan-electron-build-beta.yml
+++ b/.github/workflows/jan-electron-build-beta.yml
@@ -9,10 +9,24 @@ jobs:
   get-update-version:
     uses: ./.github/workflows/template-get-update-version.yml
 
+  rename-icons-beta:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+
+      - name: Replace Icons for Beta Build
+        run: |
+          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
+
   build-macos:
     uses: ./.github/workflows/template-build-macos.yml
     secrets: inherit
-    needs: [get-update-version]
+    needs: [rename-icons-beta, get-update-version]
     with:
       ref: ${{ github.ref }}
       public_provider: github
@@ -22,7 +36,7 @@ jobs:
   build-windows-x64:
     uses: ./.github/workflows/template-build-windows-x64.yml
     secrets: inherit
-    needs: [get-update-version]
+    needs: [rename-icons-beta, get-update-version]
     with:
       ref: ${{ github.ref }}
       public_provider: github
@@ -32,7 +46,7 @@ jobs:
   build-linux-x64:
     uses: ./.github/workflows/template-build-linux-x64.yml
     secrets: inherit
-    needs: [get-update-version]
+    needs: [rename-icons-beta, get-update-version]
     with:
       ref: ${{ github.ref }}
       public_provider: github
diff --git a/.github/workflows/jan-electron-build-nightly.yml b/.github/workflows/jan-electron-build-nightly.yml
index e08a35169..a57b91ad8 100644
--- a/.github/workflows/jan-electron-build-nightly.yml
+++ b/.github/workflows/jan-electron-build-nightly.yml
@@ -16,6 +16,20 @@ on:
     types: [submitted]
 
 jobs:
+  rename-icons-nightly:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+
+      - name: Replace Icons for Nightly Build
+        run: |
+          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
+  
   set-public-provider:
     runs-on: ubuntu-latest
     outputs:
@@ -49,7 +63,7 @@ jobs:
 
   build-macos:
     uses: ./.github/workflows/template-build-macos.yml
-    needs: [get-update-version, set-public-provider]
+    needs: [rename-icons-nightly, get-update-version, set-public-provider]
     secrets: inherit
     with:
       ref: ${{ needs.set-public-provider.outputs.ref }}
@@ -59,7 +73,7 @@ jobs:
   build-windows-x64:
     uses: ./.github/workflows/template-build-windows-x64.yml
     secrets: inherit
-    needs: [get-update-version, set-public-provider]
+    needs: [rename-icons-nightly, get-update-version, set-public-provider]
     with:
       ref: ${{ needs.set-public-provider.outputs.ref }}
       public_provider: ${{ needs.set-public-provider.outputs.public_provider }}
@@ -69,7 +83,7 @@ jobs:
   build-linux-x64:
     uses: ./.github/workflows/template-build-linux-x64.yml
     secrets: inherit
-    needs: [get-update-version, set-public-provider]
+    needs: [rename-icons-nightly, get-update-version, set-public-provider]
     with:
       ref: ${{ needs.set-public-provider.outputs.ref }}
       public_provider: ${{ needs.set-public-provider.outputs.public_provider }}
diff --git a/electron/icons/jan-beta-512x512.png b/electron/icons/jan-beta-512x512.png
new file mode 100644
index 000000000..4b715494d
Binary files /dev/null and b/electron/icons/jan-beta-512x512.png differ
diff --git a/electron/icons/jan-beta-tray.png b/electron/icons/jan-beta-tray.png
new file mode 100644
index 000000000..eaca9ad9a
Binary files /dev/null and b/electron/icons/jan-beta-tray.png differ
diff --git a/electron/icons/jan-beta-tray@2x.png b/electron/icons/jan-beta-tray@2x.png
new file mode 100644
index 000000000..deb83aace
Binary files /dev/null and b/electron/icons/jan-beta-tray@2x.png differ
diff --git a/electron/icons/jan-beta.ico b/electron/icons/jan-beta.ico
new file mode 100644
index 000000000..85cf0c1b4
Binary files /dev/null and b/electron/icons/jan-beta.ico differ
diff --git a/electron/icons/jan-beta.png b/electron/icons/jan-beta.png
new file mode 100644
index 000000000..4b715494d
Binary files /dev/null and b/electron/icons/jan-beta.png differ
diff --git a/electron/icons/jan-nightly-512x512.png b/electron/icons/jan-nightly-512x512.png
new file mode 100644
index 000000000..23f532947
Binary files /dev/null and b/electron/icons/jan-nightly-512x512.png differ
diff --git a/electron/icons/jan-nightly-tray.png b/electron/icons/jan-nightly-tray.png
new file mode 100644
index 000000000..bf164a0a6
Binary files /dev/null and b/electron/icons/jan-nightly-tray.png differ
diff --git a/electron/icons/jan-nightly-tray@2x.png b/electron/icons/jan-nightly-tray@2x.png
new file mode 100644
index 000000000..3cab5709d
Binary files /dev/null and b/electron/icons/jan-nightly-tray@2x.png differ
diff --git a/electron/icons/jan-nightly.ico b/electron/icons/jan-nightly.ico
new file mode 100644
index 000000000..8e64ba8b1
Binary files /dev/null and b/electron/icons/jan-nightly.ico differ
diff --git a/electron/icons/jan-nightly.png b/electron/icons/jan-nightly.png
new file mode 100644
index 000000000..23f532947
Binary files /dev/null and b/electron/icons/jan-nightly.png differ