From 0566df433bcd80c161280f13bbe52ff98d4a4720 Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com>
Date: Thu, 14 May 2020 16:44:14 +0200
Subject: [PATCH] Updated colour icon theme

---
 .../icons/typicons_colour_dark/README.md      | 20 ++-------
 nw/assets/icons/typicons_colour_dark/book.svg | 44 +++++++++----------
 .../typicons_colour_dark/document-text.svg    | 37 +++++++---------
 .../icons/typicons_colour_dark/download.svg   | 16 +++----
 nw/assets/icons/typicons_colour_dark/flag.svg | 16 +++----
 .../icons/typicons_colour_dark/folder.svg     | 34 +++++++-------
 .../icons/typicons_colour_dark/icons.conf     |  5 ++-
 .../typicons_colour_dark/input-checked.svg    | 27 ++++++++----
 .../icons/typicons_colour_dark/location.svg   | 16 +++----
 .../icons/typicons_colour_dark/pencil.svg     | 23 ++++++----
 nw/assets/icons/typicons_colour_dark/plus.svg | 16 +++----
 .../typicons_colour_dark/search-replace.svg   | 28 +++++++-----
 nw/assets/icons/typicons_colour_dark/time.svg | 24 ++++++----
 .../icons/typicons_colour_dark/trash.svg      | 22 ++++++----
 nw/assets/icons/typicons_colour_dark/user.svg | 27 ++++++++----
 nw/assets/icons/typicons_grey_dark/README.md  | 20 ++-------
 nw/assets/icons/typicons_grey_dark/icons.conf |  5 ++-
 nw/assets/icons/typicons_grey_light/README.md | 20 ++-------
 .../icons/typicons_grey_light/icons.conf      |  5 ++-
 nw/gui/dialogs/itemeditor.py                  | 10 ++++-
 nw/gui/icons.py                               | 24 ++++++----
 21 files changed, 229 insertions(+), 210 deletions(-)

diff --git a/nw/assets/icons/typicons_colour_dark/README.md b/nw/assets/icons/typicons_colour_dark/README.md
index 3686b78d..cfa5ea08 100644
--- a/nw/assets/icons/typicons_colour_dark/README.md
+++ b/nw/assets/icons/typicons_colour_dark/README.md
@@ -1,17 +1,5 @@
-Typicons
-----
+## Typicons
 
-Source: https://github.com/stephenhutchings/typicons.font
-
-License
--------
-
-#### Icons/Artwork
-
-Distributed under
-[CC BY-SA](http://creativecommons.org/licenses/by-sa/3.0/) licence.
-
-#### Font
-
-Distributed under
-[SIL Open Font Licence](http://scripts.sil.org/cms/scripts/page.php?item_id=OFL_web) licence.
+Copyright: Stephen Hutchings  
+Source: https://github.com/stephenhutchings/typicons.font  
+License: [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/)  
diff --git a/nw/assets/icons/typicons_colour_dark/book.svg b/nw/assets/icons/typicons_colour_dark/book.svg
index 6798b72e..efd40186 100644
--- a/nw/assets/icons/typicons_colour_dark/book.svg
+++ b/nw/assets/icons/typicons_colour_dark/book.svg
@@ -7,7 +7,7 @@
    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)"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
    sodipodi:docname="book.svg"
    id="svg891"
    viewBox="0 0 24 24"
@@ -29,16 +29,16 @@
      id="defs895" />
   <sodipodi:namedview
      inkscape:current-layer="svg891"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="0"
+     inkscape:window-maximized="0"
+     inkscape:window-y="27"
+     inkscape:window-x="48"
      inkscape:cy="12"
-     inkscape:cx="12"
+     inkscape:cx="6.8268552"
      inkscape:zoom="47.166667"
      showgrid="false"
      id="namedview893"
-     inkscape:window-height="1344"
-     inkscape:window-width="2560"
+     inkscape:window-height="1376"
+     inkscape:window-width="2374"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0"
      guidetolerance="10"
@@ -49,23 +49,19 @@
      pagecolor="#ffffff"
      inkscape:document-rotation="0" />
   <path
-     style="stroke-width:1.11111;fill:#8d1919;fill-opacity:1"
+     style="opacity:0.95;fill:#aeaeae;fill-opacity:1;stroke:none;stroke-width:1.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 6.9042969 4.2226562 L 5.7929688 5.3339844 L 15.333984 5.3339844 C 17.171762 5.3339844 18.666016 6.8282378 18.666016 8.6660156 L 18.666016 17.554688 L 19.222656 17.554688 C 19.418212 17.554687 19.777344 17.134201 19.777344 16.445312 L 19.777344 5.3339844 C 19.777344 4.7206511 19.278238 4.2226562 18.666016 4.2226562 L 6.9042969 4.2226562 z M 5.3222656 7.5546875 L 5.3222656 18.466797 L 6.4453125 18.466797 L 6.4453125 7.5546875 L 5.3222656 7.5546875 z M 7.5546875 7.5546875 L 7.5546875 18.466797 L 16.445312 18.466797 L 16.445312 8.6660156 C 16.445313 8.0526822 15.946207 7.5546875 15.333984 7.5546875 L 7.5546875 7.5546875 z "
+     id="rect11733"
+     inkscape:label="Pages" />
+  <path
+     style="display:inline;opacity:0.95;fill:#d64848;fill-opacity:1;stroke:none;stroke-width:1.83457506;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 4.2226562 7.5546875 L 4.2226562 18.666016 C 4.2226563 19.279349 4.7217622 19.777344 5.3339844 19.777344 L 6.4453125 19.777344 L 6.4453125 7.5546875 L 4.2226562 7.5546875 z M 7.5546875 7.5546875 L 7.5546875 19.777344 L 15.333984 19.777344 C 15.946207 19.777344 16.445312 19.279349 16.445312 18.666016 L 16.445312 8.6660156 C 16.445313 8.0526822 15.946207 7.5546875 15.333984 7.5546875 L 7.5546875 7.5546875 z "
+     id="rect11731"
+     inkscape:label="Cover" />
+  <path
+     style="display:inline;fill:#8d1919;fill-opacity:1;stroke-width:1.11110997"
      inkscape:connector-curvature="0"
      id="path889"
-     d="M 18.666667,2 H 6.4444444 C 6.15,2 5.8666667,2.1166667 5.6588889,2.3255556 l -3.3333333,3.3333333 -0.063333,0.068889 c -0.1544444,0.1833333 -0.25,0.4144444 -0.2611111,0.6666666 L 2,6.4533333 V 18.666667 C 2,20.504444 3.4955556,22 5.3333333,22 h 9.9999997 c 1.448889,0 2.684445,-0.928889 3.143334,-2.222222 h 0.745555 C 20.78,19.777778 22,18.314444 22,16.444444 V 5.3333333 C 22,3.4955556 20.504444,2 18.666667,2 Z M 5.3333333,19.777778 c -0.6122222,0 -1.1111111,-0.497778 -1.1111111,-1.111111 V 7.5555556 H 6.4444444 V 19.777778 Z M 16.444444,18.666667 c 0,0.613333 -0.498888,1.111111 -1.111111,1.111111 H 7.5555556 V 7.5555556 h 7.7777774 c 0.612223,0 1.111111,0.4977777 1.111111,1.1111111 z m 3.333334,-2.222223 c 0,0.688889 -0.36,1.111112 -0.555556,1.111112 H 18.666667 V 8.6666667 c 0,-1.8377778 -1.495556,-3.3333334 -3.333334,-3.3333334 H 5.7933333 L 6.9044444,4.2222222 H 18.666667 c 0.612222,0 1.111111,0.4977778 1.111111,1.1111111 z" />
-  <path
-     inkscape:connector-curvature="0"
-     id="path5553"
-     d="M 7.5689046,13.664311 V 7.5689046 h 3.9424194 c 2.796293,0 3.975082,0.00681 4.05477,0.023429 0.400795,0.083581 0.757991,0.4407772 0.841572,0.8415718 0.01675,0.080326 0.02308,1.5760396 0.02221,5.2473506 -0.0011,4.783382 -0.0037,5.144553 -0.03765,5.274529 -0.09319,0.356989 -0.395911,0.661599 -0.765333,0.770108 -0.103615,0.03044 -0.513154,0.03382 -4.086572,0.03382 H 7.5689046 Z"
-     style="fill:#d64848;fill-opacity:1;stroke-width:0.0212014" />
-  <path
-     inkscape:connector-curvature="0"
-     id="path5555"
-     d="M 5.0035336,19.711467 C 4.6350882,19.585391 4.38211,19.323214 4.274107,18.955516 4.2435159,18.851368 4.2402827,18.30166 4.2402827,13.204633 V 7.5689046 h 1.1024735 1.1024735 v 6.0954064 6.095406 L 5.7932863,19.75917 c -0.6176254,-5.19e-4 -0.6591977,-0.003 -0.7897527,-0.0477 z"
-     style="fill:#d64848;fill-opacity:1;stroke-width:0.0212014" />
-  <path
-     inkscape:connector-curvature="0"
-     id="path5557"
-     d="M 18.678271,13.035557 C 18.678158,10.081323 18.670549,8.4464784 18.656337,8.3224139 18.540177,7.3084088 18.014471,6.4396446 17.183746,5.888858 16.719508,5.5810596 16.242431,5.408369 15.677586,5.343663 15.553147,5.3294078 13.820471,5.3218427 10.653866,5.3217288 L 5.8200998,5.3215548 6.3604241,4.7809188 6.9007483,4.2402827 h 5.9698057 c 5.402863,0 5.980742,0.00321 6.084962,0.033824 0.37747,0.1108731 0.662105,0.396242 0.770744,0.7727316 0.03077,0.1066343 0.0334,0.65605 0.02838,5.9363957 l -0.0055,5.818886 -0.06261,0.179454 c -0.07162,0.205274 -0.197196,0.403273 -0.315637,0.497685 -0.0811,0.06465 -0.08266,0.06494 -0.386926,0.0722 l -0.305495,0.0073 z"
-     style="fill:#aeaeae;fill-opacity:1;stroke-width:0.0212014" />
+     d="M 18.666667,2 H 6.4444444 C 6.15,2 5.8666667,2.1166667 5.6588889,2.3255556 l -3.3333333,3.3333333 -0.063333,0.068889 c -0.1544444,0.1833333 -0.25,0.4144444 -0.2611111,0.6666666 L 2,6.4533333 V 18.666667 C 2,20.504444 3.4955556,22 5.3333333,22 h 9.9999997 c 1.448889,0 2.684445,-0.928889 3.143334,-2.222222 h 0.745555 C 20.78,19.777778 22,18.314444 22,16.444444 V 5.3333333 C 22,3.4955556 20.504444,2 18.666667,2 Z M 5.3333333,19.777778 c -0.6122222,0 -1.1111111,-0.497778 -1.1111111,-1.111111 V 7.5555556 H 6.4444444 V 19.777778 Z M 16.444444,18.666667 c 0,0.613333 -0.498888,1.111111 -1.111111,1.111111 H 7.5555556 V 7.5555556 h 7.7777774 c 0.612223,0 1.111111,0.4977777 1.111111,1.1111111 z m 3.333334,-2.222223 c 0,0.688889 -0.36,1.111112 -0.555556,1.111112 H 18.666667 V 8.6666667 c 0,-1.8377778 -1.495556,-3.3333334 -3.333334,-3.3333334 H 5.7933333 L 6.9044444,4.2222222 H 18.666667 c 0.612222,0 1.111111,0.4977778 1.111111,1.1111111 z"
+     inkscape:label="Outline" />
 </svg>
diff --git a/nw/assets/icons/typicons_colour_dark/document-text.svg b/nw/assets/icons/typicons_colour_dark/document-text.svg
index bb79ef9e..aadcc635 100644
--- a/nw/assets/icons/typicons_colour_dark/document-text.svg
+++ b/nw/assets/icons/typicons_colour_dark/document-text.svg
@@ -7,7 +7,7 @@
    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)"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
    sodipodi:docname="document-text.svg"
    id="svg2161"
    viewBox="0 0 24 24"
