diff --git a/nw/assets/icons/typicons_colour_dark/calendar.svg b/nw/assets/icons/typicons_colour_dark/calendar.svg
new file mode 100644
index 00000000..c55dbb89
--- /dev/null
+++ b/nw/assets/icons/typicons_colour_dark/calendar.svg
@@ -0,0 +1,55 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="calendar.svg"
+   id="svg1738"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24"
+   version="1.2">
+  <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" />
+  <sodipodi:namedview
+     inkscape:current-layer="svg1738"
+     inkscape:window-maximized="1"
+     inkscape:window-y="1"
+     inkscape:window-x="2560"
+     inkscape:cy="13.97449"
+     inkscape:cx="12.120186"
+     inkscape:zoom="34.117902"
+     showgrid="false"
+     id="namedview1740"
+     inkscape:window-height="1370"
+     inkscape:window-width="2560"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <path
+     style="stroke-width:1.11111;fill:#6699cc;fill-opacity:1"
+     id="path1736"
+     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" />
+</svg>
diff --git a/nw/assets/icons/typicons_colour_dark/icons.conf b/nw/assets/icons/typicons_colour_dark/icons.conf
index 76290410..b0e75498 100644
--- a/nw/assets/icons/typicons_colour_dark/icons.conf
+++ b/nw/assets/icons/typicons_colour_dark/icons.conf
@@ -21,7 +21,7 @@ cls_novel      = book.svg
 cls_plot       = puzzle.svg
 cls_character  = user.svg
 cls_world      = location.svg
-cls_timeline   = time.svg
+cls_timeline   = calendar.svg
 cls_object     = key.svg
 cls_entity     = flag.svg
 cls_custom     = star.svg
diff --git a/nw/assets/icons/typicons_colour_dark/time.svg b/nw/assets/icons/typicons_colour_dark/time.svg
deleted file mode 100644
index ac0587cb..00000000
--- a/nw/assets/icons/typicons_colour_dark/time.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?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"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
-   sodipodi:docname="time.svg"
-   id="svg8332"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata8338">
-    <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="defs8336" />
-  <sodipodi:namedview
-     inkscape:current-layer="svg8332"
-     inkscape:window-maximized="0"
-     inkscape:window-y="27"
-     inkscape:window-x="48"
-     inkscape:cy="12"
-     inkscape:cx="2.4262296"
-     inkscape:zoom="38.125"
-     showgrid="false"
-     id="namedview8334"
-     inkscape:window-height="1376"
-     inkscape:window-width="2374"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     inkscape:document-rotation="0" />
-  <path
-     style="display:inline;opacity:0.95;fill:#eaeaea;fill-opacity:1;stroke:none;stroke-width:1.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 12 4.2226562 C 7.7122222 4.2226563 4.2226562 7.7122222 4.2226562 12 C 4.2226563 16.287778 7.7122222 19.777344 12 19.777344 C 16.287778 19.777344 19.777344 16.287778 19.777344 12 C 19.777344 7.7122222 16.287778 4.2226562 12 4.2226562 z M 12 5.3339844 C 15.68 5.3339844 18.666016 8.317778 18.666016 12 C 18.666016 15.68 15.68 18.666016 12 18.666016 C 8.32 18.666016 5.3339844 15.68 5.3339844 12 C 5.3339844 8.317778 8.32 5.3339844 12 5.3339844 z M 12 6.4453125 C 8.9366667 6.4453125 6.4453125 8.936667 6.4453125 12 C 6.4453125 15.063333 8.9366667 17.554688 12 17.554688 C 15.063333 17.554687 17.554688 15.063333 17.554688 12 C 17.554687 8.936667 15.063333 6.4453125 12 6.4453125 z M 12 7.5546875 C 12.611111 7.5546875 13.111328 8.0549046 13.111328 8.6660156 L 13.111328 10.888672 L 15.333984 10.888672 C 15.945095 10.888672 16.445312 11.388889 16.445312 12 C 16.445313 12.611111 15.945095 13.111328 15.333984 13.111328 L 12 13.111328 C 11.847222 13.111328 11.701172 13.079861 11.568359 13.023438 C 11.169922 12.854167 10.888672 12.458333 10.888672 12 L 10.888672 8.6660156 C 10.888672 8.0549046 11.388889 7.5546875 12 7.5546875 z "
-     id="path20730"
-     inkscape:label="Face" />
-  <path
-     style="display:inline;fill:#cda66f;fill-opacity:1;stroke-width:1.11110997"
-     inkscape:connector-curvature="0"
-     id="path8330"
-     d="m 16.444444,12 c 0,-0.611111 -0.5,-1.111111 -1.111111,-1.111111 H 12 c -0.611111,0 -1.111111,0.5 -1.111111,1.111111 0,0.611111 0.5,1.111111 1.111111,1.111111 h 3.333333 c 0.611111,0 1.111111,-0.5 1.111111,-1.111111 z M 12,4.2222222 c 4.287778,0 7.777778,3.49 7.777778,7.7777778 0,4.287778 -3.49,7.777778 -7.777778,7.777778 -4.2877778,0 -7.7777778,-3.49 -7.7777778,-7.777778 0,-4.2877778 3.49,-7.7777778 7.7777778,-7.7777778 M 12,2 C 6.4766667,2 2,6.4766667 2,12 2,17.523333 6.4766667,22 12,22 17.523333,22 22,17.523333 22,12 22,6.4766667 17.523333,2 12,2 Z m 1.111111,6.666667 c 0,-0.611111 -0.5,-1.1111114 -1.111111,-1.1111114 -0.611111,0 -1.111111,0.5000004 -1.111111,1.1111114 V 12 c 0,0.611111 0.5,1.111111 1.111111,1.111111 0.611111,0 1.111111,-0.5 1.111111,-1.111111 z M 12,6.4444444 c 3.063333,0 5.555556,2.4922226 5.555556,5.5555556 0,3.063333 -2.492223,5.555556 -5.555556,5.555556 C 8.9366667,17.555556 6.4444444,15.063333 6.4444444,12 6.4444444,8.936667 8.9366667,6.4444444 12,6.4444444 M 12,5.3333333 C 8.32,5.3333333 5.3333333,8.317778 5.3333333,12 5.3333333,15.68 8.32,18.666667 12,18.666667 15.68,18.666667 18.666667,15.68 18.666667,12 18.666667,8.317778 15.68,5.3333333 12,5.3333333 Z"
-     inkscape:label="Outline" />
-</svg>
diff --git a/nw/assets/icons/typicons_colour_light/calendar.svg b/nw/assets/icons/typicons_colour_light/calendar.svg
new file mode 100644
index 00000000..bdaf6b28
--- /dev/null
+++ b/nw/assets/icons/typicons_colour_light/calendar.svg
@@ -0,0 +1,55 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="calendar.svg"
+   id="svg1738"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24"
+   version="1.2">
+  <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" />
+  <sodipodi:namedview
+     inkscape:current-layer="svg1738"
+     inkscape:window-maximized="1"
+     inkscape:window-y="1"
+     inkscape:window-x="2560"
+     inkscape:cy="13.97449"
+     inkscape:cx="12.120186"
+     inkscape:zoom="34.117902"
+     showgrid="false"
+     id="namedview1740"
+     inkscape:window-height="1370"
+     inkscape:window-width="2560"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <path
+     style="stroke-width:1.11111;fill:#4271ae;fill-opacity:1"
+     id="path1736"
+     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" />
+</svg>
diff --git a/nw/assets/icons/typicons_colour_light/icons.conf b/nw/assets/icons/typicons_colour_light/icons.conf
index 08042fc9..70477f64 100644
--- a/nw/assets/icons/typicons_colour_light/icons.conf
+++ b/nw/assets/icons/typicons_colour_light/icons.conf
@@ -21,7 +21,7 @@ cls_novel      = book.svg
 cls_plot       = puzzle.svg
 cls_character  = user.svg
 cls_world      = location.svg
-cls_timeline   = time.svg
+cls_timeline   = calendar.svg
 cls_object     = key.svg
 cls_entity     = flag.svg
 cls_custom     = star.svg
diff --git a/nw/assets/icons/typicons_colour_light/time.svg b/nw/assets/icons/typicons_colour_light/time.svg
deleted file mode 100644
index 0ded9527..00000000
--- a/nw/assets/icons/typicons_colour_light/time.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?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"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.2"
-   width="24"
-   height="24"
-   viewBox="0 0 24 24"
-   id="svg8332"
-   sodipodi:docname="time.svg"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
-  <metadata
-     id="metadata8338">
-    <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="defs8336" />
-  <sodipodi:namedview
-     inkscape:document-rotation="0"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1370"
-     id="namedview8334"
-     showgrid="false"
-     inkscape:zoom="38.125"
-     inkscape:cx="12.314754"
-     inkscape:cy="12"
-     inkscape:window-x="2560"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg8332" />
-  <path
-     inkscape:label="Face"
-     id="path20730"
-     d="M 12 4.2226562 C 7.7122222 4.2226563 4.2226562 7.7122222 4.2226562 12 C 4.2226563 16.287778 7.7122222 19.777344 12 19.777344 C 16.287778 19.777344 19.777344 16.287778 19.777344 12 C 19.777344 7.7122222 16.287778 4.2226562 12 4.2226562 z M 12 5.3339844 C 15.68 5.3339844 18.666016 8.317778 18.666016 12 C 18.666016 15.68 15.68 18.666016 12 18.666016 C 8.32 18.666016 5.3339844 15.68 5.3339844 12 C 5.3339844 8.317778 8.32 5.3339844 12 5.3339844 z M 12 6.4453125 C 8.9366667 6.4453125 6.4453125 8.936667 6.4453125 12 C 6.4453125 15.063333 8.9366667 17.554688 12 17.554688 C 15.063333 17.554687 17.554688 15.063333 17.554688 12 C 17.554687 8.936667 15.063333 6.4453125 12 6.4453125 z M 12 7.5546875 C 12.611111 7.5546875 13.111328 8.0549046 13.111328 8.6660156 L 13.111328 10.888672 L 15.333984 10.888672 C 15.945095 10.888672 16.445312 11.388889 16.445312 12 C 16.445313 12.611111 15.945095 13.111328 15.333984 13.111328 L 12 13.111328 C 11.847222 13.111328 11.701172 13.079861 11.568359 13.023438 C 11.169922 12.854167 10.888672 12.458333 10.888672 12 L 10.888672 8.6660156 C 10.888672 8.0549046 11.388889 7.5546875 12 7.5546875 z "
-     style="display:inline;opacity:0.95;fill:#eaeaea;fill-opacity:1;stroke:none;stroke-width:1.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <path
-     inkscape:label="Outline"
-     d="m 16.444444,12 c 0,-0.611111 -0.5,-1.111111 -1.111111,-1.111111 H 12 c -0.611111,0 -1.111111,0.5 -1.111111,1.111111 0,0.611111 0.5,1.111111 1.111111,1.111111 h 3.333333 c 0.611111,0 1.111111,-0.5 1.111111,-1.111111 z M 12,4.2222222 c 4.287778,0 7.777778,3.49 7.777778,7.7777778 0,4.287778 -3.49,7.777778 -7.777778,7.777778 -4.2877778,0 -7.7777778,-3.49 -7.7777778,-7.777778 0,-4.2877778 3.49,-7.7777778 7.7777778,-7.7777778 M 12,2 C 6.4766667,2 2,6.4766667 2,12 2,17.523333 6.4766667,22 12,22 17.523333,22 22,17.523333 22,12 22,6.4766667 17.523333,2 12,2 Z m 1.111111,6.666667 c 0,-0.611111 -0.5,-1.1111114 -1.111111,-1.1111114 -0.611111,0 -1.111111,0.5000004 -1.111111,1.1111114 V 12 c 0,0.611111 0.5,1.111111 1.111111,1.111111 0.611111,0 1.111111,-0.5 1.111111,-1.111111 z M 12,6.4444444 c 3.063333,0 5.555556,2.4922226 5.555556,5.5555556 0,3.063333 -2.492223,5.555556 -5.555556,5.555556 C 8.9366667,17.555556 6.4444444,15.063333 6.4444444,12 6.4444444,8.936667 8.9366667,6.4444444 12,6.4444444 M 12,5.3333333 C 8.32,5.3333333 5.3333333,8.317778 5.3333333,12 5.3333333,15.68 8.32,18.666667 12,18.666667 15.68,18.666667 18.666667,15.68 18.666667,12 18.666667,8.317778 15.68,5.3333333 12,5.3333333 Z"
-     id="path8330"
-     inkscape:connector-curvature="0"
-     style="display:inline;fill:#a2694f;fill-opacity:1;stroke-width:1.11110997" />
-</svg>
diff --git a/nw/assets/icons/typicons_grey_dark/calendar.svg b/nw/assets/icons/typicons_grey_dark/calendar.svg
new file mode 100644
index 00000000..3bbfee8c
--- /dev/null
+++ b/nw/assets/icons/typicons_grey_dark/calendar.svg
@@ -0,0 +1,55 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="calendar.svg"
+   id="svg1738"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24"
+   version="1.2">
+  <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" />
+  <sodipodi:namedview
+     inkscape:current-layer="svg1738"
+     inkscape:window-maximized="1"
+     inkscape:window-y="1"
+     inkscape:window-x="2560"
+     inkscape:cy="13.97449"
+     inkscape:cx="12.120186"
+     inkscape:zoom="34.117902"
+     showgrid="false"
+     id="namedview1740"
+     inkscape:window-height="1370"
+     inkscape:window-width="2560"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <path
+     style="stroke-width:1.11111;fill:#aeaeae;fill-opacity:1"
+     id="path1736"
+     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" />
+</svg>
diff --git a/nw/assets/icons/typicons_grey_dark/icons.conf b/nw/assets/icons/typicons_grey_dark/icons.conf
index d81f4adf..d06201b1 100644
--- a/nw/assets/icons/typicons_grey_dark/icons.conf
+++ b/nw/assets/icons/typicons_grey_dark/icons.conf
@@ -21,7 +21,7 @@ cls_novel      = book.svg
 cls_plot       = puzzle.svg
 cls_character  = user.svg
 cls_world      = location.svg
