diff --git a/nw/assets/icons/typicons_colour_dark/document-text.svg b/nw/assets/icons/typicons_colour_dark/document-text.svg
index d0975bad..1fb9b11a 100644
--- a/nw/assets/icons/typicons_colour_dark/document-text.svg
+++ b/nw/assets/icons/typicons_colour_dark/document-text.svg
@@ -5,11 +5,11 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   version="1.2"
-   width="24"
-   height="24"
+   id="svg2161"
    viewBox="0 0 24 24"
-   id="svg2161">
+   height="24"
+   width="24"
+   version="1.2">
   <metadata
      id="metadata2167">
     <rdf:RDF>
@@ -25,11 +25,11 @@
   <defs
      id="defs2165" />
   <path
-     id="rect12986"
+     style="opacity:0.95;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.71486783;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
      d="m 6.4444442,4.2222221 c -0.6122222,0 -1.1111111,0.4988889 -1.1111111,1.1111111 V 18.666667 c 0,0.612222 0.4988889,1.111111 1.1111111,1.111111 H 17.555555 c 0.612223,0 1.111112,-0.498889 1.111112,-1.111111 V 5.3333332 c 0,-0.6122222 -0.498889,-1.1111111 -1.111112,-1.1111111 z M 7.5555553,6.4444443 H 16.444444 C 16.751111,6.4444443 17,6.6933332 17,6.9999999 17,7.3066666 16.751111,7.5555555 16.444444,7.5555555 H 7.5555553 c -0.3066666,0 -0.5555555,-0.2488889 -0.5555555,-0.5555556 0,-0.3066667 0.2488889,-0.5555556 0.5555555,-0.5555556 z m 0,3.3333334 H 16.444444 C 16.751111,9.7777777 17,10.026667 17,10.333333 17,10.64 16.751111,10.888889 16.444444,10.888889 H 7.5555553 c -0.3066666,0 -0.5555555,-0.248889 -0.5555555,-0.555556 0,-0.306666 0.2488889,-0.5555553 0.5555555,-0.5555553 z m 0,3.3333333 H 16.444444 C 16.751111,13.111111 17,13.36 17,13.666667 c 0,0.306666 -0.248889,0.555555 -0.555556,0.555555 H 7.5555553 c -0.3066666,0 -0.5555555,-0.248889 -0.5555555,-0.555555 0,-0.306667 0.2488889,-0.555556 0.5555555,-0.555556 z m 0,3.333333 H 16.444444 C 16.751111,16.444444 17,16.693333 17,17 c 0,0.306667 -0.248889,0.555556 -0.555556,0.555556 H 7.5555553 c -0.3066666,0 -0.5555555,-0.248889 -0.5555555,-0.555556 0,-0.306667 0.2488889,-0.555556 0.5555555,-0.555556 z"
-     style="opacity:0.95;fill:#ededed;fill-opacity:1;stroke:none;stroke-width:1.71486783;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+     id="rect12986" />
   <path
-     d="M 17.555555,22 H 6.4444443 C 4.6066666,22 3.111111,20.504444 3.111111,18.666667 V 5.3333333 C 3.111111,3.4955556 4.6066666,2 6.4444443,2 H 17.555555 c 1.837778,0 3.333334,1.4955556 3.333334,3.3333333 V 18.666667 C 20.888889,20.504444 19.393333,22 17.555555,22 Z M 6.4444443,4.2222222 c -0.6122222,0 -1.1111111,0.4988889 -1.1111111,1.1111111 V 18.666667 c 0,0.612222 0.4988889,1.111111 1.1111111,1.111111 H 17.555555 c 0.612223,0 1.111112,-0.498889 1.111112,-1.111111 V 5.3333333 c 0,-0.6122222 -0.498889,-1.1111111 -1.111112,-1.1111111 z M 16.444444,10.888889 H 7.5555554 c -0.3066666,0 -0.5555555,-0.248889 -0.5555555,-0.555556 0,-0.306666 0.2488889,-0.5555552 0.5555555,-0.5555552 H 16.444444 C 16.751111,9.7777778 17,10.026667 17,10.333333 17,10.64 16.751111,10.888889 16.444444,10.888889 Z m 0,-3.3333334 H 7.5555554 C 7.2488888,7.5555556 6.9999999,7.3066667 6.9999999,7 c 0,-0.3066667 0.2488889,-0.5555556 0.5555555,-0.5555556 H 16.444444 C 16.751111,6.4444444 17,6.6933333 17,7 17,7.3066667 16.751111,7.5555556 16.444444,7.5555556 Z m 0,6.6666664 H 7.5555554 c -0.3066666,0 -0.5555555,-0.248889 -0.5555555,-0.555555 0,-0.306667 0.2488889,-0.555556 0.5555555,-0.555556 H 16.444444 C 16.751111,13.111111 17,13.36 17,13.666667 c 0,0.306666 -0.248889,0.555555 -0.555556,0.555555 z m 0,3.333334 H 7.5555554 c -0.3066666,0 -0.5555555,-0.248889 -0.5555555,-0.555556 0,-0.306667 0.2488889,-0.555556 0.5555555,-0.555556 H 16.444444 C 16.751111,16.444444 17,16.693333 17,17 c 0,0.306667 -0.248889,0.555556 -0.555556,0.555556 z"
+     style="display:inline;fill:#aeaeae;fill-opacity:1;stroke-width:1.11111116"
      id="path2157"
-     style="display:inline;fill:#363636;fill-opacity:1;stroke-width:1.11111116" />
+     d="M 17.555555,22 H 6.4444443 C 4.6066666,22 3.111111,20.504444 3.111111,18.666667 V 5.3333333 C 3.111111,3.4955556 4.6066666,2 6.4444443,2 H 17.555555 c 1.837778,0 3.333334,1.4955556 3.333334,3.3333333 V 18.666667 C 20.888889,20.504444 19.393333,22 17.555555,22 Z M 6.4444443,4.2222222 c -0.6122222,0 -1.1111111,0.4988889 -1.1111111,1.1111111 V 18.666667 c 0,0.612222 0.4988889,1.111111 1.1111111,1.111111 H 17.555555 c 0.612223,0 1.111112,-0.498889 1.111112,-1.111111 V 5.3333333 c 0,-0.6122222 -0.498889,-1.1111111 -1.111112,-1.1111111 z M 16.444444,10.888889 H 7.5555554 c -0.3066666,0 -0.5555555,-0.248889 -0.5555555,-0.555556 0,-0.306666 0.2488889,-0.5555552 0.5555555,-0.5555552 H 16.444444 C 16.751111,9.7777778 17,10.026667 17,10.333333 17,10.64 16.751111,10.888889 16.444444,10.888889 Z m 0,-3.3333334 H 7.5555554 C 7.2488888,7.5555556 6.9999999,7.3066667 6.9999999,7 c 0,-0.3066667 0.2488889,-0.5555556 0.5555555,-0.5555556 H 16.444444 C 16.751111,6.4444444 17,6.6933333 17,7 17,7.3066667 16.751111,7.5555556 16.444444,7.5555556 Z m 0,6.6666664 H 7.5555554 c -0.3066666,0 -0.5555555,-0.248889 -0.5555555,-0.555555 0,-0.306667 0.2488889,-0.555556 0.5555555,-0.555556 H 16.444444 C 16.751111,13.111111 17,13.36 17,13.666667 c 0,0.306666 -0.248889,0.555555 -0.555556,0.555555 z m 0,3.333334 H 7.5555554 c -0.3066666,0 -0.5555555,-0.248889 -0.5555555,-0.555556 0,-0.306667 0.2488889,-0.555556 0.5555555,-0.555556 H 16.444444 C 16.751111,16.444444 17,16.693333 17,17 c 0,0.306667 -0.248889,0.555556 -0.555556,0.555556 z" />
 </svg>