@@ -29,16 +29,16 @@
      id="defs2165" />
   <sodipodi:namedview
      inkscape:current-layer="svg2161"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="0"
+     inkscape:window-maximized="0"
+     inkscape:window-y="27"
+     inkscape:window-x="48"
      inkscape:cy="12"
-     inkscape:cx="12.734426"
+     inkscape:cx="6.2557375"
      inkscape:zoom="38.125"
      showgrid="false"
      id="namedview2163"
-     inkscape:window-height="1344"
-     inkscape:window-width="2560"
+     inkscape:window-height="1376"
+     inkscape:window-width="2374"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0"
      guidetolerance="10"
@@ -48,19 +48,16 @@
      bordercolor="#666666"
      pagecolor="#ffffff"
      inkscape:document-rotation="0" />
-  <g
-     style="fill:#aeaeae;fill-opacity:1"
-     transform="matrix(1.125,0,0,1.125,-1.5,-1.3749999)"
-     id="g2159">
-    <path
-       style="fill:#363636;fill-opacity:1"
-       inkscape:connector-curvature="0"
-       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:#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"
+     inkscape:label="Page"
+     inkscape:connector-curvature="0" />
+  <path
+     style="display:inline;fill:#363636;fill-opacity:1;stroke-width:1.11111116"
      inkscape:connector-curvature="0"
-     id="path4883"
-     d="M 6.2256851,19.974083 C 5.9162854,19.934305 5.586273,19.716724 5.4240615,19.445563 5.2463925,19.148562 5.2590164,19.708025 5.2590164,12.131148 5.2590164,4.6228118 5.2486679,5.1280666 5.408465,4.8344667 5.5048695,4.6573399 5.7248573,4.4585472 5.9342026,4.3593823 L 6.1114754,4.2754098 H 12 17.888525 l 0.177273,0.083972 c 0.209345,0.099165 0.429332,0.2979576 0.525737,0.4750844 0.159797,0.2935999 0.149449,-0.2116549 0.149449,7.2966818 0,7.576876 0.01262,7.017413 -0.165045,7.314414 -0.168001,0.280838 -0.488235,0.486452 -0.825324,0.529918 -0.21179,0.02731 -11.3121139,0.02596 -11.5249299,-0.0014 z M 16.780915,17.683796 c 0.181536,-0.106709 0.264585,-0.245729 0.27689,-0.4635 0.01115,-0.197359 -0.03708,-0.325385 -0.170157,-0.451691 C 16.715859,16.605559 17.063756,16.616393 12,16.616393 c -5.0637558,0 -4.7158591,-0.01083 -4.8876481,0.152212 -0.2569536,0.243875 -0.2304181,0.679899 0.053551,0.87993 0.058375,0.04112 0.1459938,0.08426 0.1947075,0.09586 0.048714,0.0116 2.1600458,0.01927 4.6918486,0.01704 l 4.603279,-0.0041 z m -0.110024,-3.32685 c 0.231854,-0.06947 0.389775,-0.288226 0.390828,-0.541395 9.84e-4,-0.236388 -0.09696,-0.403345 -0.301063,-0.513186 l -0.104918,-0.05646 H 12 7.3442623 l -0.1168681,0.06557 c -0.1811029,0.101616 -0.2728252,0.252519 -0.2850563,0.468979 -0.00804,0.142352 8.766e-4,0.199648 0.044347,0.284857 0.06286,0.123216 0.2175354,0.260338 0.331348,0.293746 0.1245293,0.03655 9.2306691,0.0345 9.3528581,-0.0021 z m 0.04471,-3.394403 c 0.124564,-0.05203 0.232418,-0.154663 0.299359,-0.284859 0.04159,-0.08088 0.05067,-0.139947 0.04283,-0.278616 -0.01143,-0.20226 -0.08521,-0.334165 -0.24888,-0.4449696 l -0.09686,-0.065574 -4.685922,-0.00677 -4.6859215,-0.00677 -0.1160029,0.061243 c -0.1782659,0.094114 -0.2695847,0.2433476 -0.2818617,0.4606206 -0.011307,0.200104 0.036345,0.327398 0.170014,0.454164 0.1696241,0.160864 -0.1773069,0.150117 4.8819331,0.15124 4.122412,9.15e-4 4.634368,-0.0034 4.721312,-0.03971 z m 0.06532,-3.4033372 C 16.962451,7.4524968 17.0455,7.313477 17.057805,7.095706 17.068957,6.8983468 17.020728,6.7703209 16.887648,6.6440144 16.715859,6.4809691 17.063756,6.4918033 12,6.4918033 c -5.0637558,0 -4.7158591,-0.010834 -4.8876481,0.1522111 -0.2569536,0.2438752 -0.2304181,0.6798998 0.053551,0.87993 0.058375,0.04112 0.1459938,0.084256 0.1947075,0.095858 0.048714,0.011602 2.1600458,0.019269 4.6918486,0.017039 l 4.603279,-0.00405 z"
-     style="fill:#ededed;fill-opacity:1;stroke-width:0.0262295" />
+     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"
+     inkscape:label="Outline" />
 </svg>
diff --git a/nw/assets/icons/typicons_colour_dark/download.svg b/nw/assets/icons/typicons_colour_dark/download.svg
index ba966a8d..c8ffa937 100644
--- a/nw/assets/icons/typicons_colour_dark/download.svg
+++ b/nw/assets/icons/typicons_colour_dark/download.svg
@@ -7,7 +7,7 @@
    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)"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
    sodipodi:docname="download.svg"
    id="svg13801"
    viewBox="0 0 24 24"
@@ -29,16 +29,16 @@
      id="defs13805" />
   <sodipodi:namedview
      inkscape:current-layer="svg13801"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="0"
+     inkscape:window-maximized="0"
+     inkscape:window-y="27"
+     inkscape:window-x="48"
      inkscape:cy="12"
-     inkscape:cx="12"
+     inkscape:cx="7.2131148"
      inkscape:zoom="38.125"
      showgrid="false"
      id="namedview13803"
-     inkscape:window-height="1344"
-     inkscape:window-width="2560"
+     inkscape:window-height="1376"
+     inkscape:window-width="2374"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0"
      guidetolerance="10"
@@ -57,7 +57,7 @@
   <path
      sodipodi:nodetypes="csccsssccsccccc"
      inkscape:connector-curvature="0"
-     style="display:inline;fill:#2c840c;fill-opacity:1"
+     style="display:inline;fill:#99cc99;fill-opacity:1"
      id="path13799"
      d="M 16.707,7.404 C 16.518,7.216 16.259,7.121 16,7.121 c -0.259,0 -0.518,0.095 -0.707,0.283 L 13,9.697 V 3 C 13,2.448 12.552,2 12,2 11.448,2 11,2.448 11,3 V 9.697 L 8.707,7.404 C 8.518,7.216 8.267,7.111 8,7.111 c -0.267,0 -0.518,0.105 -0.707,0.293 -0.39,0.39 -0.39,1.024 0,1.414 L 12,13.5 16.709,8.816 C 17.097,8.429 17.097,7.794 16.707,7.404 Z" />
 </svg>
diff --git a/nw/assets/icons/typicons_colour_dark/flag.svg b/nw/assets/icons/typicons_colour_dark/flag.svg
index 93662481..9facfcfa 100644
--- a/nw/assets/icons/typicons_colour_dark/flag.svg
+++ b/nw/assets/icons/typicons_colour_dark/flag.svg
@@ -13,7 +13,7 @@
    viewBox="0 0 24 24"
    id="svg16286"
    sodipodi:docname="flag.svg"
-   inkscape:version="1.0rc1 (09960d6f05, 2020-04-09)">
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
   <metadata
      id="metadata16292">
     <rdf:RDF>
@@ -37,20 +37,20 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1344"
+     inkscape:window-width="2374"
+     inkscape:window-height="1376"
      id="namedview16288"
      showgrid="false"
      inkscape:zoom="38.125"
-     inkscape:cx="12"
+     inkscape:cx="7.2131148"
      inkscape:cy="12"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
+     inkscape:window-x="48"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
      inkscape:current-layer="svg16286" />
   <path
      d="m 19.8612,3.6198408 c -0.460612,-0.1908955 -0.990193,-0.084979 -1.342426,0.2672537 -1.556722,1.5554906 -4.090091,1.5567222 -5.648044,0 -2.51859,-2.516126 -6.6136063,-2.516126 -9.1309639,0 C 3.5082283,4.1174007 3.378912,4.4314547 3.378912,4.7578244 V 20.768416 C 3.378912,21.44825 3.92943,22 4.610496,22 5.2915619,22 5.8420799,21.44825 5.8420799,20.768416 v -5.607402 c 1.5653433,-1.227889 3.8437741,-1.121973 5.2871901,0.320212 2.518589,2.516126 6.614837,2.516126 9.130963,0 0.231538,-0.231538 0.360855,-0.54436 0.360855,-0.87073 V 4.7578244 c 0,-0.4987915 -0.300507,-0.9470881 -0.759888,-1.1379836 z"
      id="path16284"
      inkscape:connector-curvature="0"
-     style="stroke-width:1.23158;fill:#6699cc;fill-opacity:1" />
+     style="stroke-width:1.23158;fill:#f99157;fill-opacity:1" />
 </svg>
diff --git a/nw/assets/icons/typicons_colour_dark/folder.svg b/nw/assets/icons/typicons_colour_dark/folder.svg
index 267d69fe..fd894938 100644
--- a/nw/assets/icons/typicons_colour_dark/folder.svg
+++ b/nw/assets/icons/typicons_colour_dark/folder.svg
@@ -7,7 +7,7 @@
    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)"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
    sodipodi:docname="folder.svg"
    id="svg2765"
    viewBox="0 0 24 24"
@@ -29,16 +29,16 @@
      id="defs2769" />
   <sodipodi:namedview
      inkscape:current-layer="svg2765"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="0"
+     inkscape:window-maximized="0"
+     inkscape:window-y="27"
+     inkscape:window-x="48"
      inkscape:cy="12"
-     inkscape:cx="12"
+     inkscape:cx="6.3081967"
      inkscape:zoom="38.125"
      showgrid="false"
      id="namedview2767"
-     inkscape:window-height="1344"
-     inkscape:window-width="2560"
+     inkscape:window-height="1376"
+     inkscape:window-width="2374"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0"
      guidetolerance="10"
@@ -49,18 +49,14 @@
      pagecolor="#ffffff"
      inkscape:document-rotation="0" />
   <path
-     style="stroke-width:1.11803;fill:#ffff84;fill-opacity:1"
+     style="fill:#ffffc0;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+     d="M 5.3339844 5.25 C 4.7206511 5.25 4.2226562 5.7540001 4.2226562 6.375 L 4.2226562 8.625 L 19.777344 8.625 C 19.777344 8.0039999 19.279349 7.5 18.666016 7.5 L 12 7.5 C 10.773333 7.5 9.7773438 6.4920001 9.7773438 5.25 L 5.3339844 5.25 z M 4.2226562 9.75 L 4.2226562 17.625 C 4.2226563 18.246001 4.7206511 18.75 5.3339844 18.75 L 18.666016 18.75 C 19.279349 18.75 19.777344 18.246001 19.777344 17.625 L 19.777344 9.75 L 4.2226562 9.75 z "
+     id="path12368"
+     inkscape:label="Face" />
+  <path
+     style="display:inline;fill:#ffff84;fill-opacity:1;stroke-width:1.11802995"
      inkscape:connector-curvature="0"
      id="path2763"
-     d="M 18.666667,5.2499999 H 12 C 12,4.008 11.004444,3 9.777778,3 H 5.3333333 C 3.4955556,3 2,4.51425 2,6.3749999 V 17.624999 C 2,19.48575 3.4955556,21 5.3333333,21 H 18.666667 C 20.504444,21 22,19.48575 22,17.624999 V 8.625 C 22,6.76425 20.504444,5.2499999 18.666667,5.2499999 Z m -13.3333337,0 H 9.777778 c 0,1.2420001 0.995555,2.25 2.222222,2.25 h 6.666667 c 0.613333,0 1.111111,0.504 1.111111,1.1250001 H 4.2222222 V 6.3749999 c 0,-0.6209999 0.4977778,-1.125 1.1111111,-1.125 z M 18.666667,18.75 H 5.3333333 C 4.72,18.75 4.2222222,18.246 4.2222222,17.624999 V 9.75 H 19.777778 v 7.874999 C 19.777778,18.246 19.28,18.75 18.666667,18.75 Z" />
-  <path
-     inkscape:connector-curvature="0"
-     id="path4283"
-     d="M 4.9929498,18.680231 C 4.6814599,18.574057 4.4784637,18.391551 4.3311669,18.085246 l -0.081987,-0.170492 -0.00688,-4.085246 -0.00688,-4.0852457 h 7.7646601 7.76466 l -0.007,4.0852457 -0.007,4.085246 -0.08416,0.177674 c -0.09641,0.203537 -0.305224,0.428296 -0.481751,0.518539 -0.266549,0.136263 0.115168,0.12942 -7.198023,0.129028 L 5.1671339,18.73963 4.9928706,18.68023 Z"
-     style="fill:#ffffc0;fill-opacity:1;stroke-width:0.0262295" />
-  <path
-     inkscape:connector-curvature="0"
-     id="path4285"
-     d="m 4.2416674,7.3508197 0.00751,-1.2655738 0.081243,-0.1704918 C 4.4809023,5.5989666 4.7369519,5.3811843 5.0583656,5.2956046 5.1678331,5.2664578 5.6266424,5.25958 7.4783494,5.2593277 l 2.2849067,-3.113e-4 0.017937,0.1979438 c 0.085297,0.9412787 0.7469579,1.7224442 1.6811019,1.9847292 l 0.209836,0.058917 3.632787,0.013631 c 3.346635,0.012558 3.64159,0.017163 3.74455,0.058471 0.369484,0.1482376 0.668606,0.5282354 0.706753,0.8978401 l 0.01505,0.1458447 h -7.76856 -7.7685596 z"
-     style="fill:#ffffc0;fill-opacity:1;stroke-width:0.0262295" />
+     d="M 18.666667,5.2499999 H 12 C 12,4.008 11.004444,3 9.777778,3 H 5.3333333 C 3.4955556,3 2,4.51425 2,6.3749999 V 17.624999 C 2,19.48575 3.4955556,21 5.3333333,21 H 18.666667 C 20.504444,21 22,19.48575 22,17.624999 V 8.625 C 22,6.76425 20.504444,5.2499999 18.666667,5.2499999 Z m -13.3333337,0 H 9.777778 c 0,1.2420001 0.995555,2.25 2.222222,2.25 h 6.666667 c 0.613333,0 1.111111,0.504 1.111111,1.1250001 H 4.2222222 V 6.3749999 c 0,-0.6209999 0.4977778,-1.125 1.1111111,-1.125 z M 18.666667,18.75 H 5.3333333 C 4.72,18.75 4.2222222,18.246 4.2222222,17.624999 V 9.75 H 19.777778 v 7.874999 C 19.777778,18.246 19.28,18.75 18.666667,18.75 Z"
+     inkscape:label="Outline" />
 </svg>
diff --git a/nw/assets/icons/typicons_colour_dark/icons.conf b/nw/assets/icons/typicons_colour_dark/icons.conf
index aa7942c7..dfb1278f 100644
--- a/nw/assets/icons/typicons_colour_dark/icons.conf
+++ b/nw/assets/icons/typicons_colour_dark/icons.conf
@@ -7,9 +7,12 @@
 
 [Main]
 name           = Typicons Colour Dark
-author         = Stephen Hutchings
+description    = Coulorised icons for dark GUI theme based on Typicons.
+author         = Stephen Hutchings (original), Veronica Berglyd Olsen (adaptation)
 credit         = Stephen Hutchings
 url            = https://github.com/stephenhutchings/typicons.font
+license        = CC BY-SA 4.0
+licenseurl     = https://creativecommons.org/licenses/by-sa/4.0/
 
 [Map]
 cls_none       = cancel.svg
diff --git a/nw/assets/icons/typicons_colour_dark/input-checked.svg b/nw/assets/icons/typicons_colour_dark/input-checked.svg
index ae2fede6..e4b22265 100644
--- a/nw/assets/icons/typicons_colour_dark/input-checked.svg
+++ b/nw/assets/icons/typicons_colour_dark/input-checked.svg
@@ -7,7 +7,7 @@
    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)"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
    sodipodi:docname="input-checked.svg"
    id="svg11367"
    viewBox="0 0 24 24"
@@ -29,16 +29,16 @@
      id="defs11371" />
   <sodipodi:namedview
      inkscape:current-layer="svg11367"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="0"
+     inkscape:window-maximized="0"
+     inkscape:window-y="27"
+     inkscape:window-x="48"
      inkscape:cy="12"
-     inkscape:cx="12"
+     inkscape:cx="7.2131148"
      inkscape:zoom="38.125"
      showgrid="false"
      id="namedview11369"
-     inkscape:window-height="1344"
-     inkscape:window-width="2560"
+     inkscape:window-height="1376"
+     inkscape:window-width="2374"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0"
      guidetolerance="10"
@@ -49,8 +49,17 @@
      pagecolor="#ffffff"
      inkscape:document-rotation="0" />
   <path
-     style="stroke-width:1.28571;fill:#2c840c;fill-opacity:1"
+     style="display:inline;fill:#99cc99;fill-opacity:1;stroke-width:1.28570998"
      inkscape:connector-curvature="0"
      id="path11365"
-     d="M 17.142857,21 H 6.8571429 C 4.7305714,21 3,19.269429 3,17.142857 V 6.8571429 C 3,4.7305714 4.7305714,3 6.8571429,3 h 6.4285711 c 0.711,0 1.285715,0.576 1.285715,1.2857143 0,0.7097143 -0.574715,1.2857143 -1.285715,1.2857143 H 6.8571429 c -0.7097143,0 -1.2857143,0.5772857 -1.2857143,1.2857143 V 17.142857 c 0,0.708429 0.576,1.285714 1.2857143,1.285714 H 17.142857 c 0.709714,0 1.285714,-0.577285 1.285714,-1.285714 V 13.285714 C 18.428571,12.576 19.003286,12 19.714286,12 20.425286,12 21,12.576 21,13.285714 v 3.857143 C 21,19.269429 19.269429,21 17.142857,21 Z m -3.643714,-5.357571 c -0.45,0 -0.885857,-0.178715 -1.209857,-0.502715 L 8.859,11.710714 c -0.668571,-0.669857 -0.668571,-1.755 0,-2.423571 0.669857,-0.669857 1.755,-0.669857 2.426143,0 L 13.105714,11.109 17.573571,4.0954286 c 0.459,-0.828 1.504286,-1.1275715 2.332286,-0.6672857 0.826714,0.4602857 1.125,1.5042857 0.666,2.331 l -5.572286,9.0000001 c -0.261,0.470571 -0.727714,0.790714 -1.26,0.865286 z" />
+     d="m 13.499143,15.642429 c -0.45,0 -0.885857,-0.178715 -1.209857,-0.502715 L 8.859,11.710714 c -0.668571,-0.669857 -0.668571,-1.755 0,-2.423571 0.669857,-0.669857 1.755,-0.669857 2.426143,0 L 13.105714,11.109 17.573571,4.0954286 c 0.459,-0.828 1.504286,-1.1275715 2.332286,-0.6672857 0.826714,0.4602857 1.125,1.5042857 0.666,2.331 l -5.572286,9.0000001 c -0.261,0.470571 -0.727714,0.790714 -1.26,0.865286 z"
+     sodipodi:nodetypes="cccscccccccc"
+     inkscape:label="Check" />
+  <path
+     d="M 17.142857,21 H 6.8571429 C 4.7305714,21 3,19.269429 3,17.142857 V 6.8571429 C 3,4.7305714 4.7305714,3 6.8571429,3 h 6.4285711 c 0.711,0 1.285715,0.576 1.285715,1.2857143 0,0.7097143 -0.574715,1.2857143 -1.285715,1.2857143 H 6.8571429 c -0.7097143,0 -1.2857143,0.5772857 -1.2857143,1.2857143 V 17.142857 c 0,0.708429 0.576,1.285714 1.2857143,1.285714 H 17.142857 c 0.709714,0 1.285714,-0.577285 1.285714,-1.285714 V 13.285714 C 18.428571,12.576 19.003286,12 19.714286,12 20.425286,12 21,12.576 21,13.285714 v 3.857143 C 21,19.269429 19.269429,21 17.142857,21 Z"
+     id="path16196"
+     inkscape:connector-curvature="0"
+     style="display:inline;fill:#aeaeae;fill-opacity:0.39215687;stroke-width:1.28570998"
+     sodipodi:nodetypes="sssssssssssssssssss"
+     inkscape:label="Frame" />
 </svg>
diff --git a/nw/assets/icons/typicons_colour_dark/location.svg b/nw/assets/icons/typicons_colour_dark/location.svg
index a1844983..1189343d 100644
--- a/nw/assets/icons/typicons_colour_dark/location.svg
+++ b/nw/assets/icons/typicons_colour_dark/location.svg
@@ -7,7 +7,7 @@
    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)"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
    sodipodi:docname="location.svg"
    id="svg4600"
    viewBox="0 0 24 24"
@@ -29,16 +29,16 @@
      id="defs4604" />
   <sodipodi:namedview
      inkscape:current-layer="svg4600"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="0"
+     inkscape:window-maximized="0"
+     inkscape:window-y="27"
+     inkscape:window-x="48"
      inkscape:cy="12"
-     inkscape:cx="12"
+     inkscape:cx="7.2131148"
      inkscape:zoom="38.125"
      showgrid="false"
      id="namedview4602"
-     inkscape:window-height="1344"
-     inkscape:window-width="2560"
+     inkscape:window-height="1376"
+     inkscape:window-width="2374"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0"
      guidetolerance="10"
@@ -49,7 +49,7 @@
      pagecolor="#ffffff"
      inkscape:document-rotation="0" />
   <path
-     style="stroke-width:1.05265;fill:#d64848;fill-opacity:1"
+     style="stroke-width:1.05265;fill:#6699cc;fill-opacity:1"
      inkscape:connector-curvature="0"
      id="path4598"
      d="m 17.954289,4.4260846 c -3.288464,-3.2347795 -8.6201134,-3.2347795 -11.9085778,0 -3.2884643,3.235832 -3.2884643,8.4811644 0,11.7159434 L 11.999474,22 17.954289,16.142028 c 3.288464,-3.234779 3.288464,-8.4801114 0,-11.7159434 z m -5.954815,8.6264294 c -0.703167,0 -1.363176,-0.273688 -1.861077,-0.770537 -1.0263296,-1.026329 -1.0263296,-2.695825 0,-3.7221538 0.496848,-0.4968487 1.15791,-0.7705365 1.861077,-0.7705365 0.703167,0 1.364228,0.2736878 1.861077,0.7705365 1.026329,1.0263288 1.026329,2.6968778 0,3.7221538 -0.496849,0.496849 -1.15791,0.770537 -1.861077,0.770537 z" />
diff --git a/nw/assets/icons/typicons_colour_dark/pencil.svg b/nw/assets/icons/typicons_colour_dark/pencil.svg
index bf1d0dab..873f98e4 100644
--- a/nw/assets/icons/typicons_colour_dark/pencil.svg
+++ b/nw/assets/icons/typicons_colour_dark/pencil.svg
@@ -13,7 +13,7 @@
    viewBox="0 0 24 24"
    id="svg14474"
    sodipodi:docname="pencil.svg"
-   inkscape:version="1.0rc1 (09960d6f05, 2020-04-09)">
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
   <metadata
      id="metadata14480">
     <rdf:RDF>
@@ -37,19 +37,26 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1344"
+     inkscape:window-width="2374"
+     inkscape:window-height="1376"
      id="namedview14476"
      showgrid="false"
      inkscape:zoom="38.125"
-     inkscape:cx="12"
+     inkscape:cx="2.4262296"
      inkscape:cy="12"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
+     inkscape:window-x="48"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
      inkscape:current-layer="svg14474" />
   <path
      d="M21 6.879l-3.879-3.879c-.293-.293-.678-.439-1.061-.439-.384 0-.767.146-1.06.439l-10.939 10.939c-.293.293-.558.727-.75 1.188-.192.463-.311.959-.311 1.373v4.5h4.5c.414 0 .908-.119 1.371-.311.463-.192.896-.457 1.189-.75l10.94-10.939c.293-.293.439-.678.439-1.061 0-.384-.146-.767-.439-1.06zm-15.232 8.182l8.293-8.293 1.232 1.232-8.293 8.293-1.232-1.232zm1.732 3.939h-1.5l-1-1v-1.5c0-.077.033-.305.158-.605.01-.02 2.967 2.938 2.967 2.938-.322.134-.548.167-.625.167zm1.439-.768l-1.232-1.232 8.293-8.293 1.232 1.232-8.293 8.293zm9-9l-3.172-3.172 1.293-1.293 3.17 3.172-1.291 1.293z"
      id="path14472"
-     style="fill:#aeaeae;fill-opacity:1" />
+     style="fill:#99cc99;fill-opacity:1"
+     inkscape:label="Tip" />
+  <path
+     style="display:inline;opacity:0.95;fill:#0a0a0a;fill-opacity:1;stroke:none;stroke-width:1.88249397;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 3,18.414062 V 21 h 2.5605469 z"
+     id="rect19553"
+     inkscape:connector-curvature="0"
+     inkscape:label="Pencil" />
 </svg>
diff --git a/nw/assets/icons/typicons_colour_dark/plus.svg b/nw/assets/icons/typicons_colour_dark/plus.svg
index 7287b396..8e77765e 100644
--- a/nw/assets/icons/typicons_colour_dark/plus.svg
+++ b/nw/assets/icons/typicons_colour_dark/plus.svg
@@ -7,7 +7,7 @@
    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)"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
    sodipodi:docname="plus.svg"
    id="svg5808"
    viewBox="0 0 24 24"
@@ -29,16 +29,16 @@
      id="defs5812" />
   <sodipodi:namedview
      inkscape:current-layer="svg5808"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="0"
+     inkscape:window-maximized="0"
+     inkscape:window-y="27"
+     inkscape:window-x="48"
      inkscape:cy="12"
-     inkscape:cx="12"
+     inkscape:cx="7.2131148"
      inkscape:zoom="38.125"
      showgrid="false"
      id="namedview5810"
-     inkscape:window-height="1344"
-     inkscape:window-width="2560"
+     inkscape:window-height="1376"
+     inkscape:window-width="2374"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0"
      guidetolerance="10"
@@ -49,7 +49,7 @@
      pagecolor="#ffffff"
      inkscape:document-rotation="0" />
   <path
-     style="stroke-width:1.25;fill:#2c840c;fill-opacity:1"
+     style="stroke-width:1.25;fill:#99cc99;fill-opacity:1"
      inkscape:connector-curvature="0"
      id="path5806"
      d="m 19.5,9.5 h -5 v -5 C 14.5,3.12 13.38,2 12,2 10.62,2 9.5,3.12 9.5,4.5 l 0.08875,5 H 4.5 C 3.12,9.5 2,10.62 2,12 c 0,1.38 1.12,2.5 2.5,2.5 L 9.58875,14.41125 9.5,19.5 c 0,1.38 1.12,2.5 2.5,2.5 1.38,0 2.5,-1.12 2.5,-2.5 V 14.41125 L 19.5,14.5 C 20.88,14.5 22,13.38 22,12 22,10.62 20.88,9.5 19.5,9.5 Z" />
diff --git a/nw/assets/icons/typicons_colour_dark/search-replace.svg b/nw/assets/icons/typicons_colour_dark/search-replace.svg
index b6c6e81e..012a9795 100644
--- a/nw/assets/icons/typicons_colour_dark/search-replace.svg
+++ b/nw/assets/icons/typicons_colour_dark/search-replace.svg
@@ -7,7 +7,7 @@
    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)"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
    sodipodi:docname="search-replace.svg"
    id="svg873"
    viewBox="0 0 24 24"
@@ -30,16 +30,16 @@
      id="defs877" />
   <sodipodi:namedview
      inkscape:current-layer="svg873"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="0"
+     inkscape:window-maximized="0"
+     inkscape:window-y="27"
+     inkscape:window-x="48"
      inkscape:cy="13.48294"
-     inkscape:cx="17.190111"
+     inkscape:cx="2.0335396"
      inkscape:zoom="33.35187"
      showgrid="false"
      id="namedview875"
-     inkscape:window-height="1344"
-     inkscape:window-width="2560"
+     inkscape:window-height="1376"
+     inkscape:window-width="2374"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0"
      guidetolerance="10"
@@ -54,11 +54,19 @@
      d="m 10.330622,1.9999997 c -4.5924663,0 -8.3306193,3.738153 -8.3306193,8.3306193 0,1.391929 0.3467825,2.702587 0.9532665,3.857242 0.084308,-0.108411 0.1590865,-0.228838 0.2534294,-0.323181 L 4.7482003,12.323178 C 4.5237338,11.697056 4.378519,11.032991 4.3785189,10.330619 c 0,-3.2810129 2.6710902,-5.949778 5.9521031,-5.949778 0.702303,0 1.36649,0.1429324 1.992559,0.3673563 L 14.141363,2.9300158 C 12.997884,2.3384803 11.704084,1.9999997 10.330622,1.9999997 Z m 5.635898,3.4852355 -0.60451,0.6045104 2.545919,2.5482442 0.460357,-0.4626829 C 18.332278,8.0413114 18.299136,7.9066594 18.256684,7.7754 Z m 0.292955,4.4245521 c 0.0083,0.1189097 0.01733,0.2373427 0.01861,0.3580557 l 0.169728,-0.169728 z m 2.059986,2.6993717 -5.710299,5.710299 c 0.105352,-0.03032 0.217183,-0.04484 0.320855,-0.07906 l 0.892816,0.89049 1.799581,1.797261 0.07208,0.07208 0.07672,0.06743 C 16.486443,21.66984 17.375591,22 18.275281,22 c 2.054056,0 3.724716,-1.671795 3.724716,-3.72704 0,-0.999657 -0.390465,-1.936781 -1.099745,-2.638921 l -1.129969,-1.174145 -0.639387,-0.639386 -0.890489,-0.892815 c 0.03403,-0.103138 0.04885,-0.213757 0.07906,-0.318531 z m -11.7600542,2.28784 -0.4929085,0.492908 0.5417343,0.541734 0.57196,-0.571959 C 6.960254,15.221393 6.7588057,15.062002 6.5594068,14.896999 Z m 2.7179722,1.285747 -1.209021,1.209021 0.5417345,0.541734 1.6577535,-1.655429 c -0.3372847,-0.0036 -0.668706,-0.03764 -0.990467,-0.09533 z"
      style="display:inline;fill:#6699cc;fill-opacity:1;stroke-width:1.19007"
      id="path871"
-     inkscape:connector-curvature="0" />
+     inkscape:connector-curvature="0"
+     inkscape:label="Search" />
   <path
      sodipodi:nodetypes="scccscssccsccscccccccccccccccccsccscc"
      inkscape:connector-curvature="0"
      id="path15590"
-     style="display:inline;fill:#cda66f;fill-opacity:1;stroke-width:1.19007"
-     d="m 15.96652,2.4766329 c -0.396657,0 -0.792437,0.1507259 -1.095095,0.4533829 L 3.57173,14.229712 c -0.3026571,0.302657 -0.5759103,0.751428 -0.7742385,1.227621 -0.1983282,0.47826 -0.3208556,0.99063 -0.3208556,1.418274 v 4.647756 h 4.6477558 c 0.427645,0 0.9376894,-0.122526 1.4159495,-0.320855 0.4782601,-0.198328 0.9272894,-0.471583 1.2299463,-0.774239 L 21.069984,9.1285734 c 0.302656,-0.302657 0.453382,-0.7017958 0.453382,-1.0974191 0,-0.3966562 -0.150726,-0.7924369 -0.453382,-1.0950939 L 17.063939,2.9300158 C 16.761281,2.6273588 16.362143,2.4766329 15.96652,2.4766329 Z m 0,2.2785396 3.275981,3.2759818 -1.334572,1.3368983 -3.275982,-3.2759819 z M 13.901884,6.8221334 15.173682,8.0939305 6.6082326,16.661704 5.3364357,15.387582 Z m 2.004185,2.0041848 1.271796,1.2717968 -8.5654475,8.565448 -1.2741221,-1.271796 z M 4.7063497,16.250176 c 0.010333,-0.02065 3.0644031,3.034179 3.0644031,3.034179 C 7.43814,19.422771 7.2039295,19.456408 7.1243917,19.456408 H 5.5759147 L 4.5435968,18.424084 v -1.548477 c 0,-0.07953 0.033633,-0.315548 0.1627529,-0.625436 z" />
+     style="display:inline;fill:#99cc99;fill-opacity:1;stroke-width:1.19007"
+     d="m 15.96652,2.4766329 c -0.396657,0 -0.792437,0.1507259 -1.095095,0.4533829 L 3.57173,14.229712 c -0.3026571,0.302657 -0.5759103,0.751428 -0.7742385,1.227621 -0.1983282,0.47826 -0.3208556,0.99063 -0.3208556,1.418274 v 4.647756 h 4.6477558 c 0.427645,0 0.9376894,-0.122526 1.4159495,-0.320855 0.4782601,-0.198328 0.9272894,-0.471583 1.2299463,-0.774239 L 21.069984,9.1285734 c 0.302656,-0.302657 0.453382,-0.7017958 0.453382,-1.0974191 0,-0.3966562 -0.150726,-0.7924369 -0.453382,-1.0950939 L 17.063939,2.9300158 C 16.761281,2.6273588 16.362143,2.4766329 15.96652,2.4766329 Z m 0,2.2785396 3.275981,3.2759818 -1.334572,1.3368983 -3.275982,-3.2759819 z M 13.901884,6.8221334 15.173682,8.0939305 6.6082326,16.661704 5.3364357,15.387582 Z m 2.004185,2.0041848 1.271796,1.2717968 -8.5654475,8.565448 -1.2741221,-1.271796 z M 4.7063497,16.250176 c 0.010333,-0.02065 3.0644031,3.034179 3.0644031,3.034179 C 7.43814,19.422771 7.2039295,19.456408 7.1243917,19.456408 H 5.5759147 L 4.5435968,18.424084 v -1.548477 c 0,-0.07953 0.033633,-0.315548 0.1627529,-0.625436 z"
+     inkscape:label="Edit" />
+  <path
+     style="display:inline;opacity:0.95;fill:#0a0a0a;fill-opacity:1;stroke:none;stroke-width:1.88249397;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 2.4766359,18.937425 v 2.585938 h 2.5605469 z"
+     id="rect19553"
+     inkscape:connector-curvature="0"
+     inkscape:label="Tip" />
 </svg>
diff --git a/nw/assets/icons/typicons_colour_dark/time.svg b/nw/assets/icons/typicons_colour_dark/time.svg
index e1746eda..ac0587cb 100644
--- a/nw/assets/icons/typicons_colour_dark/time.svg
+++ b/nw/assets/icons/typicons_colour_dark/time.svg
@@ -7,7 +7,7 @@
    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)"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
    sodipodi:docname="time.svg"
    id="svg8332"
    viewBox="0 0 24 24"
@@ -29,16 +29,16 @@
      id="defs8336" />
   <sodipodi:namedview
      inkscape:current-layer="svg8332"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="0"
+     inkscape:window-maximized="0"
+     inkscape:window-y="27"
+     inkscape:window-x="48"
      inkscape:cy="12"
-     inkscape:cx="12"
+     inkscape:cx="2.4262296"
      inkscape:zoom="38.125"
      showgrid="false"
      id="namedview8334"
-     inkscape:window-height="1344"
-     inkscape:window-width="2560"
+     inkscape:window-height="1376"
+     inkscape:window-width="2374"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0"
      guidetolerance="10"
@@ -49,8 +49,14 @@
      pagecolor="#ffffff"
      inkscape:document-rotation="0" />
   <path
-     style="stroke-width:1.11111;fill:#cda66f;fill-opacity:1"
+     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" />
+     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_dark/trash.svg b/nw/assets/icons/typicons_colour_dark/trash.svg
index b7728f3e..853a6743 100644
--- a/nw/assets/icons/typicons_colour_dark/trash.svg
+++ b/nw/assets/icons/typicons_colour_dark/trash.svg
@@ -13,7 +13,7 @@
    viewBox="0 0 24 24"
    id="svg10159"
    sodipodi:docname="trash.svg"
-   inkscape:version="1.0rc1 (09960d6f05, 2020-04-09)">
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
   <metadata
      id="metadata10165">
     <rdf:RDF>
@@ -37,20 +37,26 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1344"
+     inkscape:window-width="2374"
+     inkscape:window-height="1376"
      id="namedview10161"
      showgrid="false"
      inkscape:zoom="38.125"
-     inkscape:cx="12"
+     inkscape:cx="7.2131148"
      inkscape:cy="12"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
+     inkscape:window-x="48"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
      inkscape:current-layer="svg10159" />
+  <path
+     style="opacity:0.95;fill:#ededed;fill-opacity:1;stroke:none;stroke-width:1.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 6.7050781 7.8828125 L 6.7050781 17.294922 C 6.7050781 18.593745 7.7597702 19.646484 9.0585938 19.646484 L 14.941406 19.646484 C 16.240229 19.646484 17.294922 18.593745 17.294922 17.294922 L 17.294922 7.8828125 L 6.7050781 7.8828125 z M 8.4707031 9.6464844 C 8.7942326 9.6464844 9.0585938 9.910846 9.0585938 10.234375 L 9.0585938 17.294922 C 9.0585938 17.618451 8.7942326 17.882812 8.4707031 17.882812 C 8.1471737 17.882813 7.8828125 17.618451 7.8828125 17.294922 L 7.8828125 10.234375 C 7.8828125 9.910846 8.1471737 9.6464844 8.4707031 9.6464844 z M 10.824219 9.6464844 C 11.147748 9.6464844 11.412109 9.910846 11.412109 10.234375 L 11.412109 17.294922 C 11.412109 17.618451 11.147748 17.882812 10.824219 17.882812 C 10.500689 17.882813 10.234375 17.618451 10.234375 17.294922 L 10.234375 10.234375 C 10.234375 9.910846 10.500689 9.6464844 10.824219 9.6464844 z M 13.175781 9.6464844 C 13.49931 9.6464844 13.765625 9.910846 13.765625 10.234375 L 13.765625 17.294922 C 13.765625 17.618451 13.49931 17.882812 13.175781 17.882812 C 12.852252 17.882813 12.587891 17.618451 12.587891 17.294922 L 12.587891 10.234375 C 12.587891 9.910846 12.852252 9.6464844 13.175781 9.6464844 z M 15.529297 9.6464844 C 15.852827 9.6464844 16.117188 9.910846 16.117188 10.234375 L 16.117188 17.294922 C 16.117187 17.618451 15.852827 17.882812 15.529297 17.882812 C 15.205768 17.882813 14.941406 17.618451 14.941406 17.294922 L 14.941406 10.234375 C 14.941406 9.910846 15.205768 9.6464844 15.529297 9.6464844 z "
+     id="rect18880"
+     inkscape:label="Face" />
   <path
      d="M 19.647058,5.5294118 H 18.470589 V 4.3529412 C 18.470589,3.0541176 17.41647,2 16.117646,2 H 7.8823529 C 6.5835293,2 5.5294117,3.0541176 5.5294117,4.3529412 V 5.5294118 H 4.3529411 c -0.6494118,0 -1.1764706,0.5270588 -1.1764706,1.1764706 0,0.6494117 0.5270588,1.1764705 1.1764706,1.1764705 V 17.294118 C 4.3529411,19.889412 6.4635293,22 9.0588234,22 h 5.8823536 c 2.595293,0 4.705881,-2.110588 4.705881,-4.705882 V 7.8823529 c 0.649413,0 1.176471,-0.5270588 1.176471,-1.1764705 0,-0.6494118 -0.527059,-1.1764706 -1.176471,-1.1764706 z M 7.8823529,4.3529412 H 16.117646 V 5.5294118 H 7.8823529 Z M 17.294118,17.294118 c 0,1.298823 -1.054118,2.352941 -2.352941,2.352941 H 9.0588234 c -1.2988235,0 -2.3529411,-1.054118 -2.3529411,-2.352941 V 7.8823529 H 17.294118 Z M 8.4705881,9.647059 c -0.3235294,0 -0.5882352,0.264706 -0.5882352,0.588235 v 7.058824 c 0,0.323529 0.2647058,0.588235 0.5882352,0.588235 0.3235295,0 0.5882353,-0.264706 0.5882353,-0.588235 v -7.058824 c 0,-0.323529 -0.2647058,-0.588235 -0.5882353,-0.588235 z m 2.3529419,0 c -0.32353,0 -0.588235,0.264706 -0.588235,0.588235 v 7.058824 c 0,0.323529 0.264705,0.588235 0.588235,0.588235 0.323529,0 0.588235,-0.264706 0.588235,-0.588235 v -7.058824 c 0,-0.323529 -0.264706,-0.588235 -0.588235,-0.588235 z m 2.352941,0 c -0.323529,0 -0.588235,0.264706 -0.588235,0.588235 v 7.058824 c 0,0.323529 0.264706,0.588235 0.588235,0.588235 0.323529,0 0.588235,-0.264706 0.588235,-0.588235 v -7.058824 c 0,-0.323529 -0.264706,-0.588235 -0.588235,-0.588235 z m 2.352941,0 c -0.323529,0 -0.588235,0.264706 -0.588235,0.588235 v 7.058824 c 0,0.323529 0.264706,0.588235 0.588235,0.588235 0.32353,0 0.588235,-0.264706 0.588235,-0.588235 v -7.058824 c 0,-0.323529 -0.264705,-0.588235 -0.588235,-0.588235 z"
      id="path10157"
      inkscape:connector-curvature="0"
-     style="stroke-width:1.17647;fill:#aeaeae;fill-opacity:1" />
+     style="display:inline;fill:#aeaeae;fill-opacity:1;stroke-width:1.17647004"
+     inkscape:label="Outline" />
 </svg>
diff --git a/nw/assets/icons/typicons_colour_dark/user.svg b/nw/assets/icons/typicons_colour_dark/user.svg
index fce26108..b27888cc 100644
--- a/nw/assets/icons/typicons_colour_dark/user.svg
+++ b/nw/assets/icons/typicons_colour_dark/user.svg
@@ -7,7 +7,7 @@
    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)"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
    sodipodi:docname="user.svg"
    id="svg10763"
    viewBox="0 0 24 24"
@@ -29,16 +29,16 @@
      id="defs10767" />
   <sodipodi:namedview
      inkscape:current-layer="svg10763"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="0"
+     inkscape:window-maximized="0"
+     inkscape:window-y="27"
+     inkscape:window-x="48"
      inkscape:cy="12"
-     inkscape:cx="12"
+     inkscape:cx="7.2131148"
      inkscape:zoom="38.125"
      showgrid="false"
      id="namedview10765"
-     inkscape:window-height="1344"
-     inkscape:window-width="2560"
+     inkscape:window-height="1376"
+     inkscape:window-width="2374"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0"
      guidetolerance="10"
@@ -49,8 +49,17 @@
      pagecolor="#ffffff"
      inkscape:document-rotation="0" />
   <path
-     style="stroke-width:1.17647;fill:#2c840c;fill-opacity:1"
+     style="display:inline;fill:#99cc99;fill-opacity:1;stroke-width:1.17647004"
      inkscape:connector-curvature="0"
      id="path10761"
-     d="M 17.882352,7.8823529 C 17.882352,6.2576471 17.223529,4.7870588 16.16,3.7235294 15.095295,2.6588235 13.624706,2 12.000001,2 10.375295,2 8.9047059,2.6588235 7.84,3.7235294 6.7764706,4.7870588 6.1176471,6.2576471 6.1176471,7.8823529 c 0,1.6247061 0.6588235,3.0952941 1.7223529,4.1588231 1.0647059,1.064706 2.535295,1.72353 4.160001,1.72353 1.624705,0 3.095294,-0.658824 4.16,-1.72353 1.063529,-1.063529 1.722352,-2.534117 1.722351,-4.1588231 z M 4.9411765,19.647059 c 0,1.17647 2.6470588,2.352941 7.0588245,2.352941 4.138822,0 7.058822,-1.176471 7.058822,-2.352941 0,-2.352941 -2.769412,-4.705883 -7.058823,-4.705883 -4.4117647,0 -7.0588235,2.352942 -7.0588235,4.705883 z" />
+     d="m 4.9411765,19.647059 c 0,1.17647 2.6470588,2.352941 7.0588245,2.352941 4.138822,0 7.058822,-1.176471 7.058822,-2.352941 0,-2.352941 -2.769412,-4.705883 -7.058823,-4.705883 -4.4117647,0 -7.0588235,2.352942 -7.0588235,4.705883 z"
+     sodipodi:nodetypes="sssss"
+     inkscape:label="Body" />
+  <path
+     d="M 17.882352,7.8823529 C 17.882352,6.2576471 17.223529,4.7870588 16.16,3.7235294 15.095295,2.6588235 13.624706,2 12.000001,2 10.375295,2 8.9047059,2.6588235 7.84,3.7235294 6.7764706,4.7870588 6.1176471,6.2576471 6.1176471,7.8823529 c 0,1.6247061 0.6588235,3.0952941 1.7223529,4.1588231 1.0647059,1.064706 2.535295,1.72353 4.160001,1.72353 1.624705,0 3.095294,-0.658824 4.16,-1.72353 1.063529,-1.063529 1.722352,-2.534117 1.722351,-4.1588231 z"
+     id="path17511"
+     inkscape:connector-curvature="0"
+     style="display:inline;fill:#e5d49e;fill-opacity:1;stroke-width:1.17647004"
+     sodipodi:nodetypes="sssssssss"
+     inkscape:label="Head" />
 </svg>