-cls_timeline   = time.svg
+cls_timeline   = calendar.svg
 cls_object     = key.svg
 cls_entity     = flag.svg
 cls_custom     = star.svg
diff --git a/nw/assets/icons/typicons_grey_dark/time.svg b/nw/assets/icons/typicons_grey_dark/time.svg
deleted file mode 100644
index 12f47768..00000000
--- a/nw/assets/icons/typicons_grey_dark/time.svg
+++ /dev/null
@@ -1,56 +0,0 @@
-<?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"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.2"
-   width="24"
-   height="24"
-   viewBox="0 0 24 24"
-   id="svg8332"
-   sodipodi:docname="time.svg"
-   inkscape:version="1.0rc1 (09960d6f05, 2020-04-09)">
-  <metadata
-     id="metadata8338">
-    <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="defs8336" />
-  <sodipodi:namedview
-     inkscape:document-rotation="0"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1344"
-     id="namedview8334"
-     showgrid="false"
-     inkscape:zoom="38.125"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg8332" />
-  <path
-     d="m 16.444444,12 c 0,-0.611111 -0.5,-1.111111 -1.111111,-1.111111 H 12 c -0.611111,0 -1.111111,0.5 -1.111111,1.111111 0,0.611111 0.5,1.111111 1.111111,1.111111 h 3.333333 c 0.611111,0 1.111111,-0.5 1.111111,-1.111111 z M 12,4.2222222 c 4.287778,0 7.777778,3.49 7.777778,7.7777778 0,4.287778 -3.49,7.777778 -7.777778,7.777778 -4.2877778,0 -7.7777778,-3.49 -7.7777778,-7.777778 0,-4.2877778 3.49,-7.7777778 7.7777778,-7.7777778 M 12,2 C 6.4766667,2 2,6.4766667 2,12 2,17.523333 6.4766667,22 12,22 17.523333,22 22,17.523333 22,12 22,6.4766667 17.523333,2 12,2 Z m 1.111111,6.666667 c 0,-0.611111 -0.5,-1.1111114 -1.111111,-1.1111114 -0.611111,0 -1.111111,0.5000004 -1.111111,1.1111114 V 12 c 0,0.611111 0.5,1.111111 1.111111,1.111111 0.611111,0 1.111111,-0.5 1.111111,-1.111111 z M 12,6.4444444 c 3.063333,0 5.555556,2.4922226 5.555556,5.5555556 0,3.063333 -2.492223,5.555556 -5.555556,5.555556 C 8.9366667,17.555556 6.4444444,15.063333 6.4444444,12 6.4444444,8.936667 8.9366667,6.4444444 12,6.4444444 M 12,5.3333333 C 8.32,5.3333333 5.3333333,8.317778 5.3333333,12 5.3333333,15.68 8.32,18.666667 12,18.666667 15.68,18.666667 18.666667,15.68 18.666667,12 18.666667,8.317778 15.68,5.3333333 12,5.3333333 Z"
-     id="path8330"
-     inkscape:connector-curvature="0"
-     style="stroke-width:1.11111;fill:#aeaeae;fill-opacity:1" />
-</svg>
diff --git a/nw/assets/icons/typicons_grey_light/calendar.svg b/nw/assets/icons/typicons_grey_light/calendar.svg
new file mode 100644
index 00000000..600a386d
--- /dev/null
+++ b/nw/assets/icons/typicons_grey_light/calendar.svg
@@ -0,0 +1,55 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="calendar.svg"
+   id="svg1738"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24"
+   version="1.2">
+  <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" />
+  <sodipodi:namedview
+     inkscape:current-layer="svg1738"
+     inkscape:window-maximized="1"
+     inkscape:window-y="1"
+     inkscape:window-x="2560"
+     inkscape:cy="13.97449"
+     inkscape:cx="12.120186"
+     inkscape:zoom="34.117902"
+     showgrid="false"
+     id="namedview1740"
+     inkscape:window-height="1370"
+     inkscape:window-width="2560"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <path
+     style="stroke-width:1.11111;fill:#000000;fill-opacity:0.77999997"
+     id="path1736"
+     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" />
+</svg>
diff --git a/nw/assets/icons/typicons_grey_light/icons.conf b/nw/assets/icons/typicons_grey_light/icons.conf
index 2b26abc8..dd97c4c8 100644
--- a/nw/assets/icons/typicons_grey_light/icons.conf
+++ b/nw/assets/icons/typicons_grey_light/icons.conf
@@ -21,7 +21,7 @@ cls_novel      = book.svg
 cls_plot       = puzzle.svg
 cls_character  = user.svg
 cls_world      = location.svg