diff --git a/nw/assets/icons/typicons_colour_dark/heading1.svg b/nw/assets/icons/typicons_colour_dark/heading1.svg
new file mode 100644
index 00000000..faad4e82
--- /dev/null
+++ b/nw/assets/icons/typicons_colour_dark/heading1.svg
@@ -0,0 +1,37 @@
+<?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="svg1897"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24"
+   version="1.2">
+  <metadata
+     id="metadata1903">
+    <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="defs1901" />
+  <path
+     style="fill:#6699cc;fill-opacity:1;stroke-width:1.42859697"
+     id="path1895"
+     d="m 3.1443377,2.8368008 c -1.1157342,1.1157342 -1.1157342,2.9243378 0,4.040072 L 8.2658581,11.999821 3.1443377,17.12277 c -1.1157342,1.115734 -1.1157342,2.924338 0,4.040072 C 3.7014904,21.721423 4.4329321,22 5.1643736,22 5.8958159,22 6.627257,21.721423 7.1844103,21.162842 L 16.348859,11.999821 7.1844103,2.8368008 c -1.1143067,-1.1157343 -2.9257671,-1.1157343 -4.0400726,0 z" />
+  <circle
+     r="2.2222221"
+     cy="4.2222223"
+     cx="19.470242"
+     id="path2467"
+     style="fill:#6699cc;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+</svg>
diff --git a/nw/assets/icons/typicons_colour_dark/heading2.svg b/nw/assets/icons/typicons_colour_dark/heading2.svg
new file mode 100644
index 00000000..08c8ad09
--- /dev/null
+++ b/nw/assets/icons/typicons_colour_dark/heading2.svg
@@ -0,0 +1,43 @@
+<?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="svg1897"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24"
+   version="1.2">
+  <metadata
+     id="metadata1903">
+    <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="defs1901" />
+  <path
+     style="fill:#6699cc;fill-opacity:1;stroke-width:1.42859697"
+     id="path1895"
+     d="m 3.1443377,2.8368008 c -1.1157342,1.1157342 -1.1157342,2.9243378 0,4.040072 L 8.2658581,11.999821 3.1443377,17.12277 c -1.1157342,1.115734 -1.1157342,2.924338 0,4.040072 C 3.7014904,21.721423 4.4329321,22 5.1643736,22 5.8958159,22 6.627257,21.721423 7.1844103,21.162842 L 16.348859,11.999821 7.1844103,2.8368008 c -1.1143067,-1.1157343 -2.9257671,-1.1157343 -4.0400726,0 z" />
+  <circle
+     r="2.2222221"
+     cy="4.2222223"
+     cx="19.470242"
+     id="path2467"
+     style="fill:#6699cc;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <circle
+     style="fill:#6699cc;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="circle2469"
+     cx="19.470242"
+     cy="9.4077778"
+     r="2.2222221" />
+</svg>
diff --git a/nw/assets/icons/typicons_colour_dark/heading3.svg b/nw/assets/icons/typicons_colour_dark/heading3.svg
new file mode 100644
index 00000000..b5a35871
--- /dev/null
+++ b/nw/assets/icons/typicons_colour_dark/heading3.svg
@@ -0,0 +1,49 @@
+<?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="svg1897"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24"
+   version="1.2">
+  <metadata
+     id="metadata1903">
+    <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="defs1901" />
+  <path
+     style="fill:#6699cc;fill-opacity:1;stroke-width:1.42859697"
+     id="path1895"
+     d="m 3.1443377,2.8368008 c -1.1157342,1.1157342 -1.1157342,2.9243378 0,4.040072 L 8.2658581,11.999821 3.1443377,17.12277 c -1.1157342,1.115734 -1.1157342,2.924338 0,4.040072 C 3.7014904,21.721423 4.4329321,22 5.1643736,22 5.8958159,22 6.627257,21.721423 7.1844103,21.162842 L 16.348859,11.999821 7.1844103,2.8368008 c -1.1143067,-1.1157343 -2.9257671,-1.1157343 -4.0400726,0 z" />
+  <circle
+     r="2.2222221"
+     cy="4.2222223"
+     cx="19.470242"
+     id="path2467"
+     style="fill:#6699cc;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <circle
+     style="fill:#6699cc;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="circle2469"
+     cx="19.470242"
+     cy="9.4077778"
+     r="2.2222221" />
+  <circle
+     r="2.2222221"
+     cy="14.592222"
+     cx="19.470242"
+     id="circle2471"
+     style="fill:#6699cc;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+</svg>
diff --git a/nw/assets/icons/typicons_colour_dark/heading4.svg b/nw/assets/icons/typicons_colour_dark/heading4.svg
new file mode 100644
index 00000000..718c0746
--- /dev/null
+++ b/nw/assets/icons/typicons_colour_dark/heading4.svg
@@ -0,0 +1,59 @@
+<?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="svg1897"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24"
+   version="1.2">
+  <metadata
+     id="metadata1903">
+    <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="defs1901" />
+  <g
+     transform="matrix(1.1111111,0,0,1.1111111,-1.3333334,-1.3333332)"
+     id="g2616">
+    <path
+       d="m 4.029904,3.7531206 c -1.0041608,1.0041608 -1.0041608,2.6319041 0,3.6360649 L 8.6392724,11.999839 4.029904,16.610493 c -1.0041608,1.004161 -1.0041608,2.631904 0,3.636065 C 4.5313415,20.749281 5.189639,21 5.8479364,21 c 0.658298,0 1.316595,-0.250719 1.818033,-0.753442 L 15.913973,11.999839 7.6659694,3.7531206 c -1.002876,-1.0041608 -2.6331904,-1.0041608 -3.6360654,0 z"
+       id="path1895"
+       style="fill:#6699cc;fill-opacity:1;stroke-width:1.28573728" />
+    <circle
+       style="fill:#6699cc;fill-opacity:1;stroke:none;stroke-width:1.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2467"
+       cx="18.723217"
+       cy="5"
+       r="2" />
+    <circle
+       r="2"
+       cy="9.6669998"
+       cx="18.723217"
+       id="circle2469"
+       style="fill:#6699cc;fill-opacity:1;stroke:none;stroke-width:1.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <circle
+       style="fill:#6699cc;fill-opacity:1;stroke:none;stroke-width:1.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="circle2471"
+       cx="18.723217"
+       cy="14.333"
+       r="2" />
+    <circle
+       r="2"
+       cy="19"
+       cx="18.723217"
+       id="circle2473"
+       style="fill:#6699cc;fill-opacity:1;stroke:none;stroke-width:1.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/nw/assets/icons/typicons_colour_dark/icons.conf b/nw/assets/icons/typicons_colour_dark/icons.conf
index cffe7329..f55adaa9 100644
--- a/nw/assets/icons/typicons_colour_dark/icons.conf
+++ b/nw/assets/icons/typicons_colour_dark/icons.conf
@@ -28,6 +28,11 @@ cls_custom     = star.svg
 cls_trash      = trash.svg
 proj_document  = document-text.svg
 proj_folder    = folder.svg
+proj_orphan    = warning.svg
+doc_h1         = heading1.svg
+doc_h2         = heading2.svg
+doc_h3         = heading3.svg
+doc_h4         = heading4.svg
 delete         = delete.svg
 add            = plus.svg
 remove         = minus.svg
diff --git a/nw/assets/icons/typicons_colour_dark/warning.svg b/nw/assets/icons/typicons_colour_dark/warning.svg
new file mode 100644
index 00000000..eef5a902
--- /dev/null
+++ b/nw/assets/icons/typicons_colour_dark/warning.svg
@@ -0,0 +1,31 @@
+<?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="svg4695"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24"
+   version="1.2">
+  <metadata
+     id="metadata4701">
+    <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="defs4699" />
+  <path
+     style="stroke-width:1.01740682;fill:#ffff84;fill-opacity:1"
+     id="path4693"
+     d="M 21.330638,15.197201 15.315729,5.1716738 C 14.526221,3.8561667 13.318559,3.1032856 12,3.1032856 c -1.31856,0 -2.5262214,0.7528811 -3.3157291,2.0663534 L 2.6693614,15.197201 c -0.7996818,1.331785 -0.8871787,2.752085 -0.2390906,3.896668 0.6470708,1.1456 1.9106901,1.802845 3.4652878,1.802845 H 18.104441 c 1.554598,0 2.818217,-0.657245 3.465288,-1.801828 0.648088,-1.144582 0.560591,-2.564882 -0.239091,-3.897685 z M 12,17.385643 c -0.868866,0 -1.576981,-0.707098 -1.576981,-1.575963 0,-0.869883 0.707098,-1.577998 1.576981,-1.577998 0.869882,0 1.57698,0.708115 1.57698,1.577998 0,0.868865 -0.708115,1.575963 -1.57698,1.575963 z m 1.661425,-7.5532283 c -0.01119,0.03154 -1.425387,3.5283663 -1.425387,3.5283663 -0.03866,0.09564 -0.132263,0.158716 -0.235021,0.158716 -0.102758,0 -0.19636,-0.06308 -0.235021,-0.158716 L 10.350783,9.8629369 c -0.09157,-0.2370558 -0.131245,-0.4507113 -0.131245,-0.6664015 0,-0.9817977 0.798664,-1.7804621 1.780462,-1.7804621 0.981797,0 1.780462,0.7986644 1.780462,1.7804621 0,0.2156902 -0.03968,0.4293457 -0.119037,0.6358793 z" />
+</svg>
diff --git a/nw/assets/icons/typicons_colour_light/heading1.svg b/nw/assets/icons/typicons_colour_light/heading1.svg
new file mode 100644
index 00000000..89276c97
--- /dev/null
+++ b/nw/assets/icons/typicons_colour_light/heading1.svg
@@ -0,0 +1,37 @@
+<?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="svg1897"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24"
+   version="1.2">
+  <metadata
+     id="metadata1903">
+    <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="defs1901" />
+  <path
+     style="fill:#4271ae;fill-opacity:1;stroke-width:1.42859697"
+     id="path1895"
+     d="m 3.1443377,2.8368008 c -1.1157342,1.1157342 -1.1157342,2.9243378 0,4.040072 L 8.2658581,11.999821 3.1443377,17.12277 c -1.1157342,1.115734 -1.1157342,2.924338 0,4.040072 C 3.7014904,21.721423 4.4329321,22 5.1643736,22 5.8958159,22 6.627257,21.721423 7.1844103,21.162842 L 16.348859,11.999821 7.1844103,2.8368008 c -1.1143067,-1.1157343 -2.9257671,-1.1157343 -4.0400726,0 z" />
+  <circle
+     r="2.2222221"
+     cy="4.2222223"
+     cx="19.470242"
+     id="path2467"
+     style="fill:#4271ae;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+</svg>
diff --git a/nw/assets/icons/typicons_colour_light/heading2.svg b/nw/assets/icons/typicons_colour_light/heading2.svg
new file mode 100644
index 00000000..5f69658e
--- /dev/null
+++ b/nw/assets/icons/typicons_colour_light/heading2.svg
@@ -0,0 +1,43 @@
+<?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="svg1897"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24"
+   version="1.2">
+  <metadata
+     id="metadata1903">
+    <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="defs1901" />
+  <path
+     style="fill:#4271ae;fill-opacity:1;stroke-width:1.42859697"
+     id="path1895"
+     d="m 3.1443377,2.8368008 c -1.1157342,1.1157342 -1.1157342,2.9243378 0,4.040072 L 8.2658581,11.999821 3.1443377,17.12277 c -1.1157342,1.115734 -1.1157342,2.924338 0,4.040072 C 3.7014904,21.721423 4.4329321,22 5.1643736,22 5.8958159,22 6.627257,21.721423 7.1844103,21.162842 L 16.348859,11.999821 7.1844103,2.8368008 c -1.1143067,-1.1157343 -2.9257671,-1.1157343 -4.0400726,0 z" />
+  <circle
+     r="2.2222221"
+     cy="4.2222223"
+     cx="19.470242"
+     id="path2467"
+     style="fill:#4271ae;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <circle
+     style="fill:#4271ae;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="circle2469"
+     cx="19.470242"
+     cy="9.4077778"
+     r="2.2222221" />
+</svg>
diff --git a/nw/assets/icons/typicons_colour_light/heading3.svg b/nw/assets/icons/typicons_colour_light/heading3.svg
new file mode 100644
index 00000000..b7a33025
--- /dev/null
+++ b/nw/assets/icons/typicons_colour_light/heading3.svg
@@ -0,0 +1,49 @@
+<?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="svg1897"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24"
+   version="1.2">
+  <metadata
+     id="metadata1903">
+    <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="defs1901" />
+  <path
+     style="fill:#4271ae;fill-opacity:1;stroke-width:1.42859697"
+     id="path1895"
+     d="m 3.1443377,2.8368008 c -1.1157342,1.1157342 -1.1157342,2.9243378 0,4.040072 L 8.2658581,11.999821 3.1443377,17.12277 c -1.1157342,1.115734 -1.1157342,2.924338 0,4.040072 C 3.7014904,21.721423 4.4329321,22 5.1643736,22 5.8958159,22 6.627257,21.721423 7.1844103,21.162842 L 16.348859,11.999821 7.1844103,2.8368008 c -1.1143067,-1.1157343 -2.9257671,-1.1157343 -4.0400726,0 z" />
+  <circle
+     r="2.2222221"
+     cy="4.2222223"
+     cx="19.470242"
+     id="path2467"
+     style="fill:#4271ae;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <circle
+     style="fill:#4271ae;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="circle2469"
+     cx="19.470242"
+     cy="9.4077778"
+     r="2.2222221" />
+  <circle
+     r="2.2222221"
+     cy="14.592222"
+     cx="19.470242"
+     id="circle2471"
+     style="fill:#4271ae;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+</svg>
diff --git a/nw/assets/icons/typicons_colour_light/heading4.svg b/nw/assets/icons/typicons_colour_light/heading4.svg
new file mode 100644
index 00000000..50b0b351
--- /dev/null
+++ b/nw/assets/icons/typicons_colour_light/heading4.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"
+   id="svg1897"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24"
+   version="1.2">
+  <metadata
+     id="metadata1903">
+    <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="defs1901" />
+  <path
+     style="fill:#4271ae;fill-opacity:1;stroke-width:1.42859697"
+     id="path1895"
+     d="m 3.1443377,2.8368008 c -1.1157342,1.1157342 -1.1157342,2.9243378 0,4.040072 L 8.2658581,11.999821 3.1443377,17.12277 c -1.1157342,1.115734 -1.1157342,2.924338 0,4.040072 C 3.7014904,21.721423 4.4329321,22 5.1643736,22 5.8958159,22 6.627257,21.721423 7.1844103,21.162842 L 16.348859,11.999821 7.1844103,2.8368008 c -1.1143067,-1.1157343 -2.9257671,-1.1157343 -4.0400726,0 z" />
+  <circle
+     r="2.2222221"
+     cy="4.2222223"
+     cx="19.470242"
+     id="path2467"
+     style="fill:#4271ae;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <circle
+     style="fill:#4271ae;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="circle2469"
+     cx="19.470242"
+     cy="9.4077778"
+     r="2.2222221" />
+  <circle
+     r="2.2222221"
+     cy="14.592222"
+     cx="19.470242"
+     id="circle2471"
+     style="fill:#4271ae;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <circle
+     style="fill:#4271ae;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="circle2473"
+     cx="19.470242"
+     cy="19.777779"
+     r="2.2222221" />
+</svg>
diff --git a/nw/assets/icons/typicons_colour_light/icons.conf b/nw/assets/icons/typicons_colour_light/icons.conf
index ac281962..af948e10 100644
--- a/nw/assets/icons/typicons_colour_light/icons.conf
+++ b/nw/assets/icons/typicons_colour_light/icons.conf
@@ -28,6 +28,11 @@ cls_custom     = star.svg
 cls_trash      = trash.svg
 proj_document  = document-text.svg
 proj_folder    = folder.svg
+proj_orphan    = warning.svg
+doc_h1         = heading1.svg
+doc_h2         = heading2.svg
+doc_h3         = heading3.svg
+doc_h4         = heading4.svg
 delete         = delete.svg
 add            = plus.svg
 remove         = minus.svg
diff --git a/nw/assets/icons/typicons_colour_light/warning.svg b/nw/assets/icons/typicons_colour_light/warning.svg
new file mode 100644
index 00000000..ad55f227
--- /dev/null
+++ b/nw/assets/icons/typicons_colour_light/warning.svg
@@ -0,0 +1,31 @@
+<?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="svg4695"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24"
+   version="1.2">
+  <metadata
+     id="metadata4701">
+    <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="defs4699" />
+  <path
+     style="stroke-width:1.01740682;fill:#ad8700;fill-opacity:1"
+     id="path4693"
+     d="M 21.330638,15.197201 15.315729,5.1716738 C 14.526221,3.8561667 13.318559,3.1032856 12,3.1032856 c -1.31856,0 -2.5262214,0.7528811 -3.3157291,2.0663534 L 2.6693614,15.197201 c -0.7996818,1.331785 -0.8871787,2.752085 -0.2390906,3.896668 0.6470708,1.1456 1.9106901,1.802845 3.4652878,1.802845 H 18.104441 c 1.554598,0 2.818217,-0.657245 3.465288,-1.801828 0.648088,-1.144582 0.560591,-2.564882 -0.239091,-3.897685 z M 12,17.385643 c -0.868866,0 -1.576981,-0.707098 -1.576981,-1.575963 0,-0.869883 0.707098,-1.577998 1.576981,-1.577998 0.869882,0 1.57698,0.708115 1.57698,1.577998 0,0.868865 -0.708115,1.575963 -1.57698,1.575963 z m 1.661425,-7.5532283 c -0.01119,0.03154 -1.425387,3.5283663 -1.425387,3.5283663 -0.03866,0.09564 -0.132263,0.158716 -0.235021,0.158716 -0.102758,0 -0.19636,-0.06308 -0.235021,-0.158716 L 10.350783,9.8629369 c -0.09157,-0.2370558 -0.131245,-0.4507113 -0.131245,-0.6664015 0,-0.9817977 0.798664,-1.7804621 1.780462,-1.7804621 0.981797,0 1.780462,0.7986644 1.780462,1.7804621 0,0.2156902 -0.03968,0.4293457 -0.119037,0.6358793 z" />
+</svg>
diff --git a/nw/assets/icons/typicons_grey_dark/document-text.svg b/nw/assets/icons/typicons_grey_dark/document-text.svg
index 848c0d8f..1fb9b11a 100644
--- a/nw/assets/icons/typicons_grey_dark/document-text.svg
+++ b/nw/assets/icons/typicons_grey_dark/document-text.svg
@@ -24,13 +24,12 @@
   </metadata>
   <defs
      id="defs2165" />
-  <g
-     style="fill:#aeaeae;fill-opacity:1"
-     transform="matrix(1.125,0,0,1.125,-1.5,-1.3749999)"
-     id="g2159">
-    <path
-       style="fill:#aeaeae;fill-opacity:1"
-       id="path2157"
-       d="M 17,21 H 7 C 5.346,21 4,19.654 4,18 V 6 C 4,4.346 5.346,3 7,3 h 10 c 1.654,0 3,1.346 3,3 v 12 c 0,1.654 -1.346,3 -3,3 z M 7,5 C 6.449,5 6,5.449 6,6 v 12 c 0,0.551 0.449,1 1,1 h 10 c 0.551,0 1,-0.449 1,-1 V 6 C 18,5.449 17.551,5 17,5 Z m 9,6 H 8 C 7.724,11 7.5,10.776 7.5,10.5 7.5,10.224 7.724,10 8,10 h 8 c 0.276,0 0.5,0.224 0.5,0.5 0,0.276 -0.224,0.5 -0.5,0.5 z M 16,8 H 8 C 7.724,8 7.5,7.776 7.5,7.5 7.5,7.224 7.724,7 8,7 h 8 c 0.276,0 0.5,0.224 0.5,0.5 C 16.5,7.776 16.276,8 16,8 Z m 0,6 H 8 C 7.724,14 7.5,13.776 7.5,13.5 7.5,13.224 7.724,13 8,13 h 8 c 0.276,0 0.5,0.224 0.5,0.5 0,0.276 -0.224,0.5 -0.5,0.5 z m 0,3 H 8 C 7.724,17 7.5,16.776 7.5,16.5 7.5,16.224 7.724,16 8,16 h 8 c 0.276,0 0.5,0.224 0.5,0.5 0,0.276 -0.224,0.5 -0.5,0.5 z" />
-  </g>
+  <path
+     style="opacity:0.95;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.71486783;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 6.4444442,4.2222221 c -0.6122222,0 -1.1111111,0.4988889 -1.1111111,1.1111111 V 18.666667 c 0,0.612222 0.4988889,1.111111 1.1111111,1.111111 H 17.555555 c 0.612223,0 1.111112,-0.498889 1.111112,-1.111111 V 5.3333332 c 0,-0.6122222 -0.498889,-1.1111111 -1.111112,-1.1111111 z M 7.5555553,6.4444443 H 16.444444 C 16.751111,6.4444443 17,6.6933332 17,6.9999999 17,7.3066666 16.751111,7.5555555 16.444444,7.5555555 H 7.5555553 c -0.3066666,0 -0.5555555,-0.2488889 -0.5555555,-0.5555556 0,-0.3066667 0.2488889,-0.5555556 0.5555555,-0.5555556 z m 0,3.3333334 H 16.444444 C 16.751111,9.7777777 17,10.026667 17,10.333333 17,10.64 16.751111,10.888889 16.444444,10.888889 H 7.5555553 c -0.3066666,0 -0.5555555,-0.248889 -0.5555555,-0.555556 0,-0.306666 0.2488889,-0.5555553 0.5555555,-0.5555553 z m 0,3.3333333 H 16.444444 C 16.751111,13.111111 17,13.36 17,13.666667 c 0,0.306666 -0.248889,0.555555 -0.555556,0.555555 H 7.5555553 c -0.3066666,0 -0.5555555,-0.248889 -0.5555555,-0.555555 0,-0.306667 0.2488889,-0.555556 0.5555555,-0.555556 z m 0,3.333333 H 16.444444 C 16.751111,16.444444 17,16.693333 17,17 c 0,0.306667 -0.248889,0.555556 -0.555556,0.555556 H 7.5555553 c -0.3066666,0 -0.5555555,-0.248889 -0.5555555,-0.555556 0,-0.306667 0.2488889,-0.555556 0.5555555,-0.555556 z"
+     id="rect12986" />
+  <path
+     style="display:inline;fill:#aeaeae;fill-opacity:1;stroke-width:1.11111116"
+     id="path2157"
+     d="M 17.555555,22 H 6.4444443 C 4.6066666,22 3.111111,20.504444 3.111111,18.666667 V 5.3333333 C 3.111111,3.4955556 4.6066666,2 6.4444443,2 H 17.555555 c 1.837778,0 3.333334,1.4955556 3.333334,3.3333333 V 18.666667 C 20.888889,20.504444 19.393333,22 17.555555,22 Z M 6.4444443,4.2222222 c -0.6122222,0 -1.1111111,0.4988889 -1.1111111,1.1111111 V 18.666667 c 0,0.612222 0.4988889,1.111111 1.1111111,1.111111 H 17.555555 c 0.612223,0 1.111112,-0.498889 1.111112,-1.111111 V 5.3333333 c 0,-0.6122222 -0.498889,-1.1111111 -1.111112,-1.1111111 z M 16.444444,10.888889 H 7.5555554 c -0.3066666,0 -0.5555555,-0.248889 -0.5555555,-0.555556 0,-0.306666 0.2488889,-0.5555552 0.5555555,-0.5555552 H 16.444444 C 16.751111,9.7777778 17,10.026667 17,10.333333 17,10.64 16.751111,10.888889 16.444444,10.888889 Z m 0,-3.3333334 H 7.5555554 C 7.2488888,7.5555556 6.9999999,7.3066667 6.9999999,7 c 0,-0.3066667 0.2488889,-0.5555556 0.5555555,-0.5555556 H 16.444444 C 16.751111,6.4444444 17,6.6933333 17,7 17,7.3066667 16.751111,7.5555556 16.444444,7.5555556 Z m 0,6.6666664 H 7.5555554 c -0.3066666,0 -0.5555555,-0.248889 -0.5555555,-0.555555 0,-0.306667 0.2488889,-0.555556 0.5555555,-0.555556 H 16.444444 C 16.751111,13.111111 17,13.36 17,13.666667 c 0,0.306666 -0.248889,0.555555 -0.555556,0.555555 z m 0,3.333334 H 7.5555554 c -0.3066666,0 -0.5555555,-0.248889 -0.5555555,-0.555556 0,-0.306667 0.2488889,-0.555556 0.5555555,-0.555556 H 16.444444 C 16.751111,16.444444 17,16.693333 17,17 c 0,0.306667 -0.248889,0.555556 -0.555556,0.555556 z" />
 </svg>