diff --git a/nw/assets/icons/typicons_grey_dark/README.md b/nw/assets/icons/typicons_grey_dark/README.md
index 3686b78d..cfa5ea08 100644
--- a/nw/assets/icons/typicons_grey_dark/README.md
+++ b/nw/assets/icons/typicons_grey_dark/README.md
@@ -1,17 +1,5 @@
-Typicons
-----
+## Typicons
 
-Source: https://github.com/stephenhutchings/typicons.font
-
-License
--------
-
-#### Icons/Artwork
-
-Distributed under
-[CC BY-SA](http://creativecommons.org/licenses/by-sa/3.0/) licence.
-
-#### Font
-
-Distributed under
-[SIL Open Font Licence](http://scripts.sil.org/cms/scripts/page.php?item_id=OFL_web) licence.
+Copyright: Stephen Hutchings  
+Source: https://github.com/stephenhutchings/typicons.font  
+License: [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/)  
diff --git a/nw/assets/icons/typicons_grey_dark/icons.conf b/nw/assets/icons/typicons_grey_dark/icons.conf
index 1cf3b306..70cef96c 100644
--- a/nw/assets/icons/typicons_grey_dark/icons.conf
+++ b/nw/assets/icons/typicons_grey_dark/icons.conf
@@ -6,9 +6,12 @@
 
 [Main]
 name           = Typicons Grey Dark
-author         = Stephen Hutchings
+description    = Greyscaled icons for dark GUI theme based on Typicons.
+author         = Stephen Hutchings (original), Veronica Berglyd Olsen (adaptation)
 credit         = Stephen Hutchings
 url            = https://github.com/stephenhutchings/typicons.font
+license        = CC BY-SA 4.0
+licenseurl     = https://creativecommons.org/licenses/by-sa/4.0/
 
 [Map]
 cls_none       = cancel.svg
diff --git a/nw/assets/icons/typicons_grey_light/README.md b/nw/assets/icons/typicons_grey_light/README.md
index 3686b78d..cfa5ea08 100644
--- a/nw/assets/icons/typicons_grey_light/README.md
+++ b/nw/assets/icons/typicons_grey_light/README.md
@@ -1,17 +1,5 @@
-Typicons
-----
+## Typicons
 
-Source: https://github.com/stephenhutchings/typicons.font
-
-License
--------
-
-#### Icons/Artwork
-
-Distributed under
-[CC BY-SA](http://creativecommons.org/licenses/by-sa/3.0/) licence.
-
-#### Font
-
-Distributed under
-[SIL Open Font Licence](http://scripts.sil.org/cms/scripts/page.php?item_id=OFL_web) licence.
+Copyright: Stephen Hutchings  
+Source: https://github.com/stephenhutchings/typicons.font  
+License: [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/)  
diff --git a/nw/assets/icons/typicons_grey_light/icons.conf b/nw/assets/icons/typicons_grey_light/icons.conf
index 6bd45209..fc4d556e 100644
--- a/nw/assets/icons/typicons_grey_light/icons.conf
+++ b/nw/assets/icons/typicons_grey_light/icons.conf
@@ -6,9 +6,12 @@
 
 [Main]
 name           = Typicons Grey Light
-author         = Stephen Hutchings
+description    = Greyscaled icons for light GUI theme based on Typicons.
+author         = Stephen Hutchings (original), Veronica Berglyd Olsen (adaptation)
 credit         = Stephen Hutchings
 url            = https://github.com/stephenhutchings/typicons.font
+license        = CC BY-SA 4.0
+licenseurl     = https://creativecommons.org/licenses/by-sa/4.0/
 
 [Map]
 cls_none       = cancel.svg
diff --git a/nw/gui/dialogs/itemeditor.py b/nw/gui/dialogs/itemeditor.py
index 30c4721c..0b24e9d6 100644
--- a/nw/gui/dialogs/itemeditor.py
+++ b/nw/gui/dialogs/itemeditor.py
@@ -31,7 +31,7 @@ import nw
 from PyQt5.QtCore import Qt
 from PyQt5.QtWidgets import (
     QDialog, QHBoxLayout, QVBoxLayout, QGroupBox, QFormLayout, QLineEdit,
-    QPushButton, QComboBox
+    QPushButton, QComboBox, QLabel
 )
 
 from nw.constants import nwLabels, nwItemLayout, nwItemClass, nwItemType
@@ -54,11 +54,17 @@ class GuiItemEditor(QDialog):
         self.innerBox = QVBoxLayout()
 
         self.setWindowTitle("Item Settings")
-        self.guiDeco = self.theParent.theTheme.loadDecoration("settings",(64,64))
+        self.guiDeco = QLabel()
+        self.guiDeco.setPixmap(
+            self.theParent.theTheme.getPixmap(
+                nwLabels.CLASS_ICON[self.theItem.itemClass], (64,64)
+            )
+        )
 
         self.setLayout(self.outerBox)
         self.outerBox.addWidget(self.guiDeco, 0, Qt.AlignTop)
         self.outerBox.addLayout(self.innerBox)
+        self.outerBox.setSpacing(16)
 
         self.mainGroup = QGroupBox("Item Settings")
         self.mainForm  = QFormLayout()
diff --git a/nw/gui/icons.py b/nw/gui/icons.py
index 066d321e..c45a9aaf 100644
--- a/nw/gui/icons.py
+++ b/nw/gui/icons.py
@@ -98,10 +98,13 @@ class GuiIcons:
         self.confFile = None
 
         # Icon Theme Meta
-        self.themeName   = ""
-        self.themeAuthor = ""
-        self.themeCredit = ""
-        self.themeUrl    = ""
+        self.themeName        = ""
+        self.themeDescription = ""
+        self.themeAuthor      = ""
+        self.themeCredit      = ""
+        self.themeUrl         = ""
+        self.themeLicense     = ""
+        self.themeLicenseUrl  = ""
 
         return
 
@@ -133,10 +136,13 @@ class GuiIcons:
         ## Main
         cnfSec = "Main"
         if confParser.has_section(cnfSec):
-            self.themeName   = self._parseLine( confParser, cnfSec, "name",   "")
-            self.themeAuthor = self._parseLine( confParser, cnfSec, "author", "")
-            self.themeCredit = self._parseLine( confParser, cnfSec, "credit", "")
-            self.themeUrl    = self._parseLine( confParser, cnfSec, "url",    "")
+            self.themeName        = self._parseLine( confParser, cnfSec, "name", "")
+            self.themeDescription = self._parseLine( confParser, cnfSec, "description", "")
+            self.themeAuthor      = self._parseLine( confParser, cnfSec, "author", "")
+            self.themeCredit      = self._parseLine( confParser, cnfSec, "credit", "")
+            self.themeUrl         = self._parseLine( confParser, cnfSec, "url", "")
+            self.themeLicense     = self._parseLine( confParser, cnfSec, "license", "")
+            self.themeLicenseUrl  = self._parseLine( confParser, cnfSec, "licenseurl", "")
 
         ## Palette
         cnfSec = "Map"
@@ -219,7 +225,7 @@ class GuiIcons:
             return QIcon()
 
         if iconKey in self.themeMap:
-            logger.verbose("Loading: %s" % self.themeMap[iconKey])
+            logger.verbose("Loading: %s" % path.relpath(self.themeMap[iconKey]))
             return QIcon(self.themeMap[iconKey])
 
         # Next, we try to load the Qt style icons