diff --git a/novelwriter/assets/icons/typicons_dark/mixed_document-chapter.svg b/novelwriter/assets/icons/typicons_dark/mixed_document-chapter.svg
index e33bb775..ab586a75 100644
--- a/novelwriter/assets/icons/typicons_dark/mixed_document-chapter.svg
+++ b/novelwriter/assets/icons/typicons_dark/mixed_document-chapter.svg
@@ -1,47 +1,12 @@
-<?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="svg2161">
-  <metadata
-     id="metadata2167">
-    <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="defs2165" />
-  <path
-     id="rect12986"
-     style="display:inline;opacity:0.95;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.88635;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 5.8886719 3.4453125 C 5.2152275 3.4453125 4.6660156 3.9925712 4.6660156 4.6660156 L 4.6660156 19.333984 C 4.6660156 20.007428 5.2152275 20.554687 5.8886719 20.554688 L 18.111328 20.554688 C 18.784774 20.554688 19.333984 20.007428 19.333984 19.333984 L 19.333984 4.6660156 C 19.333984 3.9925712 18.784774 3.4453125 18.111328 3.4453125 L 5.8886719 3.4453125 z " />
-  <path
-     id="rect935"
-     style="fill:#d64848;fill-opacity:1;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.2"
-     d="M 5.8886719 3.4453125 C 5.2152275 3.4453125 4.6660156 3.9925712 4.6660156 4.6660156 L 4.6660156 6 L 4.6660156 7.1894531 L 4.6660156 10.058594 L 19.333984 10.058594 L 19.333984 7.1894531 L 19.333984 6 L 19.333984 4.6660156 C 19.333984 3.9925712 18.784774 3.4453125 18.111328 3.4453125 L 5.8886719 3.4453125 z " />
-  <path
-     id="path2157"
-     style="display:inline;fill:#595959;fill-opacity:1;stroke-width:1.22222"
-     d="M 7.1113281,13.222656 C 6.7739949,13.222656 6.5,13.49665 6.5,13.833984 c 0,0.337332 0.2739949,0.611328 0.6113281,0.611328 h 9.7773439 c 0.337334,1e-6 0.611328,-0.273996 0.611328,-0.611328 0,-0.337334 -0.273994,-0.611328 -0.611328,-0.611328 z m 0,3.666016 C 6.7739949,16.888672 6.5,17.162666 6.5,17.5 c 0,0.337334 0.2739949,0.611328 0.6113281,0.611328 H 16.888672 C 17.226006,18.111328 17.5,17.837334 17.5,17.5 c 0,-0.337334 -0.273994,-0.611328 -0.611328,-0.611328 z" />
-  <path
-     id="path902"
-     style="display:inline;fill:#848484;fill-opacity:1;stroke-width:1.22222"
-     d="M 5.8886719,1 C 3.8671165,1 2.2226562,2.6444602 2.2226562,4.6660156 V 19.333984 C 2.2226563,21.355538 3.8671165,23 5.8886719,23 H 18.111328 c 2.021556,0 3.666016,-1.644462 3.666016,-3.666016 V 4.6660156 C 21.777344,2.6444602 20.132884,1 18.111328,1 Z m 0,2.4453125 H 18.111328 c 0.673446,0 1.222656,0.5472587 1.222656,1.2207031 V 19.333984 c 0,0.673444 -0.54921,1.220704 -1.222656,1.220704 H 5.8886719 c -0.6734444,-10e-7 -1.2226563,-0.54726 -1.2226563,-1.220704 V 4.6660156 c 0,-0.6734444 0.5492119,-1.2207031 1.2226563,-1.2207031 z" />
-  <path
-     id="path2157-0"
-     style="display:inline;fill:#ffffff;fill-opacity:1;stroke-width:1.22222"
-     d="M 7.1113281 5.8886719 C 6.7739949 5.8886719 6.5 6.1626667 6.5 6.5 C 6.5 6.837334 6.7739949 7.1113281 7.1113281 7.1113281 L 16.888672 7.1113281 C 17.226006 7.1113281 17.5 6.837334 17.5 6.5 C 17.5 6.1626667 17.226006 5.8886719 16.888672 5.8886719 L 7.1113281 5.8886719 z " />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <g>
+  <path d="m5.8887 3.4453c-0.67344 0-1.2227 0.54726-1.2227 1.2207v14.668c0 0.67344 0.54921 1.2207 1.2227 1.2207h12.223c0.67345 0 1.2227-0.54726 1.2227-1.2207v-14.668c0-0.67344-0.54921-1.2207-1.2227-1.2207h-12.223z" fill="#fff" opacity=".95"/>
+  <path d="m5.8887 3.4453c-0.67344 0-1.2227 0.54726-1.2227 1.2207v1.334 1.1895 2.8691h14.668v-2.8691-1.1895-1.334c0-0.67344-0.54921-1.2207-1.2227-1.2207h-12.223z" fill="#d64848" stroke-width="0"/>
+  <g stroke-width="1.2222">
+   <path d="m7.1113 13.223c-0.33733 0-0.61133 0.27399-0.61133 0.61133 0 0.33733 0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 1e-6 0.61133-0.274 0.61133-0.61133 0-0.33733-0.27399-0.61133-0.61133-0.61133zm0 3.666c-0.33733 0-0.61133 0.27399-0.61133 0.61133s0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 0 0.61133-0.27399 0.61133-0.61133s-0.27399-0.61133-0.61133-0.61133z" fill="#595959"/>
+   <path d="m5.8887 1c-2.0216 0-3.666 1.6445-3.666 3.666v14.668c1e-7 2.0216 1.6445 3.666 3.666 3.666h12.223c2.0216 0 3.666-1.6445 3.666-3.666v-14.668c0-2.0216-1.6445-3.666-3.666-3.666zm0 2.4453h12.223c0.67345 0 1.2227 0.54726 1.2227 1.2207v14.668c0 0.67344-0.54921 1.2207-1.2227 1.2207h-12.223c-0.67344-1e-6 -1.2227-0.54726-1.2227-1.2207v-14.668c0-0.67344 0.54921-1.2207 1.2227-1.2207z" fill="#848484"/>
+   <path d="m7.1113 5.8887c-0.33733 0-0.61133 0.27399-0.61133 0.61133 0 0.33733 0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 0 0.61133-0.27399 0.61133-0.61133 0-0.33733-0.27399-0.61133-0.61133-0.61133h-9.7773z" fill="#fff"/>
+  </g>
+ </g>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/mixed_document-note.svg b/novelwriter/assets/icons/typicons_dark/mixed_document-note.svg
index c7ac4ae6..7778aefc 100644
--- a/novelwriter/assets/icons/typicons_dark/mixed_document-note.svg
+++ b/novelwriter/assets/icons/typicons_dark/mixed_document-note.svg
@@ -1,47 +1,12 @@
-<?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="svg2161">
-  <metadata
-     id="metadata2167">
-    <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="defs2165" />
-  <path
-     id="rect12986"
-     style="display:inline;opacity:0.95;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.88635;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 5.8886719 3.4453125 C 5.2152275 3.4453125 4.6660156 3.9925712 4.6660156 4.6660156 L 4.6660156 19.333984 C 4.6660156 20.007428 5.2152275 20.554687 5.8886719 20.554688 L 18.111328 20.554688 C 18.784774 20.554688 19.333984 20.007428 19.333984 19.333984 L 19.333984 4.6660156 C 19.333984 3.9925712 18.784774 3.4453125 18.111328 3.4453125 L 5.8886719 3.4453125 z " />
-  <path
-     id="rect935"
-     style="fill:#ffff84;fill-opacity:1;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.2"
-     d="M 5.8886719 3.4453125 C 5.2152275 3.4453125 4.6660156 3.9925712 4.6660156 4.6660156 L 4.6660156 6 L 4.6660156 7.1894531 L 4.6660156 10.058594 L 19.333984 10.058594 L 19.333984 7.1894531 L 19.333984 6 L 19.333984 4.6660156 C 19.333984 3.9925712 18.784774 3.4453125 18.111328 3.4453125 L 5.8886719 3.4453125 z " />
-  <path
-     id="path2157"
-     style="display:inline;fill:#595959;fill-opacity:1;stroke-width:1.22222"
-     d="M 7.1113281,13.222656 C 6.7739949,13.222656 6.5,13.49665 6.5,13.833984 c 0,0.337332 0.2739949,0.611328 0.6113281,0.611328 h 9.7773439 c 0.337334,1e-6 0.611328,-0.273996 0.611328,-0.611328 0,-0.337334 -0.273994,-0.611328 -0.611328,-0.611328 z m 0,3.666016 C 6.7739949,16.888672 6.5,17.162666 6.5,17.5 c 0,0.337334 0.2739949,0.611328 0.6113281,0.611328 H 16.888672 C 17.226006,18.111328 17.5,17.837334 17.5,17.5 c 0,-0.337334 -0.273994,-0.611328 -0.611328,-0.611328 z" />
-  <path
-     id="path902"
-     style="display:inline;fill:#848484;fill-opacity:1;stroke-width:1.22222"
-     d="M 5.8886719,1 C 3.8671165,1 2.2226562,2.6444602 2.2226562,4.6660156 V 19.333984 C 2.2226563,21.355538 3.8671165,23 5.8886719,23 H 18.111328 c 2.021556,0 3.666016,-1.644462 3.666016,-3.666016 V 4.6660156 C 21.777344,2.6444602 20.132884,1 18.111328,1 Z m 0,2.4453125 H 18.111328 c 0.673446,0 1.222656,0.5472587 1.222656,1.2207031 V 19.333984 c 0,0.673444 -0.54921,1.220704 -1.222656,1.220704 H 5.8886719 c -0.6734444,-10e-7 -1.2226563,-0.54726 -1.2226563,-1.220704 V 4.6660156 c 0,-0.6734444 0.5492119,-1.2207031 1.2226563,-1.2207031 z" />
-  <path
-     id="path2157-0"
-     style="display:inline;fill:#ffffff;fill-opacity:1;stroke-width:1.22222"
-     d="M 7.1113281 5.8886719 C 6.7739949 5.8886719 6.5 6.1626667 6.5 6.5 C 6.5 6.837334 6.7739949 7.1113281 7.1113281 7.1113281 L 16.888672 7.1113281 C 17.226006 7.1113281 17.5 6.837334 17.5 6.5 C 17.5 6.1626667 17.226006 5.8886719 16.888672 5.8886719 L 7.1113281 5.8886719 z " />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <g>
+  <path d="m5.8887 3.4453c-0.67344 0-1.2227 0.54726-1.2227 1.2207v14.668c0 0.67344 0.54921 1.2207 1.2227 1.2207h12.223c0.67345 0 1.2227-0.54726 1.2227-1.2207v-14.668c0-0.67344-0.54921-1.2207-1.2227-1.2207h-12.223z" fill="#fff" opacity=".95"/>
+  <path d="m5.8887 3.4453c-0.67344 0-1.2227 0.54726-1.2227 1.2207v1.334 1.1895 2.8691h14.668v-2.8691-1.1895-1.334c0-0.67344-0.54921-1.2207-1.2227-1.2207h-12.223z" fill="#ffff84" stroke-width="0"/>
+  <g stroke-width="1.2222">
+   <path d="m7.1113 13.223c-0.33733 0-0.61133 0.27399-0.61133 0.61133 0 0.33733 0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 1e-6 0.61133-0.274 0.61133-0.61133 0-0.33733-0.27399-0.61133-0.61133-0.61133zm0 3.666c-0.33733 0-0.61133 0.27399-0.61133 0.61133s0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 0 0.61133-0.27399 0.61133-0.61133s-0.27399-0.61133-0.61133-0.61133z" fill="#595959"/>
+   <path d="m5.8887 1c-2.0216 0-3.666 1.6445-3.666 3.666v14.668c1e-7 2.0216 1.6445 3.666 3.666 3.666h12.223c2.0216 0 3.666-1.6445 3.666-3.666v-14.668c0-2.0216-1.6445-3.666-3.666-3.666zm0 2.4453h12.223c0.67345 0 1.2227 0.54726 1.2227 1.2207v14.668c0 0.67344-0.54921 1.2207-1.2227 1.2207h-12.223c-0.67344-1e-6 -1.2227-0.54726-1.2227-1.2207v-14.668c0-0.67344 0.54921-1.2207 1.2227-1.2207z" fill="#848484"/>
+   <path d="m7.1113 5.8887c-0.33733 0-0.61133 0.27399-0.61133 0.61133 0 0.33733 0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 0 0.61133-0.27399 0.61133-0.61133 0-0.33733-0.27399-0.61133-0.61133-0.61133h-9.7773z" fill="#fff"/>
+  </g>
+ </g>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/mixed_document-scene.svg b/novelwriter/assets/icons/typicons_dark/mixed_document-scene.svg
index f5fe21e6..89878f30 100644
--- a/novelwriter/assets/icons/typicons_dark/mixed_document-scene.svg
+++ b/novelwriter/assets/icons/typicons_dark/mixed_document-scene.svg
@@ -1,47 +1,12 @@
-<?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="svg2161">
-  <metadata
-     id="metadata2167">
-    <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="defs2165" />
-  <path
-     id="rect12986"
-     style="display:inline;opacity:0.95;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.88635;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 5.8886719 3.4453125 C 5.2152275 3.4453125 4.6660156 3.9925712 4.6660156 4.6660156 L 4.6660156 19.333984 C 4.6660156 20.007428 5.2152275 20.554687 5.8886719 20.554688 L 18.111328 20.554688 C 18.784774 20.554688 19.333984 20.007428 19.333984 19.333984 L 19.333984 4.6660156 C 19.333984 3.9925712 18.784774 3.4453125 18.111328 3.4453125 L 5.8886719 3.4453125 z " />
-  <path
-     id="rect935"
-     style="fill:#6699cc;fill-opacity:1;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.2"
-     d="M 5.8886719 3.4453125 C 5.2152275 3.4453125 4.6660156 3.9925712 4.6660156 4.6660156 L 4.6660156 6 L 4.6660156 7.1894531 L 4.6660156 10.058594 L 19.333984 10.058594 L 19.333984 7.1894531 L 19.333984 6 L 19.333984 4.6660156 C 19.333984 3.9925712 18.784774 3.4453125 18.111328 3.4453125 L 5.8886719 3.4453125 z " />
-  <path
-     id="path2157"
-     style="display:inline;fill:#595959;fill-opacity:1;stroke-width:1.22222"
-     d="M 7.1113281,13.222656 C 6.7739949,13.222656 6.5,13.49665 6.5,13.833984 c 0,0.337332 0.2739949,0.611328 0.6113281,0.611328 h 9.7773439 c 0.337334,1e-6 0.611328,-0.273996 0.611328,-0.611328 0,-0.337334 -0.273994,-0.611328 -0.611328,-0.611328 z m 0,3.666016 C 6.7739949,16.888672 6.5,17.162666 6.5,17.5 c 0,0.337334 0.2739949,0.611328 0.6113281,0.611328 H 16.888672 C 17.226006,18.111328 17.5,17.837334 17.5,17.5 c 0,-0.337334 -0.273994,-0.611328 -0.611328,-0.611328 z" />
-  <path
-     id="path902"
-     style="display:inline;fill:#848484;fill-opacity:1;stroke-width:1.22222"
-     d="M 5.8886719,1 C 3.8671165,1 2.2226562,2.6444602 2.2226562,4.6660156 V 19.333984 C 2.2226563,21.355538 3.8671165,23 5.8886719,23 H 18.111328 c 2.021556,0 3.666016,-1.644462 3.666016,-3.666016 V 4.6660156 C 21.777344,2.6444602 20.132884,1 18.111328,1 Z m 0,2.4453125 H 18.111328 c 0.673446,0 1.222656,0.5472587 1.222656,1.2207031 V 19.333984 c 0,0.673444 -0.54921,1.220704 -1.222656,1.220704 H 5.8886719 c -0.6734444,-10e-7 -1.2226563,-0.54726 -1.2226563,-1.220704 V 4.6660156 c 0,-0.6734444 0.5492119,-1.2207031 1.2226563,-1.2207031 z" />
-  <path
-     id="path2157-0"
-     style="display:inline;fill:#ffffff;fill-opacity:1;stroke-width:1.22222"
-     d="M 7.1113281 5.8886719 C 6.7739949 5.8886719 6.5 6.1626667 6.5 6.5 C 6.5 6.837334 6.7739949 7.1113281 7.1113281 7.1113281 L 16.888672 7.1113281 C 17.226006 7.1113281 17.5 6.837334 17.5 6.5 C 17.5 6.1626667 17.226006 5.8886719 16.888672 5.8886719 L 7.1113281 5.8886719 z " />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <g>
+  <path d="m5.8887 3.4453c-0.67344 0-1.2227 0.54726-1.2227 1.2207v14.668c0 0.67344 0.54921 1.2207 1.2227 1.2207h12.223c0.67345 0 1.2227-0.54726 1.2227-1.2207v-14.668c0-0.67344-0.54921-1.2207-1.2227-1.2207h-12.223z" fill="#fff" opacity=".95"/>
+  <path d="m5.8887 3.4453c-0.67344 0-1.2227 0.54726-1.2227 1.2207v1.334 1.1895 2.8691h14.668v-2.8691-1.1895-1.334c0-0.67344-0.54921-1.2207-1.2227-1.2207h-12.223z" fill="#69c" stroke-width="0"/>
+  <g stroke-width="1.2222">
+   <path d="m7.1113 13.223c-0.33733 0-0.61133 0.27399-0.61133 0.61133 0 0.33733 0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 1e-6 0.61133-0.274 0.61133-0.61133 0-0.33733-0.27399-0.61133-0.61133-0.61133zm0 3.666c-0.33733 0-0.61133 0.27399-0.61133 0.61133s0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 0 0.61133-0.27399 0.61133-0.61133s-0.27399-0.61133-0.61133-0.61133z" fill="#595959"/>
+   <path d="m5.8887 1c-2.0216 0-3.666 1.6445-3.666 3.666v14.668c1e-7 2.0216 1.6445 3.666 3.666 3.666h12.223c2.0216 0 3.666-1.6445 3.666-3.666v-14.668c0-2.0216-1.6445-3.666-3.666-3.666zm0 2.4453h12.223c0.67345 0 1.2227 0.54726 1.2227 1.2207v14.668c0 0.67344-0.54921 1.2207-1.2227 1.2207h-12.223c-0.67344-1e-6 -1.2227-0.54726-1.2227-1.2207v-14.668c0-0.67344 0.54921-1.2207 1.2227-1.2207z" fill="#848484"/>
+   <path d="m7.1113 5.8887c-0.33733 0-0.61133 0.27399-0.61133 0.61133 0 0.33733 0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 0 0.61133-0.27399 0.61133-0.61133 0-0.33733-0.27399-0.61133-0.61133-0.61133h-9.7773z" fill="#fff"/>
+  </g>
+ </g>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/mixed_document-section.svg b/novelwriter/assets/icons/typicons_dark/mixed_document-section.svg
index 69542bd9..111b074f 100644
--- a/novelwriter/assets/icons/typicons_dark/mixed_document-section.svg
+++ b/novelwriter/assets/icons/typicons_dark/mixed_document-section.svg
@@ -1,47 +1,12 @@
-<?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="svg2161">
-  <metadata
-     id="metadata2167">
-    <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="defs2165" />
-  <path
-     id="rect12986"
-     style="display:inline;opacity:0.95;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.88635;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 5.8886719 3.4453125 C 5.2152275 3.4453125 4.6660156 3.9925712 4.6660156 4.6660156 L 4.6660156 19.333984 C 4.6660156 20.007428 5.2152275 20.554687 5.8886719 20.554688 L 18.111328 20.554688 C 18.784774 20.554688 19.333984 20.007428 19.333984 19.333984 L 19.333984 4.6660156 C 19.333984 3.9925712 18.784774 3.4453125 18.111328 3.4453125 L 5.8886719 3.4453125 z " />
-  <path
-     id="rect935"
-     style="fill:#999999;fill-opacity:1;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.2"
-     d="M 5.8886719 3.4453125 C 5.2152275 3.4453125 4.6660156 3.9925712 4.6660156 4.6660156 L 4.6660156 6 L 4.6660156 7.1894531 L 4.6660156 10.058594 L 19.333984 10.058594 L 19.333984 7.1894531 L 19.333984 6 L 19.333984 4.6660156 C 19.333984 3.9925712 18.784774 3.4453125 18.111328 3.4453125 L 5.8886719 3.4453125 z " />
-  <path
-     id="path2157"
-     style="display:inline;fill:#595959;fill-opacity:1;stroke-width:1.22222"
-     d="M 7.1113281,13.222656 C 6.7739949,13.222656 6.5,13.49665 6.5,13.833984 c 0,0.337332 0.2739949,0.611328 0.6113281,0.611328 h 9.7773439 c 0.337334,1e-6 0.611328,-0.273996 0.611328,-0.611328 0,-0.337334 -0.273994,-0.611328 -0.611328,-0.611328 z m 0,3.666016 C 6.7739949,16.888672 6.5,17.162666 6.5,17.5 c 0,0.337334 0.2739949,0.611328 0.6113281,0.611328 H 16.888672 C 17.226006,18.111328 17.5,17.837334 17.5,17.5 c 0,-0.337334 -0.273994,-0.611328 -0.611328,-0.611328 z" />
-  <path
-     id="path902"
-     style="display:inline;fill:#848484;fill-opacity:1;stroke-width:1.22222"
-     d="M 5.8886719,1 C 3.8671165,1 2.2226562,2.6444602 2.2226562,4.6660156 V 19.333984 C 2.2226563,21.355538 3.8671165,23 5.8886719,23 H 18.111328 c 2.021556,0 3.666016,-1.644462 3.666016,-3.666016 V 4.6660156 C 21.777344,2.6444602 20.132884,1 18.111328,1 Z m 0,2.4453125 H 18.111328 c 0.673446,0 1.222656,0.5472587 1.222656,1.2207031 V 19.333984 c 0,0.673444 -0.54921,1.220704 -1.222656,1.220704 H 5.8886719 c -0.6734444,-10e-7 -1.2226563,-0.54726 -1.2226563,-1.220704 V 4.6660156 c 0,-0.6734444 0.5492119,-1.2207031 1.2226563,-1.2207031 z" />
-  <path
-     id="path2157-0"
-     style="display:inline;fill:#ffffff;fill-opacity:1;stroke-width:1.22222"
-     d="M 7.1113281 5.8886719 C 6.7739949 5.8886719 6.5 6.1626667 6.5 6.5 C 6.5 6.837334 6.7739949 7.1113281 7.1113281 7.1113281 L 16.888672 7.1113281 C 17.226006 7.1113281 17.5 6.837334 17.5 6.5 C 17.5 6.1626667 17.226006 5.8886719 16.888672 5.8886719 L 7.1113281 5.8886719 z " />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <g>
+  <path d="m5.8887 3.4453c-0.67344 0-1.2227 0.54726-1.2227 1.2207v14.668c0 0.67344 0.54921 1.2207 1.2227 1.2207h12.223c0.67345 0 1.2227-0.54726 1.2227-1.2207v-14.668c0-0.67344-0.54921-1.2207-1.2227-1.2207h-12.223z" fill="#fff" opacity=".95"/>
+  <path d="m5.8887 3.4453c-0.67344 0-1.2227 0.54726-1.2227 1.2207v1.334 1.1895 2.8691h14.668v-2.8691-1.1895-1.334c0-0.67344-0.54921-1.2207-1.2227-1.2207h-12.223z" fill="#999" stroke-width="0"/>
+  <g stroke-width="1.2222">
+   <path d="m7.1113 13.223c-0.33733 0-0.61133 0.27399-0.61133 0.61133 0 0.33733 0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 1e-6 0.61133-0.274 0.61133-0.61133 0-0.33733-0.27399-0.61133-0.61133-0.61133zm0 3.666c-0.33733 0-0.61133 0.27399-0.61133 0.61133s0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 0 0.61133-0.27399 0.61133-0.61133s-0.27399-0.61133-0.61133-0.61133z" fill="#595959"/>
+   <path d="m5.8887 1c-2.0216 0-3.666 1.6445-3.666 3.666v14.668c1e-7 2.0216 1.6445 3.666 3.666 3.666h12.223c2.0216 0 3.666-1.6445 3.666-3.666v-14.668c0-2.0216-1.6445-3.666-3.666-3.666zm0 2.4453h12.223c0.67345 0 1.2227 0.54726 1.2227 1.2207v14.668c0 0.67344-0.54921 1.2207-1.2227 1.2207h-12.223c-0.67344-1e-6 -1.2227-0.54726-1.2227-1.2207v-14.668c0-0.67344 0.54921-1.2207 1.2227-1.2207z" fill="#848484"/>
+   <path d="m7.1113 5.8887c-0.33733 0-0.61133 0.27399-0.61133 0.61133 0 0.33733 0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 0 0.61133-0.27399 0.61133-0.61133 0-0.33733-0.27399-0.61133-0.61133-0.61133h-9.7773z" fill="#fff"/>
+  </g>
+ </g>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/mixed_document-title.svg b/novelwriter/assets/icons/typicons_dark/mixed_document-title.svg
index 6ecf2d5a..07fae46a 100644
--- a/novelwriter/assets/icons/typicons_dark/mixed_document-title.svg
+++ b/novelwriter/assets/icons/typicons_dark/mixed_document-title.svg
@@ -1,47 +1,12 @@
-<?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="svg2161">
-  <metadata
-     id="metadata2167">
-    <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="defs2165" />
-  <path
-     id="rect12986"
-     style="display:inline;opacity:0.95;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.88635;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 5.8886719 3.4453125 C 5.2152275 3.4453125 4.6660156 3.9925712 4.6660156 4.6660156 L 4.6660156 19.333984 C 4.6660156 20.007428 5.2152275 20.554687 5.8886719 20.554688 L 18.111328 20.554688 C 18.784774 20.554688 19.333984 20.007428 19.333984 19.333984 L 19.333984 4.6660156 C 19.333984 3.9925712 18.784774 3.4453125 18.111328 3.4453125 L 5.8886719 3.4453125 z " />
-  <path
-     id="rect935"
-     style="fill:#99cc99;fill-opacity:1;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.2"
-     d="M 5.8886719 3.4453125 C 5.2152275 3.4453125 4.6660156 3.9925712 4.6660156 4.6660156 L 4.6660156 6 L 4.6660156 7.1894531 L 4.6660156 10.058594 L 19.333984 10.058594 L 19.333984 7.1894531 L 19.333984 6 L 19.333984 4.6660156 C 19.333984 3.9925712 18.784774 3.4453125 18.111328 3.4453125 L 5.8886719 3.4453125 z " />
-  <path
-     id="path2157"
-     style="display:inline;fill:#595959;fill-opacity:1;stroke-width:1.22222"
-     d="M 7.1113281,13.222656 C 6.7739949,13.222656 6.5,13.49665 6.5,13.833984 c 0,0.337332 0.2739949,0.611328 0.6113281,0.611328 h 9.7773439 c 0.337334,1e-6 0.611328,-0.273996 0.611328,-0.611328 0,-0.337334 -0.273994,-0.611328 -0.611328,-0.611328 z m 0,3.666016 C 6.7739949,16.888672 6.5,17.162666 6.5,17.5 c 0,0.337334 0.2739949,0.611328 0.6113281,0.611328 H 16.888672 C 17.226006,18.111328 17.5,17.837334 17.5,17.5 c 0,-0.337334 -0.273994,-0.611328 -0.611328,-0.611328 z" />
-  <path
-     id="path902"
-     style="display:inline;fill:#848484;fill-opacity:1;stroke-width:1.22222"
-     d="M 5.8886719,1 C 3.8671165,1 2.2226562,2.6444602 2.2226562,4.6660156 V 19.333984 C 2.2226563,21.355538 3.8671165,23 5.8886719,23 H 18.111328 c 2.021556,0 3.666016,-1.644462 3.666016,-3.666016 V 4.6660156 C 21.777344,2.6444602 20.132884,1 18.111328,1 Z m 0,2.4453125 H 18.111328 c 0.673446,0 1.222656,0.5472587 1.222656,1.2207031 V 19.333984 c 0,0.673444 -0.54921,1.220704 -1.222656,1.220704 H 5.8886719 c -0.6734444,-10e-7 -1.2226563,-0.54726 -1.2226563,-1.220704 V 4.6660156 c 0,-0.6734444 0.5492119,-1.2207031 1.2226563,-1.2207031 z" />
-  <path
-     id="path2157-0"
-     style="display:inline;fill:#ffffff;fill-opacity:1;stroke-width:1.22222"
-     d="M 7.1113281 5.8886719 C 6.7739949 5.8886719 6.5 6.1626667 6.5 6.5 C 6.5 6.837334 6.7739949 7.1113281 7.1113281 7.1113281 L 16.888672 7.1113281 C 17.226006 7.1113281 17.5 6.837334 17.5 6.5 C 17.5 6.1626667 17.226006 5.8886719 16.888672 5.8886719 L 7.1113281 5.8886719 z " />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <g>
+  <path d="m5.8887 3.4453c-0.67344 0-1.2227 0.54726-1.2227 1.2207v14.668c0 0.67344 0.54921 1.2207 1.2227 1.2207h12.223c0.67345 0 1.2227-0.54726 1.2227-1.2207v-14.668c0-0.67344-0.54921-1.2207-1.2227-1.2207h-12.223z" fill="#fff" opacity=".95"/>
+  <path d="m5.8887 3.4453c-0.67344 0-1.2227 0.54726-1.2227 1.2207v1.334 1.1895 2.8691h14.668v-2.8691-1.1895-1.334c0-0.67344-0.54921-1.2207-1.2227-1.2207h-12.223z" fill="#9c9" stroke-width="0"/>
+  <g stroke-width="1.2222">
+   <path d="m7.1113 13.223c-0.33733 0-0.61133 0.27399-0.61133 0.61133 0 0.33733 0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 1e-6 0.61133-0.274 0.61133-0.61133 0-0.33733-0.27399-0.61133-0.61133-0.61133zm0 3.666c-0.33733 0-0.61133 0.27399-0.61133 0.61133s0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 0 0.61133-0.27399 0.61133-0.61133s-0.27399-0.61133-0.61133-0.61133z" fill="#595959"/>
+   <path d="m5.8887 1c-2.0216 0-3.666 1.6445-3.666 3.666v14.668c1e-7 2.0216 1.6445 3.666 3.666 3.666h12.223c2.0216 0 3.666-1.6445 3.666-3.666v-14.668c0-2.0216-1.6445-3.666-3.666-3.666zm0 2.4453h12.223c0.67345 0 1.2227 0.54726 1.2227 1.2207v14.668c0 0.67344-0.54921 1.2207-1.2227 1.2207h-12.223c-0.67344-1e-6 -1.2227-0.54726-1.2227-1.2207v-14.668c0-0.67344 0.54921-1.2207 1.2227-1.2207z" fill="#848484"/>
+   <path d="m7.1113 5.8887c-0.33733 0-0.61133 0.27399-0.61133 0.61133 0 0.33733 0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 0 0.61133-0.27399 0.61133-0.61133 0-0.33733-0.27399-0.61133-0.61133-0.61133h-9.7773z" fill="#fff"/>
+  </g>
+ </g>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/mixed_edit.svg b/novelwriter/assets/icons/typicons_dark/mixed_edit.svg
index 5ac0581f..910a1582 100644
--- a/novelwriter/assets/icons/typicons_dark/mixed_edit.svg
+++ b/novelwriter/assets/icons/typicons_dark/mixed_edit.svg
@@ -1,31 +1,4 @@
-<?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">
-  <metadata
-     id="metadata7542">
-    <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="defs7540" />
-  <path
-     id="path7534"
-     style="display:inline;fill:#aeaeae;fill-opacity:1;stroke-width:1.10527"
-     d="M 19.160156 0 C 18.73463 0 18.312122 0.160533 17.988281 0.484375 L 14.052734 4.421875 L 4.1054688 4.421875 C 3.4953635 4.421875 3 4.9141801 3 5.5253906 L 3 17.037109 L 3 18.429688 L 3 22.894531 C 3 23.505741 3.4953635 24 4.1054688 24 L 18.474609 24 C 19.084713 24 19.578125 23.505741 19.578125 22.894531 L 19.578125 18.429688 L 19.578125 17.037109 L 19.578125 9.9472656 L 23.515625 6.0117188 C 23.839466 5.6878766 24 5.2623116 24 4.8378906 C 24 4.4134695 23.839466 3.9918109 23.515625 3.6679688 L 20.332031 0.484375 C 20.008189 0.160533 19.584576 0 19.160156 0 z M 19.160156 2.4394531 L 21.560547 4.8398438 L 20.130859 6.2695312 L 17.730469 3.8691406 L 19.160156 2.4394531 z M 16.949219 4.6503906 L 19.349609 7.0507812 L 12.394531 14.005859 L 9.9941406 11.605469 L 16.949219 4.6503906 z M 5.2109375 6.6308594 L 11.841797 6.6308594 L 8.328125 10.146484 C 8.0042828 10.470327 7.7997073 11.043101 7.6328125 11.570312 C 7.4559704 12.122943 7.421875 12.737735 7.421875 13.195312 L 7.421875 16.578125 L 10.804688 16.578125 C 11.262267 16.578125 12.02928 16.467813 12.541016 16.257812 C 13.053858 16.047812 13.530778 15.874623 13.853516 15.550781 L 17.369141 12.158203 L 17.369141 17.037109 L 17.369141 18.429688 L 17.369141 21.789062 L 5.2109375 21.789062 L 5.2109375 18.429688 L 5.2109375 17.037109 L 5.2109375 6.6308594 z M 9.5644531 12.525391 L 11.505859 14.435547 L 9.6308594 14.369141 L 9.5644531 12.525391 z " />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m19.16 0c-0.42553 0-0.84803 0.16053-1.1719 0.48438l-3.9355 3.9375h-9.9473c-0.61011 0-1.1055 0.49231-1.1055 1.1035v11.512 1.3926 4.4648c0 0.61121 0.49536 1.1055 1.1055 1.1055h14.369c0.6101 0 1.1035-0.49426 1.1035-1.1055v-4.4648-1.3926-7.0898l3.9375-3.9355c0.32384-0.32384 0.48438-0.74941 0.48438-1.1738 0-0.42442-0.16053-0.84608-0.48438-1.1699l-3.1836-3.1836c-0.32384-0.32384-0.74746-0.48438-1.1719-0.48438zm0 2.4395 2.4004 2.4004-1.4297 1.4297-2.4004-2.4004 1.4297-1.4297zm-2.2109 2.2109 2.4004 2.4004-6.9551 6.9551-2.4004-2.4004 6.9551-6.9551zm-11.738 1.9805h6.6309l-3.5137 3.5156c-0.32384 0.32384-0.52842 0.89662-0.69531 1.4238-0.17684 0.55263-0.21094 1.1674-0.21094 1.625v3.3828h3.3828c0.45758 0 1.2246-0.11031 1.7363-0.32031 0.51284-0.21 0.98976-0.38319 1.3125-0.70703l3.5156-3.3926v4.8789 1.3926 3.3594h-12.158v-3.3594-1.3926-10.406zm4.3535 5.8945 1.9414 1.9102-1.875-0.066406-0.066406-1.8438z" fill="#aeaeae" stroke-width="1.1053"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/mixed_input-checked.svg b/novelwriter/assets/icons/typicons_dark/mixed_input-checked.svg
index a044fbaa..24307843 100644
--- a/novelwriter/assets/icons/typicons_dark/mixed_input-checked.svg
+++ b/novelwriter/assets/icons/typicons_dark/mixed_input-checked.svg
@@ -1,39 +1,5 @@
-<?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"
-   width="24"
-   height="24"
-   version="1.2"
-   viewBox="0 0 24 24"
-   id="svg2287">
-  <defs
-     id="defs2291" />
-  <metadata
-     id="metadata2281">
-    <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>
-  <path
-     d="m17.714 22h-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="path2283" />
-  <path
-     d="m19.02 3.3503c-0.60933 0.010623-1.2003 0.31545-1.5586 0.86719l-5.0977 7.8477-2.3672-3.6445c-0.57329-0.88278-1.7442-1.1319-2.627-0.55859-0.88278 0.57329-1.1319 1.7461-0.55859 2.6289l3.9199 6.0391c0.38514 0.59307 1.0409 0.88965 1.6973 0.85352 0.03023-2.78e-4 0.05972-0.0041 0.08984-0.0059 0.0556-0.0057 0.11074-0.0088 0.16602-0.01953 0.52104-0.07621 1.0077-0.36147 1.3184-0.83984l6.6445-10.23c0.57329-0.88278 0.32419-2.0556-0.55859-2.6289-0.33104-0.21498-0.70276-0.31497-1.0684-0.30859z"
-     fill="#9c9"
-     stroke-linecap="round"
-     stroke-linejoin="round"
-     stroke-width="1.111"
-     id="path2285" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m17.714 22h-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"/>
+ <path d="m19.02 3.3503c-0.60933 0.010623-1.2003 0.31545-1.5586 0.86719l-5.0977 7.8477-2.3672-3.6445c-0.57329-0.88278-1.7442-1.1319-2.627-0.55859-0.88278 0.57329-1.1319 1.7461-0.55859 2.6289l3.9199 6.0391c0.38514 0.59307 1.0409 0.88965 1.6973 0.85352 0.03023-2.78e-4 0.05972-0.0041 0.08984-0.0059 0.0556-0.0057 0.11074-0.0088 0.16602-0.01953 0.52104-0.07621 1.0077-0.36147 1.3184-0.83984l6.6445-10.23c0.57329-0.88278 0.32419-2.0556-0.55859-2.6289-0.33104-0.21498-0.70276-0.31497-1.0684-0.30859z" fill="#9c9" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.111"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/mixed_input-none.svg b/novelwriter/assets/icons/typicons_dark/mixed_input-none.svg
index f4b1ae67..e0b0f08f 100644
--- a/novelwriter/assets/icons/typicons_dark/mixed_input-none.svg
+++ b/novelwriter/assets/icons/typicons_dark/mixed_input-none.svg
@@ -1,43 +1,5 @@
-<?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"
-   width="24"
-   height="24"
-   version="1.2"
-   viewBox="0 0 24 24"
-   id="svg2931">
-  <defs
-     id="defs2935" />
-  <metadata
-     id="metadata2925">
-    <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>
-  <path
-     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"
-     width="10"
-     height="3.8"
-     rx="1.9"
-     ry="1.9"
-     fill="#f99157"
-     stroke-linecap="round"
-     stroke-linejoin="round"
-     stroke-width="1.111"
-     id="rect2929" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m6.2852 2c-2.3555-0.068198-4.4321 2.1116-4.2852 4.4549 0.0068983 3.8501-0.013834 7.7008 0.010433 11.55 0.12976 2.169 2.0765 4.054 4.2747 3.9947 3.8833-0.0037 7.7667 0.0074 11.65-0.0056 2.3181-0.058725 4.2556-2.2597 4.065-4.5624-0.003701-3.789 0.007418-7.5782-0.005586-11.367-0.058739-2.3181-2.2597-4.2556-4.5624-4.065h-11.147zm7.1621 2.8555c1.5178 0.018193 3.0402-0.037158 4.5549 0.029088 0.8319 0.14328 1.247 1.02 1.1404 1.7966-0.0049 3.7264 0.0098 7.4533-0.0074 11.179-0.06228 0.8972-0.99018 1.4068-1.8163 1.282-3.7264-5e-3 -7.4533 0.0099-11.179-0.0075-0.88935-0.06498-1.4062-0.99121-1.2821-1.8162 0.00424-3.7207-0.00847-7.4418 0.00635-11.162 0.056947-0.86274 0.94131-1.4231 1.7608-1.2992 2.2742-0.00131 4.5487 0.00261 6.8227-0.00195z" fill="#848484"/>
+ <rect x="7" y="10.1" width="10" height="3.8" rx="1.9" ry="1.9" fill="#f99157" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.111"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/mixed_input-unchecked.svg b/novelwriter/assets/icons/typicons_dark/mixed_input-unchecked.svg
index b5ee8b37..91a45b7a 100644
--- a/novelwriter/assets/icons/typicons_dark/mixed_input-unchecked.svg
+++ b/novelwriter/assets/icons/typicons_dark/mixed_input-unchecked.svg
@@ -1,39 +1,5 @@
-<?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"
-   width="24"
-   height="24"
-   version="1.2"
-   viewBox="0 0 24 24"
-   id="svg3574">
-  <defs
-     id="defs3578" />
-  <metadata
-     id="metadata3568">
-    <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>
-  <path
-     d="m17.714 22h-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="path3570" />
-  <path
-     d="m17.99 3.3379c-0.48501 0.025418-0.96034 0.23584-1.3125 0.62695l-4.6777 5.1953-1.332-1.4785c-0.70433-0.78223-1.9014-0.84495-2.6836-0.14062-0.78223 0.70433-0.84495 1.9014-0.14062 2.6836l1.5996 1.7754-1.5977 1.7754c-0.70433 0.78223-0.64161 1.9793 0.14062 2.6836 0.78223 0.70433 1.9773 0.64161 2.6816-0.14062l1.332-1.4785 1.332 1.4785c0.70433 0.78224 1.9014 0.84495 2.6836 0.14062 0.78223-0.70433 0.84495-1.9014 0.14062-2.6836l-1.5996-1.7754 4.9453-5.4922c0.70433-0.78223 0.64161-1.9793-0.14062-2.6836-0.39112-0.35216-0.88608-0.51175-1.3711-0.48633z"
-     fill="#d64848"
-     stroke-linecap="round"
-     stroke-linejoin="round"
-     stroke-width="1.111"
-     id="path3572" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m17.714 22h-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"/>
+ <path d="m17.99 3.3379c-0.48501 0.025418-0.96034 0.23584-1.3125 0.62695l-4.6777 5.1953-1.332-1.4785c-0.70433-0.78223-1.9014-0.84495-2.6836-0.14062-0.78223 0.70433-0.84495 1.9014-0.14062 2.6836l1.5996 1.7754-1.5977 1.7754c-0.70433 0.78223-0.64161 1.9793 0.14062 2.6836 0.78223 0.70433 1.9773 0.64161 2.6816-0.14062l1.332-1.4785 1.332 1.4785c0.70433 0.78224 1.9014 0.84495 2.6836 0.14062 0.78223-0.70433 0.84495-1.9014 0.14062-2.6836l-1.5996-1.7754 4.9453-5.4922c0.70433-0.78223 0.64161-1.9793-0.14062-2.6836-0.39112-0.35216-0.88608-0.51175-1.3711-0.48633z" fill="#d64848" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.111"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/mixed_search-replace.svg b/novelwriter/assets/icons/typicons_dark/mixed_search-replace.svg
index 784fb950..817adfca 100644
--- a/novelwriter/assets/icons/typicons_dark/mixed_search-replace.svg
+++ b/novelwriter/assets/icons/typicons_dark/mixed_search-replace.svg
@@ -1,39 +1,6 @@
-<?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="svg873">
-  <metadata
-     id="metadata879">
-    <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="defs877" />
-  <path
-     id="path871"
-     style="display:inline;fill:#6699cc;fill-opacity:1;stroke-width:1.19007"
-     d="m 10.330622,1.9999997 c -4.5924663,0 -8.3306193,3.738153 -8.3306193,8.3306193 0,1.391929 0.3467825,2.702587 0.9532665,3.857242 0.084308,-0.108411 0.1590865,-0.228838 0.2534294,-0.323181 L 4.7482003,12.323178 C 4.5237338,11.697056 4.378519,11.032991 4.3785189,10.330619 c 0,-3.2810129 2.6710902,-5.949778 5.9521031,-5.949778 0.702303,0 1.36649,0.1429324 1.992559,0.3673563 L 14.141363,2.9300158 C 12.997884,2.3384803 11.704084,1.9999997 10.330622,1.9999997 Z m 5.635898,3.4852355 -0.60451,0.6045104 2.545919,2.5482442 0.460357,-0.4626829 C 18.332278,8.0413114 18.299136,7.9066594 18.256684,7.7754 Z m 0.292955,4.4245521 c 0.0083,0.1189097 0.01733,0.2373427 0.01861,0.3580557 l 0.169728,-0.169728 z m 2.059986,2.6993717 -5.710299,5.710299 c 0.105352,-0.03032 0.217183,-0.04484 0.320855,-0.07906 l 0.892816,0.89049 1.799581,1.797261 0.07208,0.07208 0.07672,0.06743 C 16.486443,21.66984 17.375591,22 18.275281,22 c 2.054056,0 3.724716,-1.671795 3.724716,-3.72704 0,-0.999657 -0.390465,-1.936781 -1.099745,-2.638921 l -1.129969,-1.174145 -0.639387,-0.639386 -0.890489,-0.892815 c 0.03403,-0.103138 0.04885,-0.213757 0.07906,-0.318531 z m -11.7600542,2.28784 -0.4929085,0.492908 0.5417343,0.541734 0.57196,-0.571959 C 6.960254,15.221393 6.7588057,15.062002 6.5594068,14.896999 Z m 2.7179722,1.285747 -1.209021,1.209021 0.5417345,0.541734 1.6577535,-1.655429 c -0.3372847,-0.0036 -0.668706,-0.03764 -0.990467,-0.09533 z" />
-  <path
-     d="m 15.96652,2.4766329 c -0.396657,0 -0.792437,0.1507259 -1.095095,0.4533829 L 3.57173,14.229712 c -0.3026571,0.302657 -0.5759103,0.751428 -0.7742385,1.227621 -0.1983282,0.47826 -0.3208556,0.99063 -0.3208556,1.418274 v 4.647756 h 4.6477558 c 0.427645,0 0.9376894,-0.122526 1.4159495,-0.320855 0.4782601,-0.198328 0.9272894,-0.471583 1.2299463,-0.774239 L 21.069984,9.1285734 c 0.302656,-0.302657 0.453382,-0.7017958 0.453382,-1.0974191 0,-0.3966562 -0.150726,-0.7924369 -0.453382,-1.0950939 L 17.063939,2.9300158 C 16.761281,2.6273588 16.362143,2.4766329 15.96652,2.4766329 Z m 0,2.2785396 3.275981,3.2759818 -1.334572,1.3368983 -3.275982,-3.2759819 z M 13.901884,6.8221334 15.173682,8.0939305 6.6082326,16.661704 5.3364357,15.387582 Z m 2.004185,2.0041848 1.271796,1.2717968 -8.5654475,8.565448 -1.2741221,-1.271796 z M 4.7063497,16.250176 c 0.010333,-0.02065 3.0644031,3.034179 3.0644031,3.034179 C 7.43814,19.422771 7.2039295,19.456408 7.1243917,19.456408 H 5.5759147 L 4.5435968,18.424084 v -1.548477 c 0,-0.07953 0.033633,-0.315548 0.1627529,-0.625436 z"
-     style="display:inline;fill:#99cc99;fill-opacity:1;stroke-width:1.19007"
-     id="path15590" />
-  <path
-     id="rect19553"
-     d="m 2.4766359,18.937425 v 2.585938 h 2.5605469 z"
-     style="display:inline;opacity:0.95;fill:#0a0a0a;fill-opacity:1;stroke:none;stroke-width:1.88249397;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m10.331 2c-4.5925 0-8.3306 3.7382-8.3306 8.3306 0 1.3919 0.34678 2.7026 0.95327 3.8572 0.084308-0.10841 0.15909-0.22884 0.25343-0.32318l1.5415-1.5415c-0.22447-0.62612-0.36968-1.2902-0.36968-1.9926 0-3.281 2.6711-5.9498 5.9521-5.9498 0.7023 0 1.3665 0.14293 1.9926 0.36736l1.8182-1.8182c-1.1435-0.59154-2.4373-0.93002-3.8107-0.93002zm5.6359 3.4852-0.60451 0.60451 2.5459 2.5482 0.46036-0.46268c-0.036008-0.134-0.06915-0.26865-0.1116-0.39991zm0.29296 4.4246c0.0083 0.11891 0.01733 0.23734 0.01861 0.35806l0.16973-0.16973zm2.06 2.6994-5.7103 5.7103c0.10535-0.03032 0.21718-0.04484 0.32086-0.07906l0.89282 0.89049 1.7996 1.7973 0.07208 0.07208 0.07672 0.06743c0.71523 0.60218 1.6044 0.93234 2.5041 0.93234 2.0541 0 3.7247-1.6718 3.7247-3.727 0-0.99966-0.39046-1.9368-1.0997-2.6389l-1.13-1.1741-0.63939-0.63939-0.89049-0.89282c0.03403-0.10314 0.04885-0.21376 0.07906-0.31853zm-11.76 2.2878-0.49291 0.49291 0.54173 0.54173 0.57196-0.57196c-0.21994-0.13829-0.42139-0.29768-0.62079-0.46268zm2.718 1.2857-1.209 1.209 0.54173 0.54173 1.6578-1.6554c-0.33728-0.0036-0.66871-0.03764-0.99047-0.09533z" fill="#69c" stroke-width="1.1901"/>
+ <path d="m15.967 2.4766c-0.39666 0-0.79244 0.15073-1.0951 0.45338l-11.3 11.3c-0.30266 0.30266-0.57591 0.75143-0.77424 1.2276-0.19833 0.47826-0.32086 0.99063-0.32086 1.4183v4.6478h4.6478c0.42764 0 0.93769-0.12253 1.4159-0.32086 0.47826-0.19833 0.92729-0.47158 1.2299-0.77424l11.3-11.3c0.30266-0.30266 0.45338-0.7018 0.45338-1.0974 0-0.39666-0.15073-0.79244-0.45338-1.0951l-4.006-4.006c-0.30266-0.30266-0.7018-0.45338-1.0974-0.45338zm0 2.2785 3.276 3.276-1.3346 1.3369-3.276-3.276zm-2.0646 2.067 1.2718 1.2718-8.5654 8.5678-1.2718-1.2741zm2.0042 2.0042 1.2718 1.2718-8.5654 8.5654-1.2741-1.2718zm-11.2 7.4239c0.010333-0.02065 3.0644 3.0342 3.0644 3.0342-0.33261 0.13842-0.56682 0.17205-0.64636 0.17205h-1.5485l-1.0323-1.0323v-1.5485c0-0.07953 0.033633-0.31555 0.16275-0.62544z" fill="#9c9" stroke-width="1.1901"/>
+ <path d="m2.4766 18.937v2.5859h2.5605z" fill="#0a0a0a" opacity=".95"/>
+</svg>
diff --git a/novelwriter/assets/icons/typicons_dark/nw_deco-h0.svg b/novelwriter/assets/icons/typicons_dark/nw_deco-h0.svg
index 3c1618c9..9b9cf15e 100644
--- a/novelwriter/assets/icons/typicons_dark/nw_deco-h0.svg
+++ b/novelwriter/assets/icons/typicons_dark/nw_deco-h0.svg
@@ -1,35 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.2"
-   width="4"
-   height="24"
-   viewBox="0 0 4 24"
-   id="svg2161"
-   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/">
-  <metadata
-     id="metadata2167">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs2165" />
-  <rect
-     style="fill:#848484;fill-opacity:1;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.2"
-     id="rect1955"
-     width="4"
-     height="22"
-     x="0"
-     y="1"
-     rx="2"
-     ry="2" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="4" height="24" version="1.2" viewBox="0 0 4 24" xmlns="http://www.w3.org/2000/svg">
+ <rect y="1" width="4" height="22" rx="2" ry="2" fill="#848484" stroke-width="0"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/nw_deco-h1.svg b/novelwriter/assets/icons/typicons_dark/nw_deco-h1.svg
index 1c0dec9b..2b5398d0 100644
--- a/novelwriter/assets/icons/typicons_dark/nw_deco-h1.svg
+++ b/novelwriter/assets/icons/typicons_dark/nw_deco-h1.svg
@@ -1,35 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.2"
-   width="4"
-   height="24"
-   viewBox="0 0 4 24"
-   id="svg2161"
-   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/">
-  <metadata
-     id="metadata2167">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs2165" />
-  <rect
-     style="fill:#99cc99;fill-opacity:1;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.2"
-     id="rect1955"
-     width="4"
-     height="22"
-     x="0"
-     y="1"
-     rx="2"
-     ry="2" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="4" height="24" version="1.2" viewBox="0 0 4 24" xmlns="http://www.w3.org/2000/svg">
+ <rect y="1" width="4" height="22" rx="2" ry="2" fill="#9c9" stroke-width="0"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/nw_deco-h2.svg b/novelwriter/assets/icons/typicons_dark/nw_deco-h2.svg
index 0f86e5bb..7b71c946 100644
--- a/novelwriter/assets/icons/typicons_dark/nw_deco-h2.svg
+++ b/novelwriter/assets/icons/typicons_dark/nw_deco-h2.svg
@@ -1,35 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.2"
-   width="20"
-   height="24"
-   viewBox="0 0 20 24"
-   id="svg2161"
-   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/">
-  <metadata
-     id="metadata2167">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs2165" />
-  <rect
-     style="fill:#d64848;fill-opacity:1;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.2"
-     id="rect1955"
-     width="4"
-     height="22"
-     x="16"
-     y="1"
-     rx="2"
-     ry="2" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20" height="24" version="1.2" viewBox="0 0 20 24" xmlns="http://www.w3.org/2000/svg">
+ <rect x="16" y="1" width="4" height="22" rx="2" ry="2" fill="#d64848" stroke-width="0"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/nw_deco-h3.svg b/novelwriter/assets/icons/typicons_dark/nw_deco-h3.svg
index f05e46e6..a65690d2 100644
--- a/novelwriter/assets/icons/typicons_dark/nw_deco-h3.svg
+++ b/novelwriter/assets/icons/typicons_dark/nw_deco-h3.svg
@@ -1,35 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.2"
-   width="36"
-   height="24"
-   viewBox="0 0 36 24"
-   id="svg2161"
-   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/">
-  <metadata
-     id="metadata2167">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs2165" />
-  <rect
-     style="fill:#6699cc;fill-opacity:1;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.2"
-     id="rect1955"
-     width="4"
-     height="22"
-     x="32"
-     y="1"
-     rx="2"
-     ry="2" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="36" height="24" version="1.2" viewBox="0 0 36 24" xmlns="http://www.w3.org/2000/svg">
+ <rect x="32" y="1" width="4" height="22" rx="2" ry="2" fill="#69c" stroke-width="0"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/nw_deco-h4.svg b/novelwriter/assets/icons/typicons_dark/nw_deco-h4.svg
index aa74e6f3..d32578ed 100644
--- a/novelwriter/assets/icons/typicons_dark/nw_deco-h4.svg
+++ b/novelwriter/assets/icons/typicons_dark/nw_deco-h4.svg
@@ -1,35 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.2"
-   width="52"
-   height="24"
-   viewBox="0 0 52 24"
-   id="svg2161"
-   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/">
-  <metadata
-     id="metadata2167">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs2165" />
-  <rect
-     style="fill:#ffffff;fill-opacity:1;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.2"
-     id="rect1955"
-     width="4"
-     height="22"
-     x="48"
-     y="1"
-     rx="2"
-     ry="2" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="52" height="24" version="1.2" viewBox="0 0 52 24" xmlns="http://www.w3.org/2000/svg">
+ <rect x="48" y="1" width="4" height="22" rx="2" ry="2" fill="#fff" stroke-width="0"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/nw_deco-noveltree-more.svg b/novelwriter/assets/icons/typicons_dark/nw_deco-noveltree-more.svg
index f42d3306..845b6883 100644
--- a/novelwriter/assets/icons/typicons_dark/nw_deco-noveltree-more.svg
+++ b/novelwriter/assets/icons/typicons_dark/nw_deco-noveltree-more.svg
@@ -1,30 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.2"
-   width="24"
-   height="24"
-   viewBox="0 0 24 24"
-   id="svg2161"
-   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/">
-  <metadata
-     id="metadata2167">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs2165" />
-  <path
-     d="M 9.7,18.2 16,12 9.7,5.8 C 9.5,5.6 9.2,5.5 9,5.5 8.8,5.5 8.5,5.6 8.3,5.8 8.1,6 8,6.2 8,6.5 v 11 c 0,0.3 0.1,0.5 0.3,0.7 0.2,0.2 0.5,0.3 0.7,0.3 0.2,0 0.5,-0.1 0.7,-0.3 z"
-     id="path3096"
-     style="fill:#848484;fill-opacity:1" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m9.7 18.2 6.3-6.2-6.3-6.2c-0.2-0.2-0.5-0.3-0.7-0.3s-0.5 0.1-0.7 0.3-0.3 0.4-0.3 0.7v11c0 0.3 0.1 0.5 0.3 0.7s0.5 0.3 0.7 0.3 0.5-0.1 0.7-0.3z" fill="#848484"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/nw_search-case.svg b/novelwriter/assets/icons/typicons_dark/nw_search-case.svg
index 4701dfe1..903d2182 100644
--- a/novelwriter/assets/icons/typicons_dark/nw_search-case.svg
+++ b/novelwriter/assets/icons/typicons_dark/nw_search-case.svg
@@ -1,49 +1,4 @@
-<?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"
-   width="24"
-   height="24"
-   viewBox="0 0 6.3499999 6.3500002"
-   version="1.1"
-   id="svg8">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <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>
-  <g
-     style="fill:#aeaeae;fill-opacity:1"
-     id="layer1"
-     transform="translate(0,-290.64999)">
-    <g
-       aria-label="Aa"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:Roboto;letter-spacing:0px;word-spacing:0px;fill:#aeaeae;fill-opacity:1;stroke:none;stroke-width:0.264583"
-       id="text817">
-      <g
-         id="g968"
-         style="fill:#aeaeae;fill-opacity:1">
-        <path
-           id="path961"
-           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.93889px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#aeaeae;fill-opacity:1;stroke-width:0.264583"
-           d="M 0.35983601,295.49539 H 1.0364638 l 0.2815167,-0.85936 H 2.631725 l 0.2815166,0.85936 H 3.6195028 L 2.4292305,292.0678 H 1.6143138 Z m 1.14582229,-1.42734 0.4741333,-1.45203 0.4691945,1.45203 z" />
-        <path
-           id="path963"
-           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.93889px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#aeaeae;fill-opacity:1;stroke-width:0.264583"
-           d="m 4.701114,295.54478 c 0.3062111,0 0.5679722,-0.10372 0.7507111,-0.29139 l 0.0889,0.242 H 5.990164 v -1.44215 c 0,-0.65194 -0.3704167,-1.00754 -1.0766778,-1.00754 -0.3457222,0 -0.7112,0.084 -0.9927167,0.23213 l 0.1481667,0.43956 c 0.2469444,-0.0988 0.48895,-0.14816 0.7112,-0.14816 0.3852334,0 0.5926667,0.14816 0.5926667,0.43462 v 0.0642 c -1.0421056,0.0148 -1.5014223,0.25189 -1.5014223,0.76059 0,0.43462 0.3259667,0.71614 0.8297334,0.71614 z m -0.1975556,-0.8001 c 0,-0.21731 0.2518834,-0.31609 0.8692445,-0.32597 v 0.45438 c -0.1185333,0.1136 -0.2815167,0.1778 -0.4642556,0.1778 -0.2420055,0 -0.4049889,-0.12347 -0.4049889,-0.30621 z" />
-      </g>
-    </g>
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 6.35 6.35" xmlns="http://www.w3.org/2000/svg">
+ <path d="m0.35984 4.85h0.67663l0.28152-0.85936h1.3137l0.28152 0.85936h0.70626l-1.1903-3.4276h-0.81492zm1.1458-1.4273 0.47413-1.452 0.46919 1.452zm3.1955 1.4674c0.30621 0 0.56797-0.10372 0.75071-0.29139l0.0889 0.242h0.44944v-1.4422c0-0.65194-0.37042-1.0075-1.0767-1.0075-0.34572 0-0.7112 0.084-0.99272 0.23213l0.14817 0.43956c0.24694-0.0988 0.48895-0.14816 0.7112-0.14816 0.38523 0 0.59267 0.14816 0.59267 0.43462v0.0642c-1.0421 0.0148-1.5014 0.25189-1.5014 0.76059 0 0.43462 0.32597 0.71614 0.82973 0.71614zm-0.19756-0.8001c0-0.21731 0.25188-0.31609 0.86924-0.32597v0.45438c-0.11853 0.1136-0.28152 0.1778-0.46426 0.1778-0.24201 0-0.40499-0.12347-0.40499-0.30621z" fill="#aeaeae" style="font-feature-settings:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/nw_search-preserve.svg b/novelwriter/assets/icons/typicons_dark/nw_search-preserve.svg
index e59a8616..35fb425e 100644
--- a/novelwriter/assets/icons/typicons_dark/nw_search-preserve.svg
+++ b/novelwriter/assets/icons/typicons_dark/nw_search-preserve.svg
@@ -1,40 +1,4 @@
-<?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"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 6.3499999 6.3500002"
-   height="24"
-   width="24">
-  <g
-     style="font-size:5.64444px;line-height:1.25;font-family:'Fira Sans';-inkscape-font-specification:'Fira Sans, Normal';letter-spacing:0px;word-spacing:0px;stroke-width:0.264583"
-     id="text1549"
-     aria-label="AB">
-    <path
-       id="path1551"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.93889px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke-width:0.251875;fill:#aeaeae;fill-opacity:1"
-       d="M 0.52916667,4.8827979 H 1.1423606 L 1.397485,4.023431 H 2.588066 L 2.8431905,4.8827979 H 3.4832396 L 2.4045554,1.4552083 H 1.6660372 Z M 1.5675681,3.4554587 1.9972514,2.003425 2.4224589,3.4554587 Z" />
-    <path
-       id="path1553"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.93889px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke-width:0.25188;fill:#aeaeae;fill-opacity:1"
-       d="m 3.4395834,4.8827979 h 1.1592928 c 0.7519737,0 1.2219572,-0.4099279 1.2219572,-1.0618613 0,-0.4296835 -0.2058975,-0.7408335 -0.5639802,-0.8840614 0.1969454,-0.1432278 0.3177984,-0.3951112 0.3177984,-0.6667501 0,-0.5284612 -0.389415,-0.8149168 -1.1055804,-0.8149168 H 3.4395834 Z M 4.0125157,1.9688528 h 0.4117952 c 0.3625587,0 0.5639802,0.1679223 0.5639802,0.4642557 0,0.1778 -0.076092,0.3160889 -0.2506578,0.4247445 H 4.0125157 Z m 0,2.4003005 V 3.3566809 h 0.6714051 c 0.3357025,0 0.5416002,0.2173112 0.5416002,0.5482168 0,0.3160889 -0.1745654,0.4642556 -0.5505523,0.4642556 z" />
-  </g>
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <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>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 6.35 6.35" xmlns="http://www.w3.org/2000/svg">
+ <path d="m0.52917 4.8828h0.61319l0.25512-0.85937h1.1906l0.25512 0.85937h0.64005l-1.0787-3.4276h-0.73852zm1.0384-1.4273 0.42968-1.452 0.42521 1.452zm1.872 1.4273h1.1593c0.75197 0 1.222-0.40993 1.222-1.0619 0-0.42968-0.2059-0.74083-0.56398-0.88406 0.19695-0.14323 0.3178-0.39511 0.3178-0.66675 0-0.52846-0.38942-0.81492-1.1056-0.81492h-1.0295zm0.57293-2.9139h0.4118c0.36256 0 0.56398 0.16792 0.56398 0.46426 0 0.1778-0.076092 0.31609-0.25066 0.42474h-0.72512zm0 2.4003v-1.0125h0.67141c0.3357 0 0.5416 0.21731 0.5416 0.54822 0 0.31609-0.17457 0.46426-0.55055 0.46426z" fill="#aeaeae" style="font-variant-caps:normal;font-variant-east-asian:normal;font-variant-ligatures:normal;font-variant-numeric:normal"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/nw_search-regex.svg b/novelwriter/assets/icons/typicons_dark/nw_search-regex.svg
index 1a81cfe8..95e8a29e 100644
--- a/novelwriter/assets/icons/typicons_dark/nw_search-regex.svg
+++ b/novelwriter/assets/icons/typicons_dark/nw_search-regex.svg
@@ -1,49 +1,4 @@
-<?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"
-   width="24"
-   height="24"
-   viewBox="0 0 6.3499999 6.3500002"
-   version="1.1"
-   id="svg8">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <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>
-  <g
-     style="fill:#aeaeae;fill-opacity:1"
-     id="layer1"
-     transform="translate(0,-290.64999)">
-    <g
-       aria-label=".*"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:Roboto;letter-spacing:0px;word-spacing:0px;fill:#aeaeae;fill-opacity:1;stroke:none;stroke-width:0.264583"
-       id="text817">
-      <g
-         id="g1606"
-         style="fill:#aeaeae;fill-opacity:1">
-        <path
-           id="path1599"
-           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.93889px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#aeaeae;fill-opacity:1;stroke-width:0.264583"
-           d="m 1.9550981,295.54478 c 0.2518833,0 0.4198055,-0.18274 0.4198055,-0.4198 0,-0.25189 -0.1679222,-0.43463 -0.4198055,-0.43463 -0.2568223,0 -0.4247445,0.18274 -0.4247445,0.43463 0,0.23706 0.1679222,0.4198 0.4247445,0.4198 z" />
-        <path
-           id="path1601"
-           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.93889px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#aeaeae;fill-opacity:1;stroke-width:0.264583"
-           d="m 3.5108408,294.12732 h 0.5482167 l -0.1234722,-0.77541 0.6124222,0.49883 0.2568223,-0.43956 -0.7655278,-0.32103 0.7803444,-0.29139 -0.2518833,-0.43956 -0.6371167,0.48401 0.1284111,-0.8001 H 3.5108408 l 0.1382889,0.79516 -0.6223,-0.50377 -0.2518833,0.43956 0.7704667,0.31609 -0.7754056,0.30621 0.2469444,0.4445 0.6321778,-0.50376 z" />
-      </g>
-    </g>
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 6.35 6.35" xmlns="http://www.w3.org/2000/svg">
+ <path d="m3.5108 3.5121h0.54822l-0.12347-0.77541 0.61242 0.49883 0.25682-0.43956-0.76553-0.32103 0.78034-0.29139-0.25188-0.43956-0.63712 0.48401 0.12841-0.8001h-0.54822l0.13829 0.79516-0.6223-0.50377-0.25188 0.43956 0.77047 0.31609-0.77541 0.30621 0.24694 0.4445 0.63218-0.50376zm-1.5557 1.41c0.25188 0 0.41981-0.18274 0.41981-0.4198 0-0.25189-0.16792-0.43463-0.41981-0.43463-0.25682 0-0.42474 0.18274-0.42474 0.43463 0 0.23706 0.16792 0.4198 0.42474 0.4198z" fill="#aeaeae" style="font-feature-settings:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/nw_search-word.svg b/novelwriter/assets/icons/typicons_dark/nw_search-word.svg
index 650c7dfc..e59c7704 100644
--- a/novelwriter/assets/icons/typicons_dark/nw_search-word.svg
+++ b/novelwriter/assets/icons/typicons_dark/nw_search-word.svg
@@ -1,45 +1,4 @@
-<?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"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 6.3499999 6.3500002"
-   height="24"
-   width="24">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <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>
-  <g
-     transform="translate(0,-290.64999)"
-     id="layer1">
-    <g
-       id="text817"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:Roboto;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-       aria-label=".*">
-      <g
-         style="fill:#000000;fill-opacity:0.780392"
-         id="g1606">
-        <path
-           id="rect1629"
-           transform="matrix(0.26458334,0,0,0.26458334,0,290.64999)"
-           d="m 2,11.5 v 4 1 2 h 20 v -3 -4 h -3 v 4 H 5 v -4 z"
-           style="fill:#aeaeae;fill-opacity:1;stroke:none;stroke-width:1.76363;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      </g>
-    </g>
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 6.35 6.35" xmlns="http://www.w3.org/2000/svg">
+ <path d="m0.52915 3.0427v1.8521h5.2917v-1.8521h-0.79375v1.0583h-3.7042v-1.0583z" fill="#aeaeae"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_arrow-down-thick-grey.svg b/novelwriter/assets/icons/typicons_dark/typ_arrow-down-thick-grey.svg
index 1e57b60e..57c65d93 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_arrow-down-thick-grey.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_arrow-down-thick-grey.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg8301"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata8307">
-    <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="defs8305" />
-  <path
-     style="stroke-width:1.18357;fill:#aeaeae;fill-opacity:1"
-     id="path8299"
-     d="m 19.591431,11.061428 c -0.92437,-0.92437 -2.422771,-0.92437 -3.347141,0 l -1.877146,1.877144 V 4.367144 C 14.367144,3.059297 13.306664,2 12,2 10.692153,2 9.6328557,3.059297 9.6328557,4.367144 v 8.571428 l -1.877145,-1.877144 c -0.9243698,-0.92437 -2.4227719,-0.92437 -3.3471417,0 -0.9243697,0.924369 -0.9243697,2.422771 0,3.347141 L 12,22 19.591431,14.408569 c 0.92437,-0.92437 0.92437,-2.421588 0,-3.347141 z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m19.591 11.061c-0.92437-0.92437-2.4228-0.92437-3.3471 0l-1.8771 1.8771v-8.5714c0-1.3078-1.0605-2.3671-2.3671-2.3671-1.3078 0-2.3671 1.0593-2.3671 2.3671v8.5714l-1.8771-1.8771c-0.92437-0.92437-2.4228-0.92437-3.3471 0-0.92437 0.92437-0.92437 2.4228 0 3.3471l7.5914 7.5914 7.5914-7.5914c0.92437-0.92437 0.92437-2.4216 0-3.3471z" fill="#aeaeae" stroke-width="1.1836"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_arrow-maximise.svg b/novelwriter/assets/icons/typicons_dark/typ_arrow-maximise.svg
index 48990ef7..47f05387 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_arrow-maximise.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_arrow-maximise.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg7486"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata7492">
-    <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="defs7490" />
-  <path
-     style="stroke-width:1.25;fill:#6699cc;fill-opacity:1"
-     id="path7484"
-     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" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m15.75 2c-0.69125 0-1.25 0.56-1.25 1.25s0.55875 1.25 1.25 1.25h1.9825l-4.1162 4.1162c-0.48875 0.48875-0.48875 1.2788 0 1.7675 0.24375 0.24375 0.56375 0.36625 0.88375 0.36625s0.64-0.1225 0.88375-0.36625l4.1162-4.1162v1.9825c0 0.69 0.55875 1.25 1.25 1.25s1.25-0.56 1.25-1.25v-6.25zm-7.1338 11.616-4.1162 4.1162v-1.9825c0-0.69-0.55875-1.25-1.25-1.25s-1.25 0.56-1.25 1.25v6.2488h1.245l5.005 0.00125c0.69 0 1.25-0.56 1.25-1.25s-0.55875-1.25-1.25-1.25h-1.9825l4.1162-4.115c0.48875-0.48875 0.48875-1.2788 0-1.7675s-1.2788-0.49-1.7675-0.0012zm-2.8662-1.6162c0.69 0 1.25-0.56 1.25-1.25v-3.75h3.75c0.69125 0 1.25-0.56 1.25-1.25s-0.55875-1.25-1.25-1.25h-6.2488l-0.00125 6.25c0 0.69 0.55875 1.25 1.25 1.25zm12.5 0c-0.69125 0-1.25 0.56-1.25 1.25v3.75h-3.75c-0.69125 0-1.25 0.56-1.25 1.25s0.55875 1.25 1.25 1.25h6.25v-6.25c0-0.69-0.55875-1.25-1.25-1.25z" fill="#69c" stroke-width="1.25"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_arrow-minimise.svg b/novelwriter/assets/icons/typicons_dark/typ_arrow-minimise.svg
index bc62608a..b965395d 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_arrow-minimise.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_arrow-minimise.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg8816"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata8822">
-    <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="defs8820" />
-  <path
-     style="fill:#6699cc;fill-opacity:1;stroke-width:1.24999"
-     id="path8814"
-     d="m 4.6514795,13.249863 c -0.6912284,0 -1.2499609,0.560009 -1.2499609,1.25002 0,0.69001 0.5587325,1.250019 1.2499609,1.250019 h 1.8311928 l -4.1161214,4.116314 c -0.4887347,0.488758 -0.4887347,1.27877 0,1.767528 C 2.6102933,21.877498 2.9302833,22 3.2502733,22 c 0.31999,0 0.63998,-0.122502 0.8837224,-0.366256 l 4.2673662,-4.267567 v 2.133784 c 0,0.69001 0.558733,1.250019 1.249961,1.250019 0.6912291,0 1.0987161,-0.560009 1.0987161,-1.250019 v -6.250098 z m 1.0987157,-2.500039 c 0.6899784,0 1.2499609,-0.560009 1.2499609,-1.2500188 V 6.9997658 h 2.4999218 c 0.6912291,0 1.2499611,-0.5600087 1.2499611,-1.2500195 0,-0.6900108 -0.558732,-1.2500195 -1.2499611,-1.2500195 H 4.5014842 l -0.00125,5.0000784 c 0,0.6900098 0.5587325,1.2500188 1.249961,1.2500188 z m 12.4996098,2.500039 c -0.691229,0 -1.249961,0.560009 -1.249961,1.25002 v 2.500039 h -2.499922 c -0.691229,0 -1.249961,0.560008 -1.249961,1.250019 0,0.690011 0.558732,1.25002 1.249961,1.25002 h 4.999844 v -5.000078 c 0,-0.690011 -0.558733,-1.25002 -1.249961,-1.25002 z M 19.866004,2.3659435 15.749883,6.4822577 V 4.4997268 c 0,-0.6900108 -0.558733,-1.2500195 -1.249961,-1.2500195 -0.691229,0 -1.249961,0.5600087 -1.249961,1.2500195 v 6.2500972 h 6.249805 c 0.689978,0 1.249961,-0.560009 1.249961,-1.2500188 0,-0.690011 -0.558733,-1.25002 -1.249961,-1.25002 h -1.982438 l 4.116121,-4.1150641 c 0.488735,-0.4887576 0.488735,-1.2787699 0,-1.7675276 -0.488735,-0.4887576 -1.27871,-0.4900076 -1.767445,-0.00125 z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m4.6515 13.25c-0.69123 0-1.25 0.56001-1.25 1.25 0 0.69001 0.55873 1.25 1.25 1.25h1.8312l-4.1161 4.1163c-0.48873 0.48876-0.48873 1.2788 0 1.7675 0.24374 0.24375 0.56373 0.36626 0.88372 0.36626s0.63998-0.1225 0.88372-0.36626l4.2674-4.2676v2.1338c0 0.69001 0.55873 1.25 1.25 1.25 0.69123 0 1.0987-0.56001 1.0987-1.25v-6.2501zm1.0987-2.5c0.68998 0 1.25-0.56001 1.25-1.25v-2.5h2.4999c0.69123 0 1.25-0.56001 1.25-1.25s-0.55873-1.25-1.25-1.25h-4.9986l-0.00125 5.0001c0 0.69001 0.55873 1.25 1.25 1.25zm12.5 2.5c-0.69123 0-1.25 0.56001-1.25 1.25v2.5h-2.4999c-0.69123 0-1.25 0.56001-1.25 1.25s0.55873 1.25 1.25 1.25h4.9998v-5.0001c0-0.69001-0.55873-1.25-1.25-1.25zm1.6162-10.884-4.1161 4.1163v-1.9825c0-0.69001-0.55873-1.25-1.25-1.25-0.69123 0-1.25 0.56001-1.25 1.25v6.2501h6.2498c0.68998 0 1.25-0.56001 1.25-1.25 0-0.69001-0.55873-1.25-1.25-1.25h-1.9824l4.1161-4.1151c0.48874-0.48876 0.48874-1.2788 0-1.7675-0.48874-0.48876-1.2787-0.49001-1.7674-0.00125z" fill="#69c" stroke-width="1.25"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_arrow-repeat-grey.svg b/novelwriter/assets/icons/typicons_dark/typ_arrow-repeat-grey.svg
index 60baf3c2..e6675e02 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_arrow-repeat-grey.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_arrow-repeat-grey.svg
@@ -1,31 +1,4 @@
-<?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="svg2150">
-  <metadata
-     id="metadata2156">
-    <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="defs2154" />
-  <path
-     d="m 17,6.4445834 h -2.317778 l 1.436667,-1.4366667 c 0.434444,-0.4344445 0.434444,-1.1366667 0,-1.5711111 -0.434445,-0.4344445 -1.136667,-0.4344445 -1.571111,0 l -4.118889,4.1188889 4.118889,4.1188895 c 0.216666,0.216666 0.501111,0.325555 0.785555,0.325555 0.284445,0 0.568889,-0.108889 0.785556,-0.325555 0.434444,-0.434445 0.434444,-1.136667 0,-1.571112 L 14.682222,8.6668056 H 17 c 1.532222,0 2.777778,1.4955554 2.777778,3.3333334 0,1.837778 -1.495556,3.333333 -3.333334,3.333333 -0.614444,0 -1.111111,0.497778 -1.111111,1.111112 0,0.613333 0.496667,1.111111 1.111111,1.111111 C 19.507778,17.555695 22,15.063472 22,12.000139 22,8.9368056 19.756667,6.4445834 17,6.4445834 Z M 7.8811111,12.325695 c -0.4344444,0.434444 -0.4344444,1.136666 0,1.571111 L 9.317778,15.333472 H 7 c -1.5322222,0 -2.7777778,-1.495555 -2.7777778,-3.333333 0,-1.837778 1.4955556,-3.3333334 3.3333334,-3.3333334 0.6144444,0 1.1111111,-0.4977778 1.1111111,-1.1111111 C 8.6666667,6.9423611 8.17,6.4445834 7.5555556,6.4445834 4.4922222,6.4445834 2,8.9368056 2,12.000139 c 0,3.063333 2.2433333,5.555556 5,5.555556 h 2.317778 l -1.4366669,1.436666 c -0.4344444,0.434445 -0.4344444,1.136667 0,1.571111 0.2166667,0.216667 0.5011111,0.325556 0.7855556,0.325556 0.2844444,0 0.5688893,-0.108889 0.7855553,-0.325556 l 4.118889,-4.118888 -4.118889,-4.118889 c -0.434444,-0.434445 -1.1366664,-0.434445 -1.5711109,0 z"
-     id="path2148"
-     style="stroke-width:1.11111116;fill:#aeaeae;fill-opacity:1" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m17 6.4446h-2.3178l1.4367-1.4367c0.43444-0.43444 0.43444-1.1367 0-1.5711-0.43444-0.43444-1.1367-0.43444-1.5711 0l-4.1189 4.1189 4.1189 4.1189c0.21667 0.21667 0.50111 0.32556 0.78556 0.32556 0.28444 0 0.56889-0.10889 0.78556-0.32556 0.43444-0.43444 0.43444-1.1367 0-1.5711l-1.4367-1.4367h2.3178c1.5322 0 2.7778 1.4956 2.7778 3.3333s-1.4956 3.3333-3.3333 3.3333c-0.61444 0-1.1111 0.49778-1.1111 1.1111 0 0.61333 0.49667 1.1111 1.1111 1.1111 3.0633 0 5.5556-2.4922 5.5556-5.5556 0-3.0633-2.2433-5.5556-5-5.5556zm-9.1189 5.8811c-0.43444 0.43444-0.43444 1.1367 0 1.5711l1.4367 1.4367h-2.3178c-1.5322 0-2.7778-1.4956-2.7778-3.3333s1.4956-3.3333 3.3333-3.3333c0.61444 0 1.1111-0.49778 1.1111-1.1111 0-0.61333-0.49667-1.1111-1.1111-1.1111-3.0633 0-5.5556 2.4922-5.5556 5.5556 0 3.0633 2.2433 5.5556 5 5.5556h2.3178l-1.4367 1.4367c-0.43444 0.43444-0.43444 1.1367 0 1.5711 0.21667 0.21667 0.50111 0.32556 0.78556 0.32556 0.28444 0 0.56889-0.10889 0.78556-0.32556l4.1189-4.1189-4.1189-4.1189c-0.43444-0.43444-1.1367-0.43444-1.5711 0z" fill="#aeaeae" stroke-width="1.1111"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_at.svg b/novelwriter/assets/icons/typicons_dark/typ_at.svg
index 60bd3acc..9966ede0 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_at.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_at.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg1321"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata1327">
-    <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="defs1325" />
-  <path
-     style="stroke-width:1.25;fill:#6699cc;fill-opacity:1"
-     id="path1319"
-     d="M 12,2 C 6.48625,2 2,6.48625 2,12 c 0,5.51375 4.48625,10 10,10 2.02,0 3.965,-0.59875 5.62375,-1.73 0.57,-0.39 0.7175,-1.1675 0.32875,-1.7375 -0.38875,-0.57125 -1.165,-0.715 -1.7375,-0.32875 C 14.9725,19.0525 13.515,19.5 12,19.5 7.86375,19.5 4.5,16.13625 4.5,12 4.5,7.86375 7.86375,4.5 12,4.5 c 4.13625,0 7.5,3.36375 7.5,7.5 v 0.625 c 0,0.69 -0.56,1.25 -1.25,1.25 -0.69,0 -1.25,-0.56 -1.25,-1.25 v -3.75 c 0,-0.69125 -0.55875,-1.25 -1.25,-1.25 -0.55125,0 -1.00625,0.3625 -1.1725,0.86 C 13.8525,7.95125 12.96625,7.625 12,7.625 9.5875,7.625 7.625,9.5875 7.625,12 c 0,2.4125 1.9625,4.375 4.375,4.375 1.30625,0 2.46875,-0.5875 3.27,-1.49875 0.685,0.90375 1.76,1.49875 2.98,1.49875 2.0675,0 3.75,-1.6825 3.75,-3.75 V 12 C 22,6.48625 17.51375,2 12,2 Z m 0,11.875 c -1.03375,0 -1.875,-0.84125 -1.875,-1.875 0,-1.03375 0.84125,-1.875 1.875,-1.875 1.03375,0 1.875,0.84125 1.875,1.875 0,1.03375 -0.84125,1.875 -1.875,1.875 z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.5138 0-10 4.4862-10 10s4.4862 10 10 10c2.02 0 3.965-0.59875 5.6238-1.73 0.57-0.39 0.7175-1.1675 0.32875-1.7375-0.38875-0.57125-1.165-0.715-1.7375-0.32875-1.2425 0.84875-2.7 1.2962-4.215 1.2962-4.1362 0-7.5-3.3638-7.5-7.5s3.3638-7.5 7.5-7.5 7.5 3.3638 7.5 7.5v0.625c0 0.69-0.56 1.25-1.25 1.25s-1.25-0.56-1.25-1.25v-3.75c0-0.69125-0.55875-1.25-1.25-1.25-0.55125 0-1.0062 0.3625-1.1725 0.86-0.725-0.53375-1.6112-0.86-2.5775-0.86-2.4125 0-4.375 1.9625-4.375 4.375s1.9625 4.375 4.375 4.375c1.3062 0 2.4688-0.5875 3.27-1.4988 0.685 0.90375 1.76 1.4988 2.98 1.4988 2.0675 0 3.75-1.6825 3.75-3.75v-0.625c0-5.5138-4.4862-10-10-10zm0 11.875c-1.0338 0-1.875-0.84125-1.875-1.875s0.84125-1.875 1.875-1.875 1.875 0.84125 1.875 1.875-0.84125 1.875-1.875 1.875z" fill="#69c" stroke-width="1.25"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_book-grey.svg b/novelwriter/assets/icons/typicons_dark/typ_book-grey.svg
index a0f49771..1100eb3a 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_book-grey.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_book-grey.svg
@@ -1,31 +1,4 @@
-<?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="svg8707">
-  <metadata
-     id="metadata8713">
-    <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="defs8711" />
-  <path
-     d="M 20,0 H 5.3333333 C 4.98,0 4.64,0.14 4.3906667,0.3906667 l -4,4 -0.076,0.082667 c -0.1853334,0.22 -0.3,0.4973334 -0.3133334,0.8 L 0,5.344 V 20 c 0,2.205333 1.7946667,4 4,4 h 12 c 1.738667,0 3.221333,-1.114667 3.772,-2.666667 h 0.894667 c 1.869333,0 3.333333,-1.756 3.333333,-4 V 4 C 24,1.7946667 22.205333,0 20,0 Z M 4,21.333333 C 3.2653333,21.333333 2.6666667,20.736 2.6666667,20 V 6.6666667 H 5.3333333 V 21.333333 Z M 17.333333,20 c 0,0.736 -0.598666,1.333333 -1.333333,1.333333 H 6.6666667 V 6.6666667 H 16 C 16.734667,6.6666667 17.333333,7.264 17.333333,8 Z m 4,-2.666667 c 0,0.826667 -0.432,1.333334 -0.666666,1.333334 H 20 V 8 C 20,5.7946667 18.205333,4 16,4 H 4.552 L 5.8853333,2.6666667 H 20 C 20.734667,2.6666667 21.333333,3.264 21.333333,4 Z"
-     id="path8705"
-     style="stroke-width:1.33333;fill:#aeaeae;fill-opacity:1" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m20 0h-14.667c-0.35333 0-0.69333 0.14-0.94267 0.39067l-4 4-0.076 0.082667c-0.18533 0.22-0.3 0.49733-0.31333 0.8l-0.0013333 0.070666v14.656c0 2.2053 1.7947 4 4 4h12c1.7387 0 3.2213-1.1147 3.772-2.6667h0.89467c1.8693 0 3.3333-1.756 3.3333-4v-13.333c0-2.2053-1.7947-4-4-4zm-16 21.333c-0.73467 0-1.3333-0.59733-1.3333-1.3333v-13.333h2.6667v14.667zm13.333-1.3333c0 0.736-0.59867 1.3333-1.3333 1.3333h-9.3333v-14.667h9.3333c0.73467 0 1.3333 0.59733 1.3333 1.3333zm4-2.6667c0 0.82667-0.432 1.3333-0.66667 1.3333h-0.66667v-10.667c0-2.2053-1.7947-4-4-4h-11.448l1.3333-1.3333h14.115c0.73467 0 1.3333 0.59733 1.3333 1.3333z" fill="#aeaeae" stroke-width="1.3333"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_book.svg b/novelwriter/assets/icons/typicons_dark/typ_book.svg
index af731b39..f3ebfa6b 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_book.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_book.svg
@@ -1,39 +1,6 @@
-<?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="svg891">
-  <metadata
-     id="metadata897">
-    <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="defs895" />
-  <path
-     id="rect11733"
-     d="M 6.9042969 4.2226562 L 5.7929688 5.3339844 L 15.333984 5.3339844 C 17.171762 5.3339844 18.666016 6.8282378 18.666016 8.6660156 L 18.666016 17.554688 L 19.222656 17.554688 C 19.418212 17.554687 19.777344 17.134201 19.777344 16.445312 L 19.777344 5.3339844 C 19.777344 4.7206511 19.278238 4.2226562 18.666016 4.2226562 L 6.9042969 4.2226562 z M 5.3222656 7.5546875 L 5.3222656 18.466797 L 6.4453125 18.466797 L 6.4453125 7.5546875 L 5.3222656 7.5546875 z M 7.5546875 7.5546875 L 7.5546875 18.466797 L 16.445312 18.466797 L 16.445312 8.6660156 C 16.445313 8.0526822 15.946207 7.5546875 15.333984 7.5546875 L 7.5546875 7.5546875 z "
-     style="opacity:0.95;fill:#aeaeae;fill-opacity:1;stroke:none;stroke-width:1.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <path
-     id="rect11731"
-     d="M 4.2226562 7.5546875 L 4.2226562 18.666016 C 4.2226563 19.279349 4.7217622 19.777344 5.3339844 19.777344 L 6.4453125 19.777344 L 6.4453125 7.5546875 L 4.2226562 7.5546875 z M 7.5546875 7.5546875 L 7.5546875 19.777344 L 15.333984 19.777344 C 15.946207 19.777344 16.445312 19.279349 16.445312 18.666016 L 16.445312 8.6660156 C 16.445313 8.0526822 15.946207 7.5546875 15.333984 7.5546875 L 7.5546875 7.5546875 z "
-     style="display:inline;opacity:0.95;fill:#d64848;fill-opacity:1;stroke:none;stroke-width:1.83457506;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <path
-     d="M 18.666667,2 H 6.4444444 C 6.15,2 5.8666667,2.1166667 5.6588889,2.3255556 l -3.3333333,3.3333333 -0.063333,0.068889 c -0.1544444,0.1833333 -0.25,0.4144444 -0.2611111,0.6666666 L 2,6.4533333 V 18.666667 C 2,20.504444 3.4955556,22 5.3333333,22 h 9.9999997 c 1.448889,0 2.684445,-0.928889 3.143334,-2.222222 h 0.745555 C 20.78,19.777778 22,18.314444 22,16.444444 V 5.3333333 C 22,3.4955556 20.504444,2 18.666667,2 Z M 5.3333333,19.777778 c -0.6122222,0 -1.1111111,-0.497778 -1.1111111,-1.111111 V 7.5555556 H 6.4444444 V 19.777778 Z M 16.444444,18.666667 c 0,0.613333 -0.498888,1.111111 -1.111111,1.111111 H 7.5555556 V 7.5555556 h 7.7777774 c 0.612223,0 1.111111,0.4977777 1.111111,1.1111111 z m 3.333334,-2.222223 c 0,0.688889 -0.36,1.111112 -0.555556,1.111112 H 18.666667 V 8.6666667 c 0,-1.8377778 -1.495556,-3.3333334 -3.333334,-3.3333334 H 5.7933333 L 6.9044444,4.2222222 H 18.666667 c 0.612222,0 1.111111,0.4977778 1.111111,1.1111111 z"
-     id="path889"
-     style="display:inline;fill:#8d1919;fill-opacity:1;stroke-width:1.11110997" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m6.9043 4.2227-1.1113 1.1113h9.541c1.8378 0 3.332 1.4943 3.332 3.332v8.8887h0.55664c0.19556-1e-6 0.55469-0.42049 0.55469-1.1094v-11.111c0-0.61333-0.49911-1.1113-1.1113-1.1113h-11.762zm-1.582 3.332v10.912h1.123v-10.912h-1.123zm2.2324 0v10.912h8.8906v-9.8008c1e-6 -0.61333-0.4991-1.1113-1.1113-1.1113h-7.7793z" fill="#aeaeae" opacity=".95"/>
+ <path d="m4.2227 7.5547v11.111c1e-7 0.61333 0.49911 1.1113 1.1113 1.1113h1.1113v-12.223h-2.2227zm3.332 0v12.223h7.7793c0.61222 0 1.1113-0.498 1.1113-1.1113v-10c1e-6 -0.61333-0.4991-1.1113-1.1113-1.1113h-7.7793z" fill="#d64848" opacity=".95"/>
+ <path d="m18.667 2h-12.222c-0.29444 0-0.57778 0.11667-0.78556 0.32556l-3.3333 3.3333-0.063333 0.068889c-0.15444 0.18333-0.25 0.41444-0.26111 0.66667l-0.0011115 0.058889v12.213c0 1.8378 1.4956 3.3333 3.3333 3.3333h10c1.4489 0 2.6844-0.92889 3.1433-2.2222h0.74556c1.5578 0 2.7778-1.4633 2.7778-3.3333v-11.111c0-1.8378-1.4956-3.3333-3.3333-3.3333zm-13.333 17.778c-0.61222 0-1.1111-0.49778-1.1111-1.1111v-11.111h2.2222v12.222zm11.111-1.1111c0 0.61333-0.49889 1.1111-1.1111 1.1111h-7.7778v-12.222h7.7778c0.61222 0 1.1111 0.49778 1.1111 1.1111zm3.3333-2.2222c0 0.68889-0.36 1.1111-0.55556 1.1111h-0.55556v-8.8889c0-1.8378-1.4956-3.3333-3.3333-3.3333h-9.54l1.1111-1.1111h11.762c0.61222 0 1.1111 0.49778 1.1111 1.1111z" fill="#8d1919" stroke-width="1.1111"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_bookmark.svg b/novelwriter/assets/icons/typicons_dark/typ_bookmark.svg
index bea4bafa..172fdf92 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_bookmark.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_bookmark.svg
@@ -1,31 +1,4 @@
-<?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="svg901">
-  <metadata
-     id="metadata907">
-    <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="defs905" />
-  <path
-     d="M 16.203226,2 H 7.796774 C 6.05874,2 4.6443545,3.4143855 4.6443545,5.1524195 V 19.86371 c 0,0.540115 0.1092839,0.994063 0.3236484,1.350287 0.5926549,0.982504 1.9072138,1.059213 2.9559187,0.0084 L 11.25708,17.889239 c 0.394052,-0.393002 1.091787,-0.393002 1.485841,0 l 3.333158,3.333158 C 16.592024,21.738349 17.128987,22 17.673304,22 c 0.837492,0 1.682342,-0.660957 1.682342,-2.13629 V 5.1524195 C 19.355646,3.4143855 17.941259,2 16.203226,2 Z M 7.796774,4.101613 h 8.406452 c 0.578994,0 1.050806,0.4718121 1.050806,1.0508065 V 15.560658 l -2.575527,-2.361162 c -1.477434,-1.35449 -3.880628,-1.353439 -5.3580615,0 l -2.574476,2.361162 V 5.1524195 c 0,-0.5789944 0.4718121,-1.0508065 1.0508065,-1.0508065 z m 6.431987,12.301792 C 13.635055,15.809699 12.843798,15.482898 12,15.482898 c -0.843797,0 -1.635054,0.327852 -2.2287605,0.920507 l -3.025272,3.025272 v -2.442075 l 3.2848215,-3.011611 c 1.085483,-0.995114 2.851889,-0.995114 3.937372,0 l 3.285871,3.011611 v 2.442075 z"
-     id="path899"
-     style="fill:#6699cc;fill-opacity:1;stroke-width:1.05081" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m16.203 2h-8.4065c-1.738 0-3.1524 1.4144-3.1524 3.1524v14.711c0 0.54012 0.10928 0.99406 0.32365 1.3503 0.59265 0.9825 1.9072 1.0592 2.9559 0.0084l3.3332-3.3332c0.39405-0.393 1.0918-0.393 1.4858 0l3.3332 3.3332c0.51594 0.51595 1.0529 0.7776 1.5972 0.7776 0.83749 0 1.6823-0.66096 1.6823-2.1363v-14.711c0-1.738-1.4144-3.1524-3.1524-3.1524zm-8.4065 2.1016h8.4065c0.57899 0 1.0508 0.47181 1.0508 1.0508v10.408l-2.5755-2.3612c-1.4774-1.3545-3.8806-1.3534-5.3581 0l-2.5745 2.3612v-10.408c0-0.57899 0.47181-1.0508 1.0508-1.0508zm6.432 12.302c-0.59371-0.59371-1.385-0.92051-2.2288-0.92051-0.8438 0-1.6351 0.32785-2.2288 0.92051l-3.0253 3.0253v-2.4421l3.2848-3.0116c1.0855-0.99511 2.8519-0.99511 3.9374 0l3.2859 3.0116v2.4421z" fill="#69c" stroke-width="1.0508"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_calendar.svg b/novelwriter/assets/icons/typicons_dark/typ_calendar.svg
index d05dcc7d..999f2bf2 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_calendar.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_calendar.svg
@@ -1,31 +1,4 @@
-<?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="svg1738">
-  <metadata
-     id="metadata1744">
-    <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="defs1742" />
-  <path
-     d="M 19.777778,5.5377778 V 5.3333333 C 19.777778,3.4922222 18.285556,2 16.444444,2 14.603333,2 13.111111,3.4922222 13.111111,5.3333333 H 10.888889 C 10.888889,3.4922222 9.396667,2 7.5555556,2 5.7144444,2 4.2222222,3.4922222 4.2222222,5.3333333 V 5.5377778 C 2.9322222,5.9988889 2,7.22 2,8.6666667 V 18.666667 C 2,20.504444 3.4955556,22 5.3333333,22 H 18.666667 C 20.504444,22 22,20.504444 22,18.666667 V 8.6666667 C 22,7.22 21.067778,5.9988889 19.777778,5.5377778 Z M 15.333333,5.3333333 c 0,-0.6133333 0.496667,-1.1111111 1.111111,-1.1111111 0.614445,0 1.111112,0.4977778 1.111112,1.1111111 v 2.2222223 c 0,0.6133333 -0.496667,1.1111111 -1.111112,1.1111111 -0.614444,0 -1.111111,-0.4977778 -1.111111,-1.1111111 z m -8.8888886,0 C 6.4444444,4.72 6.9411111,4.2222222 7.5555556,4.2222222 8.17,4.2222222 8.6666667,4.72 8.6666667,5.3333333 v 2.2222223 c 0,0.6133333 -0.4966667,1.1111111 -1.1111111,1.1111111 -0.6144445,0 -1.1111112,-0.4977778 -1.1111112,-1.1111111 z M 19.777778,18.666667 c 0,0.612222 -0.497778,1.111111 -1.111111,1.111111 H 5.3333333 C 4.72,19.777778 4.2222222,19.278889 4.2222222,18.666667 V 12 H 19.777778 Z"
-     id="path1736"
-     style="stroke-width:1.11111;fill:#6699cc;fill-opacity:1" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m19.778 5.5378v-0.20444c0-1.8411-1.4922-3.3333-3.3333-3.3333-1.8411 0-3.3333 1.4922-3.3333 3.3333h-2.2222c0-1.8411-1.4922-3.3333-3.3333-3.3333-1.8411 0-3.3333 1.4922-3.3333 3.3333v0.20444c-1.29 0.46111-2.2222 1.6822-2.2222 3.1289v10c0 1.8378 1.4956 3.3333 3.3333 3.3333h13.333c1.8378 0 3.3333-1.4956 3.3333-3.3333v-10c0-1.4467-0.93222-2.6678-2.2222-3.1289zm-4.4444-0.20444c0-0.61333 0.49667-1.1111 1.1111-1.1111 0.61444 0 1.1111 0.49778 1.1111 1.1111v2.2222c0 0.61333-0.49667 1.1111-1.1111 1.1111-0.61444 0-1.1111-0.49778-1.1111-1.1111zm-8.8889 0c0-0.61333 0.49667-1.1111 1.1111-1.1111 0.61444 0 1.1111 0.49778 1.1111 1.1111v2.2222c0 0.61333-0.49667 1.1111-1.1111 1.1111-0.61444 0-1.1111-0.49778-1.1111-1.1111zm13.333 13.333c0 0.61222-0.49778 1.1111-1.1111 1.1111h-13.333c-0.61333 0-1.1111-0.49889-1.1111-1.1111v-6.6667h15.556z" fill="#69c" stroke-width="1.1111"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_cancel-grey.svg b/novelwriter/assets/icons/typicons_dark/typ_cancel-grey.svg
index 5a0b2182..cda5d15c 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_cancel-grey.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_cancel-grey.svg
@@ -1,31 +1,4 @@
-<?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="svg7731">
-  <metadata
-     id="metadata7737">
-    <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="defs7735" />
-  <path
-     d="m 20.121169,3.8786433 c -1.170024,-1.1715244 -3.072064,-1.1715244 -4.242088,0 L 12,7.7577241 8.1209195,3.8786433 c -1.1700247,-1.1715244 -3.0720643,-1.1715244 -4.2420887,0 -1.1715244,1.1715244 -1.1715244,3.070564 0,4.2420884 l 3.8775807,3.8790803 -3.8775807,3.879081 c -1.1715244,1.171525 -1.1715244,3.070564 0,4.242089 C 4.463843,20.707494 5.231859,21 5.999875,21 6.767891,21 7.5359065,20.707494 8.1209195,20.120982 L 12,16.241901 15.879081,20.120982 C 16.464093,20.707494 17.232109,21 18.000125,21 c 0.768015,0 1.536031,-0.292506 2.121044,-0.879018 1.171525,-1.171525 1.171525,-3.070564 0,-4.242089 l -3.87758,-3.879081 3.87758,-3.8790803 c 1.171525,-1.1715244 1.171525,-3.070564 0,-4.2420884 z"
-     id="path7729"
-     style="stroke-width:1.50003123;fill:#aeaeae;fill-opacity:1" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m20.121 3.8786c-1.17-1.1715-3.0721-1.1715-4.2421 0l-3.8791 3.8791-3.8791-3.8791c-1.17-1.1715-3.0721-1.1715-4.2421 0-1.1715 1.1715-1.1715 3.0706 0 4.2421l3.8776 3.8791-3.8776 3.8791c-1.1715 1.1715-1.1715 3.0706 0 4.2421 0.58501 0.58651 1.353 0.87902 2.121 0.87902s1.536-0.29251 2.121-0.87902l3.8791-3.8791 3.8791 3.8791c0.58501 0.58651 1.353 0.87902 2.121 0.87902 0.76802 0 1.536-0.29251 2.121-0.87902 1.1715-1.1715 1.1715-3.0706 0-4.2421l-3.8776-3.8791 3.8776-3.8791c1.1715-1.1715 1.1715-3.0706 0-4.2421z" fill="#aeaeae" stroke-width="1.5"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_cancel.svg b/novelwriter/assets/icons/typicons_dark/typ_cancel.svg
index 27d6b5c0..718d0ef5 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_cancel.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_cancel.svg
@@ -1,31 +1,4 @@
-<?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="svg934">
-  <metadata
-     id="metadata940">
-    <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="defs938" />
-  <path
-     d="M 12,2 C 6.48625,2 2,6.48625 2,12 2,17.51375 6.48625,22 12,22 17.51375,22 22,17.51375 22,12 22,6.48625 17.51375,2 12,2 Z M 5.75,12 c 0,-1.04 0.28,-2.005 0.73,-2.86875 L 14.86875,17.52 C 14.005,17.97 13.04,18.25 12,18.25 8.55375,18.25 5.75,15.44625 5.75,12 Z M 17.52,14.86875 9.13125,6.48 C 9.995,6.03 10.96,5.75 12,5.75 c 3.44625,0 6.25,2.80375 6.25,6.25 0,1.04 -0.28,2.005 -0.73,2.86875 z"
-     id="path932"
-     style="stroke-width:1.25;fill:#d64848;fill-opacity:1" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.5138 0-10 4.4862-10 10s4.4862 10 10 10 10-4.4862 10-10-4.4862-10-10-10zm-6.25 10c0-1.04 0.28-2.005 0.73-2.8688l8.3888 8.3888c-0.86375 0.45-1.8288 0.73-2.8688 0.73-3.4462 0-6.25-2.8038-6.25-6.25zm11.77 2.8688-8.3888-8.3888c0.86375-0.45 1.8288-0.73 2.8688-0.73 3.4462 0 6.25 2.8038 6.25 6.25 0 1.04-0.28 2.005-0.73 2.8688z" fill="#d64848" stroke-width="1.25"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_chart-bar-grey.svg b/novelwriter/assets/icons/typicons_dark/typ_chart-bar-grey.svg
index 61432fec..956830bc 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_chart-bar-grey.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_chart-bar-grey.svg
@@ -1,31 +1,4 @@
-<?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="svg1983">
-  <metadata
-     id="metadata1989">
-    <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="defs1987" />
-  <path
-     d="m 14.526375,2.5260936 c 0,-1.3958223 -1.131816,-2.5263751 -2.526375,-2.5263751 -1.394559,0 -2.526375,1.1305528 -2.526375,2.5263751 V 17.684345 h 5.05275 z m 6.315937,5.0527501 c 0,-1.3958223 -1.131815,-2.5263751 -2.526374,-2.5263751 -1.39456,0 -2.526375,1.1305528 -2.526375,2.5263751 V 17.684345 h 5.052749 z M 8.210437,11.368407 c 0,-1.3958225 -1.1318154,-2.5263765 -2.5263744,-2.5263765 -1.394559,0 -2.5263751,1.130554 -2.5263751,2.5263765 v 6.315938 H 8.210437 Z M 20.842312,21.473906 H 3.1576875 c -0.6985427,0 -1.2631875,0.564645 -1.2631875,1.263187 0,0.698543 0.5646448,1.263188 1.2631875,1.263188 H 20.842312 c 0.698544,0 1.263188,-0.564645 1.263188,-1.263188 0,-0.698542 -0.564644,-1.263187 -1.263188,-1.263187 z"
-     id="path1981"
-     style="stroke-width:1.26319;fill:#aeaeae;fill-opacity:1" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m14.526 2.5261c0-1.3958-1.1318-2.5264-2.5264-2.5264s-2.5264 1.1306-2.5264 2.5264v15.158h5.0528zm6.3159 5.0528c0-1.3958-1.1318-2.5264-2.5264-2.5264-1.3946 0-2.5264 1.1306-2.5264 2.5264v10.106h5.0527zm-12.632 3.7896c0-1.3958-1.1318-2.5264-2.5264-2.5264s-2.5264 1.1306-2.5264 2.5264v6.3159h5.0527zm12.632 10.105h-17.685c-0.69854 0-1.2632 0.56464-1.2632 1.2632 0 0.69854 0.56464 1.2632 1.2632 1.2632h17.685c0.69854 0 1.2632-0.56464 1.2632-1.2632 0-0.69854-0.56464-1.2632-1.2632-1.2632z" fill="#aeaeae" stroke-width="1.2632"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_chevron-down.svg b/novelwriter/assets/icons/typicons_dark/typ_chevron-down.svg
index 53389084..4d08c906 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_chevron-down.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_chevron-down.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg8980"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata8986">
-    <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="defs8984" />
-  <path
-     style="fill:#6699cc;fill-opacity:1;stroke-width:1.28574"
-     id="path8978"
-     d="m 3.7531209,6.4345258 c -1.004161,1.002875 -1.004161,2.63319 0,3.6360652 l 8.2467181,8.248004 8.246719,-8.248004 C 20.749281,9.5691528 21,8.9108558 21,8.2525578 c 0,-0.658297 -0.250719,-1.316595 -0.753442,-1.818032 -1.004161,-1.004161 -2.631904,-1.004161 -3.636065,0 L 11.999839,11.043894 7.3891859,6.4345258 c -1.004161,-1.004161 -2.631905,-1.004161 -3.636065,0 z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m3.7531 6.4345c-1.0042 1.0029-1.0042 2.6332 0 3.6361l8.2467 8.248 8.2467-8.248c0.50272-0.50144 0.75344-1.1597 0.75344-1.818 0-0.6583-0.25072-1.3166-0.75344-1.818-1.0042-1.0042-2.6319-1.0042-3.6361 0l-4.6107 4.6094-4.6107-4.6094c-1.0042-1.0042-2.6319-1.0042-3.6361 0z" fill="#69c" stroke-width="1.2857"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_chevron-left.svg b/novelwriter/assets/icons/typicons_dark/typ_chevron-left.svg
index df4d0635..bc8ea192 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_chevron-left.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_chevron-left.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg8980"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata8986">
-    <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="defs8984" />
-  <path
-     style="stroke-width:1.28574;fill:#6699cc;fill-opacity:1"
-     id="path8978"
-     d="m 17.565474,3.7531206 c -1.002875,-1.0041608 -2.63319,-1.0041608 -3.636065,0 L 5.6814051,11.999839 13.929409,20.246558 C 14.430847,20.749281 15.089144,21 15.747442,21 c 0.658297,0 1.316595,-0.250719 1.818032,-0.753442 1.004161,-1.004161 1.004161,-2.631904 0,-3.636065 l -4.609368,-4.610654 4.609368,-4.6106535 c 1.004161,-1.0041608 1.004161,-2.6319041 0,-3.6360649 z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m17.565 3.7531c-1.0029-1.0042-2.6332-1.0042-3.6361 0l-8.248 8.2467 8.248 8.2467c0.50144 0.50272 1.1597 0.75344 1.818 0.75344 0.6583 0 1.3166-0.25072 1.818-0.75344 1.0042-1.0042 1.0042-2.6319 0-3.6361l-4.6094-4.6107 4.6094-4.6107c1.0042-1.0042 1.0042-2.6319 0-3.6361z" fill="#69c" stroke-width="1.2857"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_chevron-right.svg b/novelwriter/assets/icons/typicons_dark/typ_chevron-right.svg
index b5671fa7..c96f63bb 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_chevron-right.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_chevron-right.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg8980"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata8986">
-    <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="defs8984" />
-  <path
-     style="fill:#6699cc;fill-opacity:1;stroke-width:1.28574"
-     id="path8978"
-     d="m 6.4345258,3.7531206 c 1.002875,-1.0041608 2.63319,-1.0041608 3.6360652,0 l 8.248004,8.2467184 -8.248004,8.246719 C 9.5691528,20.749281 8.9108558,21 8.2525578,21 c -0.658297,0 -1.316595,-0.250719 -1.818032,-0.753442 -1.004161,-1.004161 -1.004161,-2.631904 0,-3.636065 L 11.043894,11.999839 6.4345258,7.3891855 c -1.004161,-1.0041608 -1.004161,-2.6319041 0,-3.6360649 z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m6.4345 3.7531c1.0029-1.0042 2.6332-1.0042 3.6361 0l8.248 8.2467-8.248 8.2467c-0.50144 0.50272-1.1597 0.75344-1.818 0.75344-0.6583 0-1.3166-0.25072-1.818-0.75344-1.0042-1.0042-1.0042-2.6319 0-3.6361l4.6094-4.6107-4.6094-4.6107c-1.0042-1.0042-1.0042-2.6319 0-3.6361z" fill="#69c" stroke-width="1.2857"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_chevron-up.svg b/novelwriter/assets/icons/typicons_dark/typ_chevron-up.svg
index 9ac7e927..765dd6de 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_chevron-up.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_chevron-up.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg8980"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata8986">
-    <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="defs8984" />
-  <path
-     style="fill:#6699cc;fill-opacity:1;stroke-width:1.28574"
-     id="path8978"
-     d="m 20.246879,17.565474 c 1.004161,-1.002875 1.004161,-2.63319 0,-3.636065 L 12.000161,5.6814052 3.7534421,13.929409 c -0.502723,0.501438 -0.753442,1.159735 -0.753442,1.818033 0,0.658297 0.250719,1.316595 0.753442,1.818032 1.004161,1.004161 2.631904,1.004161 3.636065,0 l 4.6106539,-4.609368 4.610653,4.609368 c 1.004161,1.004161 2.631905,1.004161 3.636065,0 z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m20.247 17.565c1.0042-1.0029 1.0042-2.6332 0-3.6361l-8.2467-8.248-8.2467 8.248c-0.50272 0.50144-0.75344 1.1597-0.75344 1.818 0 0.6583 0.25072 1.3166 0.75344 1.818 1.0042 1.0042 2.6319 1.0042 3.6361 0l4.6107-4.6094 4.6107 4.6094c1.0042 1.0042 2.6319 1.0042 3.6361 0z" fill="#69c" stroke-width="1.2857"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_cog.svg b/novelwriter/assets/icons/typicons_dark/typ_cog.svg
index e2014bd8..d8b8fcc9 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_cog.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_cog.svg
@@ -1,31 +1,4 @@
-<?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="svg1989">
-  <metadata
-     id="metadata1995">
-    <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="defs1993" />
-  <path
-     d="M 8.3268645,20.0768 8.9719703,22.448 C 9.2032354,23.3008 10.175241,24 11.131598,24 h 1.738831 c 0.956356,0 1.928363,-0.6992 2.159627,-1.552 l 0.645108,-2.3712 c 0.231264,-0.8528 1.173709,-1.3536 2.091812,-1.1104 l 2.550866,0.672 c 0.91984,0.2416 2.06573,-0.1824 2.542169,-0.9456 l 0.869415,-1.3872 c 0.476441,-0.7632 0.307773,-1.8864 -0.380803,-2.4992 l -1.909236,-1.6976 c -0.688578,-0.6128 -0.688578,-1.6128 0.0017,-2.224 L 23.346891,9.1872 C 24.035507,8.5759996 24.205912,7.4527996 23.729472,6.6895996 L 22.858272,5.3024 C 22.380094,4.5392 21.235943,4.1152 20.317842,4.3568 l -2.550866,0.672 C 16.847134,5.2704 15.906428,4.7712 15.673424,3.9184 L 15.030056,1.5504 C 14.798792,0.69919996 13.826785,0 12.870429,0 H 11.131598 C 10.175241,0 9.2032354,0.69919996 8.9719703,1.552 L 8.3286034,3.92 C 8.0955994,4.7728 7.1548921,5.2736 6.2350507,5.032 L 3.684186,4.36 C 2.7643447,4.1168 1.6184552,4.5424 1.1420155,5.304 L 0.27260019,6.6912 c -0.47643954,0.7632 -0.307773,1.8864 0.38254277,2.4991996 L 2.5609015,10.8848 c 0.6868381,0.6128 0.6868381,1.6128 0,2.2256 L 0.65166536,14.808 c -0.68683817,0.6128 -0.85898242,1.736 -0.38080407,2.4992 l 0.87115421,1.3872 c 0.4764397,0.7632 1.6223292,1.1872 2.5421705,0.9456 l 2.5508647,-0.672 c 0.9181025,-0.2448 1.8605487,0.256 2.0918138,1.1088 z M 12.001014,8.8000004 c 1.919668,0 3.477662,1.4319996 3.477662,3.1999996 0,1.7664 -1.557994,3.2 -3.477662,3.2 -1.91967,0 -3.4776615,-1.4336 -3.4776615,-3.2 0,-1.768 1.5579915,-3.1999996 3.4776615,-3.1999996 z"
-     id="path1987"
-     style="fill:#aeaeae;fill-opacity:1;stroke-width:1.66797" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m8.3269 20.077 0.64511 2.3712c0.23127 0.8528 1.2033 1.552 2.1596 1.552h1.7388c0.95636 0 1.9284-0.6992 2.1596-1.552l0.64511-2.3712c0.23126-0.8528 1.1737-1.3536 2.0918-1.1104l2.5509 0.672c0.91984 0.2416 2.0657-0.1824 2.5422-0.9456l0.86942-1.3872c0.47644-0.7632 0.30777-1.8864-0.3808-2.4992l-1.9092-1.6976c-0.68858-0.6128-0.68858-1.6128 0.0017-2.224l1.9058-1.6976c0.68862-0.6112 0.85902-1.7344 0.38258-2.4976l-0.8712-1.3872c-0.47818-0.7632-1.6223-1.1872-2.5404-0.9456l-2.5509 0.672c-0.91984 0.2416-1.8605-0.2576-2.0936-1.1104l-0.64337-2.368c-0.23126-0.8512-1.2033-1.5504-2.1596-1.5504h-1.7388c-0.95636 0-1.9284 0.6992-2.1596 1.552l-0.64337 2.368c-0.233 0.8528-1.1737 1.3536-2.0936 1.112l-2.5509-0.672c-0.91984-0.2432-2.0657 0.1824-2.5422 0.944l-0.86942 1.3872c-0.47644 0.7632-0.30777 1.8864 0.38254 2.4992l1.9058 1.6944c0.68684 0.6128 0.68684 1.6128 0 2.2256l-1.9092 1.6976c-0.68684 0.6128-0.85898 1.736-0.3808 2.4992l0.87115 1.3872c0.47644 0.7632 1.6223 1.1872 2.5422 0.9456l2.5509-0.672c0.9181-0.2448 1.8605 0.256 2.0918 1.1088zm3.6741-11.277c1.9197 0 3.4777 1.432 3.4777 3.2 0 1.7664-1.558 3.2-3.4777 3.2-1.9197 0-3.4777-1.4336-3.4777-3.2 0-1.768 1.558-3.2 3.4777-3.2z" fill="#aeaeae" stroke-width="1.668"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_delete.svg b/novelwriter/assets/icons/typicons_dark/typ_delete.svg
index 316f2153..bcd9dcc9 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_delete.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_delete.svg
@@ -1,31 +1,4 @@
-<?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="svg1543">
-  <metadata
-     id="metadata1549">
-    <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="defs1547" />
-  <path
-     d="M 12,2 C 6.47625,2 2,6.4775 2,12 2,17.5225 6.47625,22 12,22 17.52375,22 22,17.5225 22,12 22,6.4775 17.52375,2 12,2 Z m 4.63375,12.86625 c 0.48875,0.48875 0.48875,1.27875 0,1.7675 C 16.39,16.8775 16.07,17 15.75,17 15.43,17 15.11,16.8775 14.86625,16.63375 L 12,13.7675 9.13375,16.63375 C 8.89,16.8775 8.57,17 8.25,17 7.93,17 7.61,16.8775 7.36625,16.63375 6.8775,16.145 6.8775,15.355 7.36625,14.86625 L 10.2325,12 7.36625,9.13375 C 6.8775,8.645 6.8775,7.855 7.36625,7.36625 7.855,6.8775 8.645,6.8775 9.13375,7.36625 L 12,10.2325 14.86625,7.36625 c 0.48875,-0.48875 1.27875,-0.48875 1.7675,0 0.48875,0.48875 0.48875,1.27875 0,1.7675 L 13.7675,12 Z"
-     id="path1541"
-     style="stroke-width:1.25;fill:#d64848;fill-opacity:1" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.5238 0-10 4.4775-10 10s4.4762 10 10 10 10-4.4775 10-10-4.4762-10-10-10zm4.6338 12.866c0.48875 0.48875 0.48875 1.2788 0 1.7675-0.24375 0.24375-0.56375 0.36625-0.88375 0.36625s-0.64-0.1225-0.88375-0.36625l-2.8662-2.8662-2.8662 2.8662c-0.24375 0.24375-0.56375 0.36625-0.88375 0.36625s-0.64-0.1225-0.88375-0.36625c-0.48875-0.48875-0.48875-1.2788 0-1.7675l2.8662-2.8662-2.8662-2.8662c-0.48875-0.48875-0.48875-1.2788 0-1.7675s1.2788-0.48875 1.7675 0l2.8662 2.8662 2.8662-2.8662c0.48875-0.48875 1.2788-0.48875 1.7675 0s0.48875 1.2788 0 1.7675l-2.8662 2.8662z" fill="#d64848" stroke-width="1.25"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_document-text.svg b/novelwriter/assets/icons/typicons_dark/typ_document-text.svg
index 0d3df7c2..016a8202 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_document-text.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_document-text.svg
@@ -1,39 +1,8 @@
-<?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="svg2161">
-  <metadata
-     id="metadata2167">
-    <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="defs2165" />
-  <path
-     id="rect12986"
-     d="m 5.8888883,3.4444441 c -0.6734444,0 -1.2222222,0.5487778 -1.2222222,1.2222222 V 19.333334 c 0,0.673444 0.5487778,1.222222 1.2222222,1.222222 H 18.11111 c 0.673446,0 1.222224,-0.548778 1.222224,-1.222222 V 4.6666663 c 0,-0.6734444 -0.548778,-1.2222222 -1.222224,-1.2222222 z m 1.2222222,2.4444444 h 9.7777775 c 0.337334,0 0.611112,0.2737778 0.611112,0.6111112 0,0.3373334 -0.273778,0.6111113 -0.611112,0.6111113 H 7.1111105 c -0.3373332,0 -0.611111,-0.2737779 -0.611111,-0.6111112 0,-0.3373335 0.2737778,-0.6111112 0.611111,-0.6111113 z m 0,3.6666664 h 9.7777775 c 0.337334,0 0.611112,0.2737789 0.611112,0.6111111 0,0.337334 -0.273778,0.611112 -0.611112,0.611112 H 7.1111105 c -0.3373332,0 -0.611111,-0.273778 -0.611111,-0.611112 0,-0.3373322 0.2737778,-0.6111111 0.611111,-0.6111111 z m 0,3.6666671 h 9.7777775 c 0.337334,0 0.611112,0.273778 0.611112,0.611112 0,0.337332 -0.273778,0.61111 -0.611112,0.61111 H 7.1111105 c -0.3373332,0 -0.611111,-0.273778 -0.611111,-0.61111 0,-0.337334 0.2737778,-0.611112 0.611111,-0.611112 z m 0,3.666666 h 9.7777775 c 0.337334,0 0.611112,0.273778 0.611112,0.611112 0,0.337334 -0.273778,0.611112 -0.611112,0.611112 H 7.1111105 c -0.3373332,0 -0.611111,-0.273778 -0.611111,-0.611112 0,-0.337334 0.2737778,-0.611112 0.611111,-0.611112 z"
-     style="display:inline;opacity:0.95;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.88635;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <path
-     id="path2157"
-     style="display:inline;fill:#595959;fill-opacity:1;stroke-width:1.22222"
-     d="M 7.1113281 5.8886719 C 6.7739949 5.8886719 6.5 6.1626666 6.5 6.5 C 6.5 6.8373334 6.7739949 7.1113281 7.1113281 7.1113281 L 16.888672 7.1113281 C 17.226006 7.1113281 17.5 6.8373334 17.5 6.5 C 17.5 6.1626666 17.226006 5.8886719 16.888672 5.8886719 L 7.1113281 5.8886719 z M 7.1113281 9.5546875 C 6.7739949 9.5546875 6.5 9.8286836 6.5 10.166016 C 6.5 10.50335 6.7739949 10.777344 7.1113281 10.777344 L 16.888672 10.777344 C 17.226006 10.777344 17.5 10.50335 17.5 10.166016 C 17.5 9.8286836 17.226006 9.5546875 16.888672 9.5546875 L 7.1113281 9.5546875 z M 7.1113281 13.222656 C 6.7739949 13.222656 6.5 13.49665 6.5 13.833984 C 6.5 14.171316 6.7739949 14.445312 7.1113281 14.445312 L 16.888672 14.445312 C 17.226006 14.445313 17.5 14.171316 17.5 13.833984 C 17.5 13.49665 17.226006 13.222656 16.888672 13.222656 L 7.1113281 13.222656 z M 7.1113281 16.888672 C 6.7739949 16.888672 6.5 17.162666 6.5 17.5 C 6.5 17.837334 6.7739949 18.111328 7.1113281 18.111328 L 16.888672 18.111328 C 17.226006 18.111328 17.5 17.837334 17.5 17.5 C 17.5 17.162666 17.226006 16.888672 16.888672 16.888672 L 7.1113281 16.888672 z " />
-  <path
-     id="path902"
-     style="display:inline;fill:#848484;fill-opacity:1;stroke-width:1.22222"
-     d="M 5.8886719,1 C 3.8671165,1 2.2226562,2.6444602 2.2226562,4.6660156 V 19.333984 C 2.2226563,21.355538 3.8671165,23 5.8886719,23 H 18.111328 c 2.021556,0 3.666016,-1.644462 3.666016,-3.666016 V 4.6660156 C 21.777344,2.6444602 20.132884,1 18.111328,1 Z m 0,2.4453125 H 18.111328 c 0.673446,0 1.222656,0.5472587 1.222656,1.2207031 V 19.333984 c 0,0.673444 -0.54921,1.220704 -1.222656,1.220704 H 5.8886719 c -0.6734444,-10e-7 -1.2226563,-0.54726 -1.2226563,-1.220704 V 4.6660156 c 0,-0.6734444 0.5492119,-1.2207031 1.2226563,-1.2207031 z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <g>
+  <path d="m5.8889 3.4444c-0.67344 0-1.2222 0.54878-1.2222 1.2222v14.667c0 0.67344 0.54878 1.2222 1.2222 1.2222h12.222c0.67345 0 1.2222-0.54878 1.2222-1.2222v-14.667c0-0.67344-0.54878-1.2222-1.2222-1.2222zm1.2222 2.4444h9.7778c0.33733 0 0.61111 0.27378 0.61111 0.61111s-0.27378 0.61111-0.61111 0.61111h-9.7778c-0.33733 0-0.61111-0.27378-0.61111-0.61111 0-0.33733 0.27378-0.61111 0.61111-0.61111zm0 3.6667h9.7778c0.33733 0 0.61111 0.27378 0.61111 0.61111 0 0.33733-0.27378 0.61111-0.61111 0.61111h-9.7778c-0.33733 0-0.61111-0.27378-0.61111-0.61111 0-0.33733 0.27378-0.61111 0.61111-0.61111zm0 3.6667h9.7778c0.33733 0 0.61111 0.27378 0.61111 0.61111 0 0.33733-0.27378 0.61111-0.61111 0.61111h-9.7778c-0.33733 0-0.61111-0.27378-0.61111-0.61111 0-0.33733 0.27378-0.61111 0.61111-0.61111zm0 3.6667h9.7778c0.33733 0 0.61111 0.27378 0.61111 0.61111s-0.27378 0.61111-0.61111 0.61111h-9.7778c-0.33733 0-0.61111-0.27378-0.61111-0.61111s0.27378-0.61111 0.61111-0.61111z" fill="#fff" opacity=".95"/>
+  <path d="m7.1113 5.8887c-0.33733 0-0.61133 0.27399-0.61133 0.61133s0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 0 0.61133-0.27399 0.61133-0.61133s-0.27399-0.61133-0.61133-0.61133h-9.7773zm0 3.666c-0.33733 0-0.61133 0.274-0.61133 0.61133 0 0.33733 0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 0 0.61133-0.27399 0.61133-0.61133 0-0.33733-0.27399-0.61133-0.61133-0.61133h-9.7773zm0 3.668c-0.33733 0-0.61133 0.27399-0.61133 0.61133 0 0.33733 0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 1e-6 0.61133-0.274 0.61133-0.61133 0-0.33733-0.27399-0.61133-0.61133-0.61133h-9.7773zm0 3.666c-0.33733 0-0.61133 0.27399-0.61133 0.61133s0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 0 0.61133-0.27399 0.61133-0.61133s-0.27399-0.61133-0.61133-0.61133h-9.7773z" fill="#595959" stroke-width="1.2222"/>
+  <path d="m5.8887 1c-2.0216 0-3.666 1.6445-3.666 3.666v14.668c1e-7 2.0216 1.6445 3.666 3.666 3.666h12.223c2.0216 0 3.666-1.6445 3.666-3.666v-14.668c0-2.0216-1.6445-3.666-3.666-3.666zm0 2.4453h12.223c0.67345 0 1.2227 0.54726 1.2227 1.2207v14.668c0 0.67344-0.54921 1.2207-1.2227 1.2207h-12.223c-0.67344-1e-6 -1.2227-0.54726-1.2227-1.2207v-14.668c0-0.67344 0.54921-1.2207 1.2227-1.2207z" fill="#848484" stroke-width="1.2222"/>
+ </g>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_export.svg b/novelwriter/assets/icons/typicons_dark/typ_export.svg
index 6e36ed53..aa6de8d4 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_export.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_export.svg
@@ -1,16 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.2"
-   width="24"
-   height="24"
-   viewBox="0 0 24 24"
-   id="svg1169"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs1173" />
-  <path
-     d="M 6.8888889,16.888889 V 17.5 c 2.0667778,-3.150889 4.4000001,-4.831444 7.3333331,-4.888889 v 3.666666 c 0,0.673444 0.624556,1.222223 1.397,1.222223 0.444889,0 0.825,-0.193112 1.079223,-0.477889 C 19.061,14.542222 24,9.5555555 24,9.5555555 c 0,0 -4.939,-4.9891115 -7.302778,-7.5007781 -0.254222,-0.2505555 -0.633111,-0.4436667 -1.078,-0.4436667 -0.772444,0 -1.397,0.5463333 -1.397,1.2222222 v 3.6666667 c -5.6955553,0 -7.3333331,5.9534434 -7.3333331,10.3888894 z m -3.6666667,5.5 H 20.333333 c 0.675889,0 1.222222,-0.547557 1.222222,-1.222223 V 13.77711 c -0.811555,0.826222 -1.66711,1.702555 -2.444444,2.501889 v 3.665444 H 4.4444445 V 5.2777775 H 13 V 2.833333 H 3.2222222 C 2.5463333,2.833333 2,3.3808886 2,4.0555552 V 21.166666 c 0,0.674666 0.5463333,1.222223 1.2222222,1.222223 z"
-     id="path1167"
-     style="stroke-width:1.22222;fill:#aeaeae;fill-opacity:1" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m6.8889 16.889v0.61111c2.0668-3.1509 4.4-4.8314 7.3333-4.8889v3.6667c0 0.67344 0.62456 1.2222 1.397 1.2222 0.44489 0 0.825-0.19311 1.0792-0.47789 2.3626-2.4799 7.3016-7.4666 7.3016-7.4666s-4.939-4.9891-7.3028-7.5008c-0.25422-0.25056-0.63311-0.44367-1.078-0.44367-0.77244 0-1.397 0.54633-1.397 1.2222v3.6667c-5.6956 0-7.3333 5.9534-7.3333 10.389zm-3.6667 5.5h17.111c0.67589 0 1.2222-0.54756 1.2222-1.2222v-7.3896c-0.81156 0.82622-1.6671 1.7026-2.4444 2.5019v3.6654h-14.667v-14.667h8.5556v-2.4444h-9.7778c-0.67589 0-1.2222 0.54756-1.2222 1.2222v17.111c0 0.67467 0.54633 1.2222 1.2222 1.2222z" fill="#aeaeae" stroke-width="1.2222"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_flag.svg b/novelwriter/assets/icons/typicons_dark/typ_flag.svg
index 8e20ad73..3899d75a 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_flag.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_flag.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg16286"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata16292">
-    <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="defs16290" />
-  <path
-     style="stroke-width:1.23158;fill:#f99157;fill-opacity:1"
-     id="path16284"
-     d="m 19.8612,3.6198408 c -0.460612,-0.1908955 -0.990193,-0.084979 -1.342426,0.2672537 -1.556722,1.5554906 -4.090091,1.5567222 -5.648044,0 -2.51859,-2.516126 -6.6136063,-2.516126 -9.1309639,0 C 3.5082283,4.1174007 3.378912,4.4314547 3.378912,4.7578244 V 20.768416 C 3.378912,21.44825 3.92943,22 4.610496,22 5.2915619,22 5.8420799,21.44825 5.8420799,20.768416 v -5.607402 c 1.5653433,-1.227889 3.8437741,-1.121973 5.2871901,0.320212 2.518589,2.516126 6.614837,2.516126 9.130963,0 0.231538,-0.231538 0.360855,-0.54436 0.360855,-0.87073 V 4.7578244 c 0,-0.4987915 -0.300507,-0.9470881 -0.759888,-1.1379836 z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m19.861 3.6198c-0.46061-0.1909-0.99019-0.084979-1.3424 0.26725-1.5567 1.5555-4.0901 1.5567-5.648 0-2.5186-2.5161-6.6136-2.5161-9.131 0-0.23154 0.23031-0.36085 0.54436-0.36085 0.87073v16.011c0 0.67983 0.55052 1.2316 1.2316 1.2316 0.68107 0 1.2316-0.55175 1.2316-1.2316v-5.6074c1.5653-1.2279 3.8438-1.122 5.2872 0.32021 2.5186 2.5161 6.6148 2.5161 9.131 0 0.23154-0.23154 0.36086-0.54436 0.36086-0.87073v-9.8527c0-0.49879-0.30051-0.94709-0.75989-1.138z" fill="#f99157" stroke-width="1.2316"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_folder.svg b/novelwriter/assets/icons/typicons_dark/typ_folder.svg
index 8e452617..097534be 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_folder.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_folder.svg
@@ -1,35 +1,5 @@
-<?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="svg2765">
-  <metadata
-     id="metadata2771">
-    <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="defs2769" />
-  <path
-     id="path12368"
-     d="M 5.3339844 5.25 C 4.7206511 5.25 4.2226562 5.7540001 4.2226562 6.375 L 4.2226562 8.625 L 19.777344 8.625 C 19.777344 8.0039999 19.279349 7.5 18.666016 7.5 L 12 7.5 C 10.773333 7.5 9.7773438 6.4920001 9.7773438 5.25 L 5.3339844 5.25 z M 4.2226562 9.75 L 4.2226562 17.625 C 4.2226563 18.246001 4.7206511 18.75 5.3339844 18.75 L 18.666016 18.75 C 19.279349 18.75 19.777344 18.246001 19.777344 17.625 L 19.777344 9.75 L 4.2226562 9.75 z "
-     style="fill:#ffffc0;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1" />
-  <path
-     d="M 18.666667,5.2499999 H 12 C 12,4.008 11.004444,3 9.777778,3 H 5.3333333 C 3.4955556,3 2,4.51425 2,6.3749999 V 17.624999 C 2,19.48575 3.4955556,21 5.3333333,21 H 18.666667 C 20.504444,21 22,19.48575 22,17.624999 V 8.625 C 22,6.76425 20.504444,5.2499999 18.666667,5.2499999 Z m -13.3333337,0 H 9.777778 c 0,1.2420001 0.995555,2.25 2.222222,2.25 h 6.666667 c 0.613333,0 1.111111,0.504 1.111111,1.1250001 H 4.2222222 V 6.3749999 c 0,-0.6209999 0.4977778,-1.125 1.1111111,-1.125 z M 18.666667,18.75 H 5.3333333 C 4.72,18.75 4.2222222,18.246 4.2222222,17.624999 V 9.75 H 19.777778 v 7.874999 C 19.777778,18.246 19.28,18.75 18.666667,18.75 Z"
-     id="path2763"
-     style="display:inline;fill:#ffff84;fill-opacity:1;stroke-width:1.11802995" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m5.334 5.25c-0.61333 0-1.1113 0.504-1.1113 1.125v2.25h15.555c0-0.621-0.498-1.125-1.1113-1.125h-6.666c-1.2267 0-2.2227-1.008-2.2227-2.25h-4.4434zm-1.1113 4.5v7.875c1e-7 0.621 0.49799 1.125 1.1113 1.125h13.332c0.61333 0 1.1113-0.504 1.1113-1.125v-7.875h-15.555z" fill="#ffffc0"/>
+ <path d="m18.667 5.25h-6.6667c0-1.242-0.99556-2.25-2.2222-2.25h-4.4444c-1.8378 0-3.3333 1.5142-3.3333 3.375v11.25c0 1.8608 1.4956 3.375 3.3333 3.375h13.333c1.8378 0 3.3333-1.5142 3.3333-3.375v-9c0-1.8608-1.4956-3.375-3.3333-3.375zm-13.333 0h4.4444c0 1.242 0.99556 2.25 2.2222 2.25h6.6667c0.61333 0 1.1111 0.504 1.1111 1.125h-15.556v-2.25c0-0.621 0.49778-1.125 1.1111-1.125zm13.333 13.5h-13.333c-0.61333 0-1.1111-0.504-1.1111-1.125v-7.875h15.556v7.875c0 0.621-0.49778 1.125-1.1111 1.125z" fill="#ffff84" stroke-width="1.118"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_globe-grey.svg b/novelwriter/assets/icons/typicons_dark/typ_globe-grey.svg
index ebb1055d..46adc157 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_globe-grey.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_globe-grey.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg3369"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata3375">
-    <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="defs3373" />
-  <path
-     style="stroke-width:1.2;fill:#aeaeae;fill-opacity:1"
-     id="path3367"
-     d="m 10.59375,21.6 h -4.8 c -0.6636,0 -1.2,0.5364 -1.2,1.2 0,0.6636 0.5364,1.2 1.2,1.2 h 12 c 0.6636,0 1.2,-0.5364 1.2,-1.2 0,-0.6636 -0.5364,-1.2 -1.2,-1.2 h -4.8 v -1.476 c 1.968,-0.4452 3.7752,-1.4256 5.2356,-2.8872 2.04,-2.04 3.1644,-4.752 3.1644,-7.6368 0,-2.4804 -0.8304,-4.8348 -2.3616,-6.7428 l 0.81,-0.8076 c 0.4692,-0.4692 0.4692,-1.2276 0.0012,-1.698 -0.4692,-0.4692 -1.2288,-0.468 -1.698,-0.0012 l -2.4624,2.4588 0.8496,0.8496 c 1.5864,1.5864 2.4612,3.6972 2.4612,5.9412 0,2.244 -0.8748,4.3524 -2.4612,5.9388 -1.5864,1.5864 -3.6948,2.4612 -5.9388,2.4612 -2.244,0 -4.3524,-0.8748 -5.9388,-2.4612 -0.4692,-0.4692 -1.2276,-0.4692 -1.6968,0 -0.4692,0.468 -0.4692,1.2276 0,1.6968 2.0388,2.04 4.7508,3.1644 7.6356,3.1644 z m 0,-19.2 c 1.9884,0 3.7884,0.8064 5.0916,2.1084 1.302,1.3032 2.1084,3.1032 2.1084,5.0916 0,1.9872 -0.8064,3.7872 -2.1084,5.0904 -1.3032,1.3032 -3.1032,2.1096 -5.0916,2.1096 -1.9896,0 -3.7884,-0.8064 -5.0904,-2.1084 -1.302,-1.3032 -2.1072,-3.1032 -2.1072,-5.0916 0,-1.9884 0.8052,-3.7884 2.1072,-5.0916 C 6.80535,3.2064 8.60415,2.4 10.59375,2.4 Z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m10.594 21.6h-4.8c-0.6636 0-1.2 0.5364-1.2 1.2s0.5364 1.2 1.2 1.2h12c0.6636 0 1.2-0.5364 1.2-1.2s-0.5364-1.2-1.2-1.2h-4.8v-1.476c1.968-0.4452 3.7752-1.4256 5.2356-2.8872 2.04-2.04 3.1644-4.752 3.1644-7.6368 0-2.4804-0.8304-4.8348-2.3616-6.7428l0.81-0.8076c0.4692-0.4692 0.4692-1.2276 0.0012-1.698-0.4692-0.4692-1.2288-0.468-1.698-0.0012l-2.4624 2.4588 0.8496 0.8496c1.5864 1.5864 2.4612 3.6972 2.4612 5.9412s-0.8748 4.3524-2.4612 5.9388-3.6948 2.4612-5.9388 2.4612-4.3524-0.8748-5.9388-2.4612c-0.4692-0.4692-1.2276-0.4692-1.6968 0-0.4692 0.468-0.4692 1.2276 0 1.6968 2.0388 2.04 4.7508 3.1644 7.6356 3.1644zm0-19.2c1.9884 0 3.7884 0.8064 5.0916 2.1084 1.302 1.3032 2.1084 3.1032 2.1084 5.0916 0 1.9872-0.8064 3.7872-2.1084 5.0904-1.3032 1.3032-3.1032 2.1096-5.0916 2.1096-1.9896 0-3.7884-0.8064-5.0904-2.1084-1.302-1.3032-2.1072-3.1032-2.1072-5.0916s0.8052-3.7884 2.1072-5.0916c1.302-1.302 3.1008-2.1084 5.0904-2.1084z" fill="#aeaeae" stroke-width="1.2"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_key.svg b/novelwriter/assets/icons/typicons_dark/typ_key.svg
index 92d1081b..1b8de73f 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_key.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_key.svg
@@ -1,31 +1,4 @@
-<?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="svg3996">
-  <metadata
-     id="metadata4002">
-    <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="defs4000" />
-  <path
-     d="m 7.357143,9.142857 c 0,1.045714 0.237143,2.034286 0.641429,2.93 l -5.641429,5.641429 v 2.142857 c 0,0 1.28,2.142857 2.8571429,2.142857 H 8.071429 v -2.857143 h 2.857143 V 16.285714 H 14.5 c 3.945714,0 7.142857,-3.197143 7.142857,-7.142857 C 21.642857,5.1971429 18.445714,2 14.5,2 10.554286,2 7.357143,5.1971429 7.357143,9.142857 Z M 14.5,12 c -1.577143,0 -2.857143,-1.28 -2.857143,-2.857143 0,-1.578571 1.28,-2.86 2.857143,-2.86 1.578572,0 2.857143,1.28 2.857143,2.86 C 17.357143,10.72 16.078572,12 14.5,12 Z"
-     id="path3994"
-     style="stroke-width:1.42857;fill:#cda66f;fill-opacity:1" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m7.3571 9.1429c0 1.0457 0.23714 2.0343 0.64143 2.93l-5.6414 5.6414v2.1429s1.28 2.1429 2.8571 2.1429h2.8571v-2.8571h2.8571v-2.8571h3.5714c3.9457 0 7.1429-3.1971 7.1429-7.1429 0-3.9457-3.1971-7.1429-7.1429-7.1429s-7.1429 3.1971-7.1429 7.1429zm7.1429 2.8571c-1.5771 0-2.8571-1.28-2.8571-2.8571 0-1.5786 1.28-2.86 2.8571-2.86 1.5786 0 2.8571 1.28 2.8571 2.86 0 1.5771-1.2786 2.8571-2.8571 2.8571z" fill="#cda66f" stroke-width="1.4286"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_location.svg b/novelwriter/assets/icons/typicons_dark/typ_location.svg
index 1bc86c48..bf461226 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_location.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_location.svg
@@ -1,31 +1,4 @@
-<?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="svg4600">
-  <metadata
-     id="metadata4606">
-    <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="defs4604" />
-  <path
-     d="m 17.954289,4.4260846 c -3.288464,-3.2347795 -8.6201134,-3.2347795 -11.9085778,0 -3.2884643,3.235832 -3.2884643,8.4811644 0,11.7159434 L 11.999474,22 17.954289,16.142028 c 3.288464,-3.234779 3.288464,-8.4801114 0,-11.7159434 z m -5.954815,8.6264294 c -0.703167,0 -1.363176,-0.273688 -1.861077,-0.770537 -1.0263296,-1.026329 -1.0263296,-2.695825 0,-3.7221538 0.496848,-0.4968487 1.15791,-0.7705365 1.861077,-0.7705365 0.703167,0 1.364228,0.2736878 1.861077,0.7705365 1.026329,1.0263288 1.026329,2.6968778 0,3.7221538 -0.496849,0.496849 -1.15791,0.770537 -1.861077,0.770537 z"
-     id="path4598"
-     style="stroke-width:1.05265;fill:#6699cc;fill-opacity:1" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m17.954 4.4261c-3.2885-3.2348-8.6201-3.2348-11.909 0-3.2885 3.2358-3.2885 8.4812 0 11.716l5.9538 5.858 5.9548-5.858c3.2885-3.2348 3.2885-8.4801 0-11.716zm-5.9548 8.6264c-0.70317 0-1.3632-0.27369-1.8611-0.77054-1.0263-1.0263-1.0263-2.6958 0-3.7222 0.49685-0.49685 1.1579-0.77054 1.8611-0.77054s1.3642 0.27369 1.8611 0.77054c1.0263 1.0263 1.0263 2.6969 0 3.7222-0.49685 0.49685-1.1579 0.77054-1.8611 0.77054z" fill="#69c" stroke-width="1.0526"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_media-pause-grey.svg b/novelwriter/assets/icons/typicons_dark/typ_media-pause-grey.svg
index b0480586..37362722 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_media-pause-grey.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_media-pause-grey.svg
@@ -1,31 +1,4 @@
-<?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="svg5582">
-  <metadata
-     id="metadata5588">
-    <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="defs5586" />
-  <path
-     d="m 6.7499997,3 c -1.656,0 -3,1.3440001 -3,3.0000001 V 17.999999 c 0,1.656 1.344,3.000001 3,3.000001 1.6560002,0 2.9999998,-1.344001 2.9999998,-3.000001 V 6.0000001 C 9.7499995,4.3440001 8.4059999,3 6.7499997,3 Z M 17.249999,3 c -1.656,0 -3.000001,1.3440001 -3.000001,3.0000001 V 17.999999 c 0,1.656 1.344001,3.000001 3.000001,3.000001 1.656,0 3.000001,-1.344001 3.000001,-3.000001 V 6.0000001 C 20.25,4.3440001 18.905999,3 17.249999,3 Z"
-     id="path5580"
-     style="fill:#aeaeae;fill-opacity:1;stroke-width:1.49999" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m6.75 3c-1.656 0-3 1.344-3 3v12c0 1.656 1.344 3 3 3 1.656 0 3-1.344 3-3v-12c0-1.656-1.344-3-3-3zm10.5 0c-1.656 0-3 1.344-3 3v12c0 1.656 1.344 3 3 3s3-1.344 3-3v-12c0-1.656-1.344-3-3-3z" fill="#aeaeae" stroke-width="1.5"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_media-record-outline.svg b/novelwriter/assets/icons/typicons_dark/typ_media-record-outline.svg
index 237dac60..20cbf14b 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_media-record-outline.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_media-record-outline.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg11603"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata11609">
-    <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="defs11607" />
-  <path
-     style="stroke-width:1.5;fill:#6699cc;fill-opacity:1"
-     id="path11601"
-     d="m 12,6 c 3.3075,0 6,2.691 6,6 0,3.309 -2.6925,6 -6,6 C 8.6925,18 6,15.309 6,12 6,8.691 8.6925,6 12,6 m 0,-3 c -4.971,0 -9,4.029 -9,9 0,4.968 4.029,9 9,9 4.968,0 9,-4.032 9,-9 0,-4.971 -4.032,-9 -9,-9 z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 6c3.3075 0 6 2.691 6 6s-2.6925 6-6 6-6-2.691-6-6 2.6925-6 6-6m0-3c-4.971 0-9 4.029-9 9 0 4.968 4.029 9 9 9 4.968 0 9-4.032 9-9 0-4.971-4.032-9-9-9z" fill="#69c" stroke-width="1.5"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_media-record.svg b/novelwriter/assets/icons/typicons_dark/typ_media-record.svg
index 8f7789b1..b3b3c510 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_media-record.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_media-record.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg10879"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata10885">
-    <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="defs10883" />
-  <path
-     style="stroke-width:1.5;fill:#6699cc;fill-opacity:1"
-     id="path10877"
-     d="M 21,12 C 21,9.5145 19.992,7.2645 18.3645,5.6355 16.7355,4.008 14.4855,3 12,3 9.516,3 7.266,4.008 5.637,5.6355 4.008,7.2645 3,9.5145 3,12 3,14.484 4.008,16.734 5.637,18.363 7.266,19.992 9.516,21 12,21 14.4855,21 16.7355,19.992 18.3645,18.363 19.992,16.734 21,14.484 21,12 Z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="M 21,12 C 21,9.5145 19.992,7.2645 18.3645,5.6355 16.7355,4.008 14.4855,3 12,3 9.516,3 7.266,4.008 5.637,5.6355 4.008,7.2645 3,9.5145 3,12 3,14.484 4.008,16.734 5.637,18.363 7.266,19.992 9.516,21 12,21 14.4855,21 16.7355,19.992 18.3645,18.363 19.992,16.734 21,14.484 21,12 Z" fill="#69c" stroke-width="1.5"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_minus.svg b/novelwriter/assets/icons/typicons_dark/typ_minus.svg
index 2e2a041e..2bba31a3 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_minus.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_minus.svg
@@ -1,31 +1,4 @@
-<?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="svg5204">
-  <metadata
-     id="metadata5210">
-    <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="defs5208" />
-  <path
-     d="M 19.5,9.5 H 4.5 C 3.12,9.5 2,10.62 2,12 c 0,1.38 1.12,2.5 2.5,2.5 h 15 C 20.88,14.5 22,13.38 22,12 22,10.62 20.88,9.5 19.5,9.5 Z"
-     id="path5202"
-     style="stroke-width:1.25;fill:#d64848;fill-opacity:1" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m19.5 9.5h-15c-1.38 0-2.5 1.12-2.5 2.5s1.12 2.5 2.5 2.5h15c1.38 0 2.5-1.12 2.5-2.5s-1.12-2.5-2.5-2.5z" fill="#d64848" stroke-width="1.25"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_pencil.svg b/novelwriter/assets/icons/typicons_dark/typ_pencil.svg
index 25c9a81e..a0b0bf09 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_pencil.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_pencil.svg
@@ -1,35 +1,5 @@
-<?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"
-   id="svg14474"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata14480">
-    <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="defs14478" />
-  <path
-     style="fill:#99cc99;fill-opacity:1"
-     id="path14472"
-     d="M21 6.879l-3.879-3.879c-.293-.293-.678-.439-1.061-.439-.384 0-.767.146-1.06.439l-10.939 10.939c-.293.293-.558.727-.75 1.188-.192.463-.311.959-.311 1.373v4.5h4.5c.414 0 .908-.119 1.371-.311.463-.192.896-.457 1.189-.75l10.94-10.939c.293-.293.439-.678.439-1.061 0-.384-.146-.767-.439-1.06zm-15.232 8.182l8.293-8.293 1.232 1.232-8.293 8.293-1.232-1.232zm1.732 3.939h-1.5l-1-1v-1.5c0-.077.033-.305.158-.605.01-.02 2.967 2.938 2.967 2.938-.322.134-.548.167-.625.167zm1.439-.768l-1.232-1.232 8.293-8.293 1.232 1.232-8.293 8.293zm9-9l-3.172-3.172 1.293-1.293 3.17 3.172-1.291 1.293z" />
-  <path
-     id="rect19553"
-     d="M 3,18.414062 V 21 h 2.5605469 z"
-     style="display:inline;opacity:0.95;fill:#0a0a0a;fill-opacity:1;stroke:none;stroke-width:1.88249397;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="M21 6.879l-3.879-3.879c-.293-.293-.678-.439-1.061-.439-.384 0-.767.146-1.06.439l-10.939 10.939c-.293.293-.558.727-.75 1.188-.192.463-.311.959-.311 1.373v4.5h4.5c.414 0 .908-.119 1.371-.311.463-.192.896-.457 1.189-.75l10.94-10.939c.293-.293.439-.678.439-1.061 0-.384-.146-.767-.439-1.06zm-15.232 8.182l8.293-8.293 1.232 1.232-8.293 8.293-1.232-1.232zm1.732 3.939h-1.5l-1-1v-1.5c0-.077.033-.305.158-.605.01-.02 2.967 2.938 2.967 2.938-.322.134-.548.167-.625.167zm1.439-.768l-1.232-1.232 8.293-8.293 1.232 1.232-8.293 8.293zm9-9l-3.172-3.172 1.293-1.293 3.17 3.172-1.291 1.293z" fill="#9c9"/>
+ <path d="m3 18.414v2.5859h2.5605z" fill="#0a0a0a" opacity=".95"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_pin-outline.svg b/novelwriter/assets/icons/typicons_dark/typ_pin-outline.svg
index 478ff1a6..51a04860 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_pin-outline.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_pin-outline.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg5619"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata5625">
-    <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="defs5623" />
-  <path
-     style="stroke-width:1.17614;fill:#6699cc;fill-opacity:1"
-     id="path5617"
-     d="M 21.321794,7.3993841 16.619582,2.6712968 C 15.735124,1.7821341 14.193203,1.772725 13.291103,2.6642399 13.060579,2.8947636 12.879453,3.1770375 12.799476,3.4040327 12.031456,5.0059369 11.206981,6.0091853 10.148454,6.6113695 L 9.8932312,6.7348644 c -1.138504,0.5704284 -2.687482,1.1514421 -5.5502098,1.1514421 -0.3128535,0 -0.6127695,0.061159 -0.9009241,0.1787735 -0.5692523,0.2375805 -1.033828,0.6998039 -1.2725846,1.2749371 -0.2340521,0.569252 -0.2340521,1.2243629 0,1.7936149 0.1223186,0.292859 0.2940352,0.553963 0.5116213,0.765668 L 6.4859506,15.704116 1.9907392,22 l 6.294707,-4.495212 3.7954078,3.795408 c 0.218762,0.222291 0.477513,0.398712 0.771548,0.518678 C 13.142909,21.940017 13.444001,22 13.753326,22 c 0.309325,0 0.610418,-0.06116 0.899748,-0.181126 0.585719,-0.241109 1.038533,-0.696275 1.270233,-1.26788 0.121142,-0.284626 0.182302,-0.596304 0.182302,-0.903276 0,-2.86508 0.581013,-4.412882 1.150266,-5.552563 0.583366,-1.166732 1.610137,-2.055894 3.239092,-2.839204 0.318734,-0.122319 0.599832,-0.301092 0.836237,-0.537497 0.907981,-0.9197419 0.903276,-2.4122651 -0.0094,-3.3190699 z m -6.172388,5.6466539 c -0.96326,1.932399 -1.397256,3.963595 -1.405489,6.591094 L 4.3430214,10.238589 c 2.5157659,0 4.4858018,-0.3940079 6.3464576,-1.2749372 L 10.965872,8.840157 c 1.645421,-0.8221227 2.902716,-2.2264352 3.984766,-4.5093251 l 4.615178,4.7645472 c -2.191151,1.0502949 -3.594287,2.3052369 -4.41641,3.9506589 z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m21.322 7.3994-4.7022-4.7281c-0.88446-0.88916-2.4264-0.89857-3.3285-0.0070569-0.23052 0.23052-0.41165 0.5128-0.49163 0.73979-0.76802 1.6019-1.5925 2.6052-2.651 3.2073l-0.25522 0.12349c-1.1385 0.57043-2.6875 1.1514-5.5502 1.1514-0.31285 0-0.61277 0.061159-0.90092 0.17877-0.56925 0.23758-1.0338 0.6998-1.2726 1.2749-0.23405 0.56925-0.23405 1.2244 0 1.7936 0.12232 0.29286 0.29404 0.55396 0.51162 0.76567l3.8048 3.8048-4.4952 6.2959 6.2947-4.4952 3.7954 3.7954c0.21876 0.22229 0.47751 0.39871 0.77155 0.51868 0.29051 0.12114 0.5916 0.18113 0.90092 0.18113s0.61042-0.06116 0.89975-0.18113c0.58572-0.24111 1.0385-0.69628 1.2702-1.2679 0.12114-0.28463 0.1823-0.5963 0.1823-0.90328 0-2.8651 0.58101-4.4129 1.1503-5.5526 0.58337-1.1667 1.6101-2.0559 3.2391-2.8392 0.31873-0.12232 0.59983-0.30109 0.83624-0.5375 0.90798-0.91974 0.90328-2.4123-0.0094-3.3191zm-6.1724 5.6467c-0.96326 1.9324-1.3973 3.9636-1.4055 6.5911l-9.4009-9.3985c2.5158 0 4.4858-0.39401 6.3465-1.2749l0.27639-0.12349c1.6454-0.82212 2.9027-2.2264 3.9848-4.5093l4.6152 4.7645c-2.1912 1.0503-3.5943 2.3052-4.4164 3.9507z" fill="#69c" stroke-width="1.1761"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_pin.svg b/novelwriter/assets/icons/typicons_dark/typ_pin.svg
index ea040440..0ee523f8 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_pin.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_pin.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg4924"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata4930">
-    <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="defs4928" />
-  <path
-     style="stroke-width:1.24817;fill:#6699cc;fill-opacity:1"
-     id="path4922"
-     d="M 16.641616,2.36759 C 16.156078,1.879557 15.367237,1.8770607 14.876708,2.3626 14.7469,2.4924093 14.657031,2.6459337 14.595871,2.8056991 13.557396,4.9725159 12.414076,6.1944709 10.971195,6.915911 9.3523243,7.7147375 7.4938043,8.270172 4.4982051,8.270172 c -0.1622616,0 -0.3245233,0.0312 -0.4767996,0.09486 -0.3058008,0.127313 -0.547945,0.370705 -0.675258,0.675258 -0.1260648,0.304552 -0.1260648,0.649046 0,0.953599 0.063657,0.153524 0.1547727,0.292071 0.2708521,0.406902 L 7.6648033,14.448593 2.0018723,22 l 7.551407,-5.662931 4.0465547,4.046555 c 0.114831,0.117328 0.253378,0.207196 0.406902,0.270852 0.152277,0.06366 0.314538,0.09736 0.4768,0.09736 0.162261,0 0.324524,-0.0337 0.476799,-0.09736 0.305801,-0.127313 0.549193,-0.36821 0.675259,-0.675259 0.06366,-0.151027 0.09611,-0.314537 0.09611,-0.475551 0,-2.995598 0.554186,-4.854118 1.351763,-6.448027 0.720193,-1.44288 1.942148,-2.586201 4.110213,-3.624676 0.161013,-0.06115 0.31329,-0.151028 0.441851,-0.280836 0.485536,-0.49053 0.48304,-1.2793713 -0.005,-1.7649081 z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m16.642 2.3676c-0.48554-0.48803-1.2744-0.49053-1.7649-0.00499-0.12981 0.12981-0.21968 0.28333-0.28084 0.4431-1.0385 2.1668-2.1818 3.3888-3.6247 4.1102-1.6189 0.79883-3.4774 1.3543-6.473 1.3543-0.16226 0-0.32452 0.0312-0.4768 0.09486-0.3058 0.12731-0.54794 0.3707-0.67526 0.67526-0.12606 0.30455-0.12606 0.64905 0 0.9536 0.063657 0.15352 0.15477 0.29207 0.27085 0.4069l4.0478 4.0478-5.6629 7.5514 7.5514-5.6629 4.0466 4.0466c0.11483 0.11733 0.25338 0.2072 0.4069 0.27085 0.15228 0.06366 0.31454 0.09736 0.4768 0.09736 0.16226 0 0.32452-0.0337 0.4768-0.09736 0.3058-0.12731 0.54919-0.36821 0.67526-0.67526 0.06366-0.15103 0.09611-0.31454 0.09611-0.47555 0-2.9956 0.55419-4.8541 1.3518-6.448 0.72019-1.4429 1.9421-2.5862 4.1102-3.6247 0.16101-0.06115 0.31329-0.15103 0.44185-0.28084 0.48554-0.49053 0.48304-1.2794-5e-3 -1.7649z" fill="#69c" stroke-width="1.2482"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_plus.svg b/novelwriter/assets/icons/typicons_dark/typ_plus.svg
index b7210cce..c19c2fc5 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_plus.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_plus.svg
@@ -1,31 +1,4 @@
-<?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="svg5808">
-  <metadata
-     id="metadata5814">
-    <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="defs5812" />
-  <path
-     d="m 19.5,9.5 h -5 v -5 C 14.5,3.12 13.38,2 12,2 10.62,2 9.5,3.12 9.5,4.5 l 0.08875,5 H 4.5 C 3.12,9.5 2,10.62 2,12 c 0,1.38 1.12,2.5 2.5,2.5 L 9.58875,14.41125 9.5,19.5 c 0,1.38 1.12,2.5 2.5,2.5 1.38,0 2.5,-1.12 2.5,-2.5 V 14.41125 L 19.5,14.5 C 20.88,14.5 22,13.38 22,12 22,10.62 20.88,9.5 19.5,9.5 Z"
-     id="path5806"
-     style="stroke-width:1.25;fill:#99cc99;fill-opacity:1" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m19.5 9.5h-5v-5c0-1.38-1.12-2.5-2.5-2.5s-2.5 1.12-2.5 2.5l0.08875 5h-5.0888c-1.38 0-2.5 1.12-2.5 2.5s1.12 2.5 2.5 2.5l5.0888-0.08875-0.08875 5.0888c0 1.38 1.12 2.5 2.5 2.5s2.5-1.12 2.5-2.5v-5.0888l5 0.08875c1.38 0 2.5-1.12 2.5-2.5s-1.12-2.5-2.5-2.5z" fill="#9c9" stroke-width="1.25"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_puzzle-outline.svg b/novelwriter/assets/icons/typicons_dark/typ_puzzle-outline.svg
index 526feec8..dcb2180e 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_puzzle-outline.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_puzzle-outline.svg
@@ -1,31 +1,4 @@
-<?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="svg11920">
-  <metadata
-     id="metadata11926">
-    <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="defs11924" />
-  <path
-     d="M 22.461538,10.769231 V 8.615385 C 22.461538,6.24 20.52923,4.3076923 18.153846,4.3076923 H 17.219692 C 17.046153,1.8683077 14.816,0 12,0 9.1839995,0 6.9538461,1.8683077 6.7803077,4.3076923 H 5.8461538 C 3.4707692,4.3076923 1.5384615,6.24 1.5384615,8.615385 v 2.153846 c 0,1.245538 0.6326154,2.273231 1.5938462,2.764307 C 2.6916923,13.764923 2.3101538,14.110769 2.032,14.548923 1.7095384,15.058462 1.5384615,15.666462 1.5384615,16.307692 v 3.384616 C 1.5384615,22.067692 3.4707692,24 5.8461538,24 H 9.2307695 C 10.432,24 11.484308,23.388308 11.990154,22.401231 l 0.04431,0.08123 C 12.569847,23.432615 13.592616,24 14.76923,24 h 3.384616 c 2.375384,0 4.307692,-1.932308 4.307692,-4.307692 v -3.384616 c 0,-1.246769 -0.633845,-2.275692 -1.596308,-2.765538 0.955077,-0.505846 1.596308,-1.545846 1.596308,-2.772923 z m -2.461539,8.923077 c 0,1.015384 -0.830769,1.846154 -1.846153,1.846154 H 14.76923 c -0.438154,0 -0.891077,-0.265847 -0.481231,-0.94277 0.30277,-0.344615 0.481231,-0.761846 0.481231,-1.211077 0,-1.190153 -1.239384,-2.153846 -2.769231,-2.153846 -1.529846,0 -2.7692295,0.963693 -2.7692295,2.153846 0,0.369231 0.116923,0.708923 0.313846,1.012923 0.6239995,0.828308 0.167384,1.140924 -0.313846,1.140924 H 5.8461538 C 4.8307692,21.538462 4,20.707692 4,19.692308 v -3.384616 c 0,-0.317538 0.1390769,-0.64123 0.4726153,-0.64123 0.128,0 0.2818462,0.048 0.4701539,0.16 0.3446154,0.302769 0.7630769,0.48123 1.2110769,0.48123 1.1889231,0 2.1538462,-1.240615 2.1538462,-2.76923 0,-1.528616 -0.9649231,-2.769231 -2.1538462,-2.769231 -0.3692308,0 -0.7089231,0.116923 -1.0116923,0.313846 C 4.8504615,11.293538 4.6227692,11.382154 4.4504615,11.382154 4.1304615,11.382154 4,11.080615 4,10.769231 V 8.615385 C 4,7.6 4.8307692,6.7692308 5.8461538,6.7692308 h 3.3846157 c 0.48123,0 0.9378465,-0.3126154 0.299077,-1.1409231 -0.182154,-0.304 -0.299077,-0.6436923 -0.299077,-1.0129231 0,-1.1901538 1.2393835,-2.1538461 2.7692305,-2.1538461 1.529847,0 2.76923,0.9636923 2.76923,2.1538461 0,0.4492308 -0.17846,0.8664616 -0.48123,1.2110769 -0.409846,0.6769231 0.04308,0.9427693 0.48123,0.9427693 h 3.384616 C 19.16923,6.7692308 20,7.6 20,8.615385 v 2.153846 c 0,0.317538 -0.139076,0.641231 -0.472616,0.641231 -0.128,0 -0.281846,-0.048 -0.470154,-0.16 -0.344615,-0.30277 -0.763077,-0.481231 -1.211077,-0.481231 -1.188923,0 -2.153846,1.240615 -2.153846,2.769231 0,1.528615 0.964923,2.76923 2.153846,2.76923 0.369231,0 0.708923,-0.116923 1.011693,-0.313846 0.291693,-0.210461 0.519384,-0.300308 0.691692,-0.299077 0.318769,0 0.449232,0.301539 0.449232,0.612923 v 3.384616 z M 4,12.546462 c 0.1427692,0.03938 0.2904615,0.06646 0.4492307,0.06646 0.4209231,0 0.8406154,-0.146461 1.2775385,-0.448 l 0.084923,-0.05046 C 5.9310769,12.036923 6.0430769,12 6.1538461,12 c 0.4356923,0 0.9230769,0.658462 0.9230769,1.538462 0,0.88 -0.4873846,1.538461 -0.9230769,1.538461 -0.1329231,0 -0.2670769,-0.05908 -0.3987692,-0.174769 l -0.176,-0.128 C 5.2086153,14.548923 4.8356923,14.435692 4.4726153,14.435692 4.3076923,14.435692 4.1513846,14.464002 4,14.508312 Z M 19.550769,14.464 c -0.420922,0 -0.840616,0.146462 -1.277539,0.448 l -0.08492,0.05046 c -0.119384,0.07754 -0.231383,0.114461 -0.340923,0.114461 -0.435692,0 -0.923077,-0.658461 -0.923077,-1.538461 0,-0.88 0.487385,-1.538462 0.923077,-1.538462 0.132924,0 0.267077,0.05908 0.39877,0.174769 l 0.175999,0.128 c 0.371693,0.225231 0.743385,0.338462 1.106462,0.338462 0.167384,0 0.322461,-0.03077 0.472616,-0.07631 v 1.965539 c -0.144,-0.03938 -0.291693,-0.06646 -0.450462,-0.06646 z m -8.54523,7.074462 C 11.129847,21.112615 11.12,20.534154 10.630154,19.820308 l -0.05415,-0.09108 c -0.07631,-0.120616 -0.115692,-0.232616 -0.115692,-0.343385 0,-0.435692 0.657231,-0.923077 1.538462,-0.923077 0.88123,0 1.538461,0.487385 1.538461,0.923077 0,0.132923 -0.05908,0.267077 -0.176,0.4 l -0.128,0.174769 c -0.4,0.660923 -0.382769,1.204923 -0.270769,1.580308 h -1.956923 z"
-     id="path11918"
-     style="stroke-width:1.23077;fill:#aeaeae;fill-opacity:1" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m22.462 10.769v-2.1538c0-2.3754-1.9323-4.3077-4.3077-4.3077h-0.93415c-0.17354-2.4394-2.4037-4.3077-5.2197-4.3077-2.816 0-5.0462 1.8683-5.2197 4.3077h-0.93415c-2.3754 0-4.3077 1.9323-4.3077 4.3077v2.1538c0 1.2455 0.63262 2.2732 1.5938 2.7643-0.44062 0.23138-0.82215 0.57723-1.1003 1.0154-0.32246 0.50954-0.49354 1.1175-0.49354 1.7588v3.3846c0 2.3754 1.9323 4.3077 4.3077 4.3077h3.3846c1.2012 0 2.2535-0.61169 2.7594-1.5988l0.04431 0.08123c0.53538 0.95015 1.5582 1.5175 2.7348 1.5175h3.3846c2.3754 0 4.3077-1.9323 4.3077-4.3077v-3.3846c0-1.2468-0.63384-2.2757-1.5963-2.7655 0.95508-0.50585 1.5963-1.5458 1.5963-2.7729zm-2.4615 8.9231c0 1.0154-0.83077 1.8462-1.8462 1.8462h-3.3846c-0.43815 0-0.89108-0.26585-0.48123-0.94277 0.30277-0.34462 0.48123-0.76185 0.48123-1.2111 0-1.1902-1.2394-2.1538-2.7692-2.1538-1.5298 0-2.7692 0.96369-2.7692 2.1538 0 0.36923 0.11692 0.70892 0.31385 1.0129 0.624 0.82831 0.16738 1.1409-0.31385 1.1409h-3.3846c-1.0154 0-1.8462-0.83077-1.8462-1.8462v-3.3846c0-0.31754 0.13908-0.64123 0.47262-0.64123 0.128 0 0.28185 0.048 0.47015 0.16 0.34462 0.30277 0.76308 0.48123 1.2111 0.48123 1.1889 0 2.1538-1.2406 2.1538-2.7692 0-1.5286-0.96492-2.7692-2.1538-2.7692-0.36923 0-0.70892 0.11692-1.0117 0.31385-0.29169 0.21046-0.51938 0.29908-0.69169 0.29908-0.32 0-0.45046-0.30154-0.45046-0.61292v-2.1538c0-1.0154 0.83077-1.8462 1.8462-1.8462h3.3846c0.48123 0 0.93785-0.31262 0.29908-1.1409-0.18215-0.304-0.29908-0.64369-0.29908-1.0129 0-1.1902 1.2394-2.1538 2.7692-2.1538s2.7692 0.96369 2.7692 2.1538c0 0.44923-0.17846 0.86646-0.48123 1.2111-0.40985 0.67692 0.04308 0.94277 0.48123 0.94277h3.3846c1.0154 0 1.8462 0.83077 1.8462 1.8462v2.1538c0 0.31754-0.13908 0.64123-0.47262 0.64123-0.128 0-0.28185-0.048-0.47015-0.16-0.34462-0.30277-0.76308-0.48123-1.2111-0.48123-1.1889 0-2.1538 1.2406-2.1538 2.7692 0 1.5286 0.96492 2.7692 2.1538 2.7692 0.36923 0 0.70892-0.11692 1.0117-0.31385 0.29169-0.21046 0.51938-0.30031 0.69169-0.29908 0.31877 0 0.44923 0.30154 0.44923 0.61292v3.3846zm-16-7.1458c0.14277 0.03938 0.29046 0.06646 0.44923 0.06646 0.42092 0 0.84062-0.14646 1.2775-0.448l0.084923-0.05046c0.11938-0.077539 0.23138-0.11446 0.34215-0.11446 0.43569 0 0.92308 0.65846 0.92308 1.5385s-0.48738 1.5385-0.92308 1.5385c-0.13292 0-0.26708-0.05908-0.39877-0.17477l-0.176-0.128c-0.37046-0.22523-0.74338-0.33846-1.1065-0.33846-0.16492 0-0.32123 0.02831-0.47262 0.07262zm15.551 1.9175c-0.42092 0-0.84062 0.14646-1.2775 0.448l-0.08492 0.05046c-0.11938 0.07754-0.23138 0.11446-0.34092 0.11446-0.43569 0-0.92308-0.65846-0.92308-1.5385s0.48738-1.5385 0.92308-1.5385c0.13292 0 0.26708 0.05908 0.39877 0.17477l0.176 0.128c0.37169 0.22523 0.74338 0.33846 1.1065 0.33846 0.16738 0 0.32246-0.03077 0.47262-0.07631v1.9655c-0.144-0.03938-0.29169-0.06646-0.45046-0.06646zm-8.5452 7.0745c0.12431-0.42585 0.11446-1.0043-0.37538-1.7182l-0.05415-0.09108c-0.07631-0.12062-0.11569-0.23262-0.11569-0.34338 0-0.43569 0.65723-0.92308 1.5385-0.92308 0.88123 0 1.5385 0.48738 1.5385 0.92308 0 0.13292-0.05908 0.26708-0.176 0.4l-0.128 0.17477c-0.4 0.66092-0.38277 1.2049-0.27077 1.5803h-1.9569z" fill="#aeaeae" stroke-width="1.2308"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_puzzle.svg b/novelwriter/assets/icons/typicons_dark/typ_puzzle.svg
index 561b3aaf..f4f215bd 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_puzzle.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_puzzle.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg6422"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata6428">
-    <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="defs6426" />
-  <path
-     style="stroke-width:1.29032;fill:#6699cc;fill-opacity:1"
-     id="path6420"
-     d="m 18.129032,10.709677 c 0.469677,0 0.908387,0.187097 1.269677,0.504517 0.708388,0.428387 0.988388,-0.04387 0.988388,-0.504517 V 8.451613 c 0,-1.0645162 -0.870968,-1.935484 -1.935484,-1.935484 h -3.548387 c -0.459355,0 -0.934194,-0.2787096 -0.504517,-0.9883871 0.31742,-0.3612903 0.504517,-0.7987096 0.504517,-1.2696774 C 14.903226,3.0103226 13.603871,2 12,2 10.396129,2 9.096774,3.0103226 9.096774,4.2580645 9.096774,4.6451613 9.219355,5.0012903 9.425806,5.32 10.08,6.1883871 9.60129,6.516129 9.096774,6.516129 H 5.5483869 c -1.0645162,0 -1.9354839,0.8709678 -1.9354839,1.935484 v 2.258064 c 0,0.504517 0.3277419,0.983226 1.1974194,0.314839 0.3174193,-0.192258 0.6735483,-0.314839 1.0606451,-0.314839 1.2464516,0 2.2580645,1.300646 2.2580645,2.903226 0,1.602581 -1.0116129,2.903226 -2.2580645,2.903226 -0.4696774,0 -0.9083871,-0.187097 -1.2696774,-0.504516 C 3.892903,15.583226 3.612903,16.055484 3.612903,16.516129 v 3.548387 C 3.612903,21.129032 4.4838707,22 5.5483869,22 H 9.096774 C 9.60129,22 10.08,21.672258 9.410322,20.803871 9.219355,20.485161 9.096774,20.129032 9.096774,19.741935 c 0,-1.247741 1.299355,-2.258064 2.903226,-2.258064 1.603871,0 2.903226,1.010323 2.903226,2.258064 0,0.470968 -0.187097,0.908388 -0.504517,1.269678 C 13.969032,21.72129 14.443871,22 14.903226,22 h 3.548387 c 1.064516,0 1.935484,-0.870968 1.935484,-1.935484 v -3.548387 c 0,-0.504516 -0.327742,-0.983226 -1.19742,-0.314839 -0.317419,0.192258 -0.673548,0.314839 -1.060645,0.314839 -1.246452,0 -2.258064,-1.300645 -2.258064,-2.903226 0,-1.60258 1.011612,-2.903226 2.258064,-2.903226 z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m18.129 10.71c0.46968 0 0.90839 0.1871 1.2697 0.50452 0.70839 0.42839 0.98839-0.04387 0.98839-0.50452v-2.2581c0-1.0645-0.87097-1.9355-1.9355-1.9355h-3.5484c-0.45936 0-0.93419-0.27871-0.50452-0.98839 0.31742-0.36129 0.50452-0.79871 0.50452-1.2697 0-1.2477-1.2994-2.2581-2.9032-2.2581s-2.9032 1.0103-2.9032 2.2581c0 0.3871 0.12258 0.74323 0.32903 1.0619 0.65419 0.86839 0.17548 1.1961-0.32903 1.1961h-3.5484c-1.0645 0-1.9355 0.87097-1.9355 1.9355v2.2581c0 0.50452 0.32774 0.98323 1.1974 0.31484 0.31742-0.19226 0.67355-0.31484 1.0606-0.31484 1.2465 0 2.2581 1.3006 2.2581 2.9032 0 1.6026-1.0116 2.9032-2.2581 2.9032-0.46968 0-0.90839-0.1871-1.2697-0.50452-0.70839-0.42839-0.98839 0.043871-0.98839 0.50452v3.5484c0 1.0645 0.87097 1.9355 1.9355 1.9355h3.5484c0.50452 0 0.98323-0.32774 0.31355-1.1961-0.19097-0.31871-0.31355-0.67484-0.31355-1.0619 0-1.2477 1.2994-2.2581 2.9032-2.2581s2.9032 1.0103 2.9032 2.2581c0 0.47097-0.1871 0.90839-0.50452 1.2697-0.42968 0.70968 0.045162 0.98839 0.50452 0.98839h3.5484c1.0645 0 1.9355-0.87097 1.9355-1.9355v-3.5484c0-0.50452-0.32774-0.98323-1.1974-0.31484-0.31742 0.19226-0.67355 0.31484-1.0606 0.31484-1.2465 0-2.2581-1.3006-2.2581-2.9032 0-1.6026 1.0116-2.9032 2.2581-2.9032z" fill="#69c" stroke-width="1.2903"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_refresh.svg b/novelwriter/assets/icons/typicons_dark/typ_refresh.svg
index 28c4cc43..99466ce7 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_refresh.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_refresh.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg6649"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata6655">
-    <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="defs6653" />
-  <path
-     style="fill:#99cc99;fill-opacity:1;stroke-width:1.33321"
-     id="path6647"
-     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" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m13.163 12.256h6.8373v-6.8347c-0.010667-1.5131-0.89467-1.877-1.964-0.80652l-1.5387 1.5437c-1.3533-1.0598-3.0093-1.6397-4.7547-1.6397-2.0667 0-4.012 0.80518-5.472 2.2676-1.4653 1.4557-2.2707 3.4034-2.2707 5.4696 0 2.0703 0.80533 4.0153 2.268 5.475 1.4627 1.4624 3.4067 2.2689 5.4747 2.2689 2.0667 0 4.012-0.80652 5.4747-2.2702 0.39467-0.39593 0.744-0.82784 1.04-1.2864 0.46267-0.7212 0.25333-1.6797-0.46667-2.1396-0.71867-0.46125-1.6773-0.25195-2.1387 0.46658-0.17733 0.27595-0.38933 0.53323-0.624 0.77319-0.87867 0.87717-2.0453 1.3597-3.2853 1.3597s-2.4067-0.48124-3.2853-1.3597c-0.876-0.87717-1.36-2.0436-1.36-3.2861 0-1.2398 0.48267-2.4062 1.36-3.2807 0.87867-0.87717 2.0453-1.3611 3.2853-1.3611 0.91733 0 1.7947 0.26795 2.5453 0.76252l-1.9307 1.9343c-1.0707 1.0691-0.70667 1.9436 0.80533 1.9436z" fill="#9c9" stroke-width="1.3332"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_search.svg b/novelwriter/assets/icons/typicons_dark/typ_search.svg
index 4c329e00..81453af0 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_search.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_search.svg
@@ -1,31 +1,4 @@
-<?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="svg873">
-  <metadata
-     id="metadata879">
-    <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="defs877" />
-  <path
-     d="M 19.769714,14.460577 19.131808,13.821482 18.240407,12.92889 C 18.510564,12.110086 18.66171,11.238917 18.66171,10.330854 18.66171,5.7381732 14.923537,2 10.330856,2 5.7381752,2 2.000002,5.7381732 2.000002,10.330854 c 0,4.592681 3.7381732,8.330854 8.330854,8.330854 0.908063,0 1.780422,-0.151146 2.599226,-0.421303 l 0.892591,0.891401 1.799465,1.797084 0.07259,0.0726 0.07617,0.06545 C 16.486163,21.669146 17.375184,22 18.274916,22 c 2.054151,0 3.725082,-1.670931 3.725082,-3.726271 0,-0.999704 -0.390359,-1.937519 -1.099672,-2.639692 z M 4.3790558,10.330854 c 0,-3.2811664 2.6694437,-5.9506101 5.9506102,-5.9506101 3.281166,0 5.95061,2.6694437 5.95061,5.9506101 0,3.281166 -2.669444,5.95061 -5.95061,5.95061 -3.2811665,0 -5.9506102,-2.669444 -5.9506102,-5.95061 z"
-     id="path871"
-     style="fill:#6699cc;fill-opacity:1;stroke-width:1.19012" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m19.77 14.461-0.63791-0.6391-0.8914-0.89259c0.27016-0.8188 0.4213-1.69 0.4213-2.598 0-4.5927-3.7382-8.3309-8.3309-8.3309-4.5927 0-8.3309 3.7382-8.3309 8.3309 0 4.5927 3.7382 8.3309 8.3309 8.3309 0.90806 0 1.7804-0.15115 2.5992-0.4213l0.89259 0.8914 1.7995 1.7971 0.07259 0.0726 0.07617 0.06545c0.71526 0.60221 1.6043 0.93306 2.504 0.93306 2.0542 0 3.7251-1.6709 3.7251-3.7263 0-0.9997-0.39036-1.9375-1.0997-2.6397zm-15.391-4.1297c0-3.2812 2.6694-5.9506 5.9506-5.9506 3.2812 0 5.9506 2.6694 5.9506 5.9506 0 3.2812-2.6694 5.9506-5.9506 5.9506-3.2812 0-5.9506-2.6694-5.9506-5.9506z" fill="#69c" stroke-width="1.1901"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_star.svg b/novelwriter/assets/icons/typicons_dark/typ_star.svg
index f1ba3594..2d1e2428 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_star.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_star.svg
@@ -1,31 +1,4 @@
-<?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="svg15078">
-  <metadata
-     id="metadata15084">
-    <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="defs15082" />
-  <path
-     d="M 8.841853,8.5972702 2.5334293,9.2966093 C 2.3059045,9.3241573 2.1047248,9.4762337 2.0292822,9.707351 c -0.075443,0.2311182 0,0.471814 0.1676499,0.623897 1.8752833,1.711226 4.6929984,4.273874 4.6929984,4.273874 -0.00239,0 -0.7735843,3.727814 -1.286114,6.215019 -0.043109,0.22513 0.03832,0.463432 0.2347098,0.605935 0.1951924,0.142502 0.4466673,0.144896 0.6442545,0.03354 2.2081879,-1.25498 5.5156792,-3.142238 5.5156792,-3.142238 l 5.513285,3.143435 c 0.20118,0.11017 0.452654,0.107776 0.647846,-0.03473 0.196391,-0.142502 0.277821,-0.380804 0.233513,-0.604736 l -1.282521,-6.21622 4.692998,-4.270281 c 0.16765,-0.156871 0.241895,-0.3975692 0.16765,-0.6274893 C 21.896992,9.4774375 21.695807,9.3253552 21.468282,9.2990102 18.943955,9.0164002 15.158659,8.5972759 15.158659,8.5972759 L 12.54452,2.8133502 c -0.0982,-0.2071674 -0.304165,-0.3520647 -0.54606,-0.3520647 -0.241895,0 -0.449062,0.1460949 -0.542467,0.3520647 z"
-     id="path15076"
-     style="stroke-width:1.1975;fill:#ffff84;fill-opacity:1" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m8.8419 8.5973-6.3084 0.69934c-0.22752 0.027548-0.4287 0.17962-0.50415 0.41074-0.075443 0.23112 0 0.47181 0.16765 0.6239 1.8753 1.7112 4.693 4.2739 4.693 4.2739-0.00239 0-0.77358 3.7278-1.2861 6.215-0.043109 0.22513 0.03832 0.46343 0.23471 0.60594 0.19519 0.1425 0.44667 0.1449 0.64425 0.03354 2.2082-1.255 5.5157-3.1422 5.5157-3.1422l5.5133 3.1434c0.20118 0.11017 0.45265 0.10778 0.64785-0.03473 0.19639-0.1425 0.27782-0.3808 0.23351-0.60474l-1.2825-6.2162 4.693-4.2703c0.16765-0.15687 0.2419-0.39757 0.16765-0.62749-0.074239-0.22992-0.27542-0.382-0.50295-0.40835-2.5243-0.28261-6.3096-0.70173-6.3096-0.70173l-2.6141-5.7839c-0.0982-0.20717-0.30416-0.35206-0.54606-0.35206s-0.44906 0.14609-0.54247 0.35206z" fill="#ffff84" stroke-width="1.1975"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_stopwatch-grey.svg b/novelwriter/assets/icons/typicons_dark/typ_stopwatch-grey.svg
index a198426c..719defae 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_stopwatch-grey.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_stopwatch-grey.svg
@@ -1,36 +1,4 @@
-<?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"
-   id="svg7030"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata7036">
-    <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="defs7034" />
-  <g
-     style="fill:#aeaeae;fill-opacity:1"
-     transform="matrix(1.1428571,0,0,1.1428571,-1.7142852,-2.2857137)"
-     id="g7028">
-    <path
-       style="fill:#aeaeae;fill-opacity:1"
-       id="path7026"
-       d="M 19.414,8.902 C 19.518,8.854 19.62,8.794 19.707,8.707 l 0.5,-0.5 c 0.391,-0.391 0.391,-1.023 0,-1.414 -0.391,-0.391 -1.023,-0.391 -1.414,0 l -0.5,0.5 -0.115,0.173 C 16.791,6.154 14.99,5.276 12.989,5.056 L 13,5 V 4 h 1 C 14.55,4 15,3.55 15,3 15,2.45 14.55,2 14,2 H 10 C 9.45,2 9,2.45 9,3 9,3.55 9.45,4 10,4 h 1 v 1 l 0.012,0.057 C 6.506,5.549 3,9.364 3,14 c 0,4.971 4.029,9 9,9 4.971,0 9,-4.029 9,-9 0,-1.894 -0.588,-3.648 -1.586,-5.098 z M 12,21 C 8.141,21 5,17.86 5,14 5,10.14 8.141,7 12,7 c 3.859,0 7,3.14 7,7 0,3.86 -3.141,7 -7,7 z m 1,-8 v -2 c 0,-0.55 -0.45,-1 -1,-1 -0.55,0 -1,0.45 -1,1 v 3 c 0,0.55 0.45,1 1,1 h 3 c 0.55,0 1,-0.45 1,-1 0,-0.55 -0.45,-1 -1,-1 z M 12,8 c -3.312,0 -6,2.688 -6,6 0,3.312 2.688,6 6,6 3.312,0 6,-2.688 6,-6 0,-3.312 -2.688,-6 -6,-6 z m 0,11 C 9.243,19 7,16.757 7,14 7,11.243 9.243,9 12,9 c 2.757,0 5,2.243 5,5 0,2.757 -2.243,5 -5,5 z" />
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m20.473 7.888c0.11886-0.054857 0.23543-0.12343 0.33486-0.22286l0.57143-0.57143c0.44686-0.44686 0.44686-1.1691 0-1.616-0.44686-0.44686-1.1691-0.44686-1.616 0l-0.57143 0.57143-0.13143 0.19771c-1.5851-1.4994-3.6434-2.5029-5.9303-2.7543l0.01257-0.064v-1.1429h1.1429c0.62857 0 1.1429-0.51429 1.1429-1.1429 3e-6 -0.62857-0.51428-1.1429-1.1429-1.1429h-4.5714c-0.62857 0-1.1429 0.51429-1.1429 1.1429 0 0.62857 0.51429 1.1429 1.1429 1.1429h1.1429v1.1429l0.01371 0.065143c-5.1497 0.56229-9.1566 4.9223-9.1566 10.221 0 5.6811 4.6046 10.286 10.286 10.286 5.6811 0 10.286-4.6046 10.286-10.286 0-2.1646-0.672-4.1691-1.8126-5.8263zm-8.4731 13.826c-4.4103 0-8-3.5886-8-8 0-4.4114 3.5897-8 8-8 4.4103 0 8 3.5886 8 8 0 4.4114-3.5897 8-8 8zm1.1429-9.1429v-2.2857c0-0.62857-0.51428-1.1429-1.1429-1.1429-0.62857 0-1.1429 0.51429-1.1429 1.1429v3.4286c0 0.62857 0.51429 1.1429 1.1429 1.1429h3.4286c0.62857 0 1.1429-0.51429 1.1429-1.1429 0-0.62857-0.51429-1.1429-1.1429-1.1429zm-1.1429-5.7143c-3.7851 0-6.8571 3.072-6.8571 6.8571s3.072 6.8571 6.8571 6.8571c3.7851 0 6.8571-3.072 6.8571-6.8571s-3.072-6.8571-6.8571-6.8571zm0 12.571c-3.1509 0-5.7143-2.5634-5.7143-5.7143s2.5634-5.7143 5.7143-5.7143c3.1509 0 5.7143 2.5634 5.7143 5.7143s-2.5634 5.7143-5.7143 5.7143z" fill="#aeaeae" stroke-width="1.1429"/>
 </svg>
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 ad1ae32b..8d98a411 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_th-list-grey.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_th-list-grey.svg
@@ -1,54 +1,4 @@
-<?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="svg5291">
-  <metadata
-     id="metadata5297">
-    <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="defs5295" />
-  <g
-     id="g5303"
-     transform="matrix(1.1578947,0,0,1.1578947,-1.6052627,-1.8947364)"
-     style="fill:#aeaeae;fill-opacity:1">
-    <path
-       d="m 19,17 h -7 c -1.103,0 -2,0.897 -2,2 0,1.103 0.897,2 2,2 h 7 c 1.103,0 2,-0.897 2,-2 0,-1.103 -0.897,-2 -2,-2 z m 0,-7 h -7 c -1.103,0 -2,0.897 -2,2 0,1.103 0.897,2 2,2 h 7 c 1.103,0 2,-0.897 2,-2 0,-1.103 -0.897,-2 -2,-2 z m 0,-7 h -7 c -1.103,0 -2,0.897 -2,2 0,1.103 0.897,2 2,2 h 7 C 20.103,7 21,6.103 21,5 21,3.897 20.103,3 19,3 Z"
-       id="path5283"
-       style="fill:#aeaeae;fill-opacity:1" />
-    <circle
-       cx="5"
-       cy="19"
-       r="2.5"
-       id="circle5285"
-       style="fill:#aeaeae;fill-opacity:1" />
-    <circle
-       cx="5"
-       cy="12"
-       r="2.5"
-       id="circle5287"
-       style="fill:#aeaeae;fill-opacity:1" />
-    <circle
-       cx="5"
-       cy="5"
-       r="2.5"
-       id="circle5289"
-       style="fill:#aeaeae;fill-opacity:1" />
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m7.0789 3.8947a2.8947 2.8947 0 0 1-2.8947 2.8947 2.8947 2.8947 0 0 1-2.8947-2.8947 2.8947 2.8947 0 0 1 2.8947-2.8947 2.8947 2.8947 0 0 1 2.8947 2.8947zm0 8.1053a2.8947 2.8947 0 0 1-2.8947 2.8947 2.8947 2.8947 0 0 1-2.8947-2.8947 2.8947 2.8947 0 0 1 2.8947-2.8947 2.8947 2.8947 0 0 1 2.8947 2.8947zm0 8.1053a2.8947 2.8947 0 0 1-2.8947 2.8947 2.8947 2.8947 0 0 1-2.8947-2.8947 2.8947 2.8947 0 0 1 2.8947-2.8947 2.8947 2.8947 0 0 1 2.8947 2.8947zm13.316-2.3158h-8.1053c-1.2772 0-2.3158 1.0386-2.3158 2.3158s1.0386 2.3158 2.3158 2.3158h8.1053c1.2772 0 2.3158-1.0386 2.3158-2.3158s-1.0386-2.3158-2.3158-2.3158zm0-8.1053h-8.1053c-1.2772 0-2.3158 1.0386-2.3158 2.3158s1.0386 2.3158 2.3158 2.3158h8.1053c1.2772 0 2.3158-1.0386 2.3158-2.3158s-1.0386-2.3158-2.3158-2.3158zm0-8.1053h-8.1053c-1.2772 0-2.3158 1.0386-2.3158 2.3158s1.0386 2.3158 2.3158 2.3158h8.1053c1.2772 0 2.3158-1.0386 2.3158-2.3158s-1.0386-2.3158-2.3158-2.3158z" fill="#aeaeae" stroke-width="1.1579"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_th-menu.svg b/novelwriter/assets/icons/typicons_dark/typ_th-menu.svg
index 89434cdf..4bf1c92f 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_th-menu.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_th-menu.svg
@@ -1,16 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.2"
-   width="24"
-   height="24"
-   viewBox="0 0 24 24"
-   id="svg4455"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs4459" />
-  <path
-     d="M19 17h-14c-1.103 0-2 .897-2 2s.897 2 2 2h14c1.103 0 2-.897 2-2s-.897-2-2-2zM19 10h-14c-1.103 0-2 .897-2 2s.897 2 2 2h14c1.103 0 2-.897 2-2s-.897-2-2-2zM19 3h-14c-1.103 0-2 .897-2 2s.897 2 2 2h14c1.103 0 2-.897 2-2s-.897-2-2-2z"
-     id="path4453"
-     style="fill:#6699cc;fill-opacity:1" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="M19 17h-14c-1.103 0-2 .897-2 2s.897 2 2 2h14c1.103 0 2-.897 2-2s-.897-2-2-2zM19 10h-14c-1.103 0-2 .897-2 2s.897 2 2 2h14c1.103 0 2-.897 2-2s-.897-2-2-2zM19 3h-14c-1.103 0-2 .897-2 2s.897 2 2 2h14c1.103 0 2-.897 2-2s-.897-2-2-2z" fill="#69c"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_times.svg b/novelwriter/assets/icons/typicons_dark/typ_times.svg
index 7eb5506d..dbd18f8d 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_times.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_times.svg
@@ -1,31 +1,4 @@
-<?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="svg8936">
-  <metadata
-     id="metadata8942">
-    <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="defs8940" />
-  <path
-     d="m 19.0412,4.9586375 c -1.014432,-1.0157327 -2.663535,-1.0157327 -3.677967,0 L 12.000001,8.3218703 8.6367669,4.9586375 c -1.0144323,-1.0157327 -2.663535,-1.0157327 -3.6779673,0 -1.0157327,1.0157328 -1.0157327,2.6622343 0,3.6779673 L 8.3207319,11.999838 4.9587996,15.36307 c -1.0157327,1.015733 -1.0157327,2.662235 0,3.677968 0.5072161,0.508516 1.1730998,0.762124 1.8389836,0.762124 0.6658835,0 1.3317669,-0.253608 1.8389837,-0.762124 l 3.3632341,-3.363233 3.363232,3.363233 c 0.507216,0.508516 1.173099,0.762124 1.838984,0.762124 0.665882,0 1.331765,-0.253608 1.838983,-0.762124 1.015733,-1.015733 1.015733,-2.662235 0,-3.677968 L 15.679268,11.999838 19.0412,8.6366048 c 1.015733,-1.015733 1.015733,-2.6622345 0,-3.6779673 z"
-     id="path8934"
-     style="fill:#d64848;fill-opacity:1;stroke-width:1.30056" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m19.041 4.9586c-1.0144-1.0157-2.6635-1.0157-3.678 0l-3.3632 3.3632-3.3632-3.3632c-1.0144-1.0157-2.6635-1.0157-3.678 0-1.0157 1.0157-1.0157 2.6622 0 3.678l3.3619 3.3632-3.3619 3.3632c-1.0157 1.0157-1.0157 2.6622 0 3.678 0.50722 0.50852 1.1731 0.76212 1.839 0.76212 0.66588 0 1.3318-0.25361 1.839-0.76212l3.3632-3.3632 3.3632 3.3632c0.50722 0.50852 1.1731 0.76212 1.839 0.76212 0.66588 0 1.3318-0.25361 1.839-0.76212 1.0157-1.0157 1.0157-2.6622 0-3.678l-3.3619-3.3632 3.3619-3.3632c1.0157-1.0157 1.0157-2.6622 0-3.678z" fill="#d64848" stroke-width="1.3006"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_trash.svg b/novelwriter/assets/icons/typicons_dark/typ_trash.svg
index a3303eb1..6521acff 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_trash.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_trash.svg
@@ -1,35 +1,5 @@
-<?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"
-   id="svg10159"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata10165">
-    <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="defs10163" />
-  <path
-     id="rect18880"
-     d="M 6.7050781 7.8828125 L 6.7050781 17.294922 C 6.7050781 18.593745 7.7597702 19.646484 9.0585938 19.646484 L 14.941406 19.646484 C 16.240229 19.646484 17.294922 18.593745 17.294922 17.294922 L 17.294922 7.8828125 L 6.7050781 7.8828125 z M 8.4707031 9.6464844 C 8.7942326 9.6464844 9.0585938 9.910846 9.0585938 10.234375 L 9.0585938 17.294922 C 9.0585938 17.618451 8.7942326 17.882812 8.4707031 17.882812 C 8.1471737 17.882813 7.8828125 17.618451 7.8828125 17.294922 L 7.8828125 10.234375 C 7.8828125 9.910846 8.1471737 9.6464844 8.4707031 9.6464844 z M 10.824219 9.6464844 C 11.147748 9.6464844 11.412109 9.910846 11.412109 10.234375 L 11.412109 17.294922 C 11.412109 17.618451 11.147748 17.882812 10.824219 17.882812 C 10.500689 17.882813 10.234375 17.618451 10.234375 17.294922 L 10.234375 10.234375 C 10.234375 9.910846 10.500689 9.6464844 10.824219 9.6464844 z M 13.175781 9.6464844 C 13.49931 9.6464844 13.765625 9.910846 13.765625 10.234375 L 13.765625 17.294922 C 13.765625 17.618451 13.49931 17.882812 13.175781 17.882812 C 12.852252 17.882813 12.587891 17.618451 12.587891 17.294922 L 12.587891 10.234375 C 12.587891 9.910846 12.852252 9.6464844 13.175781 9.6464844 z M 15.529297 9.6464844 C 15.852827 9.6464844 16.117188 9.910846 16.117188 10.234375 L 16.117188 17.294922 C 16.117187 17.618451 15.852827 17.882812 15.529297 17.882812 C 15.205768 17.882813 14.941406 17.618451 14.941406 17.294922 L 14.941406 10.234375 C 14.941406 9.910846 15.205768 9.6464844 15.529297 9.6464844 z "
-     style="opacity:0.95;fill:#ededed;fill-opacity:1;stroke:none;stroke-width:1.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <path
-     style="display:inline;fill:#aeaeae;fill-opacity:1;stroke-width:1.17647004"
-     id="path10157"
-     d="M 19.647058,5.5294118 H 18.470589 V 4.3529412 C 18.470589,3.0541176 17.41647,2 16.117646,2 H 7.8823529 C 6.5835293,2 5.5294117,3.0541176 5.5294117,4.3529412 V 5.5294118 H 4.3529411 c -0.6494118,0 -1.1764706,0.5270588 -1.1764706,1.1764706 0,0.6494117 0.5270588,1.1764705 1.1764706,1.1764705 V 17.294118 C 4.3529411,19.889412 6.4635293,22 9.0588234,22 h 5.8823536 c 2.595293,0 4.705881,-2.110588 4.705881,-4.705882 V 7.8823529 c 0.649413,0 1.176471,-0.5270588 1.176471,-1.1764705 0,-0.6494118 -0.527059,-1.1764706 -1.176471,-1.1764706 z M 7.8823529,4.3529412 H 16.117646 V 5.5294118 H 7.8823529 Z M 17.294118,17.294118 c 0,1.298823 -1.054118,2.352941 -2.352941,2.352941 H 9.0588234 c -1.2988235,0 -2.3529411,-1.054118 -2.3529411,-2.352941 V 7.8823529 H 17.294118 Z M 8.4705881,9.647059 c -0.3235294,0 -0.5882352,0.264706 -0.5882352,0.588235 v 7.058824 c 0,0.323529 0.2647058,0.588235 0.5882352,0.588235 0.3235295,0 0.5882353,-0.264706 0.5882353,-0.588235 v -7.058824 c 0,-0.323529 -0.2647058,-0.588235 -0.5882353,-0.588235 z m 2.3529419,0 c -0.32353,0 -0.588235,0.264706 -0.588235,0.588235 v 7.058824 c 0,0.323529 0.264705,0.588235 0.588235,0.588235 0.323529,0 0.588235,-0.264706 0.588235,-0.588235 v -7.058824 c 0,-0.323529 -0.264706,-0.588235 -0.588235,-0.588235 z m 2.352941,0 c -0.323529,0 -0.588235,0.264706 -0.588235,0.588235 v 7.058824 c 0,0.323529 0.264706,0.588235 0.588235,0.588235 0.323529,0 0.588235,-0.264706 0.588235,-0.588235 v -7.058824 c 0,-0.323529 -0.264706,-0.588235 -0.588235,-0.588235 z m 2.352941,0 c -0.323529,0 -0.588235,0.264706 -0.588235,0.588235 v 7.058824 c 0,0.323529 0.264706,0.588235 0.588235,0.588235 0.32353,0 0.588235,-0.264706 0.588235,-0.588235 v -7.058824 c 0,-0.323529 -0.264705,-0.588235 -0.588235,-0.588235 z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m6.7051 7.8828v9.4121c0 1.2988 1.0547 2.3516 2.3535 2.3516h5.8828c1.2988 0 2.3535-1.0527 2.3535-2.3516v-9.4121h-10.59zm1.7656 1.7637c0.32353 0 0.58789 0.26436 0.58789 0.58789v7.0605c0 0.32353-0.26436 0.58789-0.58789 0.58789-0.32353 1e-6 -0.58789-0.26436-0.58789-0.58789v-7.0605c0-0.32353 0.26436-0.58789 0.58789-0.58789zm2.3535 0c0.32353 0 0.58789 0.26436 0.58789 0.58789v7.0605c0 0.32353-0.26436 0.58789-0.58789 0.58789-0.32353 1e-6 -0.58984-0.26436-0.58984-0.58789v-7.0605c0-0.32353 0.26631-0.58789 0.58984-0.58789zm2.3516 0c0.32353 0 0.58984 0.26436 0.58984 0.58789v7.0605c0 0.32353-0.26632 0.58789-0.58984 0.58789-0.32353 1e-6 -0.58789-0.26436-0.58789-0.58789v-7.0605c0-0.32353 0.26436-0.58789 0.58789-0.58789zm2.3535 0c0.32353 0 0.58789 0.26436 0.58789 0.58789v7.0605c-1e-6 0.32353-0.26436 0.58789-0.58789 0.58789-0.32353 1e-6 -0.58789-0.26436-0.58789-0.58789v-7.0605c0-0.32353 0.26436-0.58789 0.58789-0.58789z" fill="#ededed" opacity=".95"/>
+ <path d="m19.647 5.5294h-1.1765v-1.1765c0-1.2988-1.0541-2.3529-2.3529-2.3529h-8.2353c-1.2988 0-2.3529 1.0541-2.3529 2.3529v1.1765h-1.1765c-0.64941 0-1.1765 0.52706-1.1765 1.1765 0 0.64941 0.52706 1.1765 1.1765 1.1765v9.4118c0 2.5953 2.1106 4.7059 4.7059 4.7059h5.8824c2.5953 0 4.7059-2.1106 4.7059-4.7059v-9.4118c0.64941 0 1.1765-0.52706 1.1765-1.1765 0-0.64941-0.52706-1.1765-1.1765-1.1765zm-11.765-1.1765h8.2353v1.1765h-8.2353zm9.4118 12.941c0 1.2988-1.0541 2.3529-2.3529 2.3529h-5.8824c-1.2988 0-2.3529-1.0541-2.3529-2.3529v-9.4118h10.588zm-8.8235-7.6471c-0.32353 0-0.58824 0.26471-0.58824 0.58824v7.0588c0 0.32353 0.26471 0.58824 0.58824 0.58824 0.32353 0 0.58824-0.26471 0.58824-0.58824v-7.0588c0-0.32353-0.26471-0.58824-0.58824-0.58824zm2.3529 0c-0.32353 0-0.58824 0.26471-0.58824 0.58824v7.0588c0 0.32353 0.2647 0.58824 0.58824 0.58824 0.32353 0 0.58824-0.26471 0.58824-0.58824v-7.0588c0-0.32353-0.26471-0.58824-0.58824-0.58824zm2.3529 0c-0.32353 0-0.58824 0.26471-0.58824 0.58824v7.0588c0 0.32353 0.26471 0.58824 0.58824 0.58824s0.58824-0.26471 0.58824-0.58824v-7.0588c0-0.32353-0.26471-0.58824-0.58824-0.58824zm2.3529 0c-0.32353 0-0.58824 0.26471-0.58824 0.58824v7.0588c0 0.32353 0.26471 0.58824 0.58824 0.58824 0.32353 0 0.58824-0.26471 0.58824-0.58824v-7.0588c0-0.32353-0.2647-0.58824-0.58824-0.58824z" fill="#aeaeae" stroke-width="1.1765"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_user.svg b/novelwriter/assets/icons/typicons_dark/typ_user.svg
index 13c5f69a..f8e8f0e6 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_user.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_user.svg
@@ -1,35 +1,5 @@
-<?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="svg10763">
-  <metadata
-     id="metadata10769">
-    <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="defs10767" />
-  <path
-     d="m 4.9411765,19.647059 c 0,1.17647 2.6470588,2.352941 7.0588245,2.352941 4.138822,0 7.058822,-1.176471 7.058822,-2.352941 0,-2.352941 -2.769412,-4.705883 -7.058823,-4.705883 -4.4117647,0 -7.0588235,2.352942 -7.0588235,4.705883 z"
-     id="path10761"
-     style="display:inline;fill:#99cc99;fill-opacity:1;stroke-width:1.17647004" />
-  <path
-     style="display:inline;fill:#e5d49e;fill-opacity:1;stroke-width:1.17647004"
-     id="path17511"
-     d="M 17.882352,7.8823529 C 17.882352,6.2576471 17.223529,4.7870588 16.16,3.7235294 15.095295,2.6588235 13.624706,2 12.000001,2 10.375295,2 8.9047059,2.6588235 7.84,3.7235294 6.7764706,4.7870588 6.1176471,6.2576471 6.1176471,7.8823529 c 0,1.6247061 0.6588235,3.0952941 1.7223529,4.1588231 1.0647059,1.064706 2.535295,1.72353 4.160001,1.72353 1.624705,0 3.095294,-0.658824 4.16,-1.72353 1.063529,-1.063529 1.722352,-2.534117 1.722351,-4.1588231 z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m4.9412 19.647c0 1.1765 2.6471 2.3529 7.0588 2.3529 4.1388 0 7.0588-1.1765 7.0588-2.3529 0-2.3529-2.7694-4.7059-7.0588-4.7059-4.4118 0-7.0588 2.3529-7.0588 4.7059z" fill="#9c9" stroke-width="1.1765"/>
+ <path d="m17.882 7.8824c0-1.6247-0.65882-3.0953-1.7224-4.1588-1.0647-1.0647-2.5353-1.7235-4.16-1.7235-1.6247 0-3.0953 0.65882-4.16 1.7235-1.0635 1.0635-1.7224 2.5341-1.7224 4.1588 0 1.6247 0.65882 3.0953 1.7224 4.1588 1.0647 1.0647 2.5353 1.7235 4.16 1.7235 1.6247 0 3.0953-0.65882 4.16-1.7235 1.0635-1.0635 1.7224-2.5341 1.7224-4.1588z" fill="#e5d49e" stroke-width="1.1765"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/mixed_document-chapter.svg b/novelwriter/assets/icons/typicons_light/mixed_document-chapter.svg
index edcc83fc..292f9650 100644
--- a/novelwriter/assets/icons/typicons_light/mixed_document-chapter.svg
+++ b/novelwriter/assets/icons/typicons_light/mixed_document-chapter.svg
@@ -1,47 +1,12 @@
-<?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="svg2161">
-  <metadata
-     id="metadata2167">
-    <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="defs2165" />
-  <path
-     id="rect12986"
-     style="display:inline;opacity:0.95;fill:#ededed;fill-opacity:1;stroke:none;stroke-width:1.88635;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 5.8886719 3.4453125 C 5.2152275 3.4453125 4.6660156 3.9925712 4.6660156 4.6660156 L 4.6660156 19.333984 C 4.6660156 20.007428 5.2152275 20.554687 5.8886719 20.554688 L 18.111328 20.554688 C 18.784774 20.554688 19.333984 20.007428 19.333984 19.333984 L 19.333984 4.6660156 C 19.333984 3.9925712 18.784774 3.4453125 18.111328 3.4453125 L 5.8886719 3.4453125 z " />
-  <path
-     id="rect935"
-     style="fill:#c82829;fill-opacity:1;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.2"
-     d="M 5.8886719 3.4453125 C 5.2152275 3.4453125 4.6660156 3.9925712 4.6660156 4.6660156 L 4.6660156 6 L 4.6660156 7.1894531 L 4.6660156 10.058594 L 19.333984 10.058594 L 19.333984 7.1894531 L 19.333984 6 L 19.333984 4.6660156 C 19.333984 3.9925712 18.784774 3.4453125 18.111328 3.4453125 L 5.8886719 3.4453125 z " />
-  <path
-     id="path2157"
-     style="display:inline;fill:#333333;fill-opacity:1;stroke-width:1.22222"
-     d="M 7.1113281,13.222656 C 6.7739949,13.222656 6.5,13.49665 6.5,13.833984 c 0,0.337332 0.2739949,0.611328 0.6113281,0.611328 h 9.7773439 c 0.337334,1e-6 0.611328,-0.273996 0.611328,-0.611328 0,-0.337334 -0.273994,-0.611328 -0.611328,-0.611328 z m 0,3.666016 C 6.7739949,16.888672 6.5,17.162666 6.5,17.5 c 0,0.337334 0.2739949,0.611328 0.6113281,0.611328 H 16.888672 C 17.226006,18.111328 17.5,17.837334 17.5,17.5 c 0,-0.337334 -0.273994,-0.611328 -0.611328,-0.611328 z" />
-  <path
-     id="path902"
-     style="display:inline;fill:#333333;fill-opacity:1;stroke-width:1.22222"
-     d="M 5.8886719,1 C 3.8671165,1 2.2226562,2.6444602 2.2226562,4.6660156 V 19.333984 C 2.2226563,21.355538 3.8671165,23 5.8886719,23 H 18.111328 c 2.021556,0 3.666016,-1.644462 3.666016,-3.666016 V 4.6660156 C 21.777344,2.6444602 20.132884,1 18.111328,1 Z m 0,2.4453125 H 18.111328 c 0.673446,0 1.222656,0.5472587 1.222656,1.2207031 V 19.333984 c 0,0.673444 -0.54921,1.220704 -1.222656,1.220704 H 5.8886719 c -0.6734444,-10e-7 -1.2226563,-0.54726 -1.2226563,-1.220704 V 4.6660156 c 0,-0.6734444 0.5492119,-1.2207031 1.2226563,-1.2207031 z" />
-  <path
-     id="path2157-0"
-     style="display:inline;fill:#ededed;fill-opacity:1;stroke-width:1.22222"
-     d="M 7.1113281 5.8886719 C 6.7739949 5.8886719 6.5 6.1626667 6.5 6.5 C 6.5 6.837334 6.7739949 7.1113281 7.1113281 7.1113281 L 16.888672 7.1113281 C 17.226006 7.1113281 17.5 6.837334 17.5 6.5 C 17.5 6.1626667 17.226006 5.8886719 16.888672 5.8886719 L 7.1113281 5.8886719 z " />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <g>
+  <path d="m5.8887 3.4453c-0.67344 0-1.2227 0.54726-1.2227 1.2207v14.668c0 0.67344 0.54921 1.2207 1.2227 1.2207h12.223c0.67345 0 1.2227-0.54726 1.2227-1.2207v-14.668c0-0.67344-0.54921-1.2207-1.2227-1.2207h-12.223z" fill="#ededed" opacity=".95"/>
+  <path d="m5.8887 3.4453c-0.67344 0-1.2227 0.54726-1.2227 1.2207v1.334 1.1895 2.8691h14.668v-2.8691-1.1895-1.334c0-0.67344-0.54921-1.2207-1.2227-1.2207h-12.223z" fill="#c82829" stroke-width="0"/>
+  <g stroke-width="1.2222">
+   <path d="m7.1113 13.223c-0.33733 0-0.61133 0.27399-0.61133 0.61133 0 0.33733 0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 1e-6 0.61133-0.274 0.61133-0.61133 0-0.33733-0.27399-0.61133-0.61133-0.61133zm0 3.666c-0.33733 0-0.61133 0.27399-0.61133 0.61133s0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 0 0.61133-0.27399 0.61133-0.61133s-0.27399-0.61133-0.61133-0.61133z" fill="#333"/>
+   <path d="m5.8887 1c-2.0216 0-3.666 1.6445-3.666 3.666v14.668c1e-7 2.0216 1.6445 3.666 3.666 3.666h12.223c2.0216 0 3.666-1.6445 3.666-3.666v-14.668c0-2.0216-1.6445-3.666-3.666-3.666zm0 2.4453h12.223c0.67345 0 1.2227 0.54726 1.2227 1.2207v14.668c0 0.67344-0.54921 1.2207-1.2227 1.2207h-12.223c-0.67344-1e-6 -1.2227-0.54726-1.2227-1.2207v-14.668c0-0.67344 0.54921-1.2207 1.2227-1.2207z" fill="#333"/>
+   <path d="m7.1113 5.8887c-0.33733 0-0.61133 0.27399-0.61133 0.61133 0 0.33733 0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 0 0.61133-0.27399 0.61133-0.61133 0-0.33733-0.27399-0.61133-0.61133-0.61133h-9.7773z" fill="#ededed"/>
+  </g>
+ </g>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/mixed_document-note.svg b/novelwriter/assets/icons/typicons_light/mixed_document-note.svg
index 2751929a..b190e7ea 100644
--- a/novelwriter/assets/icons/typicons_light/mixed_document-note.svg
+++ b/novelwriter/assets/icons/typicons_light/mixed_document-note.svg
@@ -1,47 +1,12 @@
-<?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="svg2161">
-  <metadata
-     id="metadata2167">
-    <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="defs2165" />
-  <path
-     id="rect12986"
-     style="display:inline;opacity:0.95;fill:#ededed;fill-opacity:1;stroke:none;stroke-width:1.88635;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 5.8886719 3.4453125 C 5.2152275 3.4453125 4.6660156 3.9925712 4.6660156 4.6660156 L 4.6660156 19.333984 C 4.6660156 20.007428 5.2152275 20.554687 5.8886719 20.554688 L 18.111328 20.554688 C 18.784774 20.554688 19.333984 20.007428 19.333984 19.333984 L 19.333984 4.6660156 C 19.333984 3.9925712 18.784774 3.4453125 18.111328 3.4453125 L 5.8886719 3.4453125 z " />
-  <path
-     id="rect935"
-     style="fill:#ad8700;fill-opacity:1;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.2"
-     d="M 5.8886719 3.4453125 C 5.2152275 3.4453125 4.6660156 3.9925712 4.6660156 4.6660156 L 4.6660156 6 L 4.6660156 7.1894531 L 4.6660156 10.058594 L 19.333984 10.058594 L 19.333984 7.1894531 L 19.333984 6 L 19.333984 4.6660156 C 19.333984 3.9925712 18.784774 3.4453125 18.111328 3.4453125 L 5.8886719 3.4453125 z " />
-  <path
-     id="path2157"
-     style="display:inline;fill:#333333;fill-opacity:1;stroke-width:1.22222"
-     d="M 7.1113281,13.222656 C 6.7739949,13.222656 6.5,13.49665 6.5,13.833984 c 0,0.337332 0.2739949,0.611328 0.6113281,0.611328 h 9.7773439 c 0.337334,1e-6 0.611328,-0.273996 0.611328,-0.611328 0,-0.337334 -0.273994,-0.611328 -0.611328,-0.611328 z m 0,3.666016 C 6.7739949,16.888672 6.5,17.162666 6.5,17.5 c 0,0.337334 0.2739949,0.611328 0.6113281,0.611328 H 16.888672 C 17.226006,18.111328 17.5,17.837334 17.5,17.5 c 0,-0.337334 -0.273994,-0.611328 -0.611328,-0.611328 z" />
-  <path
-     id="path902"
-     style="display:inline;fill:#333333;fill-opacity:1;stroke-width:1.22222"
-     d="M 5.8886719,1 C 3.8671165,1 2.2226562,2.6444602 2.2226562,4.6660156 V 19.333984 C 2.2226563,21.355538 3.8671165,23 5.8886719,23 H 18.111328 c 2.021556,0 3.666016,-1.644462 3.666016,-3.666016 V 4.6660156 C 21.777344,2.6444602 20.132884,1 18.111328,1 Z m 0,2.4453125 H 18.111328 c 0.673446,0 1.222656,0.5472587 1.222656,1.2207031 V 19.333984 c 0,0.673444 -0.54921,1.220704 -1.222656,1.220704 H 5.8886719 c -0.6734444,-10e-7 -1.2226563,-0.54726 -1.2226563,-1.220704 V 4.6660156 c 0,-0.6734444 0.5492119,-1.2207031 1.2226563,-1.2207031 z" />
-  <path
-     id="path2157-0"
-     style="display:inline;fill:#ededed;fill-opacity:1;stroke-width:1.22222"
-     d="M 7.1113281 5.8886719 C 6.7739949 5.8886719 6.5 6.1626667 6.5 6.5 C 6.5 6.837334 6.7739949 7.1113281 7.1113281 7.1113281 L 16.888672 7.1113281 C 17.226006 7.1113281 17.5 6.837334 17.5 6.5 C 17.5 6.1626667 17.226006 5.8886719 16.888672 5.8886719 L 7.1113281 5.8886719 z " />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <g>
+  <path d="m5.8887 3.4453c-0.67344 0-1.2227 0.54726-1.2227 1.2207v14.668c0 0.67344 0.54921 1.2207 1.2227 1.2207h12.223c0.67345 0 1.2227-0.54726 1.2227-1.2207v-14.668c0-0.67344-0.54921-1.2207-1.2227-1.2207h-12.223z" fill="#ededed" opacity=".95"/>
+  <path d="m5.8887 3.4453c-0.67344 0-1.2227 0.54726-1.2227 1.2207v1.334 1.1895 2.8691h14.668v-2.8691-1.1895-1.334c0-0.67344-0.54921-1.2207-1.2227-1.2207h-12.223z" fill="#ad8700" stroke-width="0"/>
+  <g stroke-width="1.2222">
+   <path d="m7.1113 13.223c-0.33733 0-0.61133 0.27399-0.61133 0.61133 0 0.33733 0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 1e-6 0.61133-0.274 0.61133-0.61133 0-0.33733-0.27399-0.61133-0.61133-0.61133zm0 3.666c-0.33733 0-0.61133 0.27399-0.61133 0.61133s0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 0 0.61133-0.27399 0.61133-0.61133s-0.27399-0.61133-0.61133-0.61133z" fill="#333"/>
+   <path d="m5.8887 1c-2.0216 0-3.666 1.6445-3.666 3.666v14.668c1e-7 2.0216 1.6445 3.666 3.666 3.666h12.223c2.0216 0 3.666-1.6445 3.666-3.666v-14.668c0-2.0216-1.6445-3.666-3.666-3.666zm0 2.4453h12.223c0.67345 0 1.2227 0.54726 1.2227 1.2207v14.668c0 0.67344-0.54921 1.2207-1.2227 1.2207h-12.223c-0.67344-1e-6 -1.2227-0.54726-1.2227-1.2207v-14.668c0-0.67344 0.54921-1.2207 1.2227-1.2207z" fill="#333"/>
+   <path d="m7.1113 5.8887c-0.33733 0-0.61133 0.27399-0.61133 0.61133 0 0.33733 0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 0 0.61133-0.27399 0.61133-0.61133 0-0.33733-0.27399-0.61133-0.61133-0.61133h-9.7773z" fill="#ededed"/>
+  </g>
+ </g>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/mixed_document-scene.svg b/novelwriter/assets/icons/typicons_light/mixed_document-scene.svg
index f2c1c576..bf923192 100644
--- a/novelwriter/assets/icons/typicons_light/mixed_document-scene.svg
+++ b/novelwriter/assets/icons/typicons_light/mixed_document-scene.svg
@@ -1,47 +1,12 @@
-<?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="svg2161">
-  <metadata
-     id="metadata2167">
-    <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="defs2165" />
-  <path
-     id="rect12986"
-     style="display:inline;opacity:0.95;fill:#ededed;fill-opacity:1;stroke:none;stroke-width:1.88635;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 5.8886719 3.4453125 C 5.2152275 3.4453125 4.6660156 3.9925712 4.6660156 4.6660156 L 4.6660156 19.333984 C 4.6660156 20.007428 5.2152275 20.554687 5.8886719 20.554688 L 18.111328 20.554688 C 18.784774 20.554688 19.333984 20.007428 19.333984 19.333984 L 19.333984 4.6660156 C 19.333984 3.9925712 18.784774 3.4453125 18.111328 3.4453125 L 5.8886719 3.4453125 z " />
-  <path
-     id="rect935"
-     style="fill:#4271ae;fill-opacity:1;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.2"
-     d="M 5.8886719 3.4453125 C 5.2152275 3.4453125 4.6660156 3.9925712 4.6660156 4.6660156 L 4.6660156 6 L 4.6660156 7.1894531 L 4.6660156 10.058594 L 19.333984 10.058594 L 19.333984 7.1894531 L 19.333984 6 L 19.333984 4.6660156 C 19.333984 3.9925712 18.784774 3.4453125 18.111328 3.4453125 L 5.8886719 3.4453125 z " />
-  <path
-     id="path2157"
-     style="display:inline;fill:#333333;fill-opacity:1;stroke-width:1.22222"
-     d="M 7.1113281,13.222656 C 6.7739949,13.222656 6.5,13.49665 6.5,13.833984 c 0,0.337332 0.2739949,0.611328 0.6113281,0.611328 h 9.7773439 c 0.337334,1e-6 0.611328,-0.273996 0.611328,-0.611328 0,-0.337334 -0.273994,-0.611328 -0.611328,-0.611328 z m 0,3.666016 C 6.7739949,16.888672 6.5,17.162666 6.5,17.5 c 0,0.337334 0.2739949,0.611328 0.6113281,0.611328 H 16.888672 C 17.226006,18.111328 17.5,17.837334 17.5,17.5 c 0,-0.337334 -0.273994,-0.611328 -0.611328,-0.611328 z" />
-  <path
-     id="path902"
-     style="display:inline;fill:#333333;fill-opacity:1;stroke-width:1.22222"
-     d="M 5.8886719,1 C 3.8671165,1 2.2226562,2.6444602 2.2226562,4.6660156 V 19.333984 C 2.2226563,21.355538 3.8671165,23 5.8886719,23 H 18.111328 c 2.021556,0 3.666016,-1.644462 3.666016,-3.666016 V 4.6660156 C 21.777344,2.6444602 20.132884,1 18.111328,1 Z m 0,2.4453125 H 18.111328 c 0.673446,0 1.222656,0.5472587 1.222656,1.2207031 V 19.333984 c 0,0.673444 -0.54921,1.220704 -1.222656,1.220704 H 5.8886719 c -0.6734444,-10e-7 -1.2226563,-0.54726 -1.2226563,-1.220704 V 4.6660156 c 0,-0.6734444 0.5492119,-1.2207031 1.2226563,-1.2207031 z" />
-  <path
-     id="path2157-0"
-     style="display:inline;fill:#ededed;fill-opacity:1;stroke-width:1.22222"
-     d="M 7.1113281 5.8886719 C 6.7739949 5.8886719 6.5 6.1626667 6.5 6.5 C 6.5 6.837334 6.7739949 7.1113281 7.1113281 7.1113281 L 16.888672 7.1113281 C 17.226006 7.1113281 17.5 6.837334 17.5 6.5 C 17.5 6.1626667 17.226006 5.8886719 16.888672 5.8886719 L 7.1113281 5.8886719 z " />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <g>
+  <path d="m5.8887 3.4453c-0.67344 0-1.2227 0.54726-1.2227 1.2207v14.668c0 0.67344 0.54921 1.2207 1.2227 1.2207h12.223c0.67345 0 1.2227-0.54726 1.2227-1.2207v-14.668c0-0.67344-0.54921-1.2207-1.2227-1.2207h-12.223z" fill="#ededed" opacity=".95"/>
+  <path d="m5.8887 3.4453c-0.67344 0-1.2227 0.54726-1.2227 1.2207v1.334 1.1895 2.8691h14.668v-2.8691-1.1895-1.334c0-0.67344-0.54921-1.2207-1.2227-1.2207h-12.223z" fill="#4271ae" stroke-width="0"/>
+  <g stroke-width="1.2222">
+   <path d="m7.1113 13.223c-0.33733 0-0.61133 0.27399-0.61133 0.61133 0 0.33733 0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 1e-6 0.61133-0.274 0.61133-0.61133 0-0.33733-0.27399-0.61133-0.61133-0.61133zm0 3.666c-0.33733 0-0.61133 0.27399-0.61133 0.61133s0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 0 0.61133-0.27399 0.61133-0.61133s-0.27399-0.61133-0.61133-0.61133z" fill="#333"/>
+   <path d="m5.8887 1c-2.0216 0-3.666 1.6445-3.666 3.666v14.668c1e-7 2.0216 1.6445 3.666 3.666 3.666h12.223c2.0216 0 3.666-1.6445 3.666-3.666v-14.668c0-2.0216-1.6445-3.666-3.666-3.666zm0 2.4453h12.223c0.67345 0 1.2227 0.54726 1.2227 1.2207v14.668c0 0.67344-0.54921 1.2207-1.2227 1.2207h-12.223c-0.67344-1e-6 -1.2227-0.54726-1.2227-1.2207v-14.668c0-0.67344 0.54921-1.2207 1.2227-1.2207z" fill="#333"/>
+   <path d="m7.1113 5.8887c-0.33733 0-0.61133 0.27399-0.61133 0.61133 0 0.33733 0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 0 0.61133-0.27399 0.61133-0.61133 0-0.33733-0.27399-0.61133-0.61133-0.61133h-9.7773z" fill="#ededed"/>
+  </g>
+ </g>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/mixed_document-section.svg b/novelwriter/assets/icons/typicons_light/mixed_document-section.svg
index 28dc015a..89856762 100644
--- a/novelwriter/assets/icons/typicons_light/mixed_document-section.svg
+++ b/novelwriter/assets/icons/typicons_light/mixed_document-section.svg
@@ -1,47 +1,12 @@
-<?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="svg2161">
-  <metadata
-     id="metadata2167">
-    <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="defs2165" />
-  <path
-     id="rect12986"
-     style="display:inline;opacity:0.95;fill:#ededed;fill-opacity:1;stroke:none;stroke-width:1.88635;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 5.8886719 3.4453125 C 5.2152275 3.4453125 4.6660156 3.9925712 4.6660156 4.6660156 L 4.6660156 19.333984 C 4.6660156 20.007428 5.2152275 20.554687 5.8886719 20.554688 L 18.111328 20.554688 C 18.784774 20.554688 19.333984 20.007428 19.333984 19.333984 L 19.333984 4.6660156 C 19.333984 3.9925712 18.784774 3.4453125 18.111328 3.4453125 L 5.8886719 3.4453125 z " />
-  <path
-     id="rect935"
-     style="fill:#787878;fill-opacity:1;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.2"
-     d="M 5.8886719 3.4453125 C 5.2152275 3.4453125 4.6660156 3.9925712 4.6660156 4.6660156 L 4.6660156 6 L 4.6660156 7.1894531 L 4.6660156 10.058594 L 19.333984 10.058594 L 19.333984 7.1894531 L 19.333984 6 L 19.333984 4.6660156 C 19.333984 3.9925712 18.784774 3.4453125 18.111328 3.4453125 L 5.8886719 3.4453125 z " />
-  <path
-     id="path2157"
-     style="display:inline;fill:#333333;fill-opacity:1;stroke-width:1.22222"
-     d="M 7.1113281,13.222656 C 6.7739949,13.222656 6.5,13.49665 6.5,13.833984 c 0,0.337332 0.2739949,0.611328 0.6113281,0.611328 h 9.7773439 c 0.337334,1e-6 0.611328,-0.273996 0.611328,-0.611328 0,-0.337334 -0.273994,-0.611328 -0.611328,-0.611328 z m 0,3.666016 C 6.7739949,16.888672 6.5,17.162666 6.5,17.5 c 0,0.337334 0.2739949,0.611328 0.6113281,0.611328 H 16.888672 C 17.226006,18.111328 17.5,17.837334 17.5,17.5 c 0,-0.337334 -0.273994,-0.611328 -0.611328,-0.611328 z" />
-  <path
-     id="path902"
-     style="display:inline;fill:#333333;fill-opacity:1;stroke-width:1.22222"
-     d="M 5.8886719,1 C 3.8671165,1 2.2226562,2.6444602 2.2226562,4.6660156 V 19.333984 C 2.2226563,21.355538 3.8671165,23 5.8886719,23 H 18.111328 c 2.021556,0 3.666016,-1.644462 3.666016,-3.666016 V 4.6660156 C 21.777344,2.6444602 20.132884,1 18.111328,1 Z m 0,2.4453125 H 18.111328 c 0.673446,0 1.222656,0.5472587 1.222656,1.2207031 V 19.333984 c 0,0.673444 -0.54921,1.220704 -1.222656,1.220704 H 5.8886719 c -0.6734444,-10e-7 -1.2226563,-0.54726 -1.2226563,-1.220704 V 4.6660156 c 0,-0.6734444 0.5492119,-1.2207031 1.2226563,-1.2207031 z" />
-  <path
-     id="path2157-0"
-     style="display:inline;fill:#ededed;fill-opacity:1;stroke-width:1.22222"
-     d="M 7.1113281 5.8886719 C 6.7739949 5.8886719 6.5 6.1626667 6.5 6.5 C 6.5 6.837334 6.7739949 7.1113281 7.1113281 7.1113281 L 16.888672 7.1113281 C 17.226006 7.1113281 17.5 6.837334 17.5 6.5 C 17.5 6.1626667 17.226006 5.8886719 16.888672 5.8886719 L 7.1113281 5.8886719 z " />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <g>
+  <path d="m5.8887 3.4453c-0.67344 0-1.2227 0.54726-1.2227 1.2207v14.668c0 0.67344 0.54921 1.2207 1.2227 1.2207h12.223c0.67345 0 1.2227-0.54726 1.2227-1.2207v-14.668c0-0.67344-0.54921-1.2207-1.2227-1.2207h-12.223z" fill="#ededed" opacity=".95"/>
+  <path d="m5.8887 3.4453c-0.67344 0-1.2227 0.54726-1.2227 1.2207v1.334 1.1895 2.8691h14.668v-2.8691-1.1895-1.334c0-0.67344-0.54921-1.2207-1.2227-1.2207h-12.223z" fill="#787878" stroke-width="0"/>
+  <g stroke-width="1.2222">
+   <path d="m7.1113 13.223c-0.33733 0-0.61133 0.27399-0.61133 0.61133 0 0.33733 0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 1e-6 0.61133-0.274 0.61133-0.61133 0-0.33733-0.27399-0.61133-0.61133-0.61133zm0 3.666c-0.33733 0-0.61133 0.27399-0.61133 0.61133s0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 0 0.61133-0.27399 0.61133-0.61133s-0.27399-0.61133-0.61133-0.61133z" fill="#333"/>
+   <path d="m5.8887 1c-2.0216 0-3.666 1.6445-3.666 3.666v14.668c1e-7 2.0216 1.6445 3.666 3.666 3.666h12.223c2.0216 0 3.666-1.6445 3.666-3.666v-14.668c0-2.0216-1.6445-3.666-3.666-3.666zm0 2.4453h12.223c0.67345 0 1.2227 0.54726 1.2227 1.2207v14.668c0 0.67344-0.54921 1.2207-1.2227 1.2207h-12.223c-0.67344-1e-6 -1.2227-0.54726-1.2227-1.2207v-14.668c0-0.67344 0.54921-1.2207 1.2227-1.2207z" fill="#333"/>
+   <path d="m7.1113 5.8887c-0.33733 0-0.61133 0.27399-0.61133 0.61133 0 0.33733 0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 0 0.61133-0.27399 0.61133-0.61133 0-0.33733-0.27399-0.61133-0.61133-0.61133h-9.7773z" fill="#ededed"/>
+  </g>
+ </g>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/mixed_document-title.svg b/novelwriter/assets/icons/typicons_light/mixed_document-title.svg
index 2051ff58..07ec932e 100644
--- a/novelwriter/assets/icons/typicons_light/mixed_document-title.svg
+++ b/novelwriter/assets/icons/typicons_light/mixed_document-title.svg
@@ -1,47 +1,12 @@
-<?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="svg2161">
-  <metadata
-     id="metadata2167">
-    <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="defs2165" />
-  <path
-     id="rect12986"
-     style="display:inline;opacity:0.95;fill:#ededed;fill-opacity:1;stroke:none;stroke-width:1.88635;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 5.8886719 3.4453125 C 5.2152275 3.4453125 4.6660156 3.9925712 4.6660156 4.6660156 L 4.6660156 19.333984 C 4.6660156 20.007428 5.2152275 20.554687 5.8886719 20.554688 L 18.111328 20.554688 C 18.784774 20.554688 19.333984 20.007428 19.333984 19.333984 L 19.333984 4.6660156 C 19.333984 3.9925712 18.784774 3.4453125 18.111328 3.4453125 L 5.8886719 3.4453125 z " />
-  <path
-     id="rect935"
-     style="fill:#718c00;fill-opacity:1;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.2"
-     d="M 5.8886719 3.4453125 C 5.2152275 3.4453125 4.6660156 3.9925712 4.6660156 4.6660156 L 4.6660156 6 L 4.6660156 7.1894531 L 4.6660156 10.058594 L 19.333984 10.058594 L 19.333984 7.1894531 L 19.333984 6 L 19.333984 4.6660156 C 19.333984 3.9925712 18.784774 3.4453125 18.111328 3.4453125 L 5.8886719 3.4453125 z " />
-  <path
-     id="path2157"
-     style="display:inline;fill:#333333;fill-opacity:1;stroke-width:1.22222"
-     d="M 7.1113281,13.222656 C 6.7739949,13.222656 6.5,13.49665 6.5,13.833984 c 0,0.337332 0.2739949,0.611328 0.6113281,0.611328 h 9.7773439 c 0.337334,1e-6 0.611328,-0.273996 0.611328,-0.611328 0,-0.337334 -0.273994,-0.611328 -0.611328,-0.611328 z m 0,3.666016 C 6.7739949,16.888672 6.5,17.162666 6.5,17.5 c 0,0.337334 0.2739949,0.611328 0.6113281,0.611328 H 16.888672 C 17.226006,18.111328 17.5,17.837334 17.5,17.5 c 0,-0.337334 -0.273994,-0.611328 -0.611328,-0.611328 z" />
-  <path
-     id="path902"
-     style="display:inline;fill:#333333;fill-opacity:1;stroke-width:1.22222"
-     d="M 5.8886719,1 C 3.8671165,1 2.2226562,2.6444602 2.2226562,4.6660156 V 19.333984 C 2.2226563,21.355538 3.8671165,23 5.8886719,23 H 18.111328 c 2.021556,0 3.666016,-1.644462 3.666016,-3.666016 V 4.6660156 C 21.777344,2.6444602 20.132884,1 18.111328,1 Z m 0,2.4453125 H 18.111328 c 0.673446,0 1.222656,0.5472587 1.222656,1.2207031 V 19.333984 c 0,0.673444 -0.54921,1.220704 -1.222656,1.220704 H 5.8886719 c -0.6734444,-10e-7 -1.2226563,-0.54726 -1.2226563,-1.220704 V 4.6660156 c 0,-0.6734444 0.5492119,-1.2207031 1.2226563,-1.2207031 z" />
-  <path
-     id="path2157-0"
-     style="display:inline;fill:#ededed;fill-opacity:1;stroke-width:1.22222"
-     d="M 7.1113281 5.8886719 C 6.7739949 5.8886719 6.5 6.1626667 6.5 6.5 C 6.5 6.837334 6.7739949 7.1113281 7.1113281 7.1113281 L 16.888672 7.1113281 C 17.226006 7.1113281 17.5 6.837334 17.5 6.5 C 17.5 6.1626667 17.226006 5.8886719 16.888672 5.8886719 L 7.1113281 5.8886719 z " />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <g>
+  <path d="m5.8887 3.4453c-0.67344 0-1.2227 0.54726-1.2227 1.2207v14.668c0 0.67344 0.54921 1.2207 1.2227 1.2207h12.223c0.67345 0 1.2227-0.54726 1.2227-1.2207v-14.668c0-0.67344-0.54921-1.2207-1.2227-1.2207h-12.223z" fill="#ededed" opacity=".95"/>
+  <path d="m5.8887 3.4453c-0.67344 0-1.2227 0.54726-1.2227 1.2207v1.334 1.1895 2.8691h14.668v-2.8691-1.1895-1.334c0-0.67344-0.54921-1.2207-1.2227-1.2207h-12.223z" fill="#718c00" stroke-width="0"/>
+  <g stroke-width="1.2222">
+   <path d="m7.1113 13.223c-0.33733 0-0.61133 0.27399-0.61133 0.61133 0 0.33733 0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 1e-6 0.61133-0.274 0.61133-0.61133 0-0.33733-0.27399-0.61133-0.61133-0.61133zm0 3.666c-0.33733 0-0.61133 0.27399-0.61133 0.61133s0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 0 0.61133-0.27399 0.61133-0.61133s-0.27399-0.61133-0.61133-0.61133z" fill="#333"/>
+   <path d="m5.8887 1c-2.0216 0-3.666 1.6445-3.666 3.666v14.668c1e-7 2.0216 1.6445 3.666 3.666 3.666h12.223c2.0216 0 3.666-1.6445 3.666-3.666v-14.668c0-2.0216-1.6445-3.666-3.666-3.666zm0 2.4453h12.223c0.67345 0 1.2227 0.54726 1.2227 1.2207v14.668c0 0.67344-0.54921 1.2207-1.2227 1.2207h-12.223c-0.67344-1e-6 -1.2227-0.54726-1.2227-1.2207v-14.668c0-0.67344 0.54921-1.2207 1.2227-1.2207z" fill="#333"/>
+   <path d="m7.1113 5.8887c-0.33733 0-0.61133 0.27399-0.61133 0.61133 0 0.33733 0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 0 0.61133-0.27399 0.61133-0.61133 0-0.33733-0.27399-0.61133-0.61133-0.61133h-9.7773z" fill="#ededed"/>
+  </g>
+ </g>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/mixed_edit.svg b/novelwriter/assets/icons/typicons_light/mixed_edit.svg
index ded34ef2..5f643b15 100644
--- a/novelwriter/assets/icons/typicons_light/mixed_edit.svg
+++ b/novelwriter/assets/icons/typicons_light/mixed_edit.svg
@@ -1,31 +1,4 @@
-<?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">
-  <metadata
-     id="metadata7542">
-    <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="defs7540" />
-  <path
-     id="path7534"
-     style="display:inline;fill:#000000;fill-opacity:0.72156864;stroke-width:1.10527"
-     d="M 19.160156 0 C 18.73463 0 18.312122 0.160533 17.988281 0.484375 L 14.052734 4.421875 L 4.1054688 4.421875 C 3.4953635 4.421875 3 4.9141801 3 5.5253906 L 3 17.037109 L 3 18.429688 L 3 22.894531 C 3 23.505741 3.4953635 24 4.1054688 24 L 18.474609 24 C 19.084713 24 19.578125 23.505741 19.578125 22.894531 L 19.578125 18.429688 L 19.578125 17.037109 L 19.578125 9.9472656 L 23.515625 6.0117188 C 23.839466 5.6878766 24 5.2623116 24 4.8378906 C 24 4.4134695 23.839466 3.9918109 23.515625 3.6679688 L 20.332031 0.484375 C 20.008189 0.160533 19.584576 0 19.160156 0 z M 19.160156 2.4394531 L 21.560547 4.8398438 L 20.130859 6.2695312 L 17.730469 3.8691406 L 19.160156 2.4394531 z M 16.949219 4.6503906 L 19.349609 7.0507812 L 12.394531 14.005859 L 9.9941406 11.605469 L 16.949219 4.6503906 z M 5.2109375 6.6308594 L 11.841797 6.6308594 L 8.328125 10.146484 C 8.0042828 10.470327 7.7997073 11.043101 7.6328125 11.570312 C 7.4559704 12.122943 7.421875 12.737735 7.421875 13.195312 L 7.421875 16.578125 L 10.804688 16.578125 C 11.262267 16.578125 12.02928 16.467813 12.541016 16.257812 C 13.053858 16.047812 13.530778 15.874623 13.853516 15.550781 L 17.369141 12.158203 L 17.369141 17.037109 L 17.369141 18.429688 L 17.369141 21.789062 L 5.2109375 21.789062 L 5.2109375 18.429688 L 5.2109375 17.037109 L 5.2109375 6.6308594 z M 9.5644531 12.525391 L 11.505859 14.435547 L 9.6308594 14.369141 L 9.5644531 12.525391 z " />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m19.16 0c-0.42553 0-0.84803 0.16053-1.1719 0.48438l-3.9355 3.9375h-9.9473c-0.61011 0-1.1055 0.49231-1.1055 1.1035v11.512 1.3926 4.4648c0 0.61121 0.49536 1.1055 1.1055 1.1055h14.369c0.6101 0 1.1035-0.49426 1.1035-1.1055v-4.4648-1.3926-7.0898l3.9375-3.9355c0.32384-0.32384 0.48438-0.74941 0.48438-1.1738 0-0.42442-0.16053-0.84608-0.48438-1.1699l-3.1836-3.1836c-0.32384-0.32384-0.74746-0.48438-1.1719-0.48438zm0 2.4395 2.4004 2.4004-1.4297 1.4297-2.4004-2.4004 1.4297-1.4297zm-2.2109 2.2109 2.4004 2.4004-6.9551 6.9551-2.4004-2.4004 6.9551-6.9551zm-11.738 1.9805h6.6309l-3.5137 3.5156c-0.32384 0.32384-0.52842 0.89662-0.69531 1.4238-0.17684 0.55263-0.21094 1.1674-0.21094 1.625v3.3828h3.3828c0.45758 0 1.2246-0.11031 1.7363-0.32031 0.51284-0.21 0.98976-0.38319 1.3125-0.70703l3.5156-3.3926v4.8789 1.3926 3.3594h-12.158v-3.3594-1.3926-10.406zm4.3535 5.8945 1.9414 1.9102-1.875-0.066406-0.066406-1.8438z" fill-opacity=".72157" stroke-width="1.1053"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/mixed_input-checked.svg b/novelwriter/assets/icons/typicons_light/mixed_input-checked.svg
index 8e42a8b6..05ce62f8 100644
--- a/novelwriter/assets/icons/typicons_light/mixed_input-checked.svg
+++ b/novelwriter/assets/icons/typicons_light/mixed_input-checked.svg
@@ -1,39 +1,5 @@
-<?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"
-   width="24"
-   height="24"
-   version="1.2"
-   viewBox="0 0 24 24"
-   id="svg879">
-  <defs
-     id="defs883" />
-  <metadata
-     id="metadata873">
-    <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>
-  <path
-     d="m17.714 22h-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="path875" />
-  <path
-     d="m19.02 3.3503c-0.60933 0.010623-1.2003 0.31545-1.5586 0.86719l-5.0977 7.8477-2.3672-3.6445c-0.57329-0.88278-1.7442-1.1319-2.627-0.55859-0.88278 0.57329-1.1319 1.7461-0.55859 2.6289l3.9199 6.0391c0.38514 0.59307 1.0409 0.88965 1.6973 0.85352 0.03023-2.78e-4 0.05972-0.0041 0.08984-0.0059 0.0556-0.0057 0.11074-0.0088 0.16602-0.01953 0.52104-0.07621 1.0077-0.36147 1.3184-0.83984l6.6445-10.23c0.57329-0.88278 0.32419-2.0556-0.55859-2.6289-0.33104-0.21498-0.70276-0.31497-1.0684-0.30859z"
-     fill="#718c00"
-     stroke-linecap="round"
-     stroke-linejoin="round"
-     stroke-width="1.111"
-     id="path877" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m17.714 22h-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"/>
+ <path d="m19.02 3.3503c-0.60933 0.010623-1.2003 0.31545-1.5586 0.86719l-5.0977 7.8477-2.3672-3.6445c-0.57329-0.88278-1.7442-1.1319-2.627-0.55859-0.88278 0.57329-1.1319 1.7461-0.55859 2.6289l3.9199 6.0391c0.38514 0.59307 1.0409 0.88965 1.6973 0.85352 0.03023-2.78e-4 0.05972-0.0041 0.08984-0.0059 0.0556-0.0057 0.11074-0.0088 0.16602-0.01953 0.52104-0.07621 1.0077-0.36147 1.3184-0.83984l6.6445-10.23c0.57329-0.88278 0.32419-2.0556-0.55859-2.6289-0.33104-0.21498-0.70276-0.31497-1.0684-0.30859z" fill="#718c00" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.111"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/mixed_input-none.svg b/novelwriter/assets/icons/typicons_light/mixed_input-none.svg
index 987e60df..59912739 100644
--- a/novelwriter/assets/icons/typicons_light/mixed_input-none.svg
+++ b/novelwriter/assets/icons/typicons_light/mixed_input-none.svg
@@ -1,43 +1,5 @@
-<?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"
-   width="24"
-   height="24"
-   version="1.2"
-   viewBox="0 0 24 24"
-   id="svg973">
-  <defs
-     id="defs977" />
-  <metadata
-     id="metadata967">
-    <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>
-  <path
-     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"
-     width="10"
-     height="3.8"
-     rx="1.9"
-     ry="1.9"
-     fill="#f5871f"
-     stroke-linecap="round"
-     stroke-linejoin="round"
-     stroke-width="1.111"
-     id="rect971" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m6.2852 2c-2.3555-0.068198-4.4321 2.1116-4.2852 4.4549 0.0068983 3.8501-0.013834 7.7008 0.010433 11.55 0.12976 2.169 2.0765 4.054 4.2747 3.9947 3.8833-0.0037 7.7667 0.0074 11.65-0.0056 2.3181-0.058725 4.2556-2.2597 4.065-4.5624-0.003701-3.789 0.007418-7.5782-0.005586-11.367-0.058739-2.3181-2.2597-4.2556-4.5624-4.065h-11.147zm7.1621 2.8555c1.5178 0.018193 3.0402-0.037158 4.5549 0.029088 0.8319 0.14328 1.247 1.02 1.1404 1.7966-0.0049 3.7264 0.0098 7.4533-0.0074 11.179-0.06228 0.8972-0.99018 1.4068-1.8163 1.282-3.7264-5e-3 -7.4533 0.0099-11.179-0.0075-0.88935-0.06498-1.4062-0.99121-1.2821-1.8162 0.00424-3.7207-0.00847-7.4418 0.00635-11.162 0.056947-0.86274 0.94131-1.4231 1.7608-1.2992 2.2742-0.00131 4.5487 0.00261 6.8227-0.00195z" fill="#333"/>
+ <rect x="7" y="10.1" width="10" height="3.8" rx="1.9" ry="1.9" fill="#f5871f" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.111"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/mixed_input-unchecked.svg b/novelwriter/assets/icons/typicons_light/mixed_input-unchecked.svg
index 0bd5f6dc..c2c314b8 100644
--- a/novelwriter/assets/icons/typicons_light/mixed_input-unchecked.svg
+++ b/novelwriter/assets/icons/typicons_light/mixed_input-unchecked.svg
@@ -1,39 +1,5 @@
-<?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"
-   width="24"
-   height="24"
-   version="1.2"
-   viewBox="0 0 24 24"
-   id="svg1616">
-  <defs
-     id="defs1620" />
-  <metadata
-     id="metadata1610">
-    <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>
-  <path
-     d="m17.714 22h-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="path1612" />
-  <path
-     d="m17.99 3.3379c-0.48501 0.025418-0.96034 0.23584-1.3125 0.62695l-4.6777 5.1953-1.332-1.4785c-0.70433-0.78223-1.9014-0.84495-2.6836-0.14062-0.78223 0.70433-0.84495 1.9014-0.14062 2.6836l1.5996 1.7754-1.5977 1.7754c-0.70433 0.78223-0.64161 1.9793 0.14062 2.6836 0.78223 0.70433 1.9773 0.64161 2.6816-0.14062l1.332-1.4785 1.332 1.4785c0.70433 0.78224 1.9014 0.84495 2.6836 0.14062 0.78223-0.70433 0.84495-1.9014 0.14062-2.6836l-1.5996-1.7754 4.9453-5.4922c0.70433-0.78223 0.64161-1.9793-0.14062-2.6836-0.39112-0.35216-0.88608-0.51175-1.3711-0.48633z"
-     fill="#c82829"
-     stroke-linecap="round"
-     stroke-linejoin="round"
-     stroke-width="1.111"
-     id="path1614" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m17.714 22h-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"/>
+ <path d="m17.99 3.3379c-0.48501 0.025418-0.96034 0.23584-1.3125 0.62695l-4.6777 5.1953-1.332-1.4785c-0.70433-0.78223-1.9014-0.84495-2.6836-0.14062-0.78223 0.70433-0.84495 1.9014-0.14062 2.6836l1.5996 1.7754-1.5977 1.7754c-0.70433 0.78223-0.64161 1.9793 0.14062 2.6836 0.78223 0.70433 1.9773 0.64161 2.6816-0.14062l1.332-1.4785 1.332 1.4785c0.70433 0.78224 1.9014 0.84495 2.6836 0.14062 0.78223-0.70433 0.84495-1.9014 0.14062-2.6836l-1.5996-1.7754 4.9453-5.4922c0.70433-0.78223 0.64161-1.9793-0.14062-2.6836-0.39112-0.35216-0.88608-0.51175-1.3711-0.48633z" fill="#c82829" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.111"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/mixed_search-replace.svg b/novelwriter/assets/icons/typicons_light/mixed_search-replace.svg
index 57761934..8031c745 100644
--- a/novelwriter/assets/icons/typicons_light/mixed_search-replace.svg
+++ b/novelwriter/assets/icons/typicons_light/mixed_search-replace.svg
@@ -1,39 +1,6 @@
-<?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"
-   id="svg873"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata879">
-    <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="defs877" />
-  <path
-     d="m 10.330622,1.9999997 c -4.5924663,0 -8.3306193,3.738153 -8.3306193,8.3306193 0,1.391929 0.3467825,2.702587 0.9532665,3.857242 0.084308,-0.108411 0.1590865,-0.228838 0.2534294,-0.323181 L 4.7482003,12.323178 C 4.5237338,11.697056 4.378519,11.032991 4.3785189,10.330619 c 0,-3.2810129 2.6710902,-5.949778 5.9521031,-5.949778 0.702303,0 1.36649,0.1429324 1.992559,0.3673563 L 14.141363,2.9300158 C 12.997884,2.3384803 11.704084,1.9999997 10.330622,1.9999997 Z m 5.635898,3.4852355 -0.60451,0.6045104 2.545919,2.5482442 0.460357,-0.4626829 C 18.332278,8.0413114 18.299136,7.9066594 18.256684,7.7754 Z m 0.292955,4.4245521 c 0.0083,0.1189097 0.01733,0.2373427 0.01861,0.3580557 l 0.169728,-0.169728 z m 2.059986,2.6993717 -5.710299,5.710299 c 0.105352,-0.03032 0.217183,-0.04484 0.320855,-0.07906 l 0.892816,0.89049 1.799581,1.797261 0.07208,0.07208 0.07672,0.06743 C 16.486443,21.66984 17.375591,22 18.275281,22 c 2.054056,0 3.724716,-1.671795 3.724716,-3.72704 0,-0.999657 -0.390465,-1.936781 -1.099745,-2.638921 l -1.129969,-1.174145 -0.639387,-0.639386 -0.890489,-0.892815 c 0.03403,-0.103138 0.04885,-0.213757 0.07906,-0.318531 z m -11.7600542,2.28784 -0.4929085,0.492908 0.5417343,0.541734 0.57196,-0.571959 C 6.960254,15.221393 6.7588057,15.062002 6.5594068,14.896999 Z m 2.7179722,1.285747 -1.209021,1.209021 0.5417345,0.541734 1.6577535,-1.655429 c -0.3372847,-0.0036 -0.668706,-0.03764 -0.990467,-0.09533 z"
-     style="display:inline;fill:#4271ae;fill-opacity:1;stroke-width:1.19007"
-     id="path871" />
-  <path
-     id="path15590"
-     style="display:inline;fill:#718c00;fill-opacity:1;stroke-width:1.19007"
-     d="m 15.96652,2.4766329 c -0.396657,0 -0.792437,0.1507259 -1.095095,0.4533829 L 3.57173,14.229712 c -0.3026571,0.302657 -0.5759103,0.751428 -0.7742385,1.227621 -0.1983282,0.47826 -0.3208556,0.99063 -0.3208556,1.418274 v 4.647756 h 4.6477558 c 0.427645,0 0.9376894,-0.122526 1.4159495,-0.320855 0.4782601,-0.198328 0.9272894,-0.471583 1.2299463,-0.774239 L 21.069984,9.1285734 c 0.302656,-0.302657 0.453382,-0.7017958 0.453382,-1.0974191 0,-0.3966562 -0.150726,-0.7924369 -0.453382,-1.0950939 L 17.063939,2.9300158 C 16.761281,2.6273588 16.362143,2.4766329 15.96652,2.4766329 Z m 0,2.2785396 3.275981,3.2759818 -1.334572,1.3368983 -3.275982,-3.2759819 z M 13.901884,6.8221334 15.173682,8.0939305 6.6082326,16.661704 5.3364357,15.387582 Z m 2.004185,2.0041848 1.271796,1.2717968 -8.5654475,8.565448 -1.2741221,-1.271796 z M 4.7063497,16.250176 c 0.010333,-0.02065 3.0644031,3.034179 3.0644031,3.034179 C 7.43814,19.422771 7.2039295,19.456408 7.1243917,19.456408 H 5.5759147 L 4.5435968,18.424084 v -1.548477 c 0,-0.07953 0.033633,-0.315548 0.1627529,-0.625436 z" />
-  <path
-     style="display:inline;opacity:0.95;fill:#0a0a0a;fill-opacity:1;stroke:none;stroke-width:1.88249397;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 2.4766359,18.937425 v 2.585938 h 2.5605469 z"
-     id="rect19553" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m10.331 2c-4.5925 0-8.3306 3.7382-8.3306 8.3306 0 1.3919 0.34678 2.7026 0.95327 3.8572 0.084308-0.10841 0.15909-0.22884 0.25343-0.32318l1.5415-1.5415c-0.22447-0.62612-0.36968-1.2902-0.36968-1.9926 0-3.281 2.6711-5.9498 5.9521-5.9498 0.7023 0 1.3665 0.14293 1.9926 0.36736l1.8182-1.8182c-1.1435-0.59154-2.4373-0.93002-3.8107-0.93002zm5.6359 3.4852-0.60451 0.60451 2.5459 2.5482 0.46036-0.46268c-0.036008-0.134-0.06915-0.26865-0.1116-0.39991zm0.29296 4.4246c0.0083 0.11891 0.01733 0.23734 0.01861 0.35806l0.16973-0.16973zm2.06 2.6994-5.7103 5.7103c0.10535-0.03032 0.21718-0.04484 0.32086-0.07906l0.89282 0.89049 1.7996 1.7973 0.07208 0.07208 0.07672 0.06743c0.71523 0.60218 1.6044 0.93234 2.5041 0.93234 2.0541 0 3.7247-1.6718 3.7247-3.727 0-0.99966-0.39046-1.9368-1.0997-2.6389l-1.13-1.1741-0.63939-0.63939-0.89049-0.89282c0.03403-0.10314 0.04885-0.21376 0.07906-0.31853zm-11.76 2.2878-0.49291 0.49291 0.54173 0.54173 0.57196-0.57196c-0.21994-0.13829-0.42139-0.29768-0.62079-0.46268zm2.718 1.2857-1.209 1.209 0.54173 0.54173 1.6578-1.6554c-0.33728-0.0036-0.66871-0.03764-0.99047-0.09533z" fill="#4271ae" stroke-width="1.1901"/>
+ <path d="m15.967 2.4766c-0.39666 0-0.79244 0.15073-1.0951 0.45338l-11.3 11.3c-0.30266 0.30266-0.57591 0.75143-0.77424 1.2276-0.19833 0.47826-0.32086 0.99063-0.32086 1.4183v4.6478h4.6478c0.42764 0 0.93769-0.12253 1.4159-0.32086 0.47826-0.19833 0.92729-0.47158 1.2299-0.77424l11.3-11.3c0.30266-0.30266 0.45338-0.7018 0.45338-1.0974 0-0.39666-0.15073-0.79244-0.45338-1.0951l-4.006-4.006c-0.30266-0.30266-0.7018-0.45338-1.0974-0.45338zm0 2.2785 3.276 3.276-1.3346 1.3369-3.276-3.276zm-2.0646 2.067 1.2718 1.2718-8.5654 8.5678-1.2718-1.2741zm2.0042 2.0042 1.2718 1.2718-8.5654 8.5654-1.2741-1.2718zm-11.2 7.4239c0.010333-0.02065 3.0644 3.0342 3.0644 3.0342-0.33261 0.13842-0.56682 0.17205-0.64636 0.17205h-1.5485l-1.0323-1.0323v-1.5485c0-0.07953 0.033633-0.31555 0.16275-0.62544z" fill="#718c00" stroke-width="1.1901"/>
+ <path d="m2.4766 18.937v2.5859h2.5605z" fill="#0a0a0a" opacity=".95"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/nw_deco-h0.svg b/novelwriter/assets/icons/typicons_light/nw_deco-h0.svg
index 3c1618c9..9b9cf15e 100644
--- a/novelwriter/assets/icons/typicons_light/nw_deco-h0.svg
+++ b/novelwriter/assets/icons/typicons_light/nw_deco-h0.svg
@@ -1,35 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.2"
-   width="4"
-   height="24"
-   viewBox="0 0 4 24"
-   id="svg2161"
-   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/">
-  <metadata
-     id="metadata2167">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs2165" />
-  <rect
-     style="fill:#848484;fill-opacity:1;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.2"
-     id="rect1955"
-     width="4"
-     height="22"
-     x="0"
-     y="1"
-     rx="2"
-     ry="2" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="4" height="24" version="1.2" viewBox="0 0 4 24" xmlns="http://www.w3.org/2000/svg">
+ <rect y="1" width="4" height="22" rx="2" ry="2" fill="#848484" stroke-width="0"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/nw_deco-h1.svg b/novelwriter/assets/icons/typicons_light/nw_deco-h1.svg
index e6c8efdc..5dd9cb21 100644
--- a/novelwriter/assets/icons/typicons_light/nw_deco-h1.svg
+++ b/novelwriter/assets/icons/typicons_light/nw_deco-h1.svg
@@ -1,35 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.2"
-   width="4"
-   height="24"
-   viewBox="0 0 4 24"
-   id="svg2161"
-   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/">
-  <metadata
-     id="metadata2167">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs2165" />
-  <rect
-     style="fill:#718c00;fill-opacity:1;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.2"
-     id="rect1955"
-     width="4"
-     height="22"
-     x="0"
-     y="1"
-     rx="2"
-     ry="2" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="4" height="24" version="1.2" viewBox="0 0 4 24" xmlns="http://www.w3.org/2000/svg">
+ <rect y="1" width="4" height="22" rx="2" ry="2" fill="#718c00" stroke-width="0"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/nw_deco-h2.svg b/novelwriter/assets/icons/typicons_light/nw_deco-h2.svg
index 7caa4203..e3ab3835 100644
--- a/novelwriter/assets/icons/typicons_light/nw_deco-h2.svg
+++ b/novelwriter/assets/icons/typicons_light/nw_deco-h2.svg
@@ -1,35 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.2"
-   width="20"
-   height="24"
-   viewBox="0 0 20 24"
-   id="svg2161"
-   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/">
-  <metadata
-     id="metadata2167">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs2165" />
-  <rect
-     style="fill:#c82829;fill-opacity:1;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.2"
-     id="rect1955"
-     width="4"
-     height="22"
-     x="16"
-     y="1"
-     rx="2"
-     ry="2" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20" height="24" version="1.2" viewBox="0 0 20 24" xmlns="http://www.w3.org/2000/svg">
+ <rect x="16" y="1" width="4" height="22" rx="2" ry="2" fill="#c82829" stroke-width="0"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/nw_deco-h3.svg b/novelwriter/assets/icons/typicons_light/nw_deco-h3.svg
index 61feca1b..f3e40a82 100644
--- a/novelwriter/assets/icons/typicons_light/nw_deco-h3.svg
+++ b/novelwriter/assets/icons/typicons_light/nw_deco-h3.svg
@@ -1,35 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.2"
-   width="36"
-   height="24"
-   viewBox="0 0 36 24"
-   id="svg2161"
-   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/">
-  <metadata
-     id="metadata2167">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs2165" />
-  <rect
-     style="fill:#4271ae;fill-opacity:1;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.2"
-     id="rect1955"
-     width="4"
-     height="22"
-     x="32"
-     y="1"
-     rx="2"
-     ry="2" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="36" height="24" version="1.2" viewBox="0 0 36 24" xmlns="http://www.w3.org/2000/svg">
+ <rect x="32" y="1" width="4" height="22" rx="2" ry="2" fill="#4271ae" stroke-width="0"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/nw_deco-h4.svg b/novelwriter/assets/icons/typicons_light/nw_deco-h4.svg
index b76fd7da..1b187073 100644
--- a/novelwriter/assets/icons/typicons_light/nw_deco-h4.svg
+++ b/novelwriter/assets/icons/typicons_light/nw_deco-h4.svg
@@ -1,35 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.2"
-   width="52"
-   height="24"
-   viewBox="0 0 52 24"
-   id="svg2161"
-   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/">
-  <metadata
-     id="metadata2167">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs2165" />
-  <rect
-     style="fill:#333333;fill-opacity:1;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.2"
-     id="rect1955"
-     width="4"
-     height="22"
-     x="48"
-     y="1"
-     rx="2"
-     ry="2" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="52" height="24" version="1.2" viewBox="0 0 52 24" xmlns="http://www.w3.org/2000/svg">
+ <rect x="48" y="1" width="4" height="22" rx="2" ry="2" fill="#333" stroke-width="0"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/nw_deco-noveltree-more.svg b/novelwriter/assets/icons/typicons_light/nw_deco-noveltree-more.svg
index f42d3306..845b6883 100644
--- a/novelwriter/assets/icons/typicons_light/nw_deco-noveltree-more.svg
+++ b/novelwriter/assets/icons/typicons_light/nw_deco-noveltree-more.svg
@@ -1,30 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.2"
-   width="24"
-   height="24"
-   viewBox="0 0 24 24"
-   id="svg2161"
-   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/">
-  <metadata
-     id="metadata2167">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs2165" />
-  <path
-     d="M 9.7,18.2 16,12 9.7,5.8 C 9.5,5.6 9.2,5.5 9,5.5 8.8,5.5 8.5,5.6 8.3,5.8 8.1,6 8,6.2 8,6.5 v 11 c 0,0.3 0.1,0.5 0.3,0.7 0.2,0.2 0.5,0.3 0.7,0.3 0.2,0 0.5,-0.1 0.7,-0.3 z"
-     id="path3096"
-     style="fill:#848484;fill-opacity:1" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m9.7 18.2 6.3-6.2-6.3-6.2c-0.2-0.2-0.5-0.3-0.7-0.3s-0.5 0.1-0.7 0.3-0.3 0.4-0.3 0.7v11c0 0.3 0.1 0.5 0.3 0.7s0.5 0.3 0.7 0.3 0.5-0.1 0.7-0.3z" fill="#848484"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/nw_search-case.svg b/novelwriter/assets/icons/typicons_light/nw_search-case.svg
index ce7e7673..c5271d80 100644
--- a/novelwriter/assets/icons/typicons_light/nw_search-case.svg
+++ b/novelwriter/assets/icons/typicons_light/nw_search-case.svg
@@ -1,48 +1,4 @@
-<?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"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 6.3499999 6.3500002"
-   height="24"
-   width="24">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <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>
-  <g
-     transform="translate(0,-290.64999)"
-     id="layer1">
-    <g
-       id="text817"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444494px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:Roboto;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458335"
-       aria-label="Aa">
-      <g
-         style="fill:#000000;fill-opacity:0.78039217"
-         id="g968">
-        <path
-           d="M 0.35983601,295.49539 H 1.0364638 l 0.2815167,-0.85936 H 2.631725 l 0.2815166,0.85936 H 3.6195028 L 2.4292305,292.0678 H 1.6143138 Z m 1.14582229,-1.42734 0.4741333,-1.45203 0.4691945,1.45203 z"
-           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.93888903px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458335;fill:#000000;fill-opacity:0.78039217"
-           id="path961" />
-        <path
-           d="m 4.701114,295.54478 c 0.3062111,0 0.5679722,-0.10372 0.7507111,-0.29139 l 0.0889,0.242 H 5.990164 v -1.44215 c 0,-0.65194 -0.3704167,-1.00754 -1.0766778,-1.00754 -0.3457222,0 -0.7112,0.084 -0.9927167,0.23213 l 0.1481667,0.43956 c 0.2469444,-0.0988 0.48895,-0.14816 0.7112,-0.14816 0.3852334,0 0.5926667,0.14816 0.5926667,0.43462 v 0.0642 c -1.0421056,0.0148 -1.5014223,0.25189 -1.5014223,0.76059 0,0.43462 0.3259667,0.71614 0.8297334,0.71614 z m -0.1975556,-0.8001 c 0,-0.21731 0.2518834,-0.31609 0.8692445,-0.32597 v 0.45438 c -0.1185333,0.1136 -0.2815167,0.1778 -0.4642556,0.1778 -0.2420055,0 -0.4049889,-0.12347 -0.4049889,-0.30621 z"
-           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.93888903px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458335;fill:#000000;fill-opacity:0.78039217"
-           id="path963" />
-      </g>
-    </g>
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 6.35 6.35" xmlns="http://www.w3.org/2000/svg">
+ <path d="m4.7011 4.89c0.30621 0 0.56797-0.10344 0.75071-0.29061l0.0889 0.24135h0.44944v-1.4383c0-0.65019-0.37042-1.0048-1.0767-1.0048-0.34572 0-0.7112 0.083774-0.99272 0.23151l0.14817 0.43838c0.24694-0.098534 0.48895-0.14776 0.7112-0.14776 0.38523 0 0.59267 0.14776 0.59267 0.43345v0.064027c-1.0421 0.01476-1.5014 0.25121-1.5014 0.75854 0 0.43345 0.32597 0.71421 0.82973 0.71421zm-0.19756-0.79795c0-0.21673 0.25188-0.31524 0.86924-0.32509v0.45316c-0.11853 0.11329-0.28152 0.17732-0.46426 0.17732-0.24201 0-0.40499-0.12314-0.40499-0.30539zm-4.1437 0.74869h0.67663l0.28152-0.85705h1.3137l0.28152 0.85705h0.70626l-1.1903-3.4184h-0.81492zm1.1458-1.4235 0.47413-1.4481 0.46919 1.4481z" fill-opacity=".78039" style="font-feature-settings:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/nw_search-preserve.svg b/novelwriter/assets/icons/typicons_light/nw_search-preserve.svg
index bcfd6082..69926638 100644
--- a/novelwriter/assets/icons/typicons_light/nw_search-preserve.svg
+++ b/novelwriter/assets/icons/typicons_light/nw_search-preserve.svg
@@ -1,40 +1,4 @@
-<?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"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 6.3499999 6.3500002"
-   height="24"
-   width="24">
-  <g
-     style="font-size:5.64444px;line-height:1.25;font-family:'Fira Sans';-inkscape-font-specification:'Fira Sans, Normal';letter-spacing:0px;word-spacing:0px;stroke-width:0.264583"
-     id="text1549"
-     aria-label="AB">
-    <path
-       id="path1551"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.93889px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke-width:0.251875;fill:#000000;fill-opacity:0.78039217"
-       d="M 0.52916667,4.8827979 H 1.1423606 L 1.397485,4.023431 H 2.588066 L 2.8431905,4.8827979 H 3.4832396 L 2.4045554,1.4552083 H 1.6660372 Z M 1.5675681,3.4554587 1.9972514,2.003425 2.4224589,3.4554587 Z" />
-    <path
-       id="path1553"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.93889px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke-width:0.25188;fill:#000000;fill-opacity:0.78039217"
-       d="m 3.4395834,4.8827979 h 1.1592928 c 0.7519737,0 1.2219572,-0.4099279 1.2219572,-1.0618613 0,-0.4296835 -0.2058975,-0.7408335 -0.5639802,-0.8840614 0.1969454,-0.1432278 0.3177984,-0.3951112 0.3177984,-0.6667501 0,-0.5284612 -0.389415,-0.8149168 -1.1055804,-0.8149168 H 3.4395834 Z M 4.0125157,1.9688528 h 0.4117952 c 0.3625587,0 0.5639802,0.1679223 0.5639802,0.4642557 0,0.1778 -0.076092,0.3160889 -0.2506578,0.4247445 H 4.0125157 Z m 0,2.4003005 V 3.3566809 h 0.6714051 c 0.3357025,0 0.5416002,0.2173112 0.5416002,0.5482168 0,0.3160889 -0.1745654,0.4642556 -0.5505523,0.4642556 z" />
-  </g>
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <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>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 6.35 6.35" xmlns="http://www.w3.org/2000/svg">
+ <path d="m3.4396 4.8828h1.1593c0.75197 0 1.222-0.40993 1.222-1.0619 0-0.42968-0.2059-0.74083-0.56398-0.88406 0.19695-0.14323 0.3178-0.39511 0.3178-0.66675 0-0.52846-0.38942-0.81492-1.1056-0.81492h-1.0295zm0.57293-2.9139h0.4118c0.36256 0 0.56398 0.16792 0.56398 0.46426 0 0.1778-0.076092 0.31609-0.25066 0.42474h-0.72512zm0 2.4003v-1.0125h0.67141c0.3357 0 0.5416 0.21731 0.5416 0.54822 0 0.31609-0.17457 0.46426-0.55055 0.46426zm-3.4833 0.51364h0.61319l0.25512-0.85937h1.1906l0.25512 0.85937h0.64005l-1.0787-3.4276h-0.73852zm1.0384-1.4273 0.42968-1.452 0.42521 1.452z" fill-opacity=".78039" stroke-width=".25188" style="font-variant-caps:normal;font-variant-east-asian:normal;font-variant-ligatures:normal;font-variant-numeric:normal"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/nw_search-regex.svg b/novelwriter/assets/icons/typicons_light/nw_search-regex.svg
index 2bbe1c22..87d127e9 100644
--- a/novelwriter/assets/icons/typicons_light/nw_search-regex.svg
+++ b/novelwriter/assets/icons/typicons_light/nw_search-regex.svg
@@ -1,48 +1,4 @@
-<?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"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 6.3499999 6.3500002"
-   height="24"
-   width="24">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <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>
-  <g
-     transform="translate(0,-290.64999)"
-     id="layer1">
-    <g
-       id="text817"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444494px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:Roboto;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458335"
-       aria-label=".*">
-      <g
-         style="fill:#000000;fill-opacity:0.78039217"
-         id="g1606">
-        <path
-           d="m 1.9550981,295.54478 c 0.2518833,0 0.4198055,-0.18274 0.4198055,-0.4198 0,-0.25189 -0.1679222,-0.43463 -0.4198055,-0.43463 -0.2568223,0 -0.4247445,0.18274 -0.4247445,0.43463 0,0.23706 0.1679222,0.4198 0.4247445,0.4198 z"
-           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.93888903px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458335;fill:#000000;fill-opacity:0.78039217"
-           id="path1599" />
-        <path
-           d="m 3.5108408,294.12732 h 0.5482167 l -0.1234722,-0.77541 0.6124222,0.49883 0.2568223,-0.43956 -0.7655278,-0.32103 0.7803444,-0.29139 -0.2518833,-0.43956 -0.6371167,0.48401 0.1284111,-0.8001 H 3.5108408 l 0.1382889,0.79516 -0.6223,-0.50377 -0.2518833,0.43956 0.7704667,0.31609 -0.7754056,0.30621 0.2469444,0.4445 0.6321778,-0.50376 z"
-           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.93888903px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458335;fill:#000000;fill-opacity:0.78039217"
-           id="path1601" />
-      </g>
-    </g>
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 6.35 6.35" xmlns="http://www.w3.org/2000/svg">
+ <path d="m3.5108 3.5077h0.54822l-0.12347-0.77373 0.61242 0.49775 0.25682-0.43861-0.76553-0.32033 0.78034-0.29076-0.25188-0.43861-0.63712 0.48296 0.12841-0.79837h-0.54822l0.13829 0.79344-0.6223-0.50268-0.25188 0.43861 0.77047 0.31541-0.77541 0.30555 0.24694 0.44354 0.63218-0.50267zm-1.5557 1.4144c0.25188 0 0.41981-0.18234 0.41981-0.41889 0-0.25134-0.16792-0.43369-0.41981-0.43369-0.25682 0-0.42474 0.18234-0.42474 0.43369 0 0.23655 0.16792 0.41889 0.42474 0.41889z" fill-opacity=".78039" style="font-feature-settings:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/nw_search-word.svg b/novelwriter/assets/icons/typicons_light/nw_search-word.svg
index 8f0aed52..90742084 100644
--- a/novelwriter/assets/icons/typicons_light/nw_search-word.svg
+++ b/novelwriter/assets/icons/typicons_light/nw_search-word.svg
@@ -1,45 +1,4 @@
-<?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"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 6.3499999 6.3500002"
-   height="24"
-   width="24">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <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>
-  <g
-     transform="translate(0,-290.64999)"
-     id="layer1">
-    <g
-       id="text817"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:Roboto;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-       aria-label=".*">
-      <g
-         style="fill:#000000;fill-opacity:0.780392"
-         id="g1606">
-        <path
-           id="rect1629"
-           transform="matrix(0.26458334,0,0,0.26458334,0,290.64999)"
-           d="m 2,11.5 v 4 1 2 h 20 v -3 -4 h -3 v 4 H 5 v -4 z"
-           style="fill:#000000;fill-opacity:0.780392;stroke:none;stroke-width:1.76363;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      </g>
-    </g>
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 6.35 6.35" xmlns="http://www.w3.org/2000/svg">
+ <path d="m0.52917 3.0427v1.8521h5.2917v-1.8521h-0.79375v1.0583h-3.7042v-1.0583z" fill-opacity=".78039"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_arrow-down-thick-grey.svg b/novelwriter/assets/icons/typicons_light/typ_arrow-down-thick-grey.svg
index 12afc290..cc4178db 100644
--- a/novelwriter/assets/icons/typicons_light/typ_arrow-down-thick-grey.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_arrow-down-thick-grey.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg8301"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata8307">
-    <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="defs8305" />
-  <path
-     style="stroke-width:1.18357;fill:#000000;fill-opacity:0.77999997"
-     id="path8299"
-     d="m 19.591431,11.061428 c -0.92437,-0.92437 -2.422771,-0.92437 -3.347141,0 l -1.877146,1.877144 V 4.367144 C 14.367144,3.059297 13.306664,2 12,2 10.692153,2 9.6328557,3.059297 9.6328557,4.367144 v 8.571428 l -1.877145,-1.877144 c -0.9243698,-0.92437 -2.4227719,-0.92437 -3.3471417,0 -0.9243697,0.924369 -0.9243697,2.422771 0,3.347141 L 12,22 19.591431,14.408569 c 0.92437,-0.92437 0.92437,-2.421588 0,-3.347141 z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m19.591 11.061c-0.92437-0.92437-2.4228-0.92437-3.3471 0l-1.8771 1.8771v-8.5714c0-1.3078-1.0605-2.3671-2.3671-2.3671-1.3078 0-2.3671 1.0593-2.3671 2.3671v8.5714l-1.8771-1.8771c-0.92437-0.92437-2.4228-0.92437-3.3471 0-0.92437 0.92437-0.92437 2.4228 0 3.3471l7.5914 7.5914 7.5914-7.5914c0.92437-0.92437 0.92437-2.4216 0-3.3471z" fill-opacity=".78" stroke-width="1.1836"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_arrow-maximise.svg b/novelwriter/assets/icons/typicons_light/typ_arrow-maximise.svg
index cd00423e..5e855826 100644
--- a/novelwriter/assets/icons/typicons_light/typ_arrow-maximise.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_arrow-maximise.svg
@@ -1,31 +1,4 @@
-<?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="svg7486">
-  <metadata
-     id="metadata7492">
-    <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="defs7490" />
-  <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"
-     style="stroke-width:1.25;fill:#4271ae;fill-opacity:1" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m15.75 2c-0.69125 0-1.25 0.56-1.25 1.25s0.55875 1.25 1.25 1.25h1.9825l-4.1162 4.1162c-0.48875 0.48875-0.48875 1.2788 0 1.7675 0.24375 0.24375 0.56375 0.36625 0.88375 0.36625s0.64-0.1225 0.88375-0.36625l4.1162-4.1162v1.9825c0 0.69 0.55875 1.25 1.25 1.25s1.25-0.56 1.25-1.25v-6.25zm-7.1338 11.616-4.1162 4.1162v-1.9825c0-0.69-0.55875-1.25-1.25-1.25s-1.25 0.56-1.25 1.25v6.2488h1.245l5.005 0.00125c0.69 0 1.25-0.56 1.25-1.25s-0.55875-1.25-1.25-1.25h-1.9825l4.1162-4.115c0.48875-0.48875 0.48875-1.2788 0-1.7675s-1.2788-0.49-1.7675-0.0012zm-2.8662-1.6162c0.69 0 1.25-0.56 1.25-1.25v-3.75h3.75c0.69125 0 1.25-0.56 1.25-1.25s-0.55875-1.25-1.25-1.25h-6.2488l-0.00125 6.25c0 0.69 0.55875 1.25 1.25 1.25zm12.5 0c-0.69125 0-1.25 0.56-1.25 1.25v3.75h-3.75c-0.69125 0-1.25 0.56-1.25 1.25s0.55875 1.25 1.25 1.25h6.25v-6.25c0-0.69-0.55875-1.25-1.25-1.25z" fill="#4271ae" stroke-width="1.25"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_arrow-minimise.svg b/novelwriter/assets/icons/typicons_light/typ_arrow-minimise.svg
index 96551d16..903257ed 100644
--- a/novelwriter/assets/icons/typicons_light/typ_arrow-minimise.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_arrow-minimise.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg8816"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata8822">
-    <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="defs8820" />
-  <path
-     style="fill:#4271ae;fill-opacity:1;stroke-width:1.24999"
-     id="path8814"
-     d="m 4.6514795,13.249863 c -0.6912284,0 -1.2499609,0.560009 -1.2499609,1.25002 0,0.69001 0.5587325,1.250019 1.2499609,1.250019 h 1.8311928 l -4.1161214,4.116314 c -0.4887347,0.488758 -0.4887347,1.27877 0,1.767528 C 2.6102933,21.877498 2.9302833,22 3.2502733,22 c 0.31999,0 0.63998,-0.122502 0.8837224,-0.366256 l 4.2673662,-4.267567 v 2.133784 c 0,0.69001 0.558733,1.250019 1.249961,1.250019 0.6912291,0 1.0987161,-0.560009 1.0987161,-1.250019 v -6.250098 z m 1.0987157,-2.500039 c 0.6899784,0 1.2499609,-0.560009 1.2499609,-1.2500188 V 6.9997658 h 2.4999218 c 0.6912291,0 1.2499611,-0.5600087 1.2499611,-1.2500195 0,-0.6900108 -0.558732,-1.2500195 -1.2499611,-1.2500195 H 4.5014842 l -0.00125,5.0000784 c 0,0.6900098 0.5587325,1.2500188 1.249961,1.2500188 z m 12.4996098,2.500039 c -0.691229,0 -1.249961,0.560009 -1.249961,1.25002 v 2.500039 h -2.499922 c -0.691229,0 -1.249961,0.560008 -1.249961,1.250019 0,0.690011 0.558732,1.25002 1.249961,1.25002 h 4.999844 v -5.000078 c 0,-0.690011 -0.558733,-1.25002 -1.249961,-1.25002 z M 19.866004,2.3659435 15.749883,6.4822577 V 4.4997268 c 0,-0.6900108 -0.558733,-1.2500195 -1.249961,-1.2500195 -0.691229,0 -1.249961,0.5600087 -1.249961,1.2500195 v 6.2500972 h 6.249805 c 0.689978,0 1.249961,-0.560009 1.249961,-1.2500188 0,-0.690011 -0.558733,-1.25002 -1.249961,-1.25002 h -1.982438 l 4.116121,-4.1150641 c 0.488735,-0.4887576 0.488735,-1.2787699 0,-1.7675276 -0.488735,-0.4887576 -1.27871,-0.4900076 -1.767445,-0.00125 z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m4.6515 13.25c-0.69123 0-1.25 0.56001-1.25 1.25 0 0.69001 0.55873 1.25 1.25 1.25h1.8312l-4.1161 4.1163c-0.48873 0.48876-0.48873 1.2788 0 1.7675 0.24374 0.24375 0.56373 0.36626 0.88372 0.36626s0.63998-0.1225 0.88372-0.36626l4.2674-4.2676v2.1338c0 0.69001 0.55873 1.25 1.25 1.25 0.69123 0 1.0987-0.56001 1.0987-1.25v-6.2501zm1.0987-2.5c0.68998 0 1.25-0.56001 1.25-1.25v-2.5h2.4999c0.69123 0 1.25-0.56001 1.25-1.25s-0.55873-1.25-1.25-1.25h-4.9986l-0.00125 5.0001c0 0.69001 0.55873 1.25 1.25 1.25zm12.5 2.5c-0.69123 0-1.25 0.56001-1.25 1.25v2.5h-2.4999c-0.69123 0-1.25 0.56001-1.25 1.25s0.55873 1.25 1.25 1.25h4.9998v-5.0001c0-0.69001-0.55873-1.25-1.25-1.25zm1.6162-10.884-4.1161 4.1163v-1.9825c0-0.69001-0.55873-1.25-1.25-1.25-0.69123 0-1.25 0.56001-1.25 1.25v6.2501h6.2498c0.68998 0 1.25-0.56001 1.25-1.25 0-0.69001-0.55873-1.25-1.25-1.25h-1.9824l4.1161-4.1151c0.48874-0.48876 0.48874-1.2788 0-1.7675-0.48874-0.48876-1.2787-0.49001-1.7674-0.00125z" fill="#4271ae" stroke-width="1.25"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_arrow-repeat-grey.svg b/novelwriter/assets/icons/typicons_light/typ_arrow-repeat-grey.svg
index 4d6d85c5..a45827e0 100644
--- a/novelwriter/assets/icons/typicons_light/typ_arrow-repeat-grey.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_arrow-repeat-grey.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg2150"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata2156">
-    <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="defs2154" />
-  <path
-     style="stroke-width:1.11111116;fill:#000000;fill-opacity:0.78039217"
-     id="path2148"
-     d="m 17,6.4445834 h -2.317778 l 1.436667,-1.4366667 c 0.434444,-0.4344445 0.434444,-1.1366667 0,-1.5711111 -0.434445,-0.4344445 -1.136667,-0.4344445 -1.571111,0 l -4.118889,4.1188889 4.118889,4.1188895 c 0.216666,0.216666 0.501111,0.325555 0.785555,0.325555 0.284445,0 0.568889,-0.108889 0.785556,-0.325555 0.434444,-0.434445 0.434444,-1.136667 0,-1.571112 L 14.682222,8.6668056 H 17 c 1.532222,0 2.777778,1.4955554 2.777778,3.3333334 0,1.837778 -1.495556,3.333333 -3.333334,3.333333 -0.614444,0 -1.111111,0.497778 -1.111111,1.111112 0,0.613333 0.496667,1.111111 1.111111,1.111111 C 19.507778,17.555695 22,15.063472 22,12.000139 22,8.9368056 19.756667,6.4445834 17,6.4445834 Z M 7.8811111,12.325695 c -0.4344444,0.434444 -0.4344444,1.136666 0,1.571111 L 9.317778,15.333472 H 7 c -1.5322222,0 -2.7777778,-1.495555 -2.7777778,-3.333333 0,-1.837778 1.4955556,-3.3333334 3.3333334,-3.3333334 0.6144444,0 1.1111111,-0.4977778 1.1111111,-1.1111111 C 8.6666667,6.9423611 8.17,6.4445834 7.5555556,6.4445834 4.4922222,6.4445834 2,8.9368056 2,12.000139 c 0,3.063333 2.2433333,5.555556 5,5.555556 h 2.317778 l -1.4366669,1.436666 c -0.4344444,0.434445 -0.4344444,1.136667 0,1.571111 0.2166667,0.216667 0.5011111,0.325556 0.7855556,0.325556 0.2844444,0 0.5688893,-0.108889 0.7855553,-0.325556 l 4.118889,-4.118888 -4.118889,-4.118889 c -0.434444,-0.434445 -1.1366664,-0.434445 -1.5711109,0 z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m17 6.4446h-2.3178l1.4367-1.4367c0.43444-0.43444 0.43444-1.1367 0-1.5711-0.43444-0.43444-1.1367-0.43444-1.5711 0l-4.1189 4.1189 4.1189 4.1189c0.21667 0.21667 0.50111 0.32556 0.78556 0.32556 0.28444 0 0.56889-0.10889 0.78556-0.32556 0.43444-0.43444 0.43444-1.1367 0-1.5711l-1.4367-1.4367h2.3178c1.5322 0 2.7778 1.4956 2.7778 3.3333s-1.4956 3.3333-3.3333 3.3333c-0.61444 0-1.1111 0.49778-1.1111 1.1111 0 0.61333 0.49667 1.1111 1.1111 1.1111 3.0633 0 5.5556-2.4922 5.5556-5.5556 0-3.0633-2.2433-5.5556-5-5.5556zm-9.1189 5.8811c-0.43444 0.43444-0.43444 1.1367 0 1.5711l1.4367 1.4367h-2.3178c-1.5322 0-2.7778-1.4956-2.7778-3.3333s1.4956-3.3333 3.3333-3.3333c0.61444 0 1.1111-0.49778 1.1111-1.1111 0-0.61333-0.49667-1.1111-1.1111-1.1111-3.0633 0-5.5556 2.4922-5.5556 5.5556 0 3.0633 2.2433 5.5556 5 5.5556h2.3178l-1.4367 1.4367c-0.43444 0.43444-0.43444 1.1367 0 1.5711 0.21667 0.21667 0.50111 0.32556 0.78556 0.32556 0.28444 0 0.56889-0.10889 0.78556-0.32556l4.1189-4.1189-4.1189-4.1189c-0.43444-0.43444-1.1367-0.43444-1.5711 0z" fill-opacity=".78039" stroke-width="1.1111"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_at.svg b/novelwriter/assets/icons/typicons_light/typ_at.svg
index 7f34cade..0578267f 100644
--- a/novelwriter/assets/icons/typicons_light/typ_at.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_at.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg1321"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata1327">
-    <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="defs1325" />
-  <path
-     style="stroke-width:1.25;fill:#4271ae;fill-opacity:1"
-     id="path1319"
-     d="M 12,2 C 6.48625,2 2,6.48625 2,12 c 0,5.51375 4.48625,10 10,10 2.02,0 3.965,-0.59875 5.62375,-1.73 0.57,-0.39 0.7175,-1.1675 0.32875,-1.7375 -0.38875,-0.57125 -1.165,-0.715 -1.7375,-0.32875 C 14.9725,19.0525 13.515,19.5 12,19.5 7.86375,19.5 4.5,16.13625 4.5,12 4.5,7.86375 7.86375,4.5 12,4.5 c 4.13625,0 7.5,3.36375 7.5,7.5 v 0.625 c 0,0.69 -0.56,1.25 -1.25,1.25 -0.69,0 -1.25,-0.56 -1.25,-1.25 v -3.75 c 0,-0.69125 -0.55875,-1.25 -1.25,-1.25 -0.55125,0 -1.00625,0.3625 -1.1725,0.86 C 13.8525,7.95125 12.96625,7.625 12,7.625 9.5875,7.625 7.625,9.5875 7.625,12 c 0,2.4125 1.9625,4.375 4.375,4.375 1.30625,0 2.46875,-0.5875 3.27,-1.49875 0.685,0.90375 1.76,1.49875 2.98,1.49875 2.0675,0 3.75,-1.6825 3.75,-3.75 V 12 C 22,6.48625 17.51375,2 12,2 Z m 0,11.875 c -1.03375,0 -1.875,-0.84125 -1.875,-1.875 0,-1.03375 0.84125,-1.875 1.875,-1.875 1.03375,0 1.875,0.84125 1.875,1.875 0,1.03375 -0.84125,1.875 -1.875,1.875 z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.5138 0-10 4.4862-10 10s4.4862 10 10 10c2.02 0 3.965-0.59875 5.6238-1.73 0.57-0.39 0.7175-1.1675 0.32875-1.7375-0.38875-0.57125-1.165-0.715-1.7375-0.32875-1.2425 0.84875-2.7 1.2962-4.215 1.2962-4.1362 0-7.5-3.3638-7.5-7.5s3.3638-7.5 7.5-7.5 7.5 3.3638 7.5 7.5v0.625c0 0.69-0.56 1.25-1.25 1.25s-1.25-0.56-1.25-1.25v-3.75c0-0.69125-0.55875-1.25-1.25-1.25-0.55125 0-1.0062 0.3625-1.1725 0.86-0.725-0.53375-1.6112-0.86-2.5775-0.86-2.4125 0-4.375 1.9625-4.375 4.375s1.9625 4.375 4.375 4.375c1.3062 0 2.4688-0.5875 3.27-1.4988 0.685 0.90375 1.76 1.4988 2.98 1.4988 2.0675 0 3.75-1.6825 3.75-3.75v-0.625c0-5.5138-4.4862-10-10-10zm0 11.875c-1.0338 0-1.875-0.84125-1.875-1.875s0.84125-1.875 1.875-1.875 1.875 0.84125 1.875 1.875-0.84125 1.875-1.875 1.875z" fill="#4271ae" stroke-width="1.25"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_book-grey.svg b/novelwriter/assets/icons/typicons_light/typ_book-grey.svg
index 06f58ae1..5bc4509c 100644
--- a/novelwriter/assets/icons/typicons_light/typ_book-grey.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_book-grey.svg
@@ -1,31 +1,4 @@
-<?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="svg8707">
-  <metadata
-     id="metadata8713">
-    <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="defs8711" />
-  <path
-     d="M 20,0 H 5.3333333 C 4.98,0 4.64,0.14 4.3906667,0.3906667 l -4,4 -0.076,0.082667 c -0.1853334,0.22 -0.3,0.4973334 -0.3133334,0.8 L 0,5.344 V 20 c 0,2.205333 1.7946667,4 4,4 h 12 c 1.738667,0 3.221333,-1.114667 3.772,-2.666667 h 0.894667 c 1.869333,0 3.333333,-1.756 3.333333,-4 V 4 C 24,1.7946667 22.205333,0 20,0 Z M 4,21.333333 C 3.2653333,21.333333 2.6666667,20.736 2.6666667,20 V 6.6666667 H 5.3333333 V 21.333333 Z M 17.333333,20 c 0,0.736 -0.598666,1.333333 -1.333333,1.333333 H 6.6666667 V 6.6666667 H 16 C 16.734667,6.6666667 17.333333,7.264 17.333333,8 Z m 4,-2.666667 c 0,0.826667 -0.432,1.333334 -0.666666,1.333334 H 20 V 8 C 20,5.7946667 18.205333,4 16,4 H 4.552 L 5.8853333,2.6666667 H 20 C 20.734667,2.6666667 21.333333,3.264 21.333333,4 Z"
-     id="path8705"
-     style="stroke-width:1.33333;fill:#000000;fill-opacity:0.72156864" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m20 0h-14.667c-0.35333 0-0.69333 0.14-0.94267 0.39067l-4 4-0.076 0.082667c-0.18533 0.22-0.3 0.49733-0.31333 0.8l-0.0013333 0.070666v14.656c0 2.2053 1.7947 4 4 4h12c1.7387 0 3.2213-1.1147 3.772-2.6667h0.89467c1.8693 0 3.3333-1.756 3.3333-4v-13.333c0-2.2053-1.7947-4-4-4zm-16 21.333c-0.73467 0-1.3333-0.59733-1.3333-1.3333v-13.333h2.6667v14.667zm13.333-1.3333c0 0.736-0.59867 1.3333-1.3333 1.3333h-9.3333v-14.667h9.3333c0.73467 0 1.3333 0.59733 1.3333 1.3333zm4-2.6667c0 0.82667-0.432 1.3333-0.66667 1.3333h-0.66667v-10.667c0-2.2053-1.7947-4-4-4h-11.448l1.3333-1.3333h14.115c0.73467 0 1.3333 0.59733 1.3333 1.3333z" fill-opacity=".72157" stroke-width="1.3333"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_book.svg b/novelwriter/assets/icons/typicons_light/typ_book.svg
index dbe713d9..c3e3b698 100644
--- a/novelwriter/assets/icons/typicons_light/typ_book.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_book.svg
@@ -1,39 +1,6 @@
-<?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"
-   id="svg891"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata897">
-    <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="defs895" />
-  <path
-     style="opacity:0.95;fill:#aeaeae;fill-opacity:1;stroke:none;stroke-width:1.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 6.9042969 4.2226562 L 5.7929688 5.3339844 L 15.333984 5.3339844 C 17.171762 5.3339844 18.666016 6.8282378 18.666016 8.6660156 L 18.666016 17.554688 L 19.222656 17.554688 C 19.418212 17.554687 19.777344 17.134201 19.777344 16.445312 L 19.777344 5.3339844 C 19.777344 4.7206511 19.278238 4.2226562 18.666016 4.2226562 L 6.9042969 4.2226562 z M 5.3222656 7.5546875 L 5.3222656 18.466797 L 6.4453125 18.466797 L 6.4453125 7.5546875 L 5.3222656 7.5546875 z M 7.5546875 7.5546875 L 7.5546875 18.466797 L 16.445312 18.466797 L 16.445312 8.6660156 C 16.445313 8.0526822 15.946207 7.5546875 15.333984 7.5546875 L 7.5546875 7.5546875 z "
-     id="rect11733" />
-  <path
-     style="display:inline;opacity:0.95;fill:#c82829;fill-opacity:1;stroke:none;stroke-width:1.83457506;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 4.2226562 7.5546875 L 4.2226562 18.666016 C 4.2226563 19.279349 4.7217622 19.777344 5.3339844 19.777344 L 6.4453125 19.777344 L 6.4453125 7.5546875 L 4.2226562 7.5546875 z M 7.5546875 7.5546875 L 7.5546875 19.777344 L 15.333984 19.777344 C 15.946207 19.777344 16.445312 19.279349 16.445312 18.666016 L 16.445312 8.6660156 C 16.445313 8.0526822 15.946207 7.5546875 15.333984 7.5546875 L 7.5546875 7.5546875 z "
-     id="rect11731" />
-  <path
-     style="display:inline;fill:#8d1919;fill-opacity:1;stroke-width:1.11110997"
-     id="path889"
-     d="M 18.666667,2 H 6.4444444 C 6.15,2 5.8666667,2.1166667 5.6588889,2.3255556 l -3.3333333,3.3333333 -0.063333,0.068889 c -0.1544444,0.1833333 -0.25,0.4144444 -0.2611111,0.6666666 L 2,6.4533333 V 18.666667 C 2,20.504444 3.4955556,22 5.3333333,22 h 9.9999997 c 1.448889,0 2.684445,-0.928889 3.143334,-2.222222 h 0.745555 C 20.78,19.777778 22,18.314444 22,16.444444 V 5.3333333 C 22,3.4955556 20.504444,2 18.666667,2 Z M 5.3333333,19.777778 c -0.6122222,0 -1.1111111,-0.497778 -1.1111111,-1.111111 V 7.5555556 H 6.4444444 V 19.777778 Z M 16.444444,18.666667 c 0,0.613333 -0.498888,1.111111 -1.111111,1.111111 H 7.5555556 V 7.5555556 h 7.7777774 c 0.612223,0 1.111111,0.4977777 1.111111,1.1111111 z m 3.333334,-2.222223 c 0,0.688889 -0.36,1.111112 -0.555556,1.111112 H 18.666667 V 8.6666667 c 0,-1.8377778 -1.495556,-3.3333334 -3.333334,-3.3333334 H 5.7933333 L 6.9044444,4.2222222 H 18.666667 c 0.612222,0 1.111111,0.4977778 1.111111,1.1111111 z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m6.9043 4.2227-1.1113 1.1113h9.541c1.8378 0 3.332 1.4943 3.332 3.332v8.8887h0.55664c0.19556-1e-6 0.55469-0.42049 0.55469-1.1094v-11.111c0-0.61333-0.49911-1.1113-1.1113-1.1113h-11.762zm-1.582 3.332v10.912h1.123v-10.912h-1.123zm2.2324 0v10.912h8.8906v-9.8008c1e-6 -0.61333-0.4991-1.1113-1.1113-1.1113h-7.7793z" fill="#aeaeae" opacity=".95"/>
+ <path d="m4.2227 7.5547v11.111c1e-7 0.61333 0.49911 1.1113 1.1113 1.1113h1.1113v-12.223h-2.2227zm3.332 0v12.223h7.7793c0.61222 0 1.1113-0.498 1.1113-1.1113v-10c1e-6 -0.61333-0.4991-1.1113-1.1113-1.1113h-7.7793z" fill="#c82829" opacity=".95"/>
+ <path d="m18.667 2h-12.222c-0.29444 0-0.57778 0.11667-0.78556 0.32556l-3.3333 3.3333-0.063333 0.068889c-0.15444 0.18333-0.25 0.41444-0.26111 0.66667l-0.0011115 0.058889v12.213c0 1.8378 1.4956 3.3333 3.3333 3.3333h10c1.4489 0 2.6844-0.92889 3.1433-2.2222h0.74556c1.5578 0 2.7778-1.4633 2.7778-3.3333v-11.111c0-1.8378-1.4956-3.3333-3.3333-3.3333zm-13.333 17.778c-0.61222 0-1.1111-0.49778-1.1111-1.1111v-11.111h2.2222v12.222zm11.111-1.1111c0 0.61333-0.49889 1.1111-1.1111 1.1111h-7.7778v-12.222h7.7778c0.61222 0 1.1111 0.49778 1.1111 1.1111zm3.3333-2.2222c0 0.68889-0.36 1.1111-0.55556 1.1111h-0.55556v-8.8889c0-1.8378-1.4956-3.3333-3.3333-3.3333h-9.54l1.1111-1.1111h11.762c0.61222 0 1.1111 0.49778 1.1111 1.1111z" fill="#8d1919" stroke-width="1.1111"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_bookmark.svg b/novelwriter/assets/icons/typicons_light/typ_bookmark.svg
index e7fa1eee..62bcb1e7 100644
--- a/novelwriter/assets/icons/typicons_light/typ_bookmark.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_bookmark.svg
@@ -1,31 +1,4 @@
-<?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="svg901">
-  <metadata
-     id="metadata907">
-    <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="defs905" />
-  <path
-     d="M 16.203226,2 H 7.796774 C 6.05874,2 4.6443545,3.4143855 4.6443545,5.1524195 V 19.86371 c 0,0.540115 0.1092839,0.994063 0.3236484,1.350287 0.5926549,0.982504 1.9072138,1.059213 2.9559187,0.0084 L 11.25708,17.889239 c 0.394052,-0.393002 1.091787,-0.393002 1.485841,0 l 3.333158,3.333158 C 16.592024,21.738349 17.128987,22 17.673304,22 c 0.837492,0 1.682342,-0.660957 1.682342,-2.13629 V 5.1524195 C 19.355646,3.4143855 17.941259,2 16.203226,2 Z M 7.796774,4.101613 h 8.406452 c 0.578994,0 1.050806,0.4718121 1.050806,1.0508065 V 15.560658 l -2.575527,-2.361162 c -1.477434,-1.35449 -3.880628,-1.353439 -5.3580615,0 l -2.574476,2.361162 V 5.1524195 c 0,-0.5789944 0.4718121,-1.0508065 1.0508065,-1.0508065 z m 6.431987,12.301792 C 13.635055,15.809699 12.843798,15.482898 12,15.482898 c -0.843797,0 -1.635054,0.327852 -2.2287605,0.920507 l -3.025272,3.025272 v -2.442075 l 3.2848215,-3.011611 c 1.085483,-0.995114 2.851889,-0.995114 3.937372,0 l 3.285871,3.011611 v 2.442075 z"
-     id="path899"
-     style="fill:#4271ae;fill-opacity:1;stroke-width:1.05081" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m16.203 2h-8.4065c-1.738 0-3.1524 1.4144-3.1524 3.1524v14.711c0 0.54012 0.10928 0.99406 0.32365 1.3503 0.59265 0.9825 1.9072 1.0592 2.9559 0.0084l3.3332-3.3332c0.39405-0.393 1.0918-0.393 1.4858 0l3.3332 3.3332c0.51594 0.51595 1.0529 0.7776 1.5972 0.7776 0.83749 0 1.6823-0.66096 1.6823-2.1363v-14.711c0-1.738-1.4144-3.1524-3.1524-3.1524zm-8.4065 2.1016h8.4065c0.57899 0 1.0508 0.47181 1.0508 1.0508v10.408l-2.5755-2.3612c-1.4774-1.3545-3.8806-1.3534-5.3581 0l-2.5745 2.3612v-10.408c0-0.57899 0.47181-1.0508 1.0508-1.0508zm6.432 12.302c-0.59371-0.59371-1.385-0.92051-2.2288-0.92051-0.8438 0-1.6351 0.32785-2.2288 0.92051l-3.0253 3.0253v-2.4421l3.2848-3.0116c1.0855-0.99511 2.8519-0.99511 3.9374 0l3.2859 3.0116v2.4421z" fill="#4271ae" stroke-width="1.0508"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_calendar.svg b/novelwriter/assets/icons/typicons_light/typ_calendar.svg
index 79497a40..0dc1b1b0 100644
--- a/novelwriter/assets/icons/typicons_light/typ_calendar.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_calendar.svg
@@ -1,31 +1,4 @@
-<?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="svg1738">
-  <metadata
-     id="metadata1744">
-    <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="defs1742" />
-  <path
-     d="M 19.777778,5.5377778 V 5.3333333 C 19.777778,3.4922222 18.285556,2 16.444444,2 14.603333,2 13.111111,3.4922222 13.111111,5.3333333 H 10.888889 C 10.888889,3.4922222 9.396667,2 7.5555556,2 5.7144444,2 4.2222222,3.4922222 4.2222222,5.3333333 V 5.5377778 C 2.9322222,5.9988889 2,7.22 2,8.6666667 V 18.666667 C 2,20.504444 3.4955556,22 5.3333333,22 H 18.666667 C 20.504444,22 22,20.504444 22,18.666667 V 8.6666667 C 22,7.22 21.067778,5.9988889 19.777778,5.5377778 Z M 15.333333,5.3333333 c 0,-0.6133333 0.496667,-1.1111111 1.111111,-1.1111111 0.614445,0 1.111112,0.4977778 1.111112,1.1111111 v 2.2222223 c 0,0.6133333 -0.496667,1.1111111 -1.111112,1.1111111 -0.614444,0 -1.111111,-0.4977778 -1.111111,-1.1111111 z m -8.8888886,0 C 6.4444444,4.72 6.9411111,4.2222222 7.5555556,4.2222222 8.17,4.2222222 8.6666667,4.72 8.6666667,5.3333333 v 2.2222223 c 0,0.6133333 -0.4966667,1.1111111 -1.1111111,1.1111111 -0.6144445,0 -1.1111112,-0.4977778 -1.1111112,-1.1111111 z M 19.777778,18.666667 c 0,0.612222 -0.497778,1.111111 -1.111111,1.111111 H 5.3333333 C 4.72,19.777778 4.2222222,19.278889 4.2222222,18.666667 V 12 H 19.777778 Z"
-     id="path1736"
-     style="stroke-width:1.11111;fill:#4271ae;fill-opacity:1" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m19.778 5.5378v-0.20444c0-1.8411-1.4922-3.3333-3.3333-3.3333-1.8411 0-3.3333 1.4922-3.3333 3.3333h-2.2222c0-1.8411-1.4922-3.3333-3.3333-3.3333-1.8411 0-3.3333 1.4922-3.3333 3.3333v0.20444c-1.29 0.46111-2.2222 1.6822-2.2222 3.1289v10c0 1.8378 1.4956 3.3333 3.3333 3.3333h13.333c1.8378 0 3.3333-1.4956 3.3333-3.3333v-10c0-1.4467-0.93222-2.6678-2.2222-3.1289zm-4.4444-0.20444c0-0.61333 0.49667-1.1111 1.1111-1.1111 0.61444 0 1.1111 0.49778 1.1111 1.1111v2.2222c0 0.61333-0.49667 1.1111-1.1111 1.1111-0.61444 0-1.1111-0.49778-1.1111-1.1111zm-8.8889 0c0-0.61333 0.49667-1.1111 1.1111-1.1111 0.61444 0 1.1111 0.49778 1.1111 1.1111v2.2222c0 0.61333-0.49667 1.1111-1.1111 1.1111-0.61444 0-1.1111-0.49778-1.1111-1.1111zm13.333 13.333c0 0.61222-0.49778 1.1111-1.1111 1.1111h-13.333c-0.61333 0-1.1111-0.49889-1.1111-1.1111v-6.6667h15.556z" fill="#4271ae" stroke-width="1.1111"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_cancel-grey.svg b/novelwriter/assets/icons/typicons_light/typ_cancel-grey.svg
index 48630300..008be70c 100644
--- a/novelwriter/assets/icons/typicons_light/typ_cancel-grey.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_cancel-grey.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg7731"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata7737">
-    <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="defs7735" />
-  <path
-     style="stroke-width:1.50003123;fill:#000000;fill-opacity:0.78039217"
-     id="path7729"
-     d="m 20.121169,3.8786433 c -1.170024,-1.1715244 -3.072064,-1.1715244 -4.242088,0 L 12,7.7577241 8.1209195,3.8786433 c -1.1700247,-1.1715244 -3.0720643,-1.1715244 -4.2420887,0 -1.1715244,1.1715244 -1.1715244,3.070564 0,4.2420884 l 3.8775807,3.8790803 -3.8775807,3.879081 c -1.1715244,1.171525 -1.1715244,3.070564 0,4.242089 C 4.463843,20.707494 5.231859,21 5.999875,21 6.767891,21 7.5359065,20.707494 8.1209195,20.120982 L 12,16.241901 15.879081,20.120982 C 16.464093,20.707494 17.232109,21 18.000125,21 c 0.768015,0 1.536031,-0.292506 2.121044,-0.879018 1.171525,-1.171525 1.171525,-3.070564 0,-4.242089 l -3.87758,-3.879081 3.87758,-3.8790803 c 1.171525,-1.1715244 1.171525,-3.070564 0,-4.2420884 z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m20.121 3.8786c-1.17-1.1715-3.0721-1.1715-4.2421 0l-3.8791 3.8791-3.8791-3.8791c-1.17-1.1715-3.0721-1.1715-4.2421 0-1.1715 1.1715-1.1715 3.0706 0 4.2421l3.8776 3.8791-3.8776 3.8791c-1.1715 1.1715-1.1715 3.0706 0 4.2421 0.58501 0.58651 1.353 0.87902 2.121 0.87902s1.536-0.29251 2.121-0.87902l3.8791-3.8791 3.8791 3.8791c0.58501 0.58651 1.353 0.87902 2.121 0.87902 0.76802 0 1.536-0.29251 2.121-0.87902 1.1715-1.1715 1.1715-3.0706 0-4.2421l-3.8776-3.8791 3.8776-3.8791c1.1715-1.1715 1.1715-3.0706 0-4.2421z" fill-opacity=".78039" stroke-width="1.5"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_cancel.svg b/novelwriter/assets/icons/typicons_light/typ_cancel.svg
index 9f96aa6a..5c2e2ba9 100644
--- a/novelwriter/assets/icons/typicons_light/typ_cancel.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_cancel.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg934"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata940">
-    <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="defs938" />
-  <path
-     style="stroke-width:1.25;fill:#c82829;fill-opacity:1"
-     id="path932"
-     d="M 12,2 C 6.48625,2 2,6.48625 2,12 2,17.51375 6.48625,22 12,22 17.51375,22 22,17.51375 22,12 22,6.48625 17.51375,2 12,2 Z M 5.75,12 c 0,-1.04 0.28,-2.005 0.73,-2.86875 L 14.86875,17.52 C 14.005,17.97 13.04,18.25 12,18.25 8.55375,18.25 5.75,15.44625 5.75,12 Z M 17.52,14.86875 9.13125,6.48 C 9.995,6.03 10.96,5.75 12,5.75 c 3.44625,0 6.25,2.80375 6.25,6.25 0,1.04 -0.28,2.005 -0.73,2.86875 z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.5138 0-10 4.4862-10 10s4.4862 10 10 10 10-4.4862 10-10-4.4862-10-10-10zm-6.25 10c0-1.04 0.28-2.005 0.73-2.8688l8.3888 8.3888c-0.86375 0.45-1.8288 0.73-2.8688 0.73-3.4462 0-6.25-2.8038-6.25-6.25zm11.77 2.8688-8.3888-8.3888c0.86375-0.45 1.8288-0.73 2.8688-0.73 3.4462 0 6.25 2.8038 6.25 6.25 0 1.04-0.28 2.005-0.73 2.8688z" fill="#c82829" stroke-width="1.25"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_chart-bar-grey.svg b/novelwriter/assets/icons/typicons_light/typ_chart-bar-grey.svg
index aace9a92..1d02c6bd 100644
--- a/novelwriter/assets/icons/typicons_light/typ_chart-bar-grey.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_chart-bar-grey.svg
@@ -1,31 +1,4 @@
-<?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="svg1983">
-  <metadata
-     id="metadata1989">
-    <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="defs1987" />
-  <path
-     d="m 14.526375,2.5260936 c 0,-1.3958223 -1.131816,-2.5263751 -2.526375,-2.5263751 -1.394559,0 -2.526375,1.1305528 -2.526375,2.5263751 V 17.684345 h 5.05275 z m 6.315937,5.0527501 c 0,-1.3958223 -1.131815,-2.5263751 -2.526374,-2.5263751 -1.39456,0 -2.526375,1.1305528 -2.526375,2.5263751 V 17.684345 h 5.052749 z M 8.210437,11.368407 c 0,-1.3958225 -1.1318154,-2.5263765 -2.5263744,-2.5263765 -1.394559,0 -2.5263751,1.130554 -2.5263751,2.5263765 v 6.315938 H 8.210437 Z M 20.842312,21.473906 H 3.1576875 c -0.6985427,0 -1.2631875,0.564645 -1.2631875,1.263187 0,0.698543 0.5646448,1.263188 1.2631875,1.263188 H 20.842312 c 0.698544,0 1.263188,-0.564645 1.263188,-1.263188 0,-0.698542 -0.564644,-1.263187 -1.263188,-1.263187 z"
-     id="path1981"
-     style="stroke-width:1.26319;fill:#000000;fill-opacity:0.72000003" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m14.526 2.5261c0-1.3958-1.1318-2.5264-2.5264-2.5264s-2.5264 1.1306-2.5264 2.5264v15.158h5.0528zm6.3159 5.0528c0-1.3958-1.1318-2.5264-2.5264-2.5264-1.3946 0-2.5264 1.1306-2.5264 2.5264v10.106h5.0527zm-12.632 3.7896c0-1.3958-1.1318-2.5264-2.5264-2.5264s-2.5264 1.1306-2.5264 2.5264v6.3159h5.0527zm12.632 10.105h-17.685c-0.69854 0-1.2632 0.56464-1.2632 1.2632 0 0.69854 0.56464 1.2632 1.2632 1.2632h17.685c0.69854 0 1.2632-0.56464 1.2632-1.2632 0-0.69854-0.56464-1.2632-1.2632-1.2632z" fill-opacity=".72" stroke-width="1.2632"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_chevron-down.svg b/novelwriter/assets/icons/typicons_light/typ_chevron-down.svg
index 6ba80643..d05627bd 100644
--- a/novelwriter/assets/icons/typicons_light/typ_chevron-down.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_chevron-down.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg8980"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata8986">
-    <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="defs8984" />
-  <path
-     style="fill:#4271ae;fill-opacity:1;stroke-width:1.28574"
-     id="path8978"
-     d="m 3.7531209,6.4345258 c -1.004161,1.002875 -1.004161,2.63319 0,3.6360652 l 8.2467181,8.248004 8.246719,-8.248004 C 20.749281,9.5691528 21,8.9108558 21,8.2525578 c 0,-0.658297 -0.250719,-1.316595 -0.753442,-1.818032 -1.004161,-1.004161 -2.631904,-1.004161 -3.636065,0 L 11.999839,11.043894 7.3891859,6.4345258 c -1.004161,-1.004161 -2.631905,-1.004161 -3.636065,0 z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m3.7531 6.4345c-1.0042 1.0029-1.0042 2.6332 0 3.6361l8.2467 8.248 8.2467-8.248c0.50272-0.50144 0.75344-1.1597 0.75344-1.818 0-0.6583-0.25072-1.3166-0.75344-1.818-1.0042-1.0042-2.6319-1.0042-3.6361 0l-4.6107 4.6094-4.6107-4.6094c-1.0042-1.0042-2.6319-1.0042-3.6361 0z" fill="#4271ae" stroke-width="1.2857"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_chevron-left.svg b/novelwriter/assets/icons/typicons_light/typ_chevron-left.svg
index 6125533e..803fb034 100644
--- a/novelwriter/assets/icons/typicons_light/typ_chevron-left.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_chevron-left.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg8980"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata8986">
-    <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="defs8984" />
-  <path
-     style="fill:#4271ae;fill-opacity:1;stroke-width:1.28574"
-     id="path8978"
-     d="m 17.565474,3.7531206 c -1.002875,-1.0041608 -2.63319,-1.0041608 -3.636065,0 L 5.6814051,11.999839 13.929409,20.246558 C 14.430847,20.749281 15.089144,21 15.747442,21 c 0.658297,0 1.316595,-0.250719 1.818032,-0.753442 1.004161,-1.004161 1.004161,-2.631904 0,-3.636065 l -4.609368,-4.610654 4.609368,-4.6106535 c 1.004161,-1.0041608 1.004161,-2.6319041 0,-3.6360649 z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m17.565 3.7531c-1.0029-1.0042-2.6332-1.0042-3.6361 0l-8.248 8.2467 8.248 8.2467c0.50144 0.50272 1.1597 0.75344 1.818 0.75344 0.6583 0 1.3166-0.25072 1.818-0.75344 1.0042-1.0042 1.0042-2.6319 0-3.6361l-4.6094-4.6107 4.6094-4.6107c1.0042-1.0042 1.0042-2.6319 0-3.6361z" fill="#4271ae" stroke-width="1.2857"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_chevron-right.svg b/novelwriter/assets/icons/typicons_light/typ_chevron-right.svg
index b4f300e1..e5041577 100644
--- a/novelwriter/assets/icons/typicons_light/typ_chevron-right.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_chevron-right.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg8980"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata8986">
-    <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="defs8984" />
-  <path
-     style="fill:#4271ae;fill-opacity:1;stroke-width:1.28574"
-     id="path8978"
-     d="m 6.4345258,3.7531206 c 1.002875,-1.0041608 2.63319,-1.0041608 3.6360652,0 l 8.248004,8.2467184 -8.248004,8.246719 C 9.5691528,20.749281 8.9108558,21 8.2525578,21 c -0.658297,0 -1.316595,-0.250719 -1.818032,-0.753442 -1.004161,-1.004161 -1.004161,-2.631904 0,-3.636065 L 11.043894,11.999839 6.4345258,7.3891855 c -1.004161,-1.0041608 -1.004161,-2.6319041 0,-3.6360649 z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m6.4345 3.7531c1.0029-1.0042 2.6332-1.0042 3.6361 0l8.248 8.2467-8.248 8.2467c-0.50144 0.50272-1.1597 0.75344-1.818 0.75344-0.6583 0-1.3166-0.25072-1.818-0.75344-1.0042-1.0042-1.0042-2.6319 0-3.6361l4.6094-4.6107-4.6094-4.6107c-1.0042-1.0042-1.0042-2.6319 0-3.6361z" fill="#4271ae" stroke-width="1.2857"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_chevron-up.svg b/novelwriter/assets/icons/typicons_light/typ_chevron-up.svg
index 1b9eb901..3eec317b 100644
--- a/novelwriter/assets/icons/typicons_light/typ_chevron-up.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_chevron-up.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg8980"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata8986">
-    <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="defs8984" />
-  <path
-     style="fill:#4271ae;fill-opacity:1;stroke-width:1.28574"
-     id="path8978"
-     d="m 20.246879,17.565474 c 1.004161,-1.002875 1.004161,-2.63319 0,-3.636065 L 12.000161,5.6814052 3.7534421,13.929409 c -0.502723,0.501438 -0.753442,1.159735 -0.753442,1.818033 0,0.658297 0.250719,1.316595 0.753442,1.818032 1.004161,1.004161 2.631904,1.004161 3.636065,0 l 4.6106539,-4.609368 4.610653,4.609368 c 1.004161,1.004161 2.631905,1.004161 3.636065,0 z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m20.247 17.565c1.0042-1.0029 1.0042-2.6332 0-3.6361l-8.2467-8.248-8.2467 8.248c-0.50272 0.50144-0.75344 1.1597-0.75344 1.818 0 0.6583 0.25072 1.3166 0.75344 1.818 1.0042 1.0042 2.6319 1.0042 3.6361 0l4.6107-4.6094 4.6107 4.6094c1.0042 1.0042 2.6319 1.0042 3.6361 0z" fill="#4271ae" stroke-width="1.2857"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_cog.svg b/novelwriter/assets/icons/typicons_light/typ_cog.svg
index edc89a8f..e456de42 100644
--- a/novelwriter/assets/icons/typicons_light/typ_cog.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_cog.svg
@@ -1,31 +1,4 @@
-<?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="svg1989">
-  <metadata
-     id="metadata1995">
-    <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="defs1993" />
-  <path
-     d="M 8.3268645,20.0768 8.9719703,22.448 C 9.2032354,23.3008 10.175241,24 11.131598,24 h 1.738831 c 0.956356,0 1.928363,-0.6992 2.159627,-1.552 l 0.645108,-2.3712 c 0.231264,-0.8528 1.173709,-1.3536 2.091812,-1.1104 l 2.550866,0.672 c 0.91984,0.2416 2.06573,-0.1824 2.542169,-0.9456 l 0.869415,-1.3872 c 0.476441,-0.7632 0.307773,-1.8864 -0.380803,-2.4992 l -1.909236,-1.6976 c -0.688578,-0.6128 -0.688578,-1.6128 0.0017,-2.224 L 23.346891,9.1872 C 24.035507,8.5759996 24.205912,7.4527996 23.729472,6.6895996 L 22.858272,5.3024 C 22.380094,4.5392 21.235943,4.1152 20.317842,4.3568 l -2.550866,0.672 C 16.847134,5.2704 15.906428,4.7712 15.673424,3.9184 L 15.030056,1.5504 C 14.798792,0.69919996 13.826785,0 12.870429,0 H 11.131598 C 10.175241,0 9.2032354,0.69919996 8.9719703,1.552 L 8.3286034,3.92 C 8.0955994,4.7728 7.1548921,5.2736 6.2350507,5.032 L 3.684186,4.36 C 2.7643447,4.1168 1.6184552,4.5424 1.1420155,5.304 L 0.27260019,6.6912 c -0.47643954,0.7632 -0.307773,1.8864 0.38254277,2.4991996 L 2.5609015,10.8848 c 0.6868381,0.6128 0.6868381,1.6128 0,2.2256 L 0.65166536,14.808 c -0.68683817,0.6128 -0.85898242,1.736 -0.38080407,2.4992 l 0.87115421,1.3872 c 0.4764397,0.7632 1.6223292,1.1872 2.5421705,0.9456 l 2.5508647,-0.672 c 0.9181025,-0.2448 1.8605487,0.256 2.0918138,1.1088 z M 12.001014,8.8000004 c 1.919668,0 3.477662,1.4319996 3.477662,3.1999996 0,1.7664 -1.557994,3.2 -3.477662,3.2 -1.91967,0 -3.4776615,-1.4336 -3.4776615,-3.2 0,-1.768 1.5579915,-3.1999996 3.4776615,-3.1999996 z"
-     id="path1987"
-     style="fill:#000000;fill-opacity:0.721569;stroke-width:1.66797" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m8.3269 20.077 0.64511 2.3712c0.23127 0.8528 1.2033 1.552 2.1596 1.552h1.7388c0.95636 0 1.9284-0.6992 2.1596-1.552l0.64511-2.3712c0.23126-0.8528 1.1737-1.3536 2.0918-1.1104l2.5509 0.672c0.91984 0.2416 2.0657-0.1824 2.5422-0.9456l0.86942-1.3872c0.47644-0.7632 0.30777-1.8864-0.3808-2.4992l-1.9092-1.6976c-0.68858-0.6128-0.68858-1.6128 0.0017-2.224l1.9058-1.6976c0.68862-0.6112 0.85902-1.7344 0.38258-2.4976l-0.8712-1.3872c-0.47818-0.7632-1.6223-1.1872-2.5404-0.9456l-2.5509 0.672c-0.91984 0.2416-1.8605-0.2576-2.0936-1.1104l-0.64337-2.368c-0.23126-0.8512-1.2033-1.5504-2.1596-1.5504h-1.7388c-0.95636 0-1.9284 0.6992-2.1596 1.552l-0.64337 2.368c-0.233 0.8528-1.1737 1.3536-2.0936 1.112l-2.5509-0.672c-0.91984-0.2432-2.0657 0.1824-2.5422 0.944l-0.86942 1.3872c-0.47644 0.7632-0.30777 1.8864 0.38254 2.4992l1.9058 1.6944c0.68684 0.6128 0.68684 1.6128 0 2.2256l-1.9092 1.6976c-0.68684 0.6128-0.85898 1.736-0.3808 2.4992l0.87115 1.3872c0.47644 0.7632 1.6223 1.1872 2.5422 0.9456l2.5509-0.672c0.9181-0.2448 1.8605 0.256 2.0918 1.1088zm3.6741-11.277c1.9197 0 3.4777 1.432 3.4777 3.2 0 1.7664-1.558 3.2-3.4777 3.2-1.9197 0-3.4777-1.4336-3.4777-3.2 0-1.768 1.558-3.2 3.4777-3.2z" fill-opacity=".72157" stroke-width="1.668"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_delete.svg b/novelwriter/assets/icons/typicons_light/typ_delete.svg
index acf7105b..93f62972 100644
--- a/novelwriter/assets/icons/typicons_light/typ_delete.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_delete.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg1543"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata1549">
-    <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="defs1547" />
-  <path
-     style="stroke-width:1.25;fill:#c82829;fill-opacity:1"
-     id="path1541"
-     d="M 12,2 C 6.47625,2 2,6.4775 2,12 2,17.5225 6.47625,22 12,22 17.52375,22 22,17.5225 22,12 22,6.4775 17.52375,2 12,2 Z m 4.63375,12.86625 c 0.48875,0.48875 0.48875,1.27875 0,1.7675 C 16.39,16.8775 16.07,17 15.75,17 15.43,17 15.11,16.8775 14.86625,16.63375 L 12,13.7675 9.13375,16.63375 C 8.89,16.8775 8.57,17 8.25,17 7.93,17 7.61,16.8775 7.36625,16.63375 6.8775,16.145 6.8775,15.355 7.36625,14.86625 L 10.2325,12 7.36625,9.13375 C 6.8775,8.645 6.8775,7.855 7.36625,7.36625 7.855,6.8775 8.645,6.8775 9.13375,7.36625 L 12,10.2325 14.86625,7.36625 c 0.48875,-0.48875 1.27875,-0.48875 1.7675,0 0.48875,0.48875 0.48875,1.27875 0,1.7675 L 13.7675,12 Z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.5238 0-10 4.4775-10 10s4.4762 10 10 10 10-4.4775 10-10-4.4762-10-10-10zm4.6338 12.866c0.48875 0.48875 0.48875 1.2788 0 1.7675-0.24375 0.24375-0.56375 0.36625-0.88375 0.36625s-0.64-0.1225-0.88375-0.36625l-2.8662-2.8662-2.8662 2.8662c-0.24375 0.24375-0.56375 0.36625-0.88375 0.36625s-0.64-0.1225-0.88375-0.36625c-0.48875-0.48875-0.48875-1.2788 0-1.7675l2.8662-2.8662-2.8662-2.8662c-0.48875-0.48875-0.48875-1.2788 0-1.7675s1.2788-0.48875 1.7675 0l2.8662 2.8662 2.8662-2.8662c0.48875-0.48875 1.2788-0.48875 1.7675 0s0.48875 1.2788 0 1.7675l-2.8662 2.8662z" fill="#c82829" stroke-width="1.25"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_document-text.svg b/novelwriter/assets/icons/typicons_light/typ_document-text.svg
index 551239c3..77e4e270 100644
--- a/novelwriter/assets/icons/typicons_light/typ_document-text.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_document-text.svg
@@ -1,39 +1,5 @@
-<?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="svg2161">
-  <metadata
-     id="metadata2167">
-    <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="defs2165" />
-  <path
-     id="rect12986"
-     d="m 5.8888883,3.4444441 c -0.6734444,0 -1.2222222,0.5487778 -1.2222222,1.2222222 V 19.333334 c 0,0.673444 0.5487778,1.222222 1.2222222,1.222222 H 18.11111 c 0.673446,0 1.222224,-0.548778 1.222224,-1.222222 V 4.6666663 c 0,-0.6734444 -0.548778,-1.2222222 -1.222224,-1.2222222 z m 1.2222222,2.4444444 h 9.7777775 c 0.337334,0 0.611112,0.2737778 0.611112,0.6111112 0,0.3373334 -0.273778,0.6111113 -0.611112,0.6111113 H 7.1111105 c -0.3373332,0 -0.611111,-0.2737779 -0.611111,-0.6111112 0,-0.3373335 0.2737778,-0.6111112 0.611111,-0.6111113 z m 0,3.6666664 h 9.7777775 c 0.337334,0 0.611112,0.2737789 0.611112,0.6111111 0,0.337334 -0.273778,0.611112 -0.611112,0.611112 H 7.1111105 c -0.3373332,0 -0.611111,-0.273778 -0.611111,-0.611112 0,-0.3373322 0.2737778,-0.6111111 0.611111,-0.6111111 z m 0,3.6666671 h 9.7777775 c 0.337334,0 0.611112,0.273778 0.611112,0.611112 0,0.337332 -0.273778,0.61111 -0.611112,0.61111 H 7.1111105 c -0.3373332,0 -0.611111,-0.273778 -0.611111,-0.61111 0,-0.337334 0.2737778,-0.611112 0.611111,-0.611112 z m 0,3.666666 h 9.7777775 c 0.337334,0 0.611112,0.273778 0.611112,0.611112 0,0.337334 -0.273778,0.611112 -0.611112,0.611112 H 7.1111105 c -0.3373332,0 -0.611111,-0.273778 -0.611111,-0.611112 0,-0.337334 0.2737778,-0.611112 0.611111,-0.611112 z"
-     style="display:inline;opacity:0.95;fill:#ededed;fill-opacity:1;stroke:none;stroke-width:1.88635;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <path
-     id="path2157"
-     style="display:inline;fill:#333333;fill-opacity:1;stroke-width:1.22222"
-     d="M 7.1113281 5.8886719 C 6.7739949 5.8886719 6.5 6.1626666 6.5 6.5 C 6.5 6.8373334 6.7739949 7.1113281 7.1113281 7.1113281 L 16.888672 7.1113281 C 17.226006 7.1113281 17.5 6.8373334 17.5 6.5 C 17.5 6.1626666 17.226006 5.8886719 16.888672 5.8886719 L 7.1113281 5.8886719 z M 7.1113281 9.5546875 C 6.7739949 9.5546875 6.5 9.8286836 6.5 10.166016 C 6.5 10.50335 6.7739949 10.777344 7.1113281 10.777344 L 16.888672 10.777344 C 17.226006 10.777344 17.5 10.50335 17.5 10.166016 C 17.5 9.8286836 17.226006 9.5546875 16.888672 9.5546875 L 7.1113281 9.5546875 z M 7.1113281 13.222656 C 6.7739949 13.222656 6.5 13.49665 6.5 13.833984 C 6.5 14.171316 6.7739949 14.445312 7.1113281 14.445312 L 16.888672 14.445312 C 17.226006 14.445313 17.5 14.171316 17.5 13.833984 C 17.5 13.49665 17.226006 13.222656 16.888672 13.222656 L 7.1113281 13.222656 z M 7.1113281 16.888672 C 6.7739949 16.888672 6.5 17.162666 6.5 17.5 C 6.5 17.837334 6.7739949 18.111328 7.1113281 18.111328 L 16.888672 18.111328 C 17.226006 18.111328 17.5 17.837334 17.5 17.5 C 17.5 17.162666 17.226006 16.888672 16.888672 16.888672 L 7.1113281 16.888672 z " />
-  <path
-     id="path902"
-     style="display:inline;fill:#333333;fill-opacity:1;stroke-width:1.22222"
-     d="M 5.8886719,1 C 3.8671165,1 2.2226562,2.6444602 2.2226562,4.6660156 V 19.333984 C 2.2226563,21.355538 3.8671165,23 5.8886719,23 H 18.111328 c 2.021556,0 3.666016,-1.644462 3.666016,-3.666016 V 4.6660156 C 21.777344,2.6444602 20.132884,1 18.111328,1 Z m 0,2.4453125 H 18.111328 c 0.673446,0 1.222656,0.5472587 1.222656,1.2207031 V 19.333984 c 0,0.673444 -0.54921,1.220704 -1.222656,1.220704 H 5.8886719 c -0.6734444,-10e-7 -1.2226563,-0.54726 -1.2226563,-1.220704 V 4.6660156 c 0,-0.6734444 0.5492119,-1.2207031 1.2226563,-1.2207031 z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m5.8889 3.4444c-0.67344 0-1.2222 0.54878-1.2222 1.2222v14.667c0 0.67344 0.54878 1.2222 1.2222 1.2222h12.222c0.67345 0 1.2222-0.54878 1.2222-1.2222v-14.667c0-0.67344-0.54878-1.2222-1.2222-1.2222zm1.2222 2.4444h9.7778c0.33733 0 0.61111 0.27378 0.61111 0.61111s-0.27378 0.61111-0.61111 0.61111h-9.7778c-0.33733 0-0.61111-0.27378-0.61111-0.61111 0-0.33733 0.27378-0.61111 0.61111-0.61111zm0 3.6667h9.7778c0.33733 0 0.61111 0.27378 0.61111 0.61111 0 0.33733-0.27378 0.61111-0.61111 0.61111h-9.7778c-0.33733 0-0.61111-0.27378-0.61111-0.61111 0-0.33733 0.27378-0.61111 0.61111-0.61111zm0 3.6667h9.7778c0.33733 0 0.61111 0.27378 0.61111 0.61111 0 0.33733-0.27378 0.61111-0.61111 0.61111h-9.7778c-0.33733 0-0.61111-0.27378-0.61111-0.61111 0-0.33733 0.27378-0.61111 0.61111-0.61111zm0 3.6667h9.7778c0.33733 0 0.61111 0.27378 0.61111 0.61111s-0.27378 0.61111-0.61111 0.61111h-9.7778c-0.33733 0-0.61111-0.27378-0.61111-0.61111s0.27378-0.61111 0.61111-0.61111z" fill="#ededed" opacity=".95"/>
+ <path d="m5.8887 1c-2.0216 0-3.666 1.6445-3.666 3.666v14.668c1e-7 2.0216 1.6445 3.666 3.666 3.666h12.223c2.0216 0 3.666-1.6445 3.666-3.666v-14.668c0-2.0216-1.6445-3.666-3.666-3.666zm0 2.4453h12.223c0.67345 0 1.2227 0.54726 1.2227 1.2207v14.668c0 0.67344-0.54921 1.2207-1.2227 1.2207h-12.223c-0.67344-1e-6 -1.2227-0.54726-1.2227-1.2207v-14.668c0-0.67344 0.54921-1.2207 1.2227-1.2207zm1.2227 2.4434c-0.33733 0-0.61133 0.27399-0.61133 0.61133s0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 0 0.61133-0.27399 0.61133-0.61133s-0.27399-0.61133-0.61133-0.61133zm0 3.666c-0.33733 0-0.61133 0.274-0.61133 0.61133 0 0.33733 0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 0 0.61133-0.27399 0.61133-0.61133 0-0.33733-0.27399-0.61133-0.61133-0.61133zm0 3.668c-0.33733 0-0.61133 0.27399-0.61133 0.61133 0 0.33733 0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 1e-6 0.61133-0.274 0.61133-0.61133 0-0.33733-0.27399-0.61133-0.61133-0.61133zm0 3.666c-0.33733 0-0.61133 0.27399-0.61133 0.61133s0.27399 0.61133 0.61133 0.61133h9.7773c0.33733 0 0.61133-0.27399 0.61133-0.61133s-0.27399-0.61133-0.61133-0.61133z" fill="#333" stroke-width="1.2222"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_export.svg b/novelwriter/assets/icons/typicons_light/typ_export.svg
index cb77796f..eed8ef4b 100644
--- a/novelwriter/assets/icons/typicons_light/typ_export.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_export.svg
@@ -1,31 +1,4 @@
-<?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">
-  <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
-     d="M 6.8888889,16.888889 V 17.5 c 2.0667778,-3.150889 4.4000001,-4.831444 7.3333331,-4.888889 v 3.666666 c 0,0.673444 0.624556,1.222223 1.397,1.222223 0.444889,0 0.825,-0.193112 1.079223,-0.477889 C 19.061,14.542222 24,9.5555555 24,9.5555555 c 0,0 -4.939,-4.9891115 -7.302778,-7.5007781 -0.254222,-0.2505555 -0.633111,-0.4436667 -1.078,-0.4436667 -0.772444,0 -1.397,0.5463333 -1.397,1.2222222 v 3.6666667 c -5.6955553,0 -7.3333331,5.9534434 -7.3333331,10.3888894 z m -3.6666667,5.5 H 20.333333 c 0.675889,0 1.222222,-0.547557 1.222222,-1.222223 V 13.77711 c -0.811555,0.826222 -1.66711,1.702555 -2.444444,2.501889 v 3.665444 H 4.4444445 V 5.2777775 H 13 V 2.833333 H 3.2222222 C 2.5463333,2.833333 2,3.3808886 2,4.0555552 V 21.166666 c 0,0.674666 0.5463333,1.222223 1.2222222,1.222223 z"
-     id="path1167"
-     style="stroke-width:1.22222;fill:#000000;fill-opacity:0.72156864" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m6.8889 16.889v0.61111c2.0668-3.1509 4.4-4.8314 7.3333-4.8889v3.6667c0 0.67344 0.62456 1.2222 1.397 1.2222 0.44489 0 0.825-0.19311 1.0792-0.47789 2.3626-2.4799 7.3016-7.4666 7.3016-7.4666s-4.939-4.9891-7.3028-7.5008c-0.25422-0.25056-0.63311-0.44367-1.078-0.44367-0.77244 0-1.397 0.54633-1.397 1.2222v3.6667c-5.6956 0-7.3333 5.9534-7.3333 10.389zm-3.6667 5.5h17.111c0.67589 0 1.2222-0.54756 1.2222-1.2222v-7.3896c-0.81156 0.82622-1.6671 1.7026-2.4444 2.5019v3.6654h-14.667v-14.667h8.5556v-2.4444h-9.7778c-0.67589 0-1.2222 0.54756-1.2222 1.2222v17.111c0 0.67467 0.54633 1.2222 1.2222 1.2222z" fill-opacity=".72157" stroke-width="1.2222"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_flag.svg b/novelwriter/assets/icons/typicons_light/typ_flag.svg
index ee543c64..66bb3739 100644
--- a/novelwriter/assets/icons/typicons_light/typ_flag.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_flag.svg
@@ -1,31 +1,4 @@
-<?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="svg16286">
-  <metadata
-     id="metadata16292">
-    <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="defs16290" />
-  <path
-     d="m 19.8612,3.6198408 c -0.460612,-0.1908955 -0.990193,-0.084979 -1.342426,0.2672537 -1.556722,1.5554906 -4.090091,1.5567222 -5.648044,0 -2.51859,-2.516126 -6.6136063,-2.516126 -9.1309639,0 C 3.5082283,4.1174007 3.378912,4.4314547 3.378912,4.7578244 V 20.768416 C 3.378912,21.44825 3.92943,22 4.610496,22 5.2915619,22 5.8420799,21.44825 5.8420799,20.768416 v -5.607402 c 1.5653433,-1.227889 3.8437741,-1.121973 5.2871901,0.320212 2.518589,2.516126 6.614837,2.516126 9.130963,0 0.231538,-0.231538 0.360855,-0.54436 0.360855,-0.87073 V 4.7578244 c 0,-0.4987915 -0.300507,-0.9470881 -0.759888,-1.1379836 z"
-     id="path16284"
-     style="stroke-width:1.23158;fill:#f5871f;fill-opacity:1" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m19.861 3.6198c-0.46061-0.1909-0.99019-0.084979-1.3424 0.26725-1.5567 1.5555-4.0901 1.5567-5.648 0-2.5186-2.5161-6.6136-2.5161-9.131 0-0.23154 0.23031-0.36085 0.54436-0.36085 0.87073v16.011c0 0.67983 0.55052 1.2316 1.2316 1.2316 0.68107 0 1.2316-0.55175 1.2316-1.2316v-5.6074c1.5653-1.2279 3.8438-1.122 5.2872 0.32021 2.5186 2.5161 6.6148 2.5161 9.131 0 0.23154-0.23154 0.36086-0.54436 0.36086-0.87073v-9.8527c0-0.49879-0.30051-0.94709-0.75989-1.138z" fill="#f5871f" stroke-width="1.2316"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_folder.svg b/novelwriter/assets/icons/typicons_light/typ_folder.svg
index 64b268ca..6d951ad2 100644
--- a/novelwriter/assets/icons/typicons_light/typ_folder.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_folder.svg
@@ -1,35 +1,5 @@
-<?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"
-   id="svg2765"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata2771">
-    <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="defs2769" />
-  <path
-     style="fill:#eab700;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
-     d="M 5.3339844 5.25 C 4.7206511 5.25 4.2226562 5.7540001 4.2226562 6.375 L 4.2226562 8.625 L 19.777344 8.625 C 19.777344 8.0039999 19.279349 7.5 18.666016 7.5 L 12 7.5 C 10.773333 7.5 9.7773438 6.4920001 9.7773438 5.25 L 5.3339844 5.25 z M 4.2226562 9.75 L 4.2226562 17.625 C 4.2226563 18.246001 4.7206511 18.75 5.3339844 18.75 L 18.666016 18.75 C 19.279349 18.75 19.777344 18.246001 19.777344 17.625 L 19.777344 9.75 L 4.2226562 9.75 z "
-     id="path12368" />
-  <path
-     style="display:inline;fill:#ad8700;fill-opacity:1;stroke-width:1.11802995"
-     id="path2763"
-     d="M 18.666667,5.2499999 H 12 C 12,4.008 11.004444,3 9.777778,3 H 5.3333333 C 3.4955556,3 2,4.51425 2,6.3749999 V 17.624999 C 2,19.48575 3.4955556,21 5.3333333,21 H 18.666667 C 20.504444,21 22,19.48575 22,17.624999 V 8.625 C 22,6.76425 20.504444,5.2499999 18.666667,5.2499999 Z m -13.3333337,0 H 9.777778 c 0,1.2420001 0.995555,2.25 2.222222,2.25 h 6.666667 c 0.613333,0 1.111111,0.504 1.111111,1.1250001 H 4.2222222 V 6.3749999 c 0,-0.6209999 0.4977778,-1.125 1.1111111,-1.125 z M 18.666667,18.75 H 5.3333333 C 4.72,18.75 4.2222222,18.246 4.2222222,17.624999 V 9.75 H 19.777778 v 7.874999 C 19.777778,18.246 19.28,18.75 18.666667,18.75 Z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m5.334 5.25c-0.61333 0-1.1113 0.504-1.1113 1.125v2.25h15.555c0-0.621-0.498-1.125-1.1113-1.125h-6.666c-1.2267 0-2.2227-1.008-2.2227-2.25h-4.4434zm-1.1113 4.5v7.875c1e-7 0.621 0.49799 1.125 1.1113 1.125h13.332c0.61333 0 1.1113-0.504 1.1113-1.125v-7.875h-15.555z" fill="#eab700"/>
+ <path d="m18.667 5.25h-6.6667c0-1.242-0.99556-2.25-2.2222-2.25h-4.4444c-1.8378 0-3.3333 1.5142-3.3333 3.375v11.25c0 1.8608 1.4956 3.375 3.3333 3.375h13.333c1.8378 0 3.3333-1.5142 3.3333-3.375v-9c0-1.8608-1.4956-3.375-3.3333-3.375zm-13.333 0h4.4444c0 1.242 0.99556 2.25 2.2222 2.25h6.6667c0.61333 0 1.1111 0.504 1.1111 1.125h-15.556v-2.25c0-0.621 0.49778-1.125 1.1111-1.125zm13.333 13.5h-13.333c-0.61333 0-1.1111-0.504-1.1111-1.125v-7.875h15.556v7.875c0 0.621-0.49778 1.125-1.1111 1.125z" fill="#ad8700" stroke-width="1.118"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_globe-grey.svg b/novelwriter/assets/icons/typicons_light/typ_globe-grey.svg
index 6afa5aa5..4cb3c5ea 100644
--- a/novelwriter/assets/icons/typicons_light/typ_globe-grey.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_globe-grey.svg
@@ -1,31 +1,4 @@
-<?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="svg3369">
-  <metadata
-     id="metadata3375">
-    <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="defs3373" />
-  <path
-     d="m 10.59375,21.6 h -4.8 c -0.6636,0 -1.2,0.5364 -1.2,1.2 0,0.6636 0.5364,1.2 1.2,1.2 h 12 c 0.6636,0 1.2,-0.5364 1.2,-1.2 0,-0.6636 -0.5364,-1.2 -1.2,-1.2 h -4.8 v -1.476 c 1.968,-0.4452 3.7752,-1.4256 5.2356,-2.8872 2.04,-2.04 3.1644,-4.752 3.1644,-7.6368 0,-2.4804 -0.8304,-4.8348 -2.3616,-6.7428 l 0.81,-0.8076 c 0.4692,-0.4692 0.4692,-1.2276 0.0012,-1.698 -0.4692,-0.4692 -1.2288,-0.468 -1.698,-0.0012 l -2.4624,2.4588 0.8496,0.8496 c 1.5864,1.5864 2.4612,3.6972 2.4612,5.9412 0,2.244 -0.8748,4.3524 -2.4612,5.9388 -1.5864,1.5864 -3.6948,2.4612 -5.9388,2.4612 -2.244,0 -4.3524,-0.8748 -5.9388,-2.4612 -0.4692,-0.4692 -1.2276,-0.4692 -1.6968,0 -0.4692,0.468 -0.4692,1.2276 0,1.6968 2.0388,2.04 4.7508,3.1644 7.6356,3.1644 z m 0,-19.2 c 1.9884,0 3.7884,0.8064 5.0916,2.1084 1.302,1.3032 2.1084,3.1032 2.1084,5.0916 0,1.9872 -0.8064,3.7872 -2.1084,5.0904 -1.3032,1.3032 -3.1032,2.1096 -5.0916,2.1096 -1.9896,0 -3.7884,-0.8064 -5.0904,-2.1084 -1.302,-1.3032 -2.1072,-3.1032 -2.1072,-5.0916 0,-1.9884 0.8052,-3.7884 2.1072,-5.0916 C 6.80535,3.2064 8.60415,2.4 10.59375,2.4 Z"
-     id="path3367"
-     style="stroke-width:1.2;fill:#000000;fill-opacity:0.77999997" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m10.594 21.6h-4.8c-0.6636 0-1.2 0.5364-1.2 1.2s0.5364 1.2 1.2 1.2h12c0.6636 0 1.2-0.5364 1.2-1.2s-0.5364-1.2-1.2-1.2h-4.8v-1.476c1.968-0.4452 3.7752-1.4256 5.2356-2.8872 2.04-2.04 3.1644-4.752 3.1644-7.6368 0-2.4804-0.8304-4.8348-2.3616-6.7428l0.81-0.8076c0.4692-0.4692 0.4692-1.2276 0.0012-1.698-0.4692-0.4692-1.2288-0.468-1.698-0.0012l-2.4624 2.4588 0.8496 0.8496c1.5864 1.5864 2.4612 3.6972 2.4612 5.9412s-0.8748 4.3524-2.4612 5.9388-3.6948 2.4612-5.9388 2.4612-4.3524-0.8748-5.9388-2.4612c-0.4692-0.4692-1.2276-0.4692-1.6968 0-0.4692 0.468-0.4692 1.2276 0 1.6968 2.0388 2.04 4.7508 3.1644 7.6356 3.1644zm0-19.2c1.9884 0 3.7884 0.8064 5.0916 2.1084 1.302 1.3032 2.1084 3.1032 2.1084 5.0916 0 1.9872-0.8064 3.7872-2.1084 5.0904-1.3032 1.3032-3.1032 2.1096-5.0916 2.1096-1.9896 0-3.7884-0.8064-5.0904-2.1084-1.302-1.3032-2.1072-3.1032-2.1072-5.0916s0.8052-3.7884 2.1072-5.0916c1.302-1.302 3.1008-2.1084 5.0904-2.1084z" fill-opacity=".78" stroke-width="1.2"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_key.svg b/novelwriter/assets/icons/typicons_light/typ_key.svg
index b3625410..4aa23e01 100644
--- a/novelwriter/assets/icons/typicons_light/typ_key.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_key.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg3996"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata4002">
-    <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="defs4000" />
-  <path
-     style="stroke-width:1.42857;fill:#a2694f;fill-opacity:1"
-     id="path3994"
-     d="m 7.357143,9.142857 c 0,1.045714 0.237143,2.034286 0.641429,2.93 l -5.641429,5.641429 v 2.142857 c 0,0 1.28,2.142857 2.8571429,2.142857 H 8.071429 v -2.857143 h 2.857143 V 16.285714 H 14.5 c 3.945714,0 7.142857,-3.197143 7.142857,-7.142857 C 21.642857,5.1971429 18.445714,2 14.5,2 10.554286,2 7.357143,5.1971429 7.357143,9.142857 Z M 14.5,12 c -1.577143,0 -2.857143,-1.28 -2.857143,-2.857143 0,-1.578571 1.28,-2.86 2.857143,-2.86 1.578572,0 2.857143,1.28 2.857143,2.86 C 17.357143,10.72 16.078572,12 14.5,12 Z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m7.3571 9.1429c0 1.0457 0.23714 2.0343 0.64143 2.93l-5.6414 5.6414v2.1429s1.28 2.1429 2.8571 2.1429h2.8571v-2.8571h2.8571v-2.8571h3.5714c3.9457 0 7.1429-3.1971 7.1429-7.1429 0-3.9457-3.1971-7.1429-7.1429-7.1429s-7.1429 3.1971-7.1429 7.1429zm7.1429 2.8571c-1.5771 0-2.8571-1.28-2.8571-2.8571 0-1.5786 1.28-2.86 2.8571-2.86 1.5786 0 2.8571 1.28 2.8571 2.86 0 1.5771-1.2786 2.8571-2.8571 2.8571z" fill="#a2694f" stroke-width="1.4286"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_location.svg b/novelwriter/assets/icons/typicons_light/typ_location.svg
index cfed73cc..1afc813c 100644
--- a/novelwriter/assets/icons/typicons_light/typ_location.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_location.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg4600"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata4606">
-    <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="defs4604" />
-  <path
-     style="stroke-width:1.05265;fill:#4271ae;fill-opacity:1"
-     id="path4598"
-     d="m 17.954289,4.4260846 c -3.288464,-3.2347795 -8.6201134,-3.2347795 -11.9085778,0 -3.2884643,3.235832 -3.2884643,8.4811644 0,11.7159434 L 11.999474,22 17.954289,16.142028 c 3.288464,-3.234779 3.288464,-8.4801114 0,-11.7159434 z m -5.954815,8.6264294 c -0.703167,0 -1.363176,-0.273688 -1.861077,-0.770537 -1.0263296,-1.026329 -1.0263296,-2.695825 0,-3.7221538 0.496848,-0.4968487 1.15791,-0.7705365 1.861077,-0.7705365 0.703167,0 1.364228,0.2736878 1.861077,0.7705365 1.026329,1.0263288 1.026329,2.6968778 0,3.7221538 -0.496849,0.496849 -1.15791,0.770537 -1.861077,0.770537 z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m17.954 4.4261c-3.2885-3.2348-8.6201-3.2348-11.909 0-3.2885 3.2358-3.2885 8.4812 0 11.716l5.9538 5.858 5.9548-5.858c3.2885-3.2348 3.2885-8.4801 0-11.716zm-5.9548 8.6264c-0.70317 0-1.3632-0.27369-1.8611-0.77054-1.0263-1.0263-1.0263-2.6958 0-3.7222 0.49685-0.49685 1.1579-0.77054 1.8611-0.77054s1.3642 0.27369 1.8611 0.77054c1.0263 1.0263 1.0263 2.6969 0 3.7222-0.49685 0.49685-1.1579 0.77054-1.8611 0.77054z" fill="#4271ae" stroke-width="1.0526"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_media-pause-grey.svg b/novelwriter/assets/icons/typicons_light/typ_media-pause-grey.svg
index deafb10d..633ba70d 100644
--- a/novelwriter/assets/icons/typicons_light/typ_media-pause-grey.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_media-pause-grey.svg
@@ -1,31 +1,4 @@
-<?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="svg5582">
-  <metadata
-     id="metadata5588">
-    <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="defs5586" />
-  <path
-     d="m 6.7499997,3 c -1.656,0 -3,1.3440001 -3,3.0000001 V 17.999999 c 0,1.656 1.344,3.000001 3,3.000001 1.6560002,0 2.9999998,-1.344001 2.9999998,-3.000001 V 6.0000001 C 9.7499995,4.3440001 8.4059999,3 6.7499997,3 Z M 17.249999,3 c -1.656,0 -3.000001,1.3440001 -3.000001,3.0000001 V 17.999999 c 0,1.656 1.344001,3.000001 3.000001,3.000001 1.656,0 3.000001,-1.344001 3.000001,-3.000001 V 6.0000001 C 20.25,4.3440001 18.905999,3 17.249999,3 Z"
-     id="path5580"
-     style="fill:#000000;fill-opacity:0.780392;stroke-width:1.49999" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m6.75 3c-1.656 0-3 1.344-3 3v12c0 1.656 1.344 3 3 3 1.656 0 3-1.344 3-3v-12c0-1.656-1.344-3-3-3zm10.5 0c-1.656 0-3 1.344-3 3v12c0 1.656 1.344 3 3 3s3-1.344 3-3v-12c0-1.656-1.344-3-3-3z" fill-opacity=".78039" stroke-width="1.5"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_media-record-outline.svg b/novelwriter/assets/icons/typicons_light/typ_media-record-outline.svg
index 29041550..fa665fa4 100644
--- a/novelwriter/assets/icons/typicons_light/typ_media-record-outline.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_media-record-outline.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg11603"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata11609">
-    <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="defs11607" />
-  <path
-     style="stroke-width:1.5;fill:#4271ae;fill-opacity:1"
-     id="path11601"
-     d="m 12,6 c 3.3075,0 6,2.691 6,6 0,3.309 -2.6925,6 -6,6 C 8.6925,18 6,15.309 6,12 6,8.691 8.6925,6 12,6 m 0,-3 c -4.971,0 -9,4.029 -9,9 0,4.968 4.029,9 9,9 4.968,0 9,-4.032 9,-9 0,-4.971 -4.032,-9 -9,-9 z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 6c3.3075 0 6 2.691 6 6s-2.6925 6-6 6-6-2.691-6-6 2.6925-6 6-6m0-3c-4.971 0-9 4.029-9 9 0 4.968 4.029 9 9 9 4.968 0 9-4.032 9-9 0-4.971-4.032-9-9-9z" fill="#4271ae" stroke-width="1.5"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_media-record.svg b/novelwriter/assets/icons/typicons_light/typ_media-record.svg
index c51c3bef..8ccc5fb5 100644
--- a/novelwriter/assets/icons/typicons_light/typ_media-record.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_media-record.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg10879"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata10885">
-    <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="defs10883" />
-  <path
-     style="stroke-width:1.5;fill:#4271ae;fill-opacity:1"
-     id="path10877"
-     d="M 21,12 C 21,9.5145 19.992,7.2645 18.3645,5.6355 16.7355,4.008 14.4855,3 12,3 9.516,3 7.266,4.008 5.637,5.6355 4.008,7.2645 3,9.5145 3,12 3,14.484 4.008,16.734 5.637,18.363 7.266,19.992 9.516,21 12,21 14.4855,21 16.7355,19.992 18.3645,18.363 19.992,16.734 21,14.484 21,12 Z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="M 21,12 C 21,9.5145 19.992,7.2645 18.3645,5.6355 16.7355,4.008 14.4855,3 12,3 9.516,3 7.266,4.008 5.637,5.6355 4.008,7.2645 3,9.5145 3,12 3,14.484 4.008,16.734 5.637,18.363 7.266,19.992 9.516,21 12,21 14.4855,21 16.7355,19.992 18.3645,18.363 19.992,16.734 21,14.484 21,12 Z" fill="#4271ae" stroke-width="1.5"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_minus.svg b/novelwriter/assets/icons/typicons_light/typ_minus.svg
index 8c267a38..05c9198a 100644
--- a/novelwriter/assets/icons/typicons_light/typ_minus.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_minus.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg5204"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata5210">
-    <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="defs5208" />
-  <path
-     style="stroke-width:1.25;fill:#c82829;fill-opacity:1"
-     id="path5202"
-     d="M 19.5,9.5 H 4.5 C 3.12,9.5 2,10.62 2,12 c 0,1.38 1.12,2.5 2.5,2.5 h 15 C 20.88,14.5 22,13.38 22,12 22,10.62 20.88,9.5 19.5,9.5 Z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m19.5 9.5h-15c-1.38 0-2.5 1.12-2.5 2.5s1.12 2.5 2.5 2.5h15c1.38 0 2.5-1.12 2.5-2.5s-1.12-2.5-2.5-2.5z" fill="#c82829" stroke-width="1.25"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_pencil.svg b/novelwriter/assets/icons/typicons_light/typ_pencil.svg
index 80e49a2c..5307c1ce 100644
--- a/novelwriter/assets/icons/typicons_light/typ_pencil.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_pencil.svg
@@ -1,35 +1,5 @@
-<?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="svg14474">
-  <metadata
-     id="metadata14480">
-    <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="defs14478" />
-  <path
-     d="M21 6.879l-3.879-3.879c-.293-.293-.678-.439-1.061-.439-.384 0-.767.146-1.06.439l-10.939 10.939c-.293.293-.558.727-.75 1.188-.192.463-.311.959-.311 1.373v4.5h4.5c.414 0 .908-.119 1.371-.311.463-.192.896-.457 1.189-.75l10.94-10.939c.293-.293.439-.678.439-1.061 0-.384-.146-.767-.439-1.06zm-15.232 8.182l8.293-8.293 1.232 1.232-8.293 8.293-1.232-1.232zm1.732 3.939h-1.5l-1-1v-1.5c0-.077.033-.305.158-.605.01-.02 2.967 2.938 2.967 2.938-.322.134-.548.167-.625.167zm1.439-.768l-1.232-1.232 8.293-8.293 1.232 1.232-8.293 8.293zm9-9l-3.172-3.172 1.293-1.293 3.17 3.172-1.291 1.293z"
-     id="path14472"
-     style="fill:#718c00;fill-opacity:1" />
-  <path
-     style="display:inline;opacity:0.95;fill:#0a0a0a;fill-opacity:1;stroke:none;stroke-width:1.88249397;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 3,18.414062 V 21 h 2.5605469 z"
-     id="rect19553" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="M21 6.879l-3.879-3.879c-.293-.293-.678-.439-1.061-.439-.384 0-.767.146-1.06.439l-10.939 10.939c-.293.293-.558.727-.75 1.188-.192.463-.311.959-.311 1.373v4.5h4.5c.414 0 .908-.119 1.371-.311.463-.192.896-.457 1.189-.75l10.94-10.939c.293-.293.439-.678.439-1.061 0-.384-.146-.767-.439-1.06zm-15.232 8.182l8.293-8.293 1.232 1.232-8.293 8.293-1.232-1.232zm1.732 3.939h-1.5l-1-1v-1.5c0-.077.033-.305.158-.605.01-.02 2.967 2.938 2.967 2.938-.322.134-.548.167-.625.167zm1.439-.768l-1.232-1.232 8.293-8.293 1.232 1.232-8.293 8.293zm9-9l-3.172-3.172 1.293-1.293 3.17 3.172-1.291 1.293z" fill="#718c00"/>
+ <path d="m3 18.414v2.5859h2.5605z" fill="#0a0a0a" opacity=".95"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_pin-outline.svg b/novelwriter/assets/icons/typicons_light/typ_pin-outline.svg
index 9091424e..ee88a535 100644
--- a/novelwriter/assets/icons/typicons_light/typ_pin-outline.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_pin-outline.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg5619"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata5625">
-    <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="defs5623" />
-  <path
-     style="stroke-width:1.17614;fill:#4271ae;fill-opacity:1"
-     id="path5617"
-     d="M 21.321794,7.3993841 16.619582,2.6712968 C 15.735124,1.7821341 14.193203,1.772725 13.291103,2.6642399 13.060579,2.8947636 12.879453,3.1770375 12.799476,3.4040327 12.031456,5.0059369 11.206981,6.0091853 10.148454,6.6113695 L 9.8932312,6.7348644 c -1.138504,0.5704284 -2.687482,1.1514421 -5.5502098,1.1514421 -0.3128535,0 -0.6127695,0.061159 -0.9009241,0.1787735 -0.5692523,0.2375805 -1.033828,0.6998039 -1.2725846,1.2749371 -0.2340521,0.569252 -0.2340521,1.2243629 0,1.7936149 0.1223186,0.292859 0.2940352,0.553963 0.5116213,0.765668 L 6.4859506,15.704116 1.9907392,22 l 6.294707,-4.495212 3.7954078,3.795408 c 0.218762,0.222291 0.477513,0.398712 0.771548,0.518678 C 13.142909,21.940017 13.444001,22 13.753326,22 c 0.309325,0 0.610418,-0.06116 0.899748,-0.181126 0.585719,-0.241109 1.038533,-0.696275 1.270233,-1.26788 0.121142,-0.284626 0.182302,-0.596304 0.182302,-0.903276 0,-2.86508 0.581013,-4.412882 1.150266,-5.552563 0.583366,-1.166732 1.610137,-2.055894 3.239092,-2.839204 0.318734,-0.122319 0.599832,-0.301092 0.836237,-0.537497 0.907981,-0.9197419 0.903276,-2.4122651 -0.0094,-3.3190699 z m -6.172388,5.6466539 c -0.96326,1.932399 -1.397256,3.963595 -1.405489,6.591094 L 4.3430214,10.238589 c 2.5157659,0 4.4858018,-0.3940079 6.3464576,-1.2749372 L 10.965872,8.840157 c 1.645421,-0.8221227 2.902716,-2.2264352 3.984766,-4.5093251 l 4.615178,4.7645472 c -2.191151,1.0502949 -3.594287,2.3052369 -4.41641,3.9506589 z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m21.322 7.3994-4.7022-4.7281c-0.88446-0.88916-2.4264-0.89857-3.3285-0.0070569-0.23052 0.23052-0.41165 0.5128-0.49163 0.73979-0.76802 1.6019-1.5925 2.6052-2.651 3.2073l-0.25522 0.12349c-1.1385 0.57043-2.6875 1.1514-5.5502 1.1514-0.31285 0-0.61277 0.061159-0.90092 0.17877-0.56925 0.23758-1.0338 0.6998-1.2726 1.2749-0.23405 0.56925-0.23405 1.2244 0 1.7936 0.12232 0.29286 0.29404 0.55396 0.51162 0.76567l3.8048 3.8048-4.4952 6.2959 6.2947-4.4952 3.7954 3.7954c0.21876 0.22229 0.47751 0.39871 0.77155 0.51868 0.29051 0.12114 0.5916 0.18113 0.90092 0.18113s0.61042-0.06116 0.89975-0.18113c0.58572-0.24111 1.0385-0.69628 1.2702-1.2679 0.12114-0.28463 0.1823-0.5963 0.1823-0.90328 0-2.8651 0.58101-4.4129 1.1503-5.5526 0.58337-1.1667 1.6101-2.0559 3.2391-2.8392 0.31873-0.12232 0.59983-0.30109 0.83624-0.5375 0.90798-0.91974 0.90328-2.4123-0.0094-3.3191zm-6.1724 5.6467c-0.96326 1.9324-1.3973 3.9636-1.4055 6.5911l-9.4009-9.3985c2.5158 0 4.4858-0.39401 6.3465-1.2749l0.27639-0.12349c1.6454-0.82212 2.9027-2.2264 3.9848-4.5093l4.6152 4.7645c-2.1912 1.0503-3.5943 2.3052-4.4164 3.9507z" fill="#4271ae" stroke-width="1.1761"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_pin.svg b/novelwriter/assets/icons/typicons_light/typ_pin.svg
index 372928f7..685a986c 100644
--- a/novelwriter/assets/icons/typicons_light/typ_pin.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_pin.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg4924"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata4930">
-    <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="defs4928" />
-  <path
-     style="stroke-width:1.24817;fill:#4271ae;fill-opacity:1"
-     id="path4922"
-     d="M 16.641616,2.36759 C 16.156078,1.879557 15.367237,1.8770607 14.876708,2.3626 14.7469,2.4924093 14.657031,2.6459337 14.595871,2.8056991 13.557396,4.9725159 12.414076,6.1944709 10.971195,6.915911 9.3523243,7.7147375 7.4938043,8.270172 4.4982051,8.270172 c -0.1622616,0 -0.3245233,0.0312 -0.4767996,0.09486 -0.3058008,0.127313 -0.547945,0.370705 -0.675258,0.675258 -0.1260648,0.304552 -0.1260648,0.649046 0,0.953599 0.063657,0.153524 0.1547727,0.292071 0.2708521,0.406902 L 7.6648033,14.448593 2.0018723,22 l 7.551407,-5.662931 4.0465547,4.046555 c 0.114831,0.117328 0.253378,0.207196 0.406902,0.270852 0.152277,0.06366 0.314538,0.09736 0.4768,0.09736 0.162261,0 0.324524,-0.0337 0.476799,-0.09736 0.305801,-0.127313 0.549193,-0.36821 0.675259,-0.675259 0.06366,-0.151027 0.09611,-0.314537 0.09611,-0.475551 0,-2.995598 0.554186,-4.854118 1.351763,-6.448027 0.720193,-1.44288 1.942148,-2.586201 4.110213,-3.624676 0.161013,-0.06115 0.31329,-0.151028 0.441851,-0.280836 0.485536,-0.49053 0.48304,-1.2793713 -0.005,-1.7649081 z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m16.642 2.3676c-0.48554-0.48803-1.2744-0.49053-1.7649-0.00499-0.12981 0.12981-0.21968 0.28333-0.28084 0.4431-1.0385 2.1668-2.1818 3.3888-3.6247 4.1102-1.6189 0.79883-3.4774 1.3543-6.473 1.3543-0.16226 0-0.32452 0.0312-0.4768 0.09486-0.3058 0.12731-0.54794 0.3707-0.67526 0.67526-0.12606 0.30455-0.12606 0.64905 0 0.9536 0.063657 0.15352 0.15477 0.29207 0.27085 0.4069l4.0478 4.0478-5.6629 7.5514 7.5514-5.6629 4.0466 4.0466c0.11483 0.11733 0.25338 0.2072 0.4069 0.27085 0.15228 0.06366 0.31454 0.09736 0.4768 0.09736 0.16226 0 0.32452-0.0337 0.4768-0.09736 0.3058-0.12731 0.54919-0.36821 0.67526-0.67526 0.06366-0.15103 0.09611-0.31454 0.09611-0.47555 0-2.9956 0.55419-4.8541 1.3518-6.448 0.72019-1.4429 1.9421-2.5862 4.1102-3.6247 0.16101-0.06115 0.31329-0.15103 0.44185-0.28084 0.48554-0.49053 0.48304-1.2794-5e-3 -1.7649z" fill="#4271ae" stroke-width="1.2482"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_plus.svg b/novelwriter/assets/icons/typicons_light/typ_plus.svg
index 2f657d8a..2a9491bd 100644
--- a/novelwriter/assets/icons/typicons_light/typ_plus.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_plus.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg5808"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata5814">
-    <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="defs5812" />
-  <path
-     style="stroke-width:1.25;fill:#718c00;fill-opacity:1"
-     id="path5806"
-     d="m 19.5,9.5 h -5 v -5 C 14.5,3.12 13.38,2 12,2 10.62,2 9.5,3.12 9.5,4.5 l 0.08875,5 H 4.5 C 3.12,9.5 2,10.62 2,12 c 0,1.38 1.12,2.5 2.5,2.5 L 9.58875,14.41125 9.5,19.5 c 0,1.38 1.12,2.5 2.5,2.5 1.38,0 2.5,-1.12 2.5,-2.5 V 14.41125 L 19.5,14.5 C 20.88,14.5 22,13.38 22,12 22,10.62 20.88,9.5 19.5,9.5 Z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m19.5 9.5h-5v-5c0-1.38-1.12-2.5-2.5-2.5s-2.5 1.12-2.5 2.5l0.08875 5h-5.0888c-1.38 0-2.5 1.12-2.5 2.5s1.12 2.5 2.5 2.5l5.0888-0.08875-0.08875 5.0888c0 1.38 1.12 2.5 2.5 2.5s2.5-1.12 2.5-2.5v-5.0888l5 0.08875c1.38 0 2.5-1.12 2.5-2.5s-1.12-2.5-2.5-2.5z" fill="#718c00" stroke-width="1.25"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_puzzle-outline.svg b/novelwriter/assets/icons/typicons_light/typ_puzzle-outline.svg
index e2792d41..362eb304 100644
--- a/novelwriter/assets/icons/typicons_light/typ_puzzle-outline.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_puzzle-outline.svg
@@ -1,31 +1,4 @@
-<?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="svg11920">
-  <metadata
-     id="metadata11926">
-    <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="defs11924" />
-  <path
-     d="M 22.461538,10.769231 V 8.615385 C 22.461538,6.24 20.52923,4.3076923 18.153846,4.3076923 H 17.219692 C 17.046153,1.8683077 14.816,0 12,0 9.1839995,0 6.9538461,1.8683077 6.7803077,4.3076923 H 5.8461538 C 3.4707692,4.3076923 1.5384615,6.24 1.5384615,8.615385 v 2.153846 c 0,1.245538 0.6326154,2.273231 1.5938462,2.764307 C 2.6916923,13.764923 2.3101538,14.110769 2.032,14.548923 1.7095384,15.058462 1.5384615,15.666462 1.5384615,16.307692 v 3.384616 C 1.5384615,22.067692 3.4707692,24 5.8461538,24 H 9.2307695 C 10.432,24 11.484308,23.388308 11.990154,22.401231 l 0.04431,0.08123 C 12.569847,23.432615 13.592616,24 14.76923,24 h 3.384616 c 2.375384,0 4.307692,-1.932308 4.307692,-4.307692 v -3.384616 c 0,-1.246769 -0.633845,-2.275692 -1.596308,-2.765538 0.955077,-0.505846 1.596308,-1.545846 1.596308,-2.772923 z m -2.461539,8.923077 c 0,1.015384 -0.830769,1.846154 -1.846153,1.846154 H 14.76923 c -0.438154,0 -0.891077,-0.265847 -0.481231,-0.94277 0.30277,-0.344615 0.481231,-0.761846 0.481231,-1.211077 0,-1.190153 -1.239384,-2.153846 -2.769231,-2.153846 -1.529846,0 -2.7692295,0.963693 -2.7692295,2.153846 0,0.369231 0.116923,0.708923 0.313846,1.012923 0.6239995,0.828308 0.167384,1.140924 -0.313846,1.140924 H 5.8461538 C 4.8307692,21.538462 4,20.707692 4,19.692308 v -3.384616 c 0,-0.317538 0.1390769,-0.64123 0.4726153,-0.64123 0.128,0 0.2818462,0.048 0.4701539,0.16 0.3446154,0.302769 0.7630769,0.48123 1.2110769,0.48123 1.1889231,0 2.1538462,-1.240615 2.1538462,-2.76923 0,-1.528616 -0.9649231,-2.769231 -2.1538462,-2.769231 -0.3692308,0 -0.7089231,0.116923 -1.0116923,0.313846 C 4.8504615,11.293538 4.6227692,11.382154 4.4504615,11.382154 4.1304615,11.382154 4,11.080615 4,10.769231 V 8.615385 C 4,7.6 4.8307692,6.7692308 5.8461538,6.7692308 h 3.3846157 c 0.48123,0 0.9378465,-0.3126154 0.299077,-1.1409231 -0.182154,-0.304 -0.299077,-0.6436923 -0.299077,-1.0129231 0,-1.1901538 1.2393835,-2.1538461 2.7692305,-2.1538461 1.529847,0 2.76923,0.9636923 2.76923,2.1538461 0,0.4492308 -0.17846,0.8664616 -0.48123,1.2110769 -0.409846,0.6769231 0.04308,0.9427693 0.48123,0.9427693 h 3.384616 C 19.16923,6.7692308 20,7.6 20,8.615385 v 2.153846 c 0,0.317538 -0.139076,0.641231 -0.472616,0.641231 -0.128,0 -0.281846,-0.048 -0.470154,-0.16 -0.344615,-0.30277 -0.763077,-0.481231 -1.211077,-0.481231 -1.188923,0 -2.153846,1.240615 -2.153846,2.769231 0,1.528615 0.964923,2.76923 2.153846,2.76923 0.369231,0 0.708923,-0.116923 1.011693,-0.313846 0.291693,-0.210461 0.519384,-0.300308 0.691692,-0.299077 0.318769,0 0.449232,0.301539 0.449232,0.612923 v 3.384616 z M 4,12.546462 c 0.1427692,0.03938 0.2904615,0.06646 0.4492307,0.06646 0.4209231,0 0.8406154,-0.146461 1.2775385,-0.448 l 0.084923,-0.05046 C 5.9310769,12.036923 6.0430769,12 6.1538461,12 c 0.4356923,0 0.9230769,0.658462 0.9230769,1.538462 0,0.88 -0.4873846,1.538461 -0.9230769,1.538461 -0.1329231,0 -0.2670769,-0.05908 -0.3987692,-0.174769 l -0.176,-0.128 C 5.2086153,14.548923 4.8356923,14.435692 4.4726153,14.435692 4.3076923,14.435692 4.1513846,14.464002 4,14.508312 Z M 19.550769,14.464 c -0.420922,0 -0.840616,0.146462 -1.277539,0.448 l -0.08492,0.05046 c -0.119384,0.07754 -0.231383,0.114461 -0.340923,0.114461 -0.435692,0 -0.923077,-0.658461 -0.923077,-1.538461 0,-0.88 0.487385,-1.538462 0.923077,-1.538462 0.132924,0 0.267077,0.05908 0.39877,0.174769 l 0.175999,0.128 c 0.371693,0.225231 0.743385,0.338462 1.106462,0.338462 0.167384,0 0.322461,-0.03077 0.472616,-0.07631 v 1.965539 c -0.144,-0.03938 -0.291693,-0.06646 -0.450462,-0.06646 z m -8.54523,7.074462 C 11.129847,21.112615 11.12,20.534154 10.630154,19.820308 l -0.05415,-0.09108 c -0.07631,-0.120616 -0.115692,-0.232616 -0.115692,-0.343385 0,-0.435692 0.657231,-0.923077 1.538462,-0.923077 0.88123,0 1.538461,0.487385 1.538461,0.923077 0,0.132923 -0.05908,0.267077 -0.176,0.4 l -0.128,0.174769 c -0.4,0.660923 -0.382769,1.204923 -0.270769,1.580308 h -1.956923 z"
-     id="path11918"
-     style="stroke-width:1.23077;fill:#000000;fill-opacity:0.72156864" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m22.462 10.769v-2.1538c0-2.3754-1.9323-4.3077-4.3077-4.3077h-0.93415c-0.17354-2.4394-2.4037-4.3077-5.2197-4.3077-2.816 0-5.0462 1.8683-5.2197 4.3077h-0.93415c-2.3754 0-4.3077 1.9323-4.3077 4.3077v2.1538c0 1.2455 0.63262 2.2732 1.5938 2.7643-0.44062 0.23138-0.82215 0.57723-1.1003 1.0154-0.32246 0.50954-0.49354 1.1175-0.49354 1.7588v3.3846c0 2.3754 1.9323 4.3077 4.3077 4.3077h3.3846c1.2012 0 2.2535-0.61169 2.7594-1.5988l0.04431 0.08123c0.53538 0.95015 1.5582 1.5175 2.7348 1.5175h3.3846c2.3754 0 4.3077-1.9323 4.3077-4.3077v-3.3846c0-1.2468-0.63384-2.2757-1.5963-2.7655 0.95508-0.50585 1.5963-1.5458 1.5963-2.7729zm-2.4615 8.9231c0 1.0154-0.83077 1.8462-1.8462 1.8462h-3.3846c-0.43815 0-0.89108-0.26585-0.48123-0.94277 0.30277-0.34462 0.48123-0.76185 0.48123-1.2111 0-1.1902-1.2394-2.1538-2.7692-2.1538-1.5298 0-2.7692 0.96369-2.7692 2.1538 0 0.36923 0.11692 0.70892 0.31385 1.0129 0.624 0.82831 0.16738 1.1409-0.31385 1.1409h-3.3846c-1.0154 0-1.8462-0.83077-1.8462-1.8462v-3.3846c0-0.31754 0.13908-0.64123 0.47262-0.64123 0.128 0 0.28185 0.048 0.47015 0.16 0.34462 0.30277 0.76308 0.48123 1.2111 0.48123 1.1889 0 2.1538-1.2406 2.1538-2.7692 0-1.5286-0.96492-2.7692-2.1538-2.7692-0.36923 0-0.70892 0.11692-1.0117 0.31385-0.29169 0.21046-0.51938 0.29908-0.69169 0.29908-0.32 0-0.45046-0.30154-0.45046-0.61292v-2.1538c0-1.0154 0.83077-1.8462 1.8462-1.8462h3.3846c0.48123 0 0.93785-0.31262 0.29908-1.1409-0.18215-0.304-0.29908-0.64369-0.29908-1.0129 0-1.1902 1.2394-2.1538 2.7692-2.1538s2.7692 0.96369 2.7692 2.1538c0 0.44923-0.17846 0.86646-0.48123 1.2111-0.40985 0.67692 0.04308 0.94277 0.48123 0.94277h3.3846c1.0154 0 1.8462 0.83077 1.8462 1.8462v2.1538c0 0.31754-0.13908 0.64123-0.47262 0.64123-0.128 0-0.28185-0.048-0.47015-0.16-0.34462-0.30277-0.76308-0.48123-1.2111-0.48123-1.1889 0-2.1538 1.2406-2.1538 2.7692 0 1.5286 0.96492 2.7692 2.1538 2.7692 0.36923 0 0.70892-0.11692 1.0117-0.31385 0.29169-0.21046 0.51938-0.30031 0.69169-0.29908 0.31877 0 0.44923 0.30154 0.44923 0.61292v3.3846zm-16-7.1458c0.14277 0.03938 0.29046 0.06646 0.44923 0.06646 0.42092 0 0.84062-0.14646 1.2775-0.448l0.084923-0.05046c0.11938-0.077539 0.23138-0.11446 0.34215-0.11446 0.43569 0 0.92308 0.65846 0.92308 1.5385s-0.48738 1.5385-0.92308 1.5385c-0.13292 0-0.26708-0.05908-0.39877-0.17477l-0.176-0.128c-0.37046-0.22523-0.74338-0.33846-1.1065-0.33846-0.16492 0-0.32123 0.02831-0.47262 0.07262zm15.551 1.9175c-0.42092 0-0.84062 0.14646-1.2775 0.448l-0.08492 0.05046c-0.11938 0.07754-0.23138 0.11446-0.34092 0.11446-0.43569 0-0.92308-0.65846-0.92308-1.5385s0.48738-1.5385 0.92308-1.5385c0.13292 0 0.26708 0.05908 0.39877 0.17477l0.176 0.128c0.37169 0.22523 0.74338 0.33846 1.1065 0.33846 0.16738 0 0.32246-0.03077 0.47262-0.07631v1.9655c-0.144-0.03938-0.29169-0.06646-0.45046-0.06646zm-8.5452 7.0745c0.12431-0.42585 0.11446-1.0043-0.37538-1.7182l-0.05415-0.09108c-0.07631-0.12062-0.11569-0.23262-0.11569-0.34338 0-0.43569 0.65723-0.92308 1.5385-0.92308 0.88123 0 1.5385 0.48738 1.5385 0.92308 0 0.13292-0.05908 0.26708-0.176 0.4l-0.128 0.17477c-0.4 0.66092-0.38277 1.2049-0.27077 1.5803h-1.9569z" fill-opacity=".72157" stroke-width="1.2308"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_puzzle.svg b/novelwriter/assets/icons/typicons_light/typ_puzzle.svg
index de7af22d..7958538a 100644
--- a/novelwriter/assets/icons/typicons_light/typ_puzzle.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_puzzle.svg
@@ -1,31 +1,4 @@
-<?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="svg6422">
-  <metadata
-     id="metadata6428">
-    <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="defs6426" />
-  <path
-     d="m 18.129032,10.709677 c 0.469677,0 0.908387,0.187097 1.269677,0.504517 0.708388,0.428387 0.988388,-0.04387 0.988388,-0.504517 V 8.451613 c 0,-1.0645162 -0.870968,-1.935484 -1.935484,-1.935484 h -3.548387 c -0.459355,0 -0.934194,-0.2787096 -0.504517,-0.9883871 0.31742,-0.3612903 0.504517,-0.7987096 0.504517,-1.2696774 C 14.903226,3.0103226 13.603871,2 12,2 10.396129,2 9.096774,3.0103226 9.096774,4.2580645 9.096774,4.6451613 9.219355,5.0012903 9.425806,5.32 10.08,6.1883871 9.60129,6.516129 9.096774,6.516129 H 5.5483869 c -1.0645162,0 -1.9354839,0.8709678 -1.9354839,1.935484 v 2.258064 c 0,0.504517 0.3277419,0.983226 1.1974194,0.314839 0.3174193,-0.192258 0.6735483,-0.314839 1.0606451,-0.314839 1.2464516,0 2.2580645,1.300646 2.2580645,2.903226 0,1.602581 -1.0116129,2.903226 -2.2580645,2.903226 -0.4696774,0 -0.9083871,-0.187097 -1.2696774,-0.504516 C 3.892903,15.583226 3.612903,16.055484 3.612903,16.516129 v 3.548387 C 3.612903,21.129032 4.4838707,22 5.5483869,22 H 9.096774 C 9.60129,22 10.08,21.672258 9.410322,20.803871 9.219355,20.485161 9.096774,20.129032 9.096774,19.741935 c 0,-1.247741 1.299355,-2.258064 2.903226,-2.258064 1.603871,0 2.903226,1.010323 2.903226,2.258064 0,0.470968 -0.187097,0.908388 -0.504517,1.269678 C 13.969032,21.72129 14.443871,22 14.903226,22 h 3.548387 c 1.064516,0 1.935484,-0.870968 1.935484,-1.935484 v -3.548387 c 0,-0.504516 -0.327742,-0.983226 -1.19742,-0.314839 -0.317419,0.192258 -0.673548,0.314839 -1.060645,0.314839 -1.246452,0 -2.258064,-1.300645 -2.258064,-2.903226 0,-1.60258 1.011612,-2.903226 2.258064,-2.903226 z"
-     id="path6420"
-     style="stroke-width:1.29032;fill:#4271ae;fill-opacity:1" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m18.129 10.71c0.46968 0 0.90839 0.1871 1.2697 0.50452 0.70839 0.42839 0.98839-0.04387 0.98839-0.50452v-2.2581c0-1.0645-0.87097-1.9355-1.9355-1.9355h-3.5484c-0.45936 0-0.93419-0.27871-0.50452-0.98839 0.31742-0.36129 0.50452-0.79871 0.50452-1.2697 0-1.2477-1.2994-2.2581-2.9032-2.2581s-2.9032 1.0103-2.9032 2.2581c0 0.3871 0.12258 0.74323 0.32903 1.0619 0.65419 0.86839 0.17548 1.1961-0.32903 1.1961h-3.5484c-1.0645 0-1.9355 0.87097-1.9355 1.9355v2.2581c0 0.50452 0.32774 0.98323 1.1974 0.31484 0.31742-0.19226 0.67355-0.31484 1.0606-0.31484 1.2465 0 2.2581 1.3006 2.2581 2.9032 0 1.6026-1.0116 2.9032-2.2581 2.9032-0.46968 0-0.90839-0.1871-1.2697-0.50452-0.70839-0.42839-0.98839 0.043871-0.98839 0.50452v3.5484c0 1.0645 0.87097 1.9355 1.9355 1.9355h3.5484c0.50452 0 0.98323-0.32774 0.31355-1.1961-0.19097-0.31871-0.31355-0.67484-0.31355-1.0619 0-1.2477 1.2994-2.2581 2.9032-2.2581s2.9032 1.0103 2.9032 2.2581c0 0.47097-0.1871 0.90839-0.50452 1.2697-0.42968 0.70968 0.045162 0.98839 0.50452 0.98839h3.5484c1.0645 0 1.9355-0.87097 1.9355-1.9355v-3.5484c0-0.50452-0.32774-0.98323-1.1974-0.31484-0.31742 0.19226-0.67355 0.31484-1.0606 0.31484-1.2465 0-2.2581-1.3006-2.2581-2.9032 0-1.6026 1.0116-2.9032 2.2581-2.9032z" fill="#4271ae" stroke-width="1.2903"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_refresh.svg b/novelwriter/assets/icons/typicons_light/typ_refresh.svg
index 66f335e4..5020f2a0 100644
--- a/novelwriter/assets/icons/typicons_light/typ_refresh.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_refresh.svg
@@ -1,31 +1,4 @@
-<?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="svg6649">
-  <metadata
-     id="metadata6655">
-    <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="defs6653" />
-  <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"
-     style="fill:#718c00;fill-opacity:1;stroke-width:1.33321" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m13.163 12.256h6.8373v-6.8347c-0.010667-1.5131-0.89467-1.877-1.964-0.80652l-1.5387 1.5437c-1.3533-1.0598-3.0093-1.6397-4.7547-1.6397-2.0667 0-4.012 0.80518-5.472 2.2676-1.4653 1.4557-2.2707 3.4034-2.2707 5.4696 0 2.0703 0.80533 4.0153 2.268 5.475 1.4627 1.4624 3.4067 2.2689 5.4747 2.2689 2.0667 0 4.012-0.80652 5.4747-2.2702 0.39467-0.39593 0.744-0.82784 1.04-1.2864 0.46267-0.7212 0.25333-1.6797-0.46667-2.1396-0.71867-0.46125-1.6773-0.25195-2.1387 0.46658-0.17733 0.27595-0.38933 0.53323-0.624 0.77319-0.87867 0.87717-2.0453 1.3597-3.2853 1.3597s-2.4067-0.48124-3.2853-1.3597c-0.876-0.87717-1.36-2.0436-1.36-3.2861 0-1.2398 0.48267-2.4062 1.36-3.2807 0.87867-0.87717 2.0453-1.3611 3.2853-1.3611 0.91733 0 1.7947 0.26795 2.5453 0.76252l-1.9307 1.9343c-1.0707 1.0691-0.70667 1.9436 0.80533 1.9436z" fill="#718c00" stroke-width="1.3332"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_search.svg b/novelwriter/assets/icons/typicons_light/typ_search.svg
index b7f05553..5d1c701d 100644
--- a/novelwriter/assets/icons/typicons_light/typ_search.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_search.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg873"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata879">
-    <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="defs877" />
-  <path
-     style="fill:#4271ae;fill-opacity:1;stroke-width:1.19012"
-     id="path871"
-     d="M 19.769714,14.460577 19.131808,13.821482 18.240407,12.92889 C 18.510564,12.110086 18.66171,11.238917 18.66171,10.330854 18.66171,5.7381732 14.923537,2 10.330856,2 5.7381752,2 2.000002,5.7381732 2.000002,10.330854 c 0,4.592681 3.7381732,8.330854 8.330854,8.330854 0.908063,0 1.780422,-0.151146 2.599226,-0.421303 l 0.892591,0.891401 1.799465,1.797084 0.07259,0.0726 0.07617,0.06545 C 16.486163,21.669146 17.375184,22 18.274916,22 c 2.054151,0 3.725082,-1.670931 3.725082,-3.726271 0,-0.999704 -0.390359,-1.937519 -1.099672,-2.639692 z M 4.3790558,10.330854 c 0,-3.2811664 2.6694437,-5.9506101 5.9506102,-5.9506101 3.281166,0 5.95061,2.6694437 5.95061,5.9506101 0,3.281166 -2.669444,5.95061 -5.95061,5.95061 -3.2811665,0 -5.9506102,-2.669444 -5.9506102,-5.95061 z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m19.77 14.461-0.63791-0.6391-0.8914-0.89259c0.27016-0.8188 0.4213-1.69 0.4213-2.598 0-4.5927-3.7382-8.3309-8.3309-8.3309-4.5927 0-8.3309 3.7382-8.3309 8.3309 0 4.5927 3.7382 8.3309 8.3309 8.3309 0.90806 0 1.7804-0.15115 2.5992-0.4213l0.89259 0.8914 1.7995 1.7971 0.07259 0.0726 0.07617 0.06545c0.71526 0.60221 1.6043 0.93306 2.504 0.93306 2.0542 0 3.7251-1.6709 3.7251-3.7263 0-0.9997-0.39036-1.9375-1.0997-2.6397zm-15.391-4.1297c0-3.2812 2.6694-5.9506 5.9506-5.9506 3.2812 0 5.9506 2.6694 5.9506 5.9506 0 3.2812-2.6694 5.9506-5.9506 5.9506-3.2812 0-5.9506-2.6694-5.9506-5.9506z" fill="#4271ae" stroke-width="1.1901"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_star.svg b/novelwriter/assets/icons/typicons_light/typ_star.svg
index a0f57d94..234444c3 100644
--- a/novelwriter/assets/icons/typicons_light/typ_star.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_star.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg15078"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata15084">
-    <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="defs15082" />
-  <path
-     style="stroke-width:1.1975;fill:#eab700;fill-opacity:1"
-     id="path15076"
-     d="M 8.841853,8.5972702 2.5334293,9.2966093 C 2.3059045,9.3241573 2.1047248,9.4762337 2.0292822,9.707351 c -0.075443,0.2311182 0,0.471814 0.1676499,0.623897 1.8752833,1.711226 4.6929984,4.273874 4.6929984,4.273874 -0.00239,0 -0.7735843,3.727814 -1.286114,6.215019 -0.043109,0.22513 0.03832,0.463432 0.2347098,0.605935 0.1951924,0.142502 0.4466673,0.144896 0.6442545,0.03354 2.2081879,-1.25498 5.5156792,-3.142238 5.5156792,-3.142238 l 5.513285,3.143435 c 0.20118,0.11017 0.452654,0.107776 0.647846,-0.03473 0.196391,-0.142502 0.277821,-0.380804 0.233513,-0.604736 l -1.282521,-6.21622 4.692998,-4.270281 c 0.16765,-0.156871 0.241895,-0.3975692 0.16765,-0.6274893 C 21.896992,9.4774375 21.695807,9.3253552 21.468282,9.2990102 18.943955,9.0164002 15.158659,8.5972759 15.158659,8.5972759 L 12.54452,2.8133502 c -0.0982,-0.2071674 -0.304165,-0.3520647 -0.54606,-0.3520647 -0.241895,0 -0.449062,0.1460949 -0.542467,0.3520647 z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m8.8419 8.5973-6.3084 0.69934c-0.22752 0.027548-0.4287 0.17962-0.50415 0.41074-0.075443 0.23112 0 0.47181 0.16765 0.6239 1.8753 1.7112 4.693 4.2739 4.693 4.2739-0.00239 0-0.77358 3.7278-1.2861 6.215-0.043109 0.22513 0.03832 0.46343 0.23471 0.60594 0.19519 0.1425 0.44667 0.1449 0.64425 0.03354 2.2082-1.255 5.5157-3.1422 5.5157-3.1422l5.5133 3.1434c0.20118 0.11017 0.45265 0.10778 0.64785-0.03473 0.19639-0.1425 0.27782-0.3808 0.23351-0.60474l-1.2825-6.2162 4.693-4.2703c0.16765-0.15687 0.2419-0.39757 0.16765-0.62749-0.074239-0.22992-0.27542-0.382-0.50295-0.40835-2.5243-0.28261-6.3096-0.70173-6.3096-0.70173l-2.6141-5.7839c-0.0982-0.20717-0.30416-0.35206-0.54606-0.35206s-0.44906 0.14609-0.54247 0.35206z" fill="#eab700" stroke-width="1.1975"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_stopwatch-grey.svg b/novelwriter/assets/icons/typicons_light/typ_stopwatch-grey.svg
index 37262250..dcf3f49e 100644
--- a/novelwriter/assets/icons/typicons_light/typ_stopwatch-grey.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_stopwatch-grey.svg
@@ -1,36 +1,4 @@
-<?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="svg7030">
-  <metadata
-     id="metadata7036">
-    <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="defs7034" />
-  <g
-     id="g7028"
-     transform="matrix(1.1428571,0,0,1.1428571,-1.7142852,-2.2857137)"
-     style="fill:#000000;fill-opacity:0.77999997">
-    <path
-       d="M 19.414,8.902 C 19.518,8.854 19.62,8.794 19.707,8.707 l 0.5,-0.5 c 0.391,-0.391 0.391,-1.023 0,-1.414 -0.391,-0.391 -1.023,-0.391 -1.414,0 l -0.5,0.5 -0.115,0.173 C 16.791,6.154 14.99,5.276 12.989,5.056 L 13,5 V 4 h 1 C 14.55,4 15,3.55 15,3 15,2.45 14.55,2 14,2 H 10 C 9.45,2 9,2.45 9,3 9,3.55 9.45,4 10,4 h 1 v 1 l 0.012,0.057 C 6.506,5.549 3,9.364 3,14 c 0,4.971 4.029,9 9,9 4.971,0 9,-4.029 9,-9 0,-1.894 -0.588,-3.648 -1.586,-5.098 z M 12,21 C 8.141,21 5,17.86 5,14 5,10.14 8.141,7 12,7 c 3.859,0 7,3.14 7,7 0,3.86 -3.141,7 -7,7 z m 1,-8 v -2 c 0,-0.55 -0.45,-1 -1,-1 -0.55,0 -1,0.45 -1,1 v 3 c 0,0.55 0.45,1 1,1 h 3 c 0.55,0 1,-0.45 1,-1 0,-0.55 -0.45,-1 -1,-1 z M 12,8 c -3.312,0 -6,2.688 -6,6 0,3.312 2.688,6 6,6 3.312,0 6,-2.688 6,-6 0,-3.312 -2.688,-6 -6,-6 z m 0,11 C 9.243,19 7,16.757 7,14 7,11.243 9.243,9 12,9 c 2.757,0 5,2.243 5,5 0,2.757 -2.243,5 -5,5 z"
-       id="path7026"
-       style="fill:#000000;fill-opacity:0.77999997" />
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m20.473 7.888c0.11886-0.054857 0.23543-0.12343 0.33486-0.22286l0.57143-0.57143c0.44686-0.44686 0.44686-1.1691 0-1.616-0.44686-0.44686-1.1691-0.44686-1.616 0l-0.57143 0.57143-0.13143 0.19771c-1.5851-1.4994-3.6434-2.5029-5.9303-2.7543l0.01257-0.064v-1.1429h1.1429c0.62857 0 1.1429-0.51429 1.1429-1.1429 3e-6 -0.62857-0.51428-1.1429-1.1429-1.1429h-4.5714c-0.62857 0-1.1429 0.51429-1.1429 1.1429 0 0.62857 0.51429 1.1429 1.1429 1.1429h1.1429v1.1429l0.01371 0.065143c-5.1497 0.56229-9.1566 4.9223-9.1566 10.221 0 5.6811 4.6046 10.286 10.286 10.286 5.6811 0 10.286-4.6046 10.286-10.286 0-2.1646-0.672-4.1691-1.8126-5.8263zm-8.4731 13.826c-4.4103 0-8-3.5886-8-8 0-4.4114 3.5897-8 8-8 4.4103 0 8 3.5886 8 8 0 4.4114-3.5897 8-8 8zm1.1429-9.1429v-2.2857c0-0.62857-0.51428-1.1429-1.1429-1.1429-0.62857 0-1.1429 0.51429-1.1429 1.1429v3.4286c0 0.62857 0.51429 1.1429 1.1429 1.1429h3.4286c0.62857 0 1.1429-0.51429 1.1429-1.1429 0-0.62857-0.51429-1.1429-1.1429-1.1429zm-1.1429-5.7143c-3.7851 0-6.8571 3.072-6.8571 6.8571s3.072 6.8571 6.8571 6.8571c3.7851 0 6.8571-3.072 6.8571-6.8571s-3.072-6.8571-6.8571-6.8571zm0 12.571c-3.1509 0-5.7143-2.5634-5.7143-5.7143s2.5634-5.7143 5.7143-5.7143c3.1509 0 5.7143 2.5634 5.7143 5.7143s-2.5634 5.7143-5.7143 5.7143z" fill-opacity=".78" stroke-width="1.1429"/>
 </svg>
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 eae674b8..234af0ec 100644
--- a/novelwriter/assets/icons/typicons_light/typ_th-list-grey.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_th-list-grey.svg
@@ -1,54 +1,4 @@
-<?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="svg5291">
-  <metadata
-     id="metadata5297">
-    <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="defs5295" />
-  <g
-     id="g5303"
-     transform="matrix(1.1578947,0,0,1.1578947,-1.6052627,-1.8947364)"
-     style="fill:#000000;fill-opacity:0.72">
-    <path
-       d="m 19,17 h -7 c -1.103,0 -2,0.897 -2,2 0,1.103 0.897,2 2,2 h 7 c 1.103,0 2,-0.897 2,-2 0,-1.103 -0.897,-2 -2,-2 z m 0,-7 h -7 c -1.103,0 -2,0.897 -2,2 0,1.103 0.897,2 2,2 h 7 c 1.103,0 2,-0.897 2,-2 0,-1.103 -0.897,-2 -2,-2 z m 0,-7 h -7 c -1.103,0 -2,0.897 -2,2 0,1.103 0.897,2 2,2 h 7 C 20.103,7 21,6.103 21,5 21,3.897 20.103,3 19,3 Z"
-       id="path5283"
-       style="fill:#000000;fill-opacity:0.72" />
-    <circle
-       cx="5"
-       cy="19"
-       r="2.5"
-       id="circle5285"
-       style="fill:#000000;fill-opacity:0.72" />
-    <circle
-       cx="5"
-       cy="12"
-       r="2.5"
-       id="circle5287"
-       style="fill:#000000;fill-opacity:0.72" />
-    <circle
-       cx="5"
-       cy="5"
-       r="2.5"
-       id="circle5289"
-       style="fill:#000000;fill-opacity:0.72" />
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path transform="matrix(1.1579 0 0 1.1579 -1.6053 -1.8947)" d="m7.5 5a2.5 2.5 0 0 1-2.5 2.5 2.5 2.5 0 0 1-2.5-2.5 2.5 2.5 0 0 1 2.5-2.5 2.5 2.5 0 0 1 2.5 2.5zm0 7a2.5 2.5 0 0 1-2.5 2.5 2.5 2.5 0 0 1-2.5-2.5 2.5 2.5 0 0 1 2.5-2.5 2.5 2.5 0 0 1 2.5 2.5zm0 7a2.5 2.5 0 0 1-2.5 2.5 2.5 2.5 0 0 1-2.5-2.5 2.5 2.5 0 0 1 2.5-2.5 2.5 2.5 0 0 1 2.5 2.5zm11.5-2h-7c-1.103 0-2 0.897-2 2s0.897 2 2 2h7c1.103 0 2-0.897 2-2s-0.897-2-2-2zm0-7h-7c-1.103 0-2 0.897-2 2s0.897 2 2 2h7c1.103 0 2-0.897 2-2s-0.897-2-2-2zm0-7h-7c-1.103 0-2 0.897-2 2s0.897 2 2 2h7c1.103 0 2-0.897 2-2s-0.897-2-2-2z" fill-opacity=".78039"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_th-menu.svg b/novelwriter/assets/icons/typicons_light/typ_th-menu.svg
index cfc8a1d9..c23c08ca 100644
--- a/novelwriter/assets/icons/typicons_light/typ_th-menu.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_th-menu.svg
@@ -1,16 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.2"
-   width="24"
-   height="24"
-   viewBox="0 0 24 24"
-   id="svg4455"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs4459" />
-  <path
-     d="M19 17h-14c-1.103 0-2 .897-2 2s.897 2 2 2h14c1.103 0 2-.897 2-2s-.897-2-2-2zM19 10h-14c-1.103 0-2 .897-2 2s.897 2 2 2h14c1.103 0 2-.897 2-2s-.897-2-2-2zM19 3h-14c-1.103 0-2 .897-2 2s.897 2 2 2h14c1.103 0 2-.897 2-2s-.897-2-2-2z"
-     id="path4453"
-     style="fill:#4271ae;fill-opacity:1" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="M19 17h-14c-1.103 0-2 .897-2 2s.897 2 2 2h14c1.103 0 2-.897 2-2s-.897-2-2-2zM19 10h-14c-1.103 0-2 .897-2 2s.897 2 2 2h14c1.103 0 2-.897 2-2s-.897-2-2-2zM19 3h-14c-1.103 0-2 .897-2 2s.897 2 2 2h14c1.103 0 2-.897 2-2s-.897-2-2-2z" fill="#4271ae"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_times.svg b/novelwriter/assets/icons/typicons_light/typ_times.svg
index 4966dbdf..a1cbf8f5 100644
--- a/novelwriter/assets/icons/typicons_light/typ_times.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_times.svg
@@ -1,31 +1,4 @@
-<?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"
-   id="svg8936"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata8942">
-    <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="defs8940" />
-  <path
-     style="fill:#c82829;fill-opacity:1;stroke-width:1.30056"
-     id="path8934"
-     d="m 19.0412,4.9586375 c -1.014432,-1.0157327 -2.663535,-1.0157327 -3.677967,0 L 12.000001,8.3218703 8.6367669,4.9586375 c -1.0144323,-1.0157327 -2.663535,-1.0157327 -3.6779673,0 -1.0157327,1.0157328 -1.0157327,2.6622343 0,3.6779673 L 8.3207319,11.999838 4.9587996,15.36307 c -1.0157327,1.015733 -1.0157327,2.662235 0,3.677968 0.5072161,0.508516 1.1730998,0.762124 1.8389836,0.762124 0.6658835,0 1.3317669,-0.253608 1.8389837,-0.762124 l 3.3632341,-3.363233 3.363232,3.363233 c 0.507216,0.508516 1.173099,0.762124 1.838984,0.762124 0.665882,0 1.331765,-0.253608 1.838983,-0.762124 1.015733,-1.015733 1.015733,-2.662235 0,-3.677968 L 15.679268,11.999838 19.0412,8.6366048 c 1.015733,-1.015733 1.015733,-2.6622345 0,-3.6779673 z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m19.041 4.9586c-1.0144-1.0157-2.6635-1.0157-3.678 0l-3.3632 3.3632-3.3632-3.3632c-1.0144-1.0157-2.6635-1.0157-3.678 0-1.0157 1.0157-1.0157 2.6622 0 3.678l3.3619 3.3632-3.3619 3.3632c-1.0157 1.0157-1.0157 2.6622 0 3.678 0.50722 0.50852 1.1731 0.76212 1.839 0.76212 0.66588 0 1.3318-0.25361 1.839-0.76212l3.3632-3.3632 3.3632 3.3632c0.50722 0.50852 1.1731 0.76212 1.839 0.76212 0.66588 0 1.3318-0.25361 1.839-0.76212 1.0157-1.0157 1.0157-2.6622 0-3.678l-3.3619-3.3632 3.3619-3.3632c1.0157-1.0157 1.0157-2.6622 0-3.678z" fill="#c82829" stroke-width="1.3006"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_trash.svg b/novelwriter/assets/icons/typicons_light/typ_trash.svg
index b2f1d3c1..6073aaef 100644
--- a/novelwriter/assets/icons/typicons_light/typ_trash.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_trash.svg
@@ -1,35 +1,5 @@
-<?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"
-   id="svg10159"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata10165">
-    <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="defs10163" />
-  <path
-     id="rect18880"
-     d="M 6.7050781 7.8828125 L 6.7050781 17.294922 C 6.7050781 18.593745 7.7597702 19.646484 9.0585938 19.646484 L 14.941406 19.646484 C 16.240229 19.646484 17.294922 18.593745 17.294922 17.294922 L 17.294922 7.8828125 L 6.7050781 7.8828125 z M 8.4707031 9.6464844 C 8.7942326 9.6464844 9.0585938 9.910846 9.0585938 10.234375 L 9.0585938 17.294922 C 9.0585938 17.618451 8.7942326 17.882812 8.4707031 17.882812 C 8.1471737 17.882813 7.8828125 17.618451 7.8828125 17.294922 L 7.8828125 10.234375 C 7.8828125 9.910846 8.1471737 9.6464844 8.4707031 9.6464844 z M 10.824219 9.6464844 C 11.147748 9.6464844 11.412109 9.910846 11.412109 10.234375 L 11.412109 17.294922 C 11.412109 17.618451 11.147748 17.882812 10.824219 17.882812 C 10.500689 17.882813 10.234375 17.618451 10.234375 17.294922 L 10.234375 10.234375 C 10.234375 9.910846 10.500689 9.6464844 10.824219 9.6464844 z M 13.175781 9.6464844 C 13.49931 9.6464844 13.765625 9.910846 13.765625 10.234375 L 13.765625 17.294922 C 13.765625 17.618451 13.49931 17.882812 13.175781 17.882812 C 12.852252 17.882813 12.587891 17.618451 12.587891 17.294922 L 12.587891 10.234375 C 12.587891 9.910846 12.852252 9.6464844 13.175781 9.6464844 z M 15.529297 9.6464844 C 15.852827 9.6464844 16.117188 9.910846 16.117188 10.234375 L 16.117188 17.294922 C 16.117187 17.618451 15.852827 17.882812 15.529297 17.882812 C 15.205768 17.882813 14.941406 17.618451 14.941406 17.294922 L 14.941406 10.234375 C 14.941406 9.910846 15.205768 9.6464844 15.529297 9.6464844 z "
-     style="opacity:0.95;fill:#e5e5e5;fill-opacity:1;stroke:none;stroke-width:1.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <path
-     style="display:inline;fill:#333333;fill-opacity:1;stroke-width:1.17647004"
-     id="path10157"
-     d="M 19.647058,5.5294118 H 18.470589 V 4.3529412 C 18.470589,3.0541176 17.41647,2 16.117646,2 H 7.8823529 C 6.5835293,2 5.5294117,3.0541176 5.5294117,4.3529412 V 5.5294118 H 4.3529411 c -0.6494118,0 -1.1764706,0.5270588 -1.1764706,1.1764706 0,0.6494117 0.5270588,1.1764705 1.1764706,1.1764705 V 17.294118 C 4.3529411,19.889412 6.4635293,22 9.0588234,22 h 5.8823536 c 2.595293,0 4.705881,-2.110588 4.705881,-4.705882 V 7.8823529 c 0.649413,0 1.176471,-0.5270588 1.176471,-1.1764705 0,-0.6494118 -0.527059,-1.1764706 -1.176471,-1.1764706 z M 7.8823529,4.3529412 H 16.117646 V 5.5294118 H 7.8823529 Z M 17.294118,17.294118 c 0,1.298823 -1.054118,2.352941 -2.352941,2.352941 H 9.0588234 c -1.2988235,0 -2.3529411,-1.054118 -2.3529411,-2.352941 V 7.8823529 H 17.294118 Z M 8.4705881,9.647059 c -0.3235294,0 -0.5882352,0.264706 -0.5882352,0.588235 v 7.058824 c 0,0.323529 0.2647058,0.588235 0.5882352,0.588235 0.3235295,0 0.5882353,-0.264706 0.5882353,-0.588235 v -7.058824 c 0,-0.323529 -0.2647058,-0.588235 -0.5882353,-0.588235 z m 2.3529419,0 c -0.32353,0 -0.588235,0.264706 -0.588235,0.588235 v 7.058824 c 0,0.323529 0.264705,0.588235 0.588235,0.588235 0.323529,0 0.588235,-0.264706 0.588235,-0.588235 v -7.058824 c 0,-0.323529 -0.264706,-0.588235 -0.588235,-0.588235 z m 2.352941,0 c -0.323529,0 -0.588235,0.264706 -0.588235,0.588235 v 7.058824 c 0,0.323529 0.264706,0.588235 0.588235,0.588235 0.323529,0 0.588235,-0.264706 0.588235,-0.588235 v -7.058824 c 0,-0.323529 -0.264706,-0.588235 -0.588235,-0.588235 z m 2.352941,0 c -0.323529,0 -0.588235,0.264706 -0.588235,0.588235 v 7.058824 c 0,0.323529 0.264706,0.588235 0.588235,0.588235 0.32353,0 0.588235,-0.264706 0.588235,-0.588235 v -7.058824 c 0,-0.323529 -0.264705,-0.588235 -0.588235,-0.588235 z" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m6.7051 7.8828v9.4121c0 1.2988 1.0547 2.3516 2.3535 2.3516h5.8828c1.2988 0 2.3535-1.0527 2.3535-2.3516v-9.4121h-10.59zm1.7656 1.7637c0.32353 0 0.58789 0.26436 0.58789 0.58789v7.0605c0 0.32353-0.26436 0.58789-0.58789 0.58789-0.32353 1e-6 -0.58789-0.26436-0.58789-0.58789v-7.0605c0-0.32353 0.26436-0.58789 0.58789-0.58789zm2.3535 0c0.32353 0 0.58789 0.26436 0.58789 0.58789v7.0605c0 0.32353-0.26436 0.58789-0.58789 0.58789-0.32353 1e-6 -0.58984-0.26436-0.58984-0.58789v-7.0605c0-0.32353 0.26631-0.58789 0.58984-0.58789zm2.3516 0c0.32353 0 0.58984 0.26436 0.58984 0.58789v7.0605c0 0.32353-0.26632 0.58789-0.58984 0.58789-0.32353 1e-6 -0.58789-0.26436-0.58789-0.58789v-7.0605c0-0.32353 0.26436-0.58789 0.58789-0.58789zm2.3535 0c0.32353 0 0.58789 0.26436 0.58789 0.58789v7.0605c-1e-6 0.32353-0.26436 0.58789-0.58789 0.58789-0.32353 1e-6 -0.58789-0.26436-0.58789-0.58789v-7.0605c0-0.32353 0.26436-0.58789 0.58789-0.58789z" fill="#e5e5e5" opacity=".95"/>
+ <path d="m19.647 5.5294h-1.1765v-1.1765c0-1.2988-1.0541-2.3529-2.3529-2.3529h-8.2353c-1.2988 0-2.3529 1.0541-2.3529 2.3529v1.1765h-1.1765c-0.64941 0-1.1765 0.52706-1.1765 1.1765 0 0.64941 0.52706 1.1765 1.1765 1.1765v9.4118c0 2.5953 2.1106 4.7059 4.7059 4.7059h5.8824c2.5953 0 4.7059-2.1106 4.7059-4.7059v-9.4118c0.64941 0 1.1765-0.52706 1.1765-1.1765 0-0.64941-0.52706-1.1765-1.1765-1.1765zm-11.765-1.1765h8.2353v1.1765h-8.2353zm9.4118 12.941c0 1.2988-1.0541 2.3529-2.3529 2.3529h-5.8824c-1.2988 0-2.3529-1.0541-2.3529-2.3529v-9.4118h10.588zm-8.8235-7.6471c-0.32353 0-0.58824 0.26471-0.58824 0.58824v7.0588c0 0.32353 0.26471 0.58824 0.58824 0.58824 0.32353 0 0.58824-0.26471 0.58824-0.58824v-7.0588c0-0.32353-0.26471-0.58824-0.58824-0.58824zm2.3529 0c-0.32353 0-0.58824 0.26471-0.58824 0.58824v7.0588c0 0.32353 0.2647 0.58824 0.58824 0.58824 0.32353 0 0.58824-0.26471 0.58824-0.58824v-7.0588c0-0.32353-0.26471-0.58824-0.58824-0.58824zm2.3529 0c-0.32353 0-0.58824 0.26471-0.58824 0.58824v7.0588c0 0.32353 0.26471 0.58824 0.58824 0.58824s0.58824-0.26471 0.58824-0.58824v-7.0588c0-0.32353-0.26471-0.58824-0.58824-0.58824zm2.3529 0c-0.32353 0-0.58824 0.26471-0.58824 0.58824v7.0588c0 0.32353 0.26471 0.58824 0.58824 0.58824 0.32353 0 0.58824-0.26471 0.58824-0.58824v-7.0588c0-0.32353-0.2647-0.58824-0.58824-0.58824z" fill="#333" stroke-width="1.1765"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_user.svg b/novelwriter/assets/icons/typicons_light/typ_user.svg
index 3a234b27..c85b1e1c 100644
--- a/novelwriter/assets/icons/typicons_light/typ_user.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_user.svg
@@ -1,35 +1,5 @@
-<?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"
-   id="svg10763"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata10769">
-    <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="defs10767" />
-  <path
-     style="display:inline;fill:#718c00;fill-opacity:1;stroke-width:1.17647004"
-     id="path10761"
-     d="m 4.9411765,19.647059 c 0,1.17647 2.6470588,2.352941 7.0588245,2.352941 4.138822,0 7.058822,-1.176471 7.058822,-2.352941 0,-2.352941 -2.769412,-4.705883 -7.058823,-4.705883 -4.4117647,0 -7.0588235,2.352942 -7.0588235,4.705883 z" />
-  <path
-     d="M 17.882352,7.8823529 C 17.882352,6.2576471 17.223529,4.7870588 16.16,3.7235294 15.095295,2.6588235 13.624706,2 12.000001,2 10.375295,2 8.9047059,2.6588235 7.84,3.7235294 6.7764706,4.7870588 6.1176471,6.2576471 6.1176471,7.8823529 c 0,1.6247061 0.6588235,3.0952941 1.7223529,4.1588231 1.0647059,1.064706 2.535295,1.72353 4.160001,1.72353 1.624705,0 3.095294,-0.658824 4.16,-1.72353 1.063529,-1.063529 1.722352,-2.534117 1.722351,-4.1588231 z"
-     id="path17511"
-     style="display:inline;fill:#a26941;fill-opacity:1;stroke-width:1.17647004" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m4.9412 19.647c0 1.1765 2.6471 2.3529 7.0588 2.3529 4.1388 0 7.0588-1.1765 7.0588-2.3529 0-2.3529-2.7694-4.7059-7.0588-4.7059-4.4118 0-7.0588 2.3529-7.0588 4.7059z" fill="#718c00" stroke-width="1.1765"/>
+ <path d="m17.882 7.8824c0-1.6247-0.65882-3.0953-1.7224-4.1588-1.0647-1.0647-2.5353-1.7235-4.16-1.7235-1.6247 0-3.0953 0.65882-4.16 1.7235-1.0635 1.0635-1.7224 2.5341-1.7224 4.1588 0 1.6247 0.65882 3.0953 1.7224 4.1588 1.0647 1.0647 2.5353 1.7235 4.16 1.7235 1.6247 0 3.0953-0.65882 4.16-1.7235 1.0635-1.0635 1.7224-2.5341 1.7224-4.1588z" fill="#a26941" stroke-width="1.1765"/>
 </svg>