diff --git a/nw/assets/icons/typicons_grey_dark/heading1.svg b/nw/assets/icons/typicons_grey_dark/heading1.svg
new file mode 100644
index 00000000..28bcaaaa
--- /dev/null
+++ b/nw/assets/icons/typicons_grey_dark/heading1.svg
@@ -0,0 +1,37 @@
+<?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="svg1897"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24"
+   version="1.2">
+  <metadata
+     id="metadata1903">
+    <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="defs1901" />
+  <path
+     style="fill:#aeaeae;fill-opacity:1;stroke-width:1.42859697"
+     id="path1895"
+     d="m 3.1443377,2.8368008 c -1.1157342,1.1157342 -1.1157342,2.9243378 0,4.040072 L 8.2658581,11.999821 3.1443377,17.12277 c -1.1157342,1.115734 -1.1157342,2.924338 0,4.040072 C 3.7014904,21.721423 4.4329321,22 5.1643736,22 5.8958159,22 6.627257,21.721423 7.1844103,21.162842 L 16.348859,11.999821 7.1844103,2.8368008 c -1.1143067,-1.1157343 -2.9257671,-1.1157343 -4.0400726,0 z" />
+  <circle
+     r="2.2222221"
+     cy="4.2222223"
+     cx="19.470242"
+     id="path2467"
+     style="fill:#aeaeae;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+</svg>
diff --git a/nw/assets/icons/typicons_grey_dark/heading2.svg b/nw/assets/icons/typicons_grey_dark/heading2.svg
new file mode 100644
index 00000000..0183b97f
--- /dev/null
+++ b/nw/assets/icons/typicons_grey_dark/heading2.svg
@@ -0,0 +1,43 @@
+<?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="svg1897"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24"
+   version="1.2">
+  <metadata
+     id="metadata1903">
+    <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="defs1901" />
+  <path
+     style="fill:#aeaeae;fill-opacity:1;stroke-width:1.42859697"
+     id="path1895"
+     d="m 3.1443377,2.8368008 c -1.1157342,1.1157342 -1.1157342,2.9243378 0,4.040072 L 8.2658581,11.999821 3.1443377,17.12277 c -1.1157342,1.115734 -1.1157342,2.924338 0,4.040072 C 3.7014904,21.721423 4.4329321,22 5.1643736,22 5.8958159,22 6.627257,21.721423 7.1844103,21.162842 L 16.348859,11.999821 7.1844103,2.8368008 c -1.1143067,-1.1157343 -2.9257671,-1.1157343 -4.0400726,0 z" />
+  <circle
+     r="2.2222221"
+     cy="4.2222223"
+     cx="19.470242"
+     id="path2467"
+     style="fill:#aeaeae;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <circle
+     style="fill:#aeaeae;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="circle2469"
+     cx="19.470242"
+     cy="9.4077778"
+     r="2.2222221" />
+</svg>
diff --git a/nw/assets/icons/typicons_grey_dark/heading3.svg b/nw/assets/icons/typicons_grey_dark/heading3.svg
new file mode 100644
index 00000000..498cc9a1
--- /dev/null
+++ b/nw/assets/icons/typicons_grey_dark/heading3.svg
@@ -0,0 +1,49 @@
+<?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="svg1897"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24"
+   version="1.2">
+  <metadata
+     id="metadata1903">
+    <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="defs1901" />
+  <path
+     style="fill:#aeaeae;fill-opacity:1;stroke-width:1.42859697"
+     id="path1895"
+     d="m 3.1443377,2.8368008 c -1.1157342,1.1157342 -1.1157342,2.9243378 0,4.040072 L 8.2658581,11.999821 3.1443377,17.12277 c -1.1157342,1.115734 -1.1157342,2.924338 0,4.040072 C 3.7014904,21.721423 4.4329321,22 5.1643736,22 5.8958159,22 6.627257,21.721423 7.1844103,21.162842 L 16.348859,11.999821 7.1844103,2.8368008 c -1.1143067,-1.1157343 -2.9257671,-1.1157343 -4.0400726,0 z" />
+  <circle
+     r="2.2222221"
+     cy="4.2222223"
+     cx="19.470242"
+     id="path2467"
+     style="fill:#aeaeae;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <circle
+     style="fill:#aeaeae;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="circle2469"
+     cx="19.470242"
+     cy="9.4077778"
+     r="2.2222221" />
+  <circle
+     r="2.2222221"
+     cy="14.592222"
+     cx="19.470242"
+     id="circle2471"
+     style="fill:#aeaeae;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+</svg>
diff --git a/nw/assets/icons/typicons_grey_dark/heading4.svg b/nw/assets/icons/typicons_grey_dark/heading4.svg
new file mode 100644
index 00000000..0470a292
--- /dev/null
+++ b/nw/assets/icons/typicons_grey_dark/heading4.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"
+   id="svg1897"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24"
+   version="1.2">
+  <metadata
+     id="metadata1903">
+    <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="defs1901" />
+  <path
+     style="fill:#aeaeae;fill-opacity:1;stroke-width:1.42859697"
+     id="path1895"
+     d="m 3.1443377,2.8368008 c -1.1157342,1.1157342 -1.1157342,2.9243378 0,4.040072 L 8.2658581,11.999821 3.1443377,17.12277 c -1.1157342,1.115734 -1.1157342,2.924338 0,4.040072 C 3.7014904,21.721423 4.4329321,22 5.1643736,22 5.8958159,22 6.627257,21.721423 7.1844103,21.162842 L 16.348859,11.999821 7.1844103,2.8368008 c -1.1143067,-1.1157343 -2.9257671,-1.1157343 -4.0400726,0 z" />
+  <circle
+     r="2.2222221"
+     cy="4.2222223"
+     cx="19.470242"
+     id="path2467"
+     style="fill:#aeaeae;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <circle
+     style="fill:#aeaeae;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="circle2469"
+     cx="19.470242"
+     cy="9.4077778"
+     r="2.2222221" />
+  <circle
+     r="2.2222221"
+     cy="14.592222"
+     cx="19.470242"
+     id="circle2471"
+     style="fill:#aeaeae;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <circle
+     style="fill:#aeaeae;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="circle2473"
+     cx="19.470242"
+     cy="19.777779"
+     r="2.2222221" />
+</svg>
diff --git a/nw/assets/icons/typicons_grey_dark/icons.conf b/nw/assets/icons/typicons_grey_dark/icons.conf
index d03bec4d..b8b24e46 100644
--- a/nw/assets/icons/typicons_grey_dark/icons.conf
+++ b/nw/assets/icons/typicons_grey_dark/icons.conf
@@ -28,6 +28,11 @@ cls_custom     = star.svg
 cls_trash      = trash.svg
 proj_document  = document-text.svg
 proj_folder    = folder.svg
+proj_orphan    = warning.svg
+doc_h1         = heading1.svg
+doc_h2         = heading2.svg
+doc_h3         = heading3.svg
+doc_h4         = heading4.svg
 delete         = delete.svg
 add            = plus.svg
 remove         = minus.svg
diff --git a/nw/assets/icons/typicons_grey_dark/warning.svg b/nw/assets/icons/typicons_grey_dark/warning.svg
new file mode 100644
index 00000000..3753c9f4
--- /dev/null
+++ b/nw/assets/icons/typicons_grey_dark/warning.svg
@@ -0,0 +1,31 @@
+<?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="svg4695"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24"
+   version="1.2">
+  <metadata
+     id="metadata4701">
+    <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="defs4699" />
+  <path
+     style="stroke-width:1.01740682;fill:#aeaeae;fill-opacity:1"
+     id="path4693"
+     d="M 21.330638,15.197201 15.315729,5.1716738 C 14.526221,3.8561667 13.318559,3.1032856 12,3.1032856 c -1.31856,0 -2.5262214,0.7528811 -3.3157291,2.0663534 L 2.6693614,15.197201 c -0.7996818,1.331785 -0.8871787,2.752085 -0.2390906,3.896668 0.6470708,1.1456 1.9106901,1.802845 3.4652878,1.802845 H 18.104441 c 1.554598,0 2.818217,-0.657245 3.465288,-1.801828 0.648088,-1.144582 0.560591,-2.564882 -0.239091,-3.897685 z M 12,17.385643 c -0.868866,0 -1.576981,-0.707098 -1.576981,-1.575963 0,-0.869883 0.707098,-1.577998 1.576981,-1.577998 0.869882,0 1.57698,0.708115 1.57698,1.577998 0,0.868865 -0.708115,1.575963 -1.57698,1.575963 z m 1.661425,-7.5532283 c -0.01119,0.03154 -1.425387,3.5283663 -1.425387,3.5283663 -0.03866,0.09564 -0.132263,0.158716 -0.235021,0.158716 -0.102758,0 -0.19636,-0.06308 -0.235021,-0.158716 L 10.350783,9.8629369 c -0.09157,-0.2370558 -0.131245,-0.4507113 -0.131245,-0.6664015 0,-0.9817977 0.798664,-1.7804621 1.780462,-1.7804621 0.981797,0 1.780462,0.7986644 1.780462,1.7804621 0,0.2156902 -0.03968,0.4293457 -0.119037,0.6358793 z" />
+</svg>
diff --git a/nw/assets/icons/typicons_grey_light/document-text.svg b/nw/assets/icons/typicons_grey_light/document-text.svg
index 04b2bb7b..6b4722ec 100644
--- a/nw/assets/icons/typicons_grey_light/document-text.svg
+++ b/nw/assets/icons/typicons_grey_light/document-text.svg
@@ -5,11 +5,11 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   version="1.2"
-   width="24"
-   height="24"
+   id="svg2161"
    viewBox="0 0 24 24"
