From b7744bbda24692b337b0d17268523f9fec1c2b94 Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Tue, 20 Dec 2022 12:25:15 +0100
Subject: [PATCH 1/3] Correct paths for input-none icons (#1297)

---
 .../assets/icons/typicons_dark/mixed_input-none.svg        | 7 +++----
 .../assets/icons/typicons_light/mixed_input-none.svg       | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/novelwriter/assets/icons/typicons_dark/mixed_input-none.svg b/novelwriter/assets/icons/typicons_dark/mixed_input-none.svg
index 105e1d8f..f4b1ae67 100644
--- a/novelwriter/assets/icons/typicons_dark/mixed_input-none.svg
+++ b/novelwriter/assets/icons/typicons_dark/mixed_input-none.svg
@@ -25,10 +25,9 @@
     </rdf:RDF>
   </metadata>
   <path
-     d="m2 17.714v-11.429c0-2.3629 1.9229-4.2857 4.2857-4.2857h11.429c2.3629 0 4.2857 1.9229 4.2857 4.2857v7.1429c0 0.79-0.64 1.4286-1.4286 1.4286-0.78857 0-1.4286-0.63857-1.4286-1.4286v-7.1429c0-0.78857-0.64143-1.4286-1.4286-1.4286h-11.429c-0.78714 0-1.4286 0.64-1.4286 1.4286v11.429c0 0.78857 0.64143 1.4286 1.4286 1.4286h4.2857c0.78857 0 1.4286 0.63857 1.4286 1.4286s-0.64 1.4286-1.4286 1.4286h-4.2857c-2.3629 0-4.2857-1.9229-4.2857-4.2857zm15.714 4.2857h-11.429c-2.3629 0-4.2857-1.9229-4.2857-4.2857v-11.429c0-2.3629 1.9229-4.2857 4.2857-4.2857h7.1429c0.79 0 1.4286 0.64 1.4286 1.4286 0 0.78857-0.63857 1.4286-1.4286 1.4286h-7.1429c-0.78857 0-1.4286 0.64143-1.4286 1.4286v11.429c0 0.78714 0.64 1.4286 1.4286 1.4286h11.429c0.78857 0 1.4286-0.64143 1.4286-1.4286v-4.2857c0-0.78857 0.63857-1.4286 1.4286-1.4286s1.4286 0.64 1.4286 1.4286v4.2857c0 2.3629-1.9229 4.2857-4.2857 4.2857z"
-     fill="#848484"
-     stroke-width="1.4286"
-     id="path2927" />
+     id="path2927"
+     style="fill:#848484;fill-opacity:1"
+     d="M 6.2851562,2 C 3.9296438,1.9318024 1.8530839,4.1116184 2,6.4548618 2.0068983,10.304935 1.9861657,14.15563 2.0104329,18.005313 2.1401885,20.174302 4.0868901,22.059322 6.2851562,22 c 3.8832648,-0.0037 7.7667178,0.0074 11.6498648,-0.0056 C 20.253096,21.935675 22.190613,19.73469 22,17.432001 21.996299,13.643017 22.007418,9.8538453 21.994414,6.0649793 21.935675,3.7469037 19.734691,1.8093866 17.432001,2 13.716386,2 10.000771,2 6.2851562,2 Z m 7.1621098,2.8554688 c 1.517767,0.018193 3.040205,-0.037158 4.55493,0.029088 0.831903,0.1432784 1.247019,1.0200413 1.140382,1.796579 -0.0049,3.726426 0.0098,7.453347 -0.0074,11.179464 -0.06228,0.897202 -0.990183,1.406807 -1.816343,1.281978 -3.726391,-0.005 -7.4532932,0.0099 -11.1793638,-0.0075 -0.8893499,-0.06498 -1.4061831,-0.991209 -1.2820783,-1.81622 0.00424,-3.720679 -0.00847,-7.4417768 0.00635,-11.1621953 0.056947,-0.8627405 0.9413144,-1.4230927 1.7608001,-1.2992468 2.2741995,-0.00131 4.5486615,0.00261 6.8226985,-0.00195 z" />
   <rect
      x="7"
      y="10.1"
diff --git a/novelwriter/assets/icons/typicons_light/mixed_input-none.svg b/novelwriter/assets/icons/typicons_light/mixed_input-none.svg
index f80dd7ff..987e60df 100644
--- a/novelwriter/assets/icons/typicons_light/mixed_input-none.svg
+++ b/novelwriter/assets/icons/typicons_light/mixed_input-none.svg
@@ -25,10 +25,9 @@
     </rdf:RDF>
   </metadata>
   <path
-     d="m2 17.714v-11.429c0-2.3629 1.9229-4.2857 4.2857-4.2857h11.429c2.3629 0 4.2857 1.9229 4.2857 4.2857v7.1429c0 0.79-0.64 1.4286-1.4286 1.4286-0.78857 0-1.4286-0.63857-1.4286-1.4286v-7.1429c0-0.78857-0.64143-1.4286-1.4286-1.4286h-11.429c-0.78714 0-1.4286 0.64-1.4286 1.4286v11.429c0 0.78857 0.64143 1.4286 1.4286 1.4286h4.2857c0.78857 0 1.4286 0.63857 1.4286 1.4286s-0.64 1.4286-1.4286 1.4286h-4.2857c-2.3629 0-4.2857-1.9229-4.2857-4.2857zm15.714 4.2857h-11.429c-2.3629 0-4.2857-1.9229-4.2857-4.2857v-11.429c0-2.3629 1.9229-4.2857 4.2857-4.2857h7.1429c0.79 0 1.4286 0.64 1.4286 1.4286 0 0.78857-0.63857 1.4286-1.4286 1.4286h-7.1429c-0.78857 0-1.4286 0.64143-1.4286 1.4286v11.429c0 0.78714 0.64 1.4286 1.4286 1.4286h11.429c0.78857 0 1.4286-0.64143 1.4286-1.4286v-4.2857c0-0.78857 0.63857-1.4286 1.4286-1.4286s1.4286 0.64 1.4286 1.4286v4.2857c0 2.3629-1.9229 4.2857-4.2857 4.2857z"
-     fill="#333"
-     stroke-width="1.4286"
-     id="path969" />
+     id="path969"
+     style="fill:#333333;fill-opacity:1"
+     d="M 6.2851562,2 C 3.9296438,1.9318024 1.8530839,4.1116184 2,6.4548618 2.0068983,10.304935 1.9861657,14.15563 2.0104329,18.005313 2.1401885,20.174302 4.0868901,22.059322 6.2851562,22 c 3.8832648,-0.0037 7.7667178,0.0074 11.6498648,-0.0056 C 20.253096,21.935675 22.190613,19.73469 22,17.432001 21.996299,13.643017 22.007418,9.8538453 21.994414,6.0649793 21.935675,3.7469037 19.734691,1.8093866 17.432001,2 13.716386,2 10.000771,2 6.2851562,2 Z m 7.1621098,2.8554688 c 1.517767,0.018193 3.040205,-0.037158 4.55493,0.029088 0.831903,0.1432784 1.247019,1.0200413 1.140382,1.796579 -0.0049,3.726426 0.0098,7.453347 -0.0074,11.179464 -0.06228,0.897202 -0.990183,1.406807 -1.816343,1.281978 -3.726391,-0.005 -7.4532932,0.0099 -11.1793638,-0.0075 -0.8893499,-0.06498 -1.4061831,-0.991209 -1.2820783,-1.81622 0.00424,-3.720679 -0.00847,-7.4417768 0.00635,-11.1621953 0.056947,-0.8627405 0.9413144,-1.4230927 1.7608001,-1.2992468 2.2741995,-0.00131 4.5486615,0.00261 6.8226985,-0.00195 z" />
   <rect
      x="7"
      y="10.1"

From 6c76e31e0b29fa8cdce7954f31f58c1e67926e35 Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Tue, 20 Dec 2022 12:32:42 +0100
Subject: [PATCH 2/3] Remove Inkscape meta data from a bunch of icons

---
 .../assets/icons/typicons_dark/mixed_edit.svg | 35 +++------------
 .../typicons_dark/typ_arrow-maximise.svg      | 24 -----------
 .../typicons_dark/typ_arrow-minimise.svg      | 24 -----------
 .../icons/typicons_dark/typ_refresh.svg       | 24 -----------
 .../icons/typicons_dark/typ_th-list-grey.svg  | 28 +-----------
 .../icons/typicons_light/mixed_edit.svg       | 35 +++------------
 .../typicons_light/typ_arrow-maximise.svg     | 27 +-----------
 .../typicons_light/typ_arrow-minimise.svg     | 24 -----------
 .../icons/typicons_light/typ_export.svg       | 43 ++++++++-----------
 .../icons/typicons_light/typ_refresh.svg      | 27 +-----------
 .../icons/typicons_light/typ_th-list-grey.svg | 28 +-----------
 11 files changed, 38 insertions(+), 281 deletions(-)

diff --git a/novelwriter/assets/icons/typicons_dark/mixed_edit.svg b/novelwriter/assets/icons/typicons_dark/mixed_edit.svg
index fac03f3e..5ac0581f 100644
--- a/novelwriter/assets/icons/typicons_dark/mixed_edit.svg
+++ b/novelwriter/assets/icons/typicons_dark/mixed_edit.svg
@@ -1,37 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
    version="1.2"
    width="24"
    height="24"
    viewBox="0 0 24 24"
-   id="svg7536"
-   sodipodi:docname="mixed_edit.svg"
-   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <sodipodi:namedview
-     id="namedview1259"
-     pagecolor="#505050"
-     bordercolor="#eeeeee"
-     borderopacity="1"
-     inkscape:pageshadow="0"
-     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="34.625"
-     inkscape:cx="8.7364621"
-     inkscape:cy="11.98556"
-     inkscape:window-width="2560"
-     inkscape:window-height="1330"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg7536" />
+   id="svg7536">
   <metadata
      id="metadata7542">
     <rdf:RDF>
@@ -40,6 +18,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_arrow-maximise.svg b/novelwriter/assets/icons/typicons_dark/typ_arrow-maximise.svg
index a5ee7fa0..48990ef7 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_arrow-maximise.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_arrow-maximise.svg
@@ -5,10 +5,6 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
-   sodipodi:docname="arrow-maximise.svg"
    id="svg7486"
    viewBox="0 0 24 24"
    height="24"
@@ -28,26 +24,6 @@
   </metadata>
   <defs
      id="defs7490" />
-  <sodipodi:namedview
-     inkscape:current-layer="svg7486"
-     inkscape:window-maximized="1"
-     inkscape:window-y="1"
-     inkscape:window-x="2560"
-     inkscape:cy="12"
-     inkscape:cx="12"
-     inkscape:zoom="38.125"
-     showgrid="false"
-     id="namedview7488"
-     inkscape:window-height="1370"
-     inkscape:window-width="2560"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
-     bordercolor="#666666"
-     pagecolor="#ffffff" />
   <path
      style="stroke-width:1.25;fill:#6699cc;fill-opacity:1"
      id="path7484"
diff --git a/novelwriter/assets/icons/typicons_dark/typ_arrow-minimise.svg b/novelwriter/assets/icons/typicons_dark/typ_arrow-minimise.svg
index 83d5a066..bc62608a 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_arrow-minimise.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_arrow-minimise.svg
@@ -5,10 +5,6 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
-   sodipodi:docname="arrow-minimise.svg"
    id="svg8816"
    viewBox="0 0 24 24"
    height="24"
@@ -28,26 +24,6 @@
   </metadata>
   <defs
      id="defs8820" />
-  <sodipodi:namedview
-     inkscape:current-layer="svg8816"
-     inkscape:window-maximized="1"
-     inkscape:window-y="1"
-     inkscape:window-x="2560"
-     inkscape:cy="12"
-     inkscape:cx="12"
-     inkscape:zoom="38.125"
-     showgrid="false"
-     id="namedview8818"
-     inkscape:window-height="1370"
-     inkscape:window-width="2560"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
-     bordercolor="#666666"
-     pagecolor="#ffffff" />
   <path
      style="fill:#6699cc;fill-opacity:1;stroke-width:1.24999"
      id="path8814"
diff --git a/novelwriter/assets/icons/typicons_dark/typ_refresh.svg b/novelwriter/assets/icons/typicons_dark/typ_refresh.svg
index f1853eb3..28c4cc43 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_refresh.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_refresh.svg
@@ -5,10 +5,6 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
-   sodipodi:docname="refresh.svg"
    id="svg6649"
    viewBox="0 0 24 24"
    height="24"
@@ -28,26 +24,6 @@
   </metadata>
   <defs
      id="defs6653" />
-  <sodipodi:namedview
-     inkscape:current-layer="svg6649"
-     inkscape:window-maximized="1"
-     inkscape:window-y="1"
-     inkscape:window-x="2560"
-     inkscape:cy="12"
-     inkscape:cx="12"
-     inkscape:zoom="38.125"
-     showgrid="false"
-     id="namedview6651"
-     inkscape:window-height="1370"
-     inkscape:window-width="2560"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
-     bordercolor="#666666"
-     pagecolor="#ffffff" />
   <path
      style="fill:#99cc99;fill-opacity:1;stroke-width:1.33321"
      id="path6647"
diff --git a/novelwriter/assets/icons/typicons_dark/typ_th-list-grey.svg b/novelwriter/assets/icons/typicons_dark/typ_th-list-grey.svg
index a977f507..ad1ae32b 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_th-list-grey.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_th-list-grey.svg
@@ -5,35 +5,11 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.2"
    width="24"
    height="24"
    viewBox="0 0 24 24"
-   id="svg5291"
-   sodipodi:docname="status_lines-dark.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1344"
-     id="namedview6681"
-     showgrid="false"
-     inkscape:zoom="38.125"
-     inkscape:cx="12.065574"
-     inkscape:cy="12"
-     inkscape:window-x="2560"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg5291" />
+   id="svg5291">
   <metadata
      id="metadata5297">
     <rdf:RDF>
@@ -42,7 +18,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
diff --git a/novelwriter/assets/icons/typicons_light/mixed_edit.svg b/novelwriter/assets/icons/typicons_light/mixed_edit.svg
index 982206ed..ded34ef2 100644
--- a/novelwriter/assets/icons/typicons_light/mixed_edit.svg
+++ b/novelwriter/assets/icons/typicons_light/mixed_edit.svg
@@ -1,37 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
    version="1.2"
    width="24"
    height="24"
    viewBox="0 0 24 24"
-   id="svg7536"
-   sodipodi:docname="mixed_edit.svg"
-   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <sodipodi:namedview
-     id="namedview1259"
-     pagecolor="#505050"
-     bordercolor="#eeeeee"
-     borderopacity="1"
-     inkscape:pageshadow="0"
-     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="34.625"
-     inkscape:cx="3.1913357"
-     inkscape:cy="11.98556"
-     inkscape:window-width="2560"
-     inkscape:window-height="1330"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg7536" />
+   id="svg7536">
   <metadata
      id="metadata7542">
     <rdf:RDF>
@@ -40,6 +18,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
diff --git a/novelwriter/assets/icons/typicons_light/typ_arrow-maximise.svg b/novelwriter/assets/icons/typicons_light/typ_arrow-maximise.svg
index 3ef012fe..cd00423e 100644
--- a/novelwriter/assets/icons/typicons_light/typ_arrow-maximise.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_arrow-maximise.svg
@@ -5,15 +5,11 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.2"
    width="24"
    height="24"
    viewBox="0 0 24 24"
-   id="svg7486"
-   sodipodi:docname="arrow-maximise.svg"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+   id="svg7486">
   <metadata
      id="metadata7492">
     <rdf:RDF>
@@ -28,27 +24,6 @@
   </metadata>
   <defs
      id="defs7490" />
-  <sodipodi:namedview
-     inkscape:document-rotation="0"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1370"
-     id="namedview7488"
-     showgrid="false"
-     inkscape:zoom="38.125"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:window-x="2560"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg7486" />
   <path
      d="m 15.75,2 c -0.69125,0 -1.25,0.56 -1.25,1.25 0,0.69 0.55875,1.25 1.25,1.25 h 1.9825 l -4.11625,4.11625 c -0.48875,0.48875 -0.48875,1.27875 0,1.7675 C 13.86,10.6275 14.18,10.75 14.5,10.75 c 0.32,0 0.64,-0.1225 0.88375,-0.36625 L 19.5,6.2675 V 8.25 c 0,0.69 0.55875,1.25 1.25,1.25 C 21.44125,9.5 22,8.94 22,8.25 V 2 Z M 8.61625,13.61625 4.5,17.7325 V 15.75 C 4.5,15.06 3.94125,14.5 3.25,14.5 2.55875,14.5 2,15.06 2,15.75 v 6.24875 H 3.245 L 8.25,22 C 8.94,22 9.5,21.44 9.5,20.75 9.5,20.06 8.94125,19.5 8.25,19.5 H 6.2675 l 4.11625,-4.115 c 0.48875,-0.48875 0.48875,-1.27875 0,-1.7675 C 9.895,13.12875 9.105,13.1275 8.61625,13.6163 Z M 5.75,12 C 6.44,12 7,11.44 7,10.75 V 7 h 3.75 C 11.44125,7 12,6.44 12,5.75 12,5.06 11.44125,4.5 10.75,4.5 H 4.50125 L 4.5,10.75 C 4.5,11.44 5.05875,12 5.75,12 Z m 12.5,0 C 17.55875,12 17,12.56 17,13.25 V 17 H 13.25 C 12.55875,17 12,17.56 12,18.25 c 0,0.69 0.55875,1.25 1.25,1.25 H 19.5 V 13.25 C 19.5,12.56 18.94125,12 18.25,12 Z"
      id="path7484"
diff --git a/novelwriter/assets/icons/typicons_light/typ_arrow-minimise.svg b/novelwriter/assets/icons/typicons_light/typ_arrow-minimise.svg
index 0d9f7d13..96551d16 100644
--- a/novelwriter/assets/icons/typicons_light/typ_arrow-minimise.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_arrow-minimise.svg
@@ -5,10 +5,6 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
-   sodipodi:docname="arrow-minimise.svg"
    id="svg8816"
    viewBox="0 0 24 24"
    height="24"
@@ -28,26 +24,6 @@
   </metadata>
   <defs
      id="defs8820" />
-  <sodipodi:namedview
-     inkscape:current-layer="svg8816"
-     inkscape:window-maximized="1"
-     inkscape:window-y="1"
-     inkscape:window-x="2560"
-     inkscape:cy="12"
-     inkscape:cx="12"
-     inkscape:zoom="38.125"
-     showgrid="false"
-     id="namedview8818"
-     inkscape:window-height="1370"
-     inkscape:window-width="2560"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
-     bordercolor="#666666"
-     pagecolor="#ffffff" />
   <path
      style="fill:#4271ae;fill-opacity:1;stroke-width:1.24999"
      id="path8814"
diff --git a/novelwriter/assets/icons/typicons_light/typ_export.svg b/novelwriter/assets/icons/typicons_light/typ_export.svg
index 537f71f9..cb77796f 100644
--- a/novelwriter/assets/icons/typicons_light/typ_export.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_export.svg
@@ -1,34 +1,27 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
    version="1.2"
    width="24"
    height="24"
    viewBox="0 0 24 24"
-   id="svg1169"
-   sodipodi:docname="typ_export.svg"
-   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview2676"
-     pagecolor="#505050"
-     bordercolor="#eeeeee"
-     borderopacity="1"
-     inkscape:pageshadow="0"
-     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="34.625"
-     inkscape:cx="6.4259928"
-     inkscape:cy="11.98556"
-     inkscape:window-width="2560"
-     inkscape:window-height="1330"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg1169" />
+   id="svg1169">
+  <metadata
+     id="metadata13645">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
   <defs
      id="defs1173" />
   <path
diff --git a/novelwriter/assets/icons/typicons_light/typ_refresh.svg b/novelwriter/assets/icons/typicons_light/typ_refresh.svg
index d1d9513b..66f335e4 100644
--- a/novelwriter/assets/icons/typicons_light/typ_refresh.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_refresh.svg
@@ -5,15 +5,11 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.2"
    width="24"
    height="24"
    viewBox="0 0 24 24"
-   id="svg6649"
-   sodipodi:docname="refresh.svg"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+   id="svg6649">
   <metadata
      id="metadata6655">
     <rdf:RDF>
@@ -28,27 +24,6 @@
   </metadata>
   <defs
      id="defs6653" />
-  <sodipodi:namedview
-     inkscape:document-rotation="0"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1370"
-     id="namedview6651"
-     showgrid="false"
-     inkscape:zoom="38.125"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:window-x="2560"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg6649" />
   <path
      d="M 13.162667,12.25611 H 20 V 5.4213831 C 19.989333,3.9083317 19.105333,3.5443996 18.036,4.6148668 L 16.497333,6.1585791 C 15.144,5.0987766 13.488,4.5188846 11.742667,4.5188846 9.676,4.5188846 7.7306667,5.3240679 6.2706667,6.7864621 4.8053333,8.242191 4,10.189828 4,12.25611 4,14.326391 4.8053333,16.271361 6.268,17.731089 7.7306667,19.193484 9.674667,20 11.742667,20 c 2.066666,0 4.012,-0.806516 5.474666,-2.270244 0.394667,-0.395926 0.744,-0.827845 1.04,-1.286427 C 18.72,15.72213 18.510667,14.763642 17.790667,14.303728 17.072,13.842481 16.113333,14.051775 15.652,14.770308 c -0.177333,0.275948 -0.389333,0.533234 -0.624,0.773189 -0.878667,0.87717 -2.045333,1.359747 -3.285333,1.359747 -1.24,0 -2.406667,-0.481244 -3.285334,-1.359747 -0.8759997,-0.87717 -1.3599997,-2.043619 -1.3599997,-3.286054 0,-1.239769 0.4826667,-2.406219 1.3599997,-3.280722 0.878667,-0.87717 2.045334,-1.36108 3.285334,-1.36108 0.917333,0 1.794666,0.26795 2.545333,0.762525 l -1.930667,1.934306 c -1.070666,1.069134 -0.706666,1.943638 0.805334,1.943638 z"
      id="path6647"
diff --git a/novelwriter/assets/icons/typicons_light/typ_th-list-grey.svg b/novelwriter/assets/icons/typicons_light/typ_th-list-grey.svg
index d249f307..eae674b8 100644
--- a/novelwriter/assets/icons/typicons_light/typ_th-list-grey.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_th-list-grey.svg
@@ -5,35 +5,11 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.2"
    width="24"
    height="24"
    viewBox="0 0 24 24"
-   id="svg5291"
-   sodipodi:docname="status_lines.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1344"
-     id="namedview7270"
-     showgrid="false"
-     inkscape:zoom="38.125"
-     inkscape:cx="12.065574"
-     inkscape:cy="12"
-     inkscape:window-x="2560"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg5291" />
+   id="svg5291">
   <metadata
      id="metadata5297">
     <rdf:RDF>
@@ -42,7 +18,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>

From 1664f92cc8bcb0534737b2f356714cce052e8633 Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Tue, 20 Dec 2022 12:50:21 +0100
Subject: [PATCH 3/3] Also allow custom icon themes

---
 docs/source/int_customise.rst    | 15 +++++++++------
 novelwriter/config.py            |  3 ++-
 novelwriter/gui/theme.py         |  6 ++++--
 tests/test_gui/test_gui_theme.py |  1 -
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/docs/source/int_customise.rst b/docs/source/int_customise.rst
index 27b94284..07b130b4 100644
--- a/docs/source/int_customise.rst
+++ b/docs/source/int_customise.rst
@@ -52,14 +52,16 @@ modify it as you like.
   `novelwriter/assets/syntax <https://github.com/vkbo/novelWriter/tree/main/novelwriter/assets/syntax>`_.
 * The existing GUI themes are stored in
   `novelwriter/assets/themes <https://github.com/vkbo/novelWriter/tree/main/novelwriter/assets/themes>`_.
+* The existing icon themes are stored in
+  `novelwriter/assets/icons <https://github.com/vkbo/novelWriter/tree/main/novelwriter/assets/icons>`_.
 
 Remember to also change the name of your theme by modifying the ``name`` setting at the top of the
 file, otherwise you may not be able to distinguish them in :guilabel:`Preferences`.
 
 For novelWriter to be able to locate the custom theme files, you must copy them to the
 :ref:`a_locations_data` location in your home or user area. There should be a folder there named
-``syntax`` for syntax themes and just ``themes`` for GUI themes. These folders are created the
-first time you start novelWriter.
+``syntax`` for syntax themes, just ``themes`` for GUI themes, and ``icons`` for icon themes. These
+folders are created the first time you start novelWriter.
 
 Once the files are copied there, they should show up in :guilabel:`Preferences` with the label you
 set as ``name`` inside the file.
@@ -70,8 +72,8 @@ set as ``name`` inside the file.
    theme colour scheme.
 
 
-Gustom GUI Theme
-----------------
+Gustom GUI and Icons Theme
+--------------------------
 
 A GUI theme conf file consists of the follwing settings:
 
@@ -109,8 +111,9 @@ A GUI theme conf file consists of the follwing settings:
    statusunsaved   = 100, 100, 100
 
 In the Main section you must at least define the ``name`` and ``icontheme`` settings. The
-``icontheme`` settings should correspond to one of the internal icon themes. Either
-``typicons_light`` or ``typicons_dark``.
+``icontheme`` settings should correspond to one of the internal icon themes, either
+``typicons_light`` or ``typicons_dark``, or to an icon theme in your custom icons directory. The
+setting must match the icon theme's folder name.
 
 The Palette values correspond the the Qt enum values for QPalette::ColorRole, see the
 `Qt documentation <https://doc.qt.io/qt-5.15/qpalette.html#ColorRole-enum>`_ for more details. The
diff --git a/novelwriter/config.py b/novelwriter/config.py
index b6708add..e60a9444 100644
--- a/novelwriter/config.py
+++ b/novelwriter/config.py
@@ -461,10 +461,11 @@ class Config:
         self._confPath.mkdir(exist_ok=True)
         self._dataPath.mkdir(exist_ok=True)
 
-        # Also create the syntax and themes folders if possible
+        # Also create the syntax, themes and icons folders if possible
         if self._dataPath.is_dir():
             (self._dataPath / "syntax").mkdir(exist_ok=True)
             (self._dataPath / "themes").mkdir(exist_ok=True)
+            (self._dataPath / "icons").mkdir(exist_ok=True)
 
         # Check if config file exists, and load it. If not, we save defaults
         if (self._confPath / nwFiles.CONF_FILE).is_file():
diff --git a/novelwriter/gui/theme.py b/novelwriter/gui/theme.py
index c3516556..17e58ff4 100644
--- a/novelwriter/gui/theme.py
+++ b/novelwriter/gui/theme.py
@@ -507,8 +507,10 @@ class GuiIcons:
         self._themeMap = {}
         themePath = self._iconPath / iconTheme
         if not themePath.is_dir():
-            logger.warning("No icons loaded for '%s'", iconTheme)
-            return False
+            themePath = self.mainConf.dataPath("icons") / iconTheme
+            if not themePath.is_dir():
+                logger.warning("No icons loaded for '%s'", iconTheme)
+                return False
 
         themeConf = themePath / self._confName
         logger.info("Loading icon theme '%s'", iconTheme)
diff --git a/tests/test_gui/test_gui_theme.py b/tests/test_gui/test_gui_theme.py
index f5751e7b..c8133f6b 100644
--- a/tests/test_gui/test_gui_theme.py
+++ b/tests/test_gui/test_gui_theme.py
@@ -282,7 +282,6 @@ def testGuiTheme_Icons(qtbot, caplog, monkeypatch, nwGUI, fncPath):
     # Load a broken theme file
     iconsDir = fncPath / "icons"
     testIcons = iconsDir / "testicons"
-    iconsDir.mkdir()
     testIcons.mkdir()
     writeFile(testIcons / "icons.conf", (
         "[Main]\n"