-cls_timeline   = time.svg
+cls_timeline   = calendar.svg
 cls_object     = key.svg
 cls_entity     = flag.svg
 cls_custom     = star.svg
diff --git a/nw/assets/icons/typicons_grey_light/time.svg b/nw/assets/icons/typicons_grey_light/time.svg
deleted file mode 100644
index 9e47aa48..00000000
--- a/nw/assets/icons/typicons_grey_light/time.svg
+++ /dev/null
@@ -1,55 +0,0 @@
-<?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"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0rc1 (09960d6f05, 2020-04-09)"
-   sodipodi:docname="time.svg"
-   id="svg8332"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24"
-   version="1.2">
-  <metadata
-     id="metadata8338">
-    <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="defs8336" />
-  <sodipodi:namedview
-     inkscape:current-layer="svg8332"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="0"
-     inkscape:cy="12"
-     inkscape:cx="12"
-     inkscape:zoom="38.125"
-     showgrid="false"
-     id="namedview8334"
-     inkscape:window-height="1344"
-     inkscape:window-width="2560"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
-     bordercolor="#666666"
-     pagecolor="#ffffff" />
-  <path
-     style="stroke-width:1.11111;fill:#000000;fill-opacity:0.77999997"
-     inkscape:connector-curvature="0"
-     id="path8330"
-     d="m 16.444444,12 c 0,-0.611111 -0.5,-1.111111 -1.111111,-1.111111 H 12 c -0.611111,0 -1.111111,0.5 -1.111111,1.111111 0,0.611111 0.5,1.111111 1.111111,1.111111 h 3.333333 c 0.611111,0 1.111111,-0.5 1.111111,-1.111111 z M 12,4.2222222 c 4.287778,0 7.777778,3.49 7.777778,7.7777778 0,4.287778 -3.49,7.777778 -7.777778,7.777778 -4.2877778,0 -7.7777778,-3.49 -7.7777778,-7.777778 0,-4.2877778 3.49,-7.7777778 7.7777778,-7.7777778 M 12,2 C 6.4766667,2 2,6.4766667 2,12 2,17.523333 6.4766667,22 12,22 17.523333,22 22,17.523333 22,12 22,6.4766667 17.523333,2 12,2 Z m 1.111111,6.666667 c 0,-0.611111 -0.5,-1.1111114 -1.111111,-1.1111114 -0.611111,0 -1.111111,0.5000004 -1.111111,1.1111114 V 12 c 0,0.611111 0.5,1.111111 1.111111,1.111111 0.611111,0 1.111111,-0.5 1.111111,-1.111111 z M 12,6.4444444 c 3.063333,0 5.555556,2.4922226 5.555556,5.5555556 0,3.063333 -2.492223,5.555556 -5.555556,5.555556 C 8.9366667,17.555556 6.4444444,15.063333 6.4444444,12 6.4444444,8.936667 8.9366667,6.4444444 12,6.4444444 M 12,5.3333333 C 8.32,5.3333333 5.3333333,8.317778 5.3333333,12 5.3333333,15.68 8.32,18.666667 12,18.666667 15.68,18.666667 18.666667,15.68 18.666667,12 18.666667,8.317778 15.68,5.3333333 12,5.3333333 Z" />
-</svg>
diff --git a/nw/assets/themes/gui/default/style.qss b/nw/assets/themes/gui/default/style.qss
deleted file mode 100644
index 90ef623f..00000000
--- a/nw/assets/themes/gui/default/style.qss
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Default Theme: Light
- */
-
-QTreeView, QHeaderView {
-    font-size: 13px;
-}
diff --git a/nw/assets/themes/gui/default_dark/README.md b/nw/assets/themes/gui/default_dark/README.md
deleted file mode 100644
index 36d11bcf..00000000
--- a/nw/assets/themes/gui/default_dark/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default Dark Theme
-
-## Icons
-
-The following icons are from the typicons.font package on [GitHub](https://github.com/stephenhutchings/typicons.font):
-
-* globe.svg
-* time.svg
diff --git a/nw/assets/themes/gui/default_dark/icons/add.png b/nw/assets/themes/gui/default_dark/icons/add.png
deleted file mode 100644
index 48632071..00000000
Binary files a/nw/assets/themes/gui/default_dark/icons/add.png and /dev/null differ
diff --git a/nw/assets/themes/gui/default_dark/icons/close.png b/nw/assets/themes/gui/default_dark/icons/close.png
deleted file mode 100644
index e3ff6ae0..00000000
Binary files a/nw/assets/themes/gui/default_dark/icons/close.png and /dev/null differ
diff --git a/nw/assets/themes/gui/default_dark/icons/document.png b/nw/assets/themes/gui/default_dark/icons/document.png
deleted file mode 100644
index 0d619034..00000000
Binary files a/nw/assets/themes/gui/default_dark/icons/document.png and /dev/null differ
diff --git a/nw/assets/themes/gui/default_dark/icons/folder.png b/nw/assets/themes/gui/default_dark/icons/folder.png
deleted file mode 100644
index e7e36709..00000000
Binary files a/nw/assets/themes/gui/default_dark/icons/folder.png and /dev/null differ
diff --git a/nw/assets/themes/gui/default_dark/icons/globe.svg b/nw/assets/themes/gui/default_dark/icons/globe.svg
deleted file mode 100644
index d56050b5..00000000
--- a/nw/assets/themes/gui/default_dark/icons/globe.svg
+++ /dev/null
@@ -1,56 +0,0 @@
-<?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"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.2"
-   width="20"
-   height="20"
-   viewBox="0 0 20 20"
-   id="svg856"
-   sodipodi:docname="globe.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
-  <metadata
-     id="metadata862">
-    <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="defs860" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1013"
-     id="namedview858"
-     showgrid="false"
-     inkscape:zoom="33.875"
-     inkscape:cx="12.118081"
-     inkscape:cy="12"
-     inkscape:window-x="1920"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg856" />
-  <path
-     d="m 8.932347,3.9995001 c 2.198072,0 3.985624,1.794056 3.985624,4.0001249 0,2.206069 -1.787552,4.000125 -3.985624,4.000125 -2.1960777,0 -3.9836298,-1.794056 -3.9836298,-4.000125 0,-2.2060689 1.7875521,-4.0001249 3.9836298,-4.0001249 m 0,-2.0000625 c -3.3020882,0 -5.9764414,2.6860839 -5.9764414,6.0001874 0,3.314104 2.6743532,6.000188 5.9764414,6.000188 3.300097,0 5.978436,-2.688084 5.978436,-6.000188 0,-3.3141035 -2.678339,-6.0001874 -5.978436,-6.0001874 z m 5.978436,16.0005004 h -3.985624 v -1.230039 c 1.635102,-0.371012 3.134693,-1.188037 4.347319,-2.406075 C 16.965371,12.664771 17.9,10.4037 17.9,8.000625 17.9,5.9335605 17.211483,3.9724992 15.939073,2.3814495 l 0.672574,-0.673021 c 0.389595,-0.3910122 0.389595,-1.023032 9.75e-4,-1.4150442 -0.390591,-0.3920123 -1.020319,-0.3900122 -1.409914,-0.001 l -2.044625,2.049064 0.705456,0.7080221 c 1.317248,1.3210413 2.043628,3.0800966 2.043628,4.9501546 0,1.870058 -0.72638,3.627113 -2.043628,4.949155 -1.317249,1.322041 -3.067934,2.051064 -4.931213,2.051064 -1.8632787,0 -3.6139637,-0.729023 -4.9312122,-2.051064 -0.3895946,-0.391013 -1.0193231,-0.391013 -1.4089178,0 -0.3895947,0.390012 -0.3895947,1.023032 0,1.414044 1.6928935,1.699053 3.9447707,2.637082 6.34013,2.637082 v 1.000032 H 4.9467244 c -0.5510125,0 -0.9964058,0.447013 -0.9964058,1.000031 C 3.9503186,19.552986 4.3957119,20 4.9467244,20 h 9.9640586 c 0.551012,0 0.996406,-0.447014 0.996406,-1.000031 0,-0.553018 -0.445394,-1.000031 -0.996406,-1.000031 z"
-     id="path854"
-     inkscape:connector-curvature="0"
-     style="stroke-width:0.99821687;fill:#aeaeae;fill-opacity:1" />
-</svg>
diff --git a/nw/assets/themes/gui/default_dark/icons/orphan.png b/nw/assets/themes/gui/default_dark/icons/orphan.png
deleted file mode 100644
index 1d2c1b26..00000000
Binary files a/nw/assets/themes/gui/default_dark/icons/orphan.png and /dev/null differ
diff --git a/nw/assets/themes/gui/default_dark/icons/remove.png b/nw/assets/themes/gui/default_dark/icons/remove.png
deleted file mode 100644
index 0b218f87..00000000
Binary files a/nw/assets/themes/gui/default_dark/icons/remove.png and /dev/null differ
diff --git a/nw/assets/themes/gui/default_dark/icons/replace.png b/nw/assets/themes/gui/default_dark/icons/replace.png
deleted file mode 100644
index 55155d97..00000000
Binary files a/nw/assets/themes/gui/default_dark/icons/replace.png and /dev/null differ
diff --git a/nw/assets/themes/gui/default_dark/icons/root.png b/nw/assets/themes/gui/default_dark/icons/root.png
deleted file mode 100644
index a927c6d1..00000000
Binary files a/nw/assets/themes/gui/default_dark/icons/root.png and /dev/null differ
diff --git a/nw/assets/themes/gui/default_dark/icons/save.png b/nw/assets/themes/gui/default_dark/icons/save.png
deleted file mode 100644
index 6b3c4496..00000000
Binary files a/nw/assets/themes/gui/default_dark/icons/save.png and /dev/null differ
diff --git a/nw/assets/themes/gui/default_dark/icons/search.png b/nw/assets/themes/gui/default_dark/icons/search.png
deleted file mode 100644
index 8cdb5347..00000000
Binary files a/nw/assets/themes/gui/default_dark/icons/search.png and /dev/null differ
diff --git a/nw/assets/themes/gui/default_dark/icons/time.svg b/nw/assets/themes/gui/default_dark/icons/time.svg
deleted file mode 100644
index bdb740c1..00000000
--- a/nw/assets/themes/gui/default_dark/icons/time.svg
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.2"
-   width="21"
-   height="21"
-   viewBox="0 0 21 21"
-   id="svg1039"
-   sodipodi:docname="time-dark.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
-  <metadata
-     id="metadata1045">
-    <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="defs1043" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1013"
-     id="namedview1041"
-     showgrid="false"
-     inkscape:zoom="27.812867"
-     inkscape:cx="6.903687"
-     inkscape:cy="11.89962"
-     inkscape:window-x="1920"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg1039" />
-  <g
-     id="g1037"
-     transform="translate(-1.5,-2)"
-     style="fill:#aeaeae;fill-opacity:1">
-    <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="path1035"
-       inkscape:connector-curvature="0"
-       style="fill:#aeaeae;fill-opacity:1" />
-  </g>
-</svg>
diff --git a/nw/assets/themes/gui/default_dark/icons/trash.png b/nw/assets/themes/gui/default_dark/icons/trash.png
deleted file mode 100644
index 96afbba0..00000000
Binary files a/nw/assets/themes/gui/default_dark/icons/trash.png and /dev/null differ
diff --git a/nw/assets/themes/gui/default_dark/styles.qss b/nw/assets/themes/gui/default_dark/styles.qss
index 6c847eb6..44f94ec6 100644
--- a/nw/assets/themes/gui/default_dark/styles.qss
+++ b/nw/assets/themes/gui/default_dark/styles.qss
@@ -1,7 +1,5 @@
 /**
  * Default Theme: Dark
+ * This theme doesn't use any custom styles, so the file is only here as
+ * an example. There doesn't have to be a styles.qss file in the folder.
  */
-
-QTreeView, QHeaderView {
-    font-size: 13px;
-}
diff --git a/nw/gui/outline.py b/nw/gui/outline.py
index 81cd805d..2d2716f8 100644
--- a/nw/gui/outline.py
+++ b/nw/gui/outline.py
@@ -351,8 +351,6 @@ class GuiOutline(QTreeWidget):
             headItem.setTextAlignment(self.colIndex[nwOutline.CCOUNT], Qt.AlignRight)
             headItem.setTextAlignment(self.colIndex[nwOutline.WCOUNT], Qt.AlignRight)
             headItem.setTextAlignment(self.colIndex[nwOutline.PCOUNT], Qt.AlignRight)
-            for hItem in self.treeOrder:
-                headItem.setFont(self.colIndex[hItem], self.theTheme.guiFont)
 
         currTitle   = None
         currChapter = None
@@ -446,9 +444,6 @@ class GuiOutline(QTreeWidget):
         newItem.setText(self.colIndex[nwOutline.ENTITY], ", ".join(theRefs[nwKeyWords.ENTITY_KEY]))
         newItem.setText(self.colIndex[nwOutline.CUSTOM], ", ".join(theRefs[nwKeyWords.CUSTOM_KEY]))
 
-        for i in self.treeOrder:
-            newItem.setFont(self.colIndex[i], self.theTheme.guiFont)
-
         return newItem
 
 # END Class GuiOutline
diff --git a/nw/gui/projload.py b/nw/gui/projload.py
index 45300332..06a32f72 100644
--- a/nw/gui/projload.py
+++ b/nw/gui/projload.py
@@ -94,9 +94,6 @@ class GuiProjectLoad(QDialog):
         treeHead = self.listBox.headerItem()
         treeHead.setTextAlignment(1, Qt.AlignRight)
         treeHead.setTextAlignment(2, Qt.AlignRight)
-        treeHead.setFont(0, self.theTheme.guiFont)
-        treeHead.setFont(1, self.theTheme.guiFont)
-        treeHead.setFont(2, self.theTheme.guiFont)
 
         self.lblRecent = QLabel("<b>Recently Opened Projects</b>")
         self.lblPath   = QLabel("<b>Path</b>")
@@ -262,9 +259,6 @@ class GuiProjectLoad(QDialog):
             newItem.setTextAlignment(0, Qt.AlignLeft  | Qt.AlignVCenter)
             newItem.setTextAlignment(1, Qt.AlignRight | Qt.AlignVCenter)
             newItem.setTextAlignment(2, Qt.AlignRight | Qt.AlignVCenter)
-            newItem.setFont(0, self.theTheme.guiFont)
-            newItem.setFont(1, self.theTheme.guiFont)
-            newItem.setFont(2, self.theTheme.guiFont)
             self.listBox.addTopLevelItem(newItem)
             if not hasSelection:
                 newItem.setSelected(True)
diff --git a/nw/gui/projsettings.py b/nw/gui/projsettings.py
index 2a4dc680..f7766ad5 100644
--- a/nw/gui/projsettings.py
+++ b/nw/gui/projsettings.py
@@ -461,14 +461,8 @@ class GuiProjectEditReplace(QWidget):
         self.listBox.itemSelectionChanged.connect(self._selectedItem)
         self.listBox.setIndentation(0)
 
-        treeHead = self.listBox.headerItem()
-        treeHead.setFont(0, self.theTheme.guiFont)
-        treeHead.setFont(1, self.theTheme.guiFont)
-
         for aKey, aVal in self.theProject.autoReplace.items():
             newItem = QTreeWidgetItem(["<%s>" % aKey, aVal])
-            newItem.setFont(0, self.theTheme.guiFont)
-            newItem.setFont(1, self.theTheme.guiFont)
             self.listBox.addTopLevelItem(newItem)
 
         self.listBox.sortByColumn(0, Qt.AscendingOrder)
@@ -559,8 +553,6 @@ class GuiProjectEditReplace(QWidget):
         saveKey = "<keyword%d>" % (self.listBox.topLevelItemCount() + 1)
         newVal  = ""
         newItem = QTreeWidgetItem([saveKey, newVal])
-        newItem.setFont(0, self.theTheme.guiFont)
-        newItem.setFont(1, self.theTheme.guiFont)
         self.listBox.addTopLevelItem(newItem)
         return True
 
diff --git a/nw/gui/projtree.py b/nw/gui/projtree.py
index 66ba4639..7a3c98fb 100644
--- a/nw/gui/projtree.py
+++ b/nw/gui/projtree.py
@@ -83,14 +83,6 @@ class GuiProjectTree(QTreeWidget):
         treeHeadItem.setToolTip(self.C_EXPORT, "Include in build")
         treeHeadItem.setToolTip(self.C_FLAGS, "Status, class, and layout flags")
 
-        # Force the font to fix font sizing issues on some platforms
-        # like Ubuntu. This must also be set when the rows are added.
-        self.setFont(self.theTheme.guiFont)
-        treeHeadItem.setFont(self.C_NAME, self.theTheme.guiFont)
-        treeHeadItem.setFont(self.C_COUNT,self.theTheme.guiFont)
-        treeHeadItem.setFont(self.C_EXPORT, self.theTheme.guiFont)
-        treeHeadItem.setFont(self.C_FLAGS, self.theTheme.guiFont)
-
         # Let the last column stretch, and set the minimum size to the
         # size of the icon as the default Qt font metrics approach fails
         # for some fonts like the Ubuntu font.
@@ -699,10 +691,6 @@ class GuiProjectTree(QTreeWidget):
         newItem.setTextAlignment(self.C_EXPORT, Qt.AlignLeft  | Qt.AlignVCenter)
         newItem.setTextAlignment(self.C_FLAGS,  Qt.AlignLeft  | Qt.AlignVCenter)
 
-        newItem.setFont(self.C_NAME,  self.theTheme.guiFont)
-        newItem.setFont(self.C_COUNT, self.theTheme.guiFont)
-        newItem.setFont(self.C_FLAGS, self.theTheme.guiFont)
-
         newItem.setData(self.C_NAME, Qt.UserRole, tHandle)
 
         self.theMap[tHandle] = newItem
diff --git a/nw/guimain.py b/nw/guimain.py
index 549e25b5..80478624 100644
--- a/nw/guimain.py
+++ b/nw/guimain.py
@@ -197,9 +197,11 @@ class GuiMain(QMainWindow):
 
         # Shortcuts and Actions
         self._connectMenuActions()
+
         keyReturn = QShortcut(self.treeView)
         keyReturn.setKey(QKeySequence(Qt.Key_Return))
         keyReturn.activated.connect(self._treeKeyPressReturn)
+
         keyEscape = QShortcut(self)
         keyEscape.setKey(QKeySequence(Qt.Key_Escape))
         keyEscape.activated.connect(self._keyPressEscape)
@@ -1021,6 +1023,9 @@ class GuiMain(QMainWindow):
     ##
 
     def _treeSingleClick(self):
+        """Single click on a project tree item just updates the details
+        panel below the tree.
+        """
         sHandle = self.treeView.getSelectedHandle()
         if sHandle is not None:
             self.treeMeta.updateViewBox(sHandle)
@@ -1036,7 +1041,7 @@ class GuiMain(QMainWindow):
         if nwItem is not None:
             if nwItem.itemType == nwItemType.FILE:
                 logger.verbose("Requested item %s is a file" % tHandle)
-                self.openDocument(tHandle)
+                self.openDocument(tHandle, changeFocus=False)
             else:
                 logger.verbose("Requested item %s is a folder" % tHandle)
         return