-   id="svg2161">
+   height="24"
+   width="24"
+   version="1.2">
   <metadata
      id="metadata2167">
     <rdf:RDF>
@@ -24,13 +24,12 @@
   </metadata>
   <defs
      id="defs2165" />
-  <g
-     id="g2159"
-     transform="matrix(1.125,0,0,1.125,-1.5,-1.3749999)"
-     style="fill:#000000;fill-opacity:0.78">
-    <path
-       d="M 17,21 H 7 C 5.346,21 4,19.654 4,18 V 6 C 4,4.346 5.346,3 7,3 h 10 c 1.654,0 3,1.346 3,3 v 12 c 0,1.654 -1.346,3 -3,3 z M 7,5 C 6.449,5 6,5.449 6,6 v 12 c 0,0.551 0.449,1 1,1 h 10 c 0.551,0 1,-0.449 1,-1 V 6 C 18,5.449 17.551,5 17,5 Z m 9,6 H 8 C 7.724,11 7.5,10.776 7.5,10.5 7.5,10.224 7.724,10 8,10 h 8 c 0.276,0 0.5,0.224 0.5,0.5 0,0.276 -0.224,0.5 -0.5,0.5 z M 16,8 H 8 C 7.724,8 7.5,7.776 7.5,7.5 7.5,7.224 7.724,7 8,7 h 8 c 0.276,0 0.5,0.224 0.5,0.5 C 16.5,7.776 16.276,8 16,8 Z m 0,6 H 8 C 7.724,14 7.5,13.776 7.5,13.5 7.5,13.224 7.724,13 8,13 h 8 c 0.276,0 0.5,0.224 0.5,0.5 0,0.276 -0.224,0.5 -0.5,0.5 z m 0,3 H 8 C 7.724,17 7.5,16.776 7.5,16.5 7.5,16.224 7.724,16 8,16 h 8 c 0.276,0 0.5,0.224 0.5,0.5 0,0.276 -0.224,0.5 -0.5,0.5 z"
-       id="path2157"
-       style="fill:#000000;fill-opacity:0.78" />
-  </g>
+  <path
+     style="opacity:0.95;fill:#ededed;fill-opacity:1;stroke:none;stroke-width:1.71486783;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 6.4444442,4.2222221 c -0.6122222,0 -1.1111111,0.4988889 -1.1111111,1.1111111 V 18.666667 c 0,0.612222 0.4988889,1.111111 1.1111111,1.111111 H 17.555555 c 0.612223,0 1.111112,-0.498889 1.111112,-1.111111 V 5.3333332 c 0,-0.6122222 -0.498889,-1.1111111 -1.111112,-1.1111111 z M 7.5555553,6.4444443 H 16.444444 C 16.751111,6.4444443 17,6.6933332 17,6.9999999 17,7.3066666 16.751111,7.5555555 16.444444,7.5555555 H 7.5555553 c -0.3066666,0 -0.5555555,-0.2488889 -0.5555555,-0.5555556 0,-0.3066667 0.2488889,-0.5555556 0.5555555,-0.5555556 z m 0,3.3333334 H 16.444444 C 16.751111,9.7777777 17,10.026667 17,10.333333 17,10.64 16.751111,10.888889 16.444444,10.888889 H 7.5555553 c -0.3066666,0 -0.5555555,-0.248889 -0.5555555,-0.555556 0,-0.306666 0.2488889,-0.5555553 0.5555555,-0.5555553 z m 0,3.3333333 H 16.444444 C 16.751111,13.111111 17,13.36 17,13.666667 c 0,0.306666 -0.248889,0.555555 -0.555556,0.555555 H 7.5555553 c -0.3066666,0 -0.5555555,-0.248889 -0.5555555,-0.555555 0,-0.306667 0.2488889,-0.555556 0.5555555,-0.555556 z m 0,3.333333 H 16.444444 C 16.751111,16.444444 17,16.693333 17,17 c 0,0.306667 -0.248889,0.555556 -0.555556,0.555556 H 7.5555553 c -0.3066666,0 -0.5555555,-0.248889 -0.5555555,-0.555556 0,-0.306667 0.2488889,-0.555556 0.5555555,-0.555556 z"
+     id="rect12986" />
+  <path
+     style="display:inline;fill:#333333;fill-opacity:1;stroke-width:1.11111116"
+     id="path2157"
+     d="M 17.555555,22 H 6.4444443 C 4.6066666,22 3.111111,20.504444 3.111111,18.666667 V 5.3333333 C 3.111111,3.4955556 4.6066666,2 6.4444443,2 H 17.555555 c 1.837778,0 3.333334,1.4955556 3.333334,3.3333333 V 18.666667 C 20.888889,20.504444 19.393333,22 17.555555,22 Z M 6.4444443,4.2222222 c -0.6122222,0 -1.1111111,0.4988889 -1.1111111,1.1111111 V 18.666667 c 0,0.612222 0.4988889,1.111111 1.1111111,1.111111 H 17.555555 c 0.612223,0 1.111112,-0.498889 1.111112,-1.111111 V 5.3333333 c 0,-0.6122222 -0.498889,-1.1111111 -1.111112,-1.1111111 z M 16.444444,10.888889 H 7.5555554 c -0.3066666,0 -0.5555555,-0.248889 -0.5555555,-0.555556 0,-0.306666 0.2488889,-0.5555552 0.5555555,-0.5555552 H 16.444444 C 16.751111,9.7777778 17,10.026667 17,10.333333 17,10.64 16.751111,10.888889 16.444444,10.888889 Z m 0,-3.3333334 H 7.5555554 C 7.2488888,7.5555556 6.9999999,7.3066667 6.9999999,7 c 0,-0.3066667 0.2488889,-0.5555556 0.5555555,-0.5555556 H 16.444444 C 16.751111,6.4444444 17,6.6933333 17,7 17,7.3066667 16.751111,7.5555556 16.444444,7.5555556 Z m 0,6.6666664 H 7.5555554 c -0.3066666,0 -0.5555555,-0.248889 -0.5555555,-0.555555 0,-0.306667 0.2488889,-0.555556 0.5555555,-0.555556 H 16.444444 C 16.751111,13.111111 17,13.36 17,13.666667 c 0,0.306666 -0.248889,0.555555 -0.555556,0.555555 z m 0,3.333334 H 7.5555554 c -0.3066666,0 -0.5555555,-0.248889 -0.5555555,-0.555556 0,-0.306667 0.2488889,-0.555556 0.5555555,-0.555556 H 16.444444 C 16.751111,16.444444 17,16.693333 17,17 c 0,0.306667 -0.248889,0.555556 -0.555556,0.555556 z" />
 </svg>
