diff --git a/.github/workflows/jan-electron-build-beta.yml b/.github/workflows/jan-electron-build-beta.yml
index 180781e33..c8b2f4b2f 100644
--- a/.github/workflows/jan-electron-build-beta.yml
+++ b/.github/workflows/jan-electron-build-beta.yml
@@ -9,24 +9,10 @@ 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: [rename-icons-beta, get-update-version]
+    needs: [get-update-version]
     with:
       ref: ${{ github.ref }}
       public_provider: github
@@ -37,7 +23,7 @@ jobs:
   build-windows-x64:
     uses: ./.github/workflows/template-build-windows-x64.yml
     secrets: inherit
-    needs: [rename-icons-beta, get-update-version]
+    needs: [get-update-version]
     with:
       ref: ${{ github.ref }}
       public_provider: github
@@ -48,7 +34,7 @@ jobs:
   build-linux-x64:
     uses: ./.github/workflows/template-build-linux-x64.yml
     secrets: inherit
-    needs: [rename-icons-beta, get-update-version]
+    needs: [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 3887977f9..6f1b8d901 100644
--- a/.github/workflows/jan-electron-build-nightly.yml
+++ b/.github/workflows/jan-electron-build-nightly.yml
@@ -16,20 +16,6 @@ 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:
@@ -63,33 +49,34 @@ jobs:
 
   build-macos:
     uses: ./.github/workflows/template-build-macos.yml
-    needs: [rename-icons-nightly, get-update-version, set-public-provider]
+    needs: [get-update-version, set-public-provider]
     secrets: inherit
     with:
       ref: ${{ needs.set-public-provider.outputs.ref }}
       public_provider: ${{ needs.set-public-provider.outputs.public_provider }}
       new_version: ${{ needs.get-update-version.outputs.new_version }}
+      nightly: true
       cortex_api_port: "39261"
 
   build-windows-x64:
     uses: ./.github/workflows/template-build-windows-x64.yml
     secrets: inherit
-    needs: [rename-icons-nightly, get-update-version, set-public-provider]
+    needs: [get-update-version, set-public-provider]
     with:
       ref: ${{ needs.set-public-provider.outputs.ref }}
       public_provider: ${{ needs.set-public-provider.outputs.public_provider }}
       new_version: ${{ needs.get-update-version.outputs.new_version }}
+      nightly: true
       cortex_api_port: "39261"
-
-          
   build-linux-x64:
     uses: ./.github/workflows/template-build-linux-x64.yml
     secrets: inherit
-    needs: [rename-icons-nightly, get-update-version, set-public-provider]
+    needs: [get-update-version, set-public-provider]
     with:
       ref: ${{ needs.set-public-provider.outputs.ref }}
       public_provider: ${{ needs.set-public-provider.outputs.public_provider }}
       new_version: ${{ needs.get-update-version.outputs.new_version }}
+      nightly: true
       cortex_api_port: "39261"
 
   sync-temp-to-latest:
@@ -158,4 +145,3 @@ jobs:
           RUN_ID=${{ github.run_id }}
           COMMENT="This is the build for this pull request. You can download it from the Artifacts section here: [Build URL](https://github.com/${{ github.repository }}/actions/runs/${RUN_ID})."
           gh pr comment $PR_URL --body "$COMMENT"
-    
\ 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 a0f919c6a..5ab492f34 100644
--- a/.github/workflows/template-build-linux-x64.yml
+++ b/.github/workflows/template-build-linux-x64.yml
@@ -23,6 +23,10 @@ on:
         required: false
         type: boolean
         default: false
+      nightly:
+        required: false
+        type: boolean
+        default: false
       cortex_api_port:
         required: false
         type: string
@@ -47,6 +51,26 @@ jobs:
         with:
           ref: ${{ inputs.ref }}
 
+      - name: Replace Icons for Beta Build
+        if: inputs.beta == true
+        shell: bash
+        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
+
+      - name: Replace Icons for Nightly Build
+        if: inputs.nightly == true
+        shell: bash
+        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
+
       - name: Installing node
         uses: actions/setup-node@v1
         with:
diff --git a/.github/workflows/template-build-macos.yml b/.github/workflows/template-build-macos.yml
index 50cb07274..9a9a79efb 100644
--- a/.github/workflows/template-build-macos.yml
+++ b/.github/workflows/template-build-macos.yml
@@ -23,6 +23,10 @@ on:
         required: false
         type: boolean
         default: false
+      nightly:
+        required: false
+        type: boolean
+        default: false
       cortex_api_port:
         required: false
         type: string
@@ -56,6 +60,26 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: ${{ inputs.ref }}
+      
+      - name: Replace Icons for Beta Build
+        if: inputs.beta == true
+        shell: bash
+        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
+
+      - name: Replace Icons for Nightly Build
+        if: inputs.nightly == true
+        shell: bash
+        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
 
       - name: Installing node
         uses: actions/setup-node@v1
diff --git a/.github/workflows/template-build-windows-x64.yml b/.github/workflows/template-build-windows-x64.yml
index 9974d2949..2833dd578 100644
--- a/.github/workflows/template-build-windows-x64.yml
+++ b/.github/workflows/template-build-windows-x64.yml
@@ -23,6 +23,10 @@ on:
         required: false
         type: boolean
         default: false
+      nightly:
+        required: false
+        type: boolean
+        default: false
       cortex_api_port:
         required: false
         type: string
@@ -56,6 +60,26 @@ jobs:
         with:
           ref: ${{ inputs.ref }}
 
+      - name: Replace Icons for Beta Build
+        if: inputs.beta == true
+        shell: bash
+        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
+
+      - name: Replace Icons for Nightly Build
+        if: inputs.nightly == true
+        shell: bash
+        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
+
       - name: Installing node
         uses: actions/setup-node@v1
         with: