Clean up missed bits and remaining references

CONTRIBUTING.md

@@ -61,7 +61,7 @@ The translation files needed at runtime can be built with:
 python pkgutils.py qtlrelease
 ```
 
-Default icon themes can be built with:
+Default icon themes can be updated with:
 
 ```bash
 python pkgutils.py icons default

CREDITS.md

@@ -62,15 +62,10 @@ The following libraries are dependencies of novelWriter:
 
 ## Icon Themes
 
-The default icon theme is a subset of icons from:
+The default icon themes are subsets of icons from:
 
 * **Material Symbols** by Google Inc (Apache 2.0)
-
-Additional icon themes may or may not be bundled with novelWriter, depending on license
-constraints. These themes include a subset of icons from:
-
 * **Font Awesome** by Fonticons Inc (CC BY 4.0)
-* **Remix** by RemixIcon (Apache 2.0 w/non-free clause)
 * **Lucide** by Cole Bemis and Lucide Contributors (ISC License)
 
 ## Colour Themes

novelwriter/assets/text/credits_en.htm

@@ -76,18 +76,11 @@
 
   <h3>Icon Themes</h3>
 
-  <p>The default icon theme is a subset of icons from:</p>
+  <p>The default icon themes are subsets of icons from:</p>
 
   <ul>
     <li><b>Material Symbols</b> by Google Inc (Apache 2.0)</li>
-  </ul>
-
-  <p>Additional icon themes may or may not be bundled with novelWriter, depending on license
-    constraints. These themes include a subset of icons from:</p>
-
-  <ul>
     <li><b>Font Awesome</b> by Fonticons Inc (CC BY 4.0)</li>
-    <li><b>Remix</b> by RemixIcon (Apache 2.0 w/non-free clause)</li>
     <li><b>Lucide</b> by Cole Bemis and Lucide Contributors (ISC License)</li>
   </ul>
 

setup/iss_license.txt

@@ -43,12 +43,12 @@ Copyright: Google Inc
 Website: <https://fonts.google.com/icons>
 License: Apache 2.0 <https://www.apache.org/licenses/LICENSE-2.0.txt>
 
-Remix Icon
-Copyright: Remix Icon
-Website: <https://remixicon.com>
-License: Apache 2.0 <https://www.apache.org/licenses/LICENSE-2.0.txt>
-
 Font Awesome
 Copyright: Fonticons Inc
 Website: <https://fontawesome.com>
 License: CC BY 4.0 <https://creativecommons.org/licenses/by/4.0/>
+
+Lucide
+Copyright: Cole Bemis, Lucide Contributors
+Website: <https://lucide.dev>
+License: ISC <https://opensource.org/license/isc-license-txt>

tests/gui/test_theme.py

@@ -863,24 +863,10 @@ def testGuiTheme_CheckTheme(theme):
     assert deprecated == [], "Deprecated options in theme file"
 
 
+@pytest.mark.gui
 @pytest.mark.parametrize(
     "icons",
-    [
-        pytest.param(
-            a.stem,
-            marks=(
-                (pytest.mark.gui,)
-                if a.stem.startswith("material")
-                else (
-                    pytest.mark.gui,
-                    pytest.mark.opt_assets,
-                    pytest.mark.xfail(reason="May be stale from another branch", strict=False),
-                )
-            ),
-        )
-        for a in CONFIG.assetPath("icons").iterdir()
-        if a.is_dir and a.suffix == ".icons"
-    ],
+    [a.stem for a in CONFIG.assetPath("icons").iterdir() if a.is_file() and a.suffix == ".icons"],
 )
 def testGuiTheme_CheckIcons(icons, tstPaths):
     """Test loading all icons."""

utils/icon_themes.py

@@ -60,7 +60,7 @@ ICON_EXTRACT = {
 
 # fmt: off
 ICONS = [
-    # Remember to also update tests/files/all_icons.json for test coverage
+    # Remember to also update tests/_files/all_icons.json for test coverage
     "alert_error",
     "alert_info",
     "alert_question",
@@ -387,7 +387,7 @@ def main(args: argparse.Namespace) -> None:
     iconsDir = ROOT_DIR / "novelwriter" / "assets" / "icons"
 
     style = args.style
-    if style in ("all", "default", "material"):
+    if style in ("all", "default", "free", "material"):
         processMaterialIcons(
             workDir,
             iconsDir,
@@ -431,7 +431,7 @@ def main(args: argparse.Namespace) -> None:
             },
         )
 
-    if style in ("all", "optional", "free", "font_awesome"):
+    if style in ("all", "default", "free", "font_awesome"):
         processFontAwesome(
             workDir,
             iconsDir,
@@ -442,7 +442,7 @@ def main(args: argparse.Namespace) -> None:
             },
         )
 
-    if style in ("all", "optional", "free", "lucide"):
+    if style in ("all", "default", "free", "lucide"):
         processLucide(
             workDir,
             iconsDir,