diff --git a/nw/assets/icons/typicons_grey_light/heading1.svg b/nw/assets/icons/typicons_grey_light/heading1.svg
new file mode 100644
index 00000000..4bb013d7
--- /dev/null
+++ b/nw/assets/icons/typicons_grey_light/heading1.svg
@@ -0,0 +1,37 @@
+<?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="svg1897"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24"
+   version="1.2">
+  <metadata
+     id="metadata1903">
+    <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="defs1901" />
+  <path
+     style="fill:#000000;fill-opacity:0.78039217;stroke-width:1.42859697"
+     id="path1895"
+     d="m 3.1443377,2.8368008 c -1.1157342,1.1157342 -1.1157342,2.9243378 0,4.040072 L 8.2658581,11.999821 3.1443377,17.12277 c -1.1157342,1.115734 -1.1157342,2.924338 0,4.040072 C 3.7014904,21.721423 4.4329321,22 5.1643736,22 5.8958159,22 6.627257,21.721423 7.1844103,21.162842 L 16.348859,11.999821 7.1844103,2.8368008 c -1.1143067,-1.1157343 -2.9257671,-1.1157343 -4.0400726,0 z" />
+  <circle
+     r="2.2222221"
+     cy="4.2222223"
+     cx="19.470242"
+     id="path2467"
+     style="fill:#000000;fill-opacity:0.78039217;stroke:none;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+</svg>
diff --git a/nw/assets/icons/typicons_grey_light/heading2.svg b/nw/assets/icons/typicons_grey_light/heading2.svg
new file mode 100644
index 00000000..25ec3e05
--- /dev/null
+++ b/nw/assets/icons/typicons_grey_light/heading2.svg
@@ -0,0 +1,43 @@
+<?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="svg1897"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24"
+   version="1.2">
+  <metadata
+     id="metadata1903">
+    <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="defs1901" />
+  <path
+     style="fill:#000000;fill-opacity:0.78039217;stroke-width:1.42859697"
+     id="path1895"
+     d="m 3.1443377,2.8368008 c -1.1157342,1.1157342 -1.1157342,2.9243378 0,4.040072 L 8.2658581,11.999821 3.1443377,17.12277 c -1.1157342,1.115734 -1.1157342,2.924338 0,4.040072 C 3.7014904,21.721423 4.4329321,22 5.1643736,22 5.8958159,22 6.627257,21.721423 7.1844103,21.162842 L 16.348859,11.999821 7.1844103,2.8368008 c -1.1143067,-1.1157343 -2.9257671,-1.1157343 -4.0400726,0 z" />
+  <circle
+     r="2.2222221"
+     cy="4.2222223"
+     cx="19.470242"
+     id="path2467"
+     style="fill:#000000;fill-opacity:0.78039217;stroke:none;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <circle
+     style="fill:#000000;fill-opacity:0.78039217;stroke:none;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="circle2469"
+     cx="19.470242"
+     cy="9.4077778"
+     r="2.2222221" />
+</svg>
diff --git a/nw/assets/icons/typicons_grey_light/heading3.svg b/nw/assets/icons/typicons_grey_light/heading3.svg
new file mode 100644
index 00000000..942ceb60
--- /dev/null
+++ b/nw/assets/icons/typicons_grey_light/heading3.svg
@@ -0,0 +1,49 @@
+<?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="svg1897"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24"
+   version="1.2">
+  <metadata
+     id="metadata1903">
+    <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="defs1901" />
+  <path
+     style="fill:#000000;fill-opacity:0.78039217;stroke-width:1.42859697"
+     id="path1895"
+     d="m 3.1443377,2.8368008 c -1.1157342,1.1157342 -1.1157342,2.9243378 0,4.040072 L 8.2658581,11.999821 3.1443377,17.12277 c -1.1157342,1.115734 -1.1157342,2.924338 0,4.040072 C 3.7014904,21.721423 4.4329321,22 5.1643736,22 5.8958159,22 6.627257,21.721423 7.1844103,21.162842 L 16.348859,11.999821 7.1844103,2.8368008 c -1.1143067,-1.1157343 -2.9257671,-1.1157343 -4.0400726,0 z" />
+  <circle
+     r="2.2222221"
+     cy="4.2222223"
+     cx="19.470242"
+     id="path2467"
+     style="fill:#000000;fill-opacity:0.78039217;stroke:none;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <circle
+     style="fill:#000000;fill-opacity:0.78039217;stroke:none;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="circle2469"
+     cx="19.470242"
+     cy="9.4077778"
+     r="2.2222221" />
+  <circle
+     r="2.2222221"
+     cy="14.592222"
+     cx="19.470242"
+     id="circle2471"
+     style="fill:#000000;fill-opacity:0.78039217;stroke:none;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+</svg>
diff --git a/nw/assets/icons/typicons_grey_light/heading4.svg b/nw/assets/icons/typicons_grey_light/heading4.svg
new file mode 100644
index 00000000..39613ceb
--- /dev/null
+++ b/nw/assets/icons/typicons_grey_light/heading4.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"
+   id="svg1897"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24"
+   version="1.2">
+  <metadata
+     id="metadata1903">
+    <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="defs1901" />
+  <path
+     style="fill:#000000;fill-opacity:0.78039217;stroke-width:1.42859697"
+     id="path1895"
+     d="m 3.1443377,2.8368008 c -1.1157342,1.1157342 -1.1157342,2.9243378 0,4.040072 L 8.2658581,11.999821 3.1443377,17.12277 c -1.1157342,1.115734 -1.1157342,2.924338 0,4.040072 C 3.7014904,21.721423 4.4329321,22 5.1643736,22 5.8958159,22 6.627257,21.721423 7.1844103,21.162842 L 16.348859,11.999821 7.1844103,2.8368008 c -1.1143067,-1.1157343 -2.9257671,-1.1157343 -4.0400726,0 z" />
+  <circle
+     r="2.2222221"
+     cy="4.2222223"
+     cx="19.470242"
+     id="path2467"
+     style="fill:#000000;fill-opacity:0.78039217;stroke:none;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <circle
+     style="fill:#000000;fill-opacity:0.78039217;stroke:none;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="circle2469"
+     cx="19.470242"
+     cy="9.4077778"
+     r="2.2222221" />
+  <circle
+     r="2.2222221"
+     cy="14.592222"
+     cx="19.470242"
+     id="circle2471"
+     style="fill:#000000;fill-opacity:0.78039217;stroke:none;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <circle
+     style="fill:#000000;fill-opacity:0.78039217;stroke:none;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="circle2473"
+     cx="19.470242"
+     cy="19.777779"
+     r="2.2222221" />
+</svg>
diff --git a/nw/assets/icons/typicons_grey_light/icons.conf b/nw/assets/icons/typicons_grey_light/icons.conf
index 9f04ee61..9d99741c 100644
--- a/nw/assets/icons/typicons_grey_light/icons.conf
+++ b/nw/assets/icons/typicons_grey_light/icons.conf
@@ -28,6 +28,11 @@ cls_custom     = star.svg
 cls_trash      = trash.svg
 proj_document  = document-text.svg
 proj_folder    = folder.svg
+proj_orphan    = warning.svg
+doc_h1         = heading1.svg
+doc_h2         = heading2.svg
+doc_h3         = heading3.svg
+doc_h4         = heading4.svg
 delete         = delete.svg
 add            = plus.svg
 remove         = minus.svg
diff --git a/nw/assets/icons/typicons_grey_light/warning.svg b/nw/assets/icons/typicons_grey_light/warning.svg
new file mode 100644
index 00000000..86f67929
--- /dev/null
+++ b/nw/assets/icons/typicons_grey_light/warning.svg
@@ -0,0 +1,31 @@
+<?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="svg4695"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24"
+   version="1.2">
+  <metadata
+     id="metadata4701">
+    <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="defs4699" />
+  <path
+     style="stroke-width:1.01740682;fill:#000000;fill-opacity:0.78039217"
+     id="path4693"
+     d="M 21.330638,15.197201 15.315729,5.1716738 C 14.526221,3.8561667 13.318559,3.1032856 12,3.1032856 c -1.31856,0 -2.5262214,0.7528811 -3.3157291,2.0663534 L 2.6693614,15.197201 c -0.7996818,1.331785 -0.8871787,2.752085 -0.2390906,3.896668 0.6470708,1.1456 1.9106901,1.802845 3.4652878,1.802845 H 18.104441 c 1.554598,0 2.818217,-0.657245 3.465288,-1.801828 0.648088,-1.144582 0.560591,-2.564882 -0.239091,-3.897685 z M 12,17.385643 c -0.868866,0 -1.576981,-0.707098 -1.576981,-1.575963 0,-0.869883 0.707098,-1.577998 1.576981,-1.577998 0.869882,0 1.57698,0.708115 1.57698,1.577998 0,0.868865 -0.708115,1.575963 -1.57698,1.575963 z m 1.661425,-7.5532283 c -0.01119,0.03154 -1.425387,3.5283663 -1.425387,3.5283663 -0.03866,0.09564 -0.132263,0.158716 -0.235021,0.158716 -0.102758,0 -0.19636,-0.06308 -0.235021,-0.158716 L 10.350783,9.8629369 c -0.09157,-0.2370558 -0.131245,-0.4507113 -0.131245,-0.6664015 0,-0.9817977 0.798664,-1.7804621 1.780462,-1.7804621 0.981797,0 1.780462,0.7986644 1.780462,1.7804621 0,0.2156902 -0.03968,0.4293457 -0.119037,0.6358793 z" />
+</svg>
diff --git a/nw/config.py b/nw/config.py
index a8435188..ca9cab7b 100644
--- a/nw/config.py
+++ b/nw/config.py
@@ -83,7 +83,7 @@ class Config:
         ## General
         self.guiTheme    = "default"
         self.guiSyntax   = "default_light"
