diff --git a/.github/workflows/build_assets.yml b/.github/workflows/build_assets.yml
index 26f9eace..d9959e37 100644
--- a/.github/workflows/build_assets.yml
+++ b/.github/workflows/build_assets.yml
@@ -26,6 +26,7 @@ jobs:
       - name: Build Assets
         run: |
           python pkgutils.py build-assets
+          python pkgutils.py icons optional
 
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
@@ -35,5 +36,6 @@ jobs:
             novelwriter/assets/manual*.pdf
             novelwriter/assets/sample.zip
             novelwriter/assets/i18n/*.qm
+            novelwriter/assets/icons/*.icons
           if-no-files-found: error
           retention-days: 14
diff --git a/.gitignore b/.gitignore
index 18a432eb..833d4182 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,10 @@ setup.iss
 i18n/*.qm
 i18n/*.qph
 
+# Icons Themes Except Material Symbols
+/novelwriter/assets/icons/*.icons
+!/novelwriter/assets/icons/material_*.icons
+
 # Documentation
 /docs/build/
 /docs/source/locales/**/*.mo
diff --git a/setup/make_pip.sh b/setup/make_pip.sh
index 4c3eb846..681a3cb5 100755
--- a/setup/make_pip.sh
+++ b/setup/make_pip.sh
@@ -24,6 +24,7 @@ echo " Building Dependencies"
 echo "================================================================================"
 echo ""
 python3 pkgutils.py build-assets
+python3 pkgutils.py icons optional
 
 echo ""
 echo " Building Packages"
diff --git a/setup/make_release.sh b/setup/make_release.sh
index cbe4ca25..97438bd9 100755
--- a/setup/make_release.sh
+++ b/setup/make_release.sh
@@ -18,6 +18,7 @@ fi
 source $ENVPATH/bin/activate
 pip3 install -r requirements.txt -r docs/requirements.txt
 python3 pkgutils.py build-assets
+python3 pkgutils.py icons optional
 deactivate
 
 echo ""