-        self.guiIcons    = "typicons_grey_light"
+        self.guiIcons    = "typicons_colour_light"
         self.guiDark     = False
         self.guiLang     = "en" # Hardcoded for now
         self.guiFont     = ""
diff --git a/nw/gui/mainmenu.py b/nw/gui/mainmenu.py
index 7cd20565..ece05a58 100644
--- a/nw/gui/mainmenu.py
+++ b/nw/gui/mainmenu.py
@@ -360,21 +360,21 @@ class GuiMainMenu(QMenuBar):
         self.viewMenu = self.addMenu("&View")
 
         # View > TreeView
-        self.aFocusTree = QAction("TreeView", self)
+        self.aFocusTree = QAction("Focus Project Tree", self)
         self.aFocusTree.setStatusTip("Move focus to project tree")
         self.aFocusTree.setShortcut("Alt+1")
         self.aFocusTree.triggered.connect(lambda : self.theParent.setFocus(1))
         self.viewMenu.addAction(self.aFocusTree)
 
         # View > Document Pane 1
-        self.aFocusEditor = QAction("Left Document Pane", self)
+        self.aFocusEditor = QAction("Focus Document Editor", self)
         self.aFocusEditor.setStatusTip("Move focus to left document pane")
         self.aFocusEditor.setShortcut("Alt+2")
         self.aFocusEditor.triggered.connect(lambda : self.theParent.setFocus(2))
         self.viewMenu.addAction(self.aFocusEditor)
 
         # View > Document Pane 2
-        self.aFocusView = QAction("Right Document Pane", self)
+        self.aFocusView = QAction("Focus Document Viewer", self)
         self.aFocusView.setStatusTip("Move focus to right document pane")
         self.aFocusView.setShortcut("Alt+3")
         self.aFocusView.triggered.connect(lambda : self.theParent.setFocus(3))
@@ -591,8 +591,8 @@ class GuiMainMenu(QMenuBar):
         self.aFmtComment.triggered.connect(lambda: self._docAction(nwDocAction.BLOCK_COM))
         self.fmtMenu.addAction(self.aFmtComment)
 
-        # Format > Remove Format
-        self.aFmtNoFormat = QAction("Remove Format", self)
+        # Format > Remove Block Format
+        self.aFmtNoFormat = QAction("Remove Block Format", self)
         self.aFmtNoFormat.setStatusTip("Strips block format")
         self.aFmtNoFormat.setShortcuts(["Ctrl+0","Ctrl+Shift+/"])
         self.aFmtNoFormat.triggered.connect(lambda: self._docAction(nwDocAction.BLOCK_TXT))
diff --git a/nw/gui/outline.py b/nw/gui/outline.py
index 2d2716f8..b2c45f86 100644
--- a/nw/gui/outline.py
+++ b/nw/gui/outline.py
@@ -371,7 +371,7 @@ class GuiOutline(QTreeWidget):
 
             tLevel = self.theIndex.novelIndex[tHandle][sTitle]["level"]
             tTime  = self.theIndex.novelIndex[tHandle][sTitle]["updated"]
-            tItem  = self._createTreeItem(tHandle, sTitle)
+            tItem  = self._createTreeItem(tHandle, sTitle, tLevel)
             self.treeMap[titleKey] = tItem
 
             if tLevel == "H1":
@@ -410,17 +410,18 @@ class GuiOutline(QTreeWidget):
 
         return
 
-    def _createTreeItem(self, tHandle, sTitle):
+    def _createTreeItem(self, tHandle, sTitle, tLevel):
         """Populate a tree item with all the column values.
         """
         nwItem = self.theProject.projTree[tHandle]
         novIdx = self.theIndex.novelIndex[tHandle][sTitle]
 
         newItem = QTreeWidgetItem()
+        hIcon   = "doc_%s" % tLevel.lower()
 
         newItem.setText(self.colIndex[nwOutline.TITLE],  novIdx["title"])
         newItem.setData(self.colIndex[nwOutline.TITLE],  Qt.UserRole, tHandle)
-        newItem.setIcon(self.colIndex[nwOutline.TITLE],  self.theTheme.getIcon("hash"))
+        newItem.setIcon(self.colIndex[nwOutline.TITLE],  self.theTheme.getIcon(hIcon))
         newItem.setText(self.colIndex[nwOutline.LEVEL],  novIdx["level"])
         newItem.setText(self.colIndex[nwOutline.LABEL],  nwItem.itemName)
         newItem.setIcon(self.colIndex[nwOutline.LABEL],  self.theTheme.getIcon("proj_document"))
diff --git a/nw/gui/projtree.py b/nw/gui/projtree.py
index 7a3c98fb..b7b9029c 100644
--- a/nw/gui/projtree.py
+++ b/nw/gui/projtree.py
@@ -67,7 +67,7 @@ class GuiProjectTree(QTreeWidget):
         self.clearTree()
 
         # Build GUI
-        iPx = self.theTheme.textIconSize
+        iPx = self.theTheme.baseIconSize
         self.setIconSize(QSize(iPx, iPx))
         self.setExpandsOnDoubleClick(True)
         self.setIndentation(iPx)
@@ -758,8 +758,8 @@ class GuiProjectTree(QTreeWidget):
             self.addTopLevelItem(newItem)
             self.orphRoot = newItem
             newItem.setExpanded(True)
-            newItem.setData(self.C_NAME, "")
-            newItem.setIcon(self.C_NAME, self.theTheme.getIcon("warning"))
+            newItem.setData(self.C_NAME, Qt.UserRole, "")
+            newItem.setIcon(self.C_NAME, self.theTheme.getIcon("proj_orphan"))
         return
 
     def _cleanOrphanedRoot(self):
diff --git a/nw/gui/theme.py b/nw/gui/theme.py
index 9d513262..08b18691 100644
--- a/nw/gui/theme.py
+++ b/nw/gui/theme.py
@@ -509,10 +509,15 @@ class GuiIcons:
         "cls_trash"      : (QStyle.SP_DriveHDIcon,         "drive-harddisk"),
         "proj_document"  : (QStyle.SP_FileIcon,            "x-office-document"),
         "proj_folder"    : (QStyle.SP_DirIcon,             "folder"),
+        "proj_orphan"    : (QStyle.SP_MessageBoxWarning,   "dialog-warning"),
         "proj_nwx"       : (None,                          None),
         "status_lang"    : (None,                          None),
         "status_time"    : (None,                          None),
         "status_stats"   : (None,                          None),
+        "doc_h1"         : (QStyle.SP_FileIcon,            "x-office-document"),
+        "doc_h2"         : (QStyle.SP_FileIcon,            "x-office-document"),
+        "doc_h3"         : (QStyle.SP_FileIcon,            "x-office-document"),
+        "doc_h4"         : (QStyle.SP_FileIcon,            "x-office-document"),
 
         ## General Button Icons
         "folder-open"    : (QStyle.SP_DirOpenIcon,         "folder-open"),
diff --git a/tests/reference/novelwriter.conf b/tests/reference/novelwriter.conf
index 2c17e47f..2ecde509 100644
--- a/tests/reference/novelwriter.conf
+++ b/tests/reference/novelwriter.conf
@@ -2,7 +2,7 @@
 timestamp = 2020-06-03 20:42:03
 theme = default
 syntax = default_light
-icons = typicons_grey_light
+icons = typicons_colour_light
 guidark = False
 guifont = 
 guifontsize = 11