diff --git a/annotations/src/main/java/mindustry/annotations/BaseProcessor.java b/annotations/src/main/java/mindustry/annotations/BaseProcessor.java
index 010a9949c0..fd2c05dca2 100644
--- a/annotations/src/main/java/mindustry/annotations/BaseProcessor.java
+++ b/annotations/src/main/java/mindustry/annotations/BaseProcessor.java
@@ -229,7 +229,7 @@ public abstract class BaseProcessor extends AbstractProcessor{
         try{
             process(roundEnv);
         }catch(Throwable e){
-            e.printStackTrace();
+            Log.err(e);
             throw new RuntimeException(e);
         }
         return true;
diff --git a/annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java b/annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java
index bca6c7660a..497a622749 100644
--- a/annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java
+++ b/annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java
@@ -49,8 +49,13 @@ public class AssetsProcess extends BaseProcessor{
         ictype.addField(FieldSpec.builder(ParameterizedTypeName.get(ObjectMap.class, String.class, TextureRegionDrawable.class),
                 "icons", Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL).initializer("new ObjectMap<>()").build());
 
+        ObjectSet<String> used = new ObjectSet<>();
+
         for(Jval val : icons.get("glyphs").asArray()){
             String name = capitalize(val.getString("css", ""));
+
+            if(!val.getBool("selected", true) || !used.add(name)) continue;
+
             int code = val.getInt("code", 0);
             ichtype.addField(FieldSpec.builder(char.class, name, Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL).initializer("(char)" + code).build());
 
diff --git a/core/assets-raw/fontgen/icons/logic.svg b/core/assets-raw/fontgen/extra/logic.svg
similarity index 100%
rename from core/assets-raw/fontgen/icons/logic.svg
rename to core/assets-raw/fontgen/extra/logic.svg
diff --git a/core/assets-raw/fontgen/icons/admin.svg b/core/assets-raw/fontgen/icons/admin.svg
deleted file mode 100644
index 8b6e5e5220..0000000000
--- a/core/assets-raw/fontgen/icons/admin.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   width="12"
-   height="12"
-   viewBox="0 0 12 12"
-   sodipodi:docname="admin.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <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="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="52.678571"
-     inkscape:cx="7.760678"
-     inkscape:cy="6.4128813"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g827" />
-  <g
-     id="g827"
-     transform="translate(-1,-1)">
-    <path
-       id="path823"
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 6.125,5.625 Q 6.25,5.25 6.625,5.125 7,5 7.375,5.125 7.75,5.25 7.875,5.625 8,6 7.875,6.375 7.75,6.75 7.375,6.875 7,7 6.625,6.875 6.25,6.75 6.125,6.375 6,6 6.125,5.625 M 3,1.5 Q 3.25,1.25 3.625,1.125 4,1 4.5,1 5,1 5.5,1 6,1 6.5,1 7,1 7.5,1 8,1 8.5,1 9,1 9.5,1 10,1 10.375,1.125 10.75,1.25 11,1.5 11.25,1.75 11.5,2 11.75,2.25 12,2.5 12.25,2.75 12.5,3 12.75,3.25 12.875,3.625 13,4 13,4.5 13,5 13,5.5 13,6 13,6.5 13,7 12.875,7.375 12.75,7.75 12.5,8 12.25,8.25 12.125,8.625 12,9 12,9.5 12,10 11.875,10.375 11.75,10.75 11.5,11 11.25,11.25 11,11.5 10.75,11.75 10.5,12 10.25,12.25 10,12.5 9.75,12.75 9.375,12.875 9,13 8.5,13 8,13 7.5,13 7,13 6.5,13 6,13 5.5,13 5,13 4.625,12.875 4.25,12.75 4,12.5 3.75,12.25 3.5,12 3.25,11.75 3,11.5 2.75,11.25 2.5,11 2.25,10.75 2.125,10.375 2,10 2,9.5 2,9 1.875,8.625 1.75,8.25 1.5,8 1.25,7.75 1.125,7.375 1,7 1,6.5 1,6 1,5.5 1,5 1,4.5 1,4 1.125,3.625 1.25,3.25 1.5,3 1.75,2.75 2,2.5 2.25,2.25 2.5,2 2.75,1.75 3,1.5 M 7.5,10 Q 8,10 8.375,9.875 8.75,9.75 8.75,9.5 8.75,9.25 8.375,9.125 8,9 7.5,9 7,9 6.5,9 6,9 5.625,9.125 5.25,9.25 5.25,9.5 5.25,9.75 5.625,9.875 6,10 6.5,10 q 0.5,0 1,0 m 0,-2 Q 8,8 8.375,7.875 8.75,7.75 9,7.5 9.25,7.25 9.5,7 9.75,6.75 9.875,6.375 10,6 9.875,5.625 9.75,5.25 9.5,5 9.25,4.75 9,4.5 8.75,4.25 8.375,4.125 8,4 7.5,4 7,4 6.5,4 6,4 5.625,4.125 5.25,4.25 5,4.5 4.75,4.75 4.5,5 4.25,5.25 4.125,5.625 4,6 4.125,6.375 4.25,6.75 4.5,7 4.75,7.25 5,7.5 5.25,7.75 5.625,7.875 6,8 6.5,8 7,8 7.5,8"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/core/assets-raw/fontgen/icons/book.svg b/core/assets-raw/fontgen/icons/book.svg
deleted file mode 100644
index 4ce30ae7ee..0000000000
--- a/core/assets-raw/fontgen/icons/book.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   width="10"
-   height="11"
-   viewBox="0 0 10 11"
-   sodipodi:docname="book.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <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="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="18.624687"
-     inkscape:cx="-15.26171"
-     inkscape:cy="11.56781"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g24" />
-  <g
-     id="g24"
-     transform="translate(-2,-2)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 4.5,2 C 4.1666667,2 3.875,2.0416667 3.625,2.125 3.375,2.2083333 3.1666667,2.3333333 3,2.5 L 2.5,3 C 2.3333333,3.1666667 2.2083333,3.375 2.125,3.625 2.0416667,3.875 2,4.1666667 2,4.5 v 1 1 1 1 1 1 1 c 0,0.333333 0.041667,0.625 0.125,0.875 0.083333,0.25 0.25,0.416667 0.5,0.5 C 2.875,12.958333 3.1666667,13 3.5,13 h 1 1 1 1 1 1 c 0.3333333,0 0.625,-0.04167 0.875,-0.125 C 10.625,12.79167 10.833333,12.666667 11,12.5 L 11.5,12 c 0.166667,-0.166667 0.291667,-0.375 0.375,-0.625 C 11.958333,11.125 12,10.833333 12,10.5 v -1 -1 -1 -1 -1 -1 -1 C 12,3.1666667 11.95833,2.875 11.875,2.625 11.79167,2.375 11.625,2.2083333 11.375,2.125 11.125,2.0416667 10.833333,2 10.5,2 h -1 -1 -1 -1 -1 z m 1,1 h 1 1 1 1 c 0.3333333,0 0.625,0.041667 0.875,0.125 0.25,0.083333 0.416667,0.25 0.5,0.5 C 10.958333,3.875 11,4.1666667 11,4.5 v 1 1 1 1 1 c 0,0.3333333 -0.04167,0.625 -0.125,0.875 -0.08333,0.25 -0.25,0.416667 -0.5,0.5 C 10.125,10.958333 9.8333333,11 9.5,11 h -1 -1 -1 -1 C 5.1666667,11 4.875,10.95833 4.625,10.875 4.375,10.79167 4.2083333,10.625 4.125,10.375 4.0416667,10.125 4,9.8333333 4,9.5 v -1 -1 -1 -1 -1 C 4,4.1666667 4.0416667,3.875 4.125,3.625 4.2083333,3.375 4.375,3.2083333 4.625,3.125 4.875,3.0416667 5.1666667,3 5.5,3 Z m 1,1 C 6.1666667,4 5.875,4.041667 5.625,4.125 c -0.25,0.083333 -0.4166667,0.25 -0.5,0.5 -0.083333,0.25 -0.083333,0.5 0,0.75 0.083333,0.25 0.25,0.4166667 0.5,0.5 C 5.875,5.9583333 6.1666667,6 6.5,6 h 1 1 c 0.3333333,0 0.625,-0.041667 0.875,-0.125 0.25,-0.083333 0.4166667,-0.25 0.5,-0.5 0.083333,-0.25 0.083333,-0.5 0,-0.75 C 9.791667,4.375 9.625,4.2083333 9.375,4.125 9.125,4.0416667 8.8333333,4 8.5,4 h -1 z m 0,3 C 6.1666667,7 5.875,7.0416667 5.625,7.125 5.375,7.2083333 5.25,7.3333333 5.25,7.5 5.25,7.6666667 5.375,7.7916667 5.625,7.875 5.875,7.9583333 6.1666667,8 6.5,8 h 1 1 C 8.8333333,8 9.125,7.9583333 9.375,7.875 9.625,7.7916667 9.75,7.6666667 9.75,7.5 9.75,7.3333333 9.625,7.2083333 9.375,7.125 9.125,7.0416667 8.8333333,7 8.5,7 h -1 z m 0,2 C 6.1666667,9 5.875,9.0416667 5.625,9.125 5.375,9.2083333 5.25,9.3333333 5.25,9.5 5.25,9.6666667 5.375,9.7916667 5.625,9.875 5.875,9.9583333 6.1666667,10 6.5,10 h 1 1 C 8.8333333,10 9.125,9.9583333 9.375,9.875 9.625,9.7916667 9.75,9.6666667 9.75,9.5 9.75,9.3333333 9.625,9.2083333 9.375,9.125 9.125,9.0416667 8.8333333,9 8.5,9 h -1 z"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/core/assets-raw/fontgen/icons/chat.svg b/core/assets-raw/fontgen/icons/chat.svg
deleted file mode 100644
index dab837b908..0000000000
--- a/core/assets-raw/fontgen/icons/chat.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   width="8"
-   height="7.75"
-   viewBox="0 0 8 7.75"
-   sodipodi:docname="chat.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <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="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="23.6"
-     inkscape:cx="-8.033898"
-     inkscape:cy="4.0042373"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g16" />
-  <g
-     id="g16"
-     transform="translate(-1,-1)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 2,1.5 Q 2.25,1.25 2.625,1.125 3,1 3.5,1 4,1 4.5,1 5,1 5.5,1 6,1 6.5,1 7,1 7.375,1.125 7.75,1.25 8,1.5 8.25,1.75 8.5,2 8.75,2.25 8.875,2.625 9,3 9,3.5 9,4 9,4.5 9,5 8.875,5.375 8.75,5.75 8.5,6 8.25,6.25 8,6.5 7.75,6.75 7.375,6.875 7,7 6.5,7 6,7 5.5,7 5,7 4.5,7 4,7 3.625,7.125 3.25,7.25 3.125,7.625 3,8 2.875,8.375 2.75,8.75 2.5,8.75 2.25,8.75 2,8.5 1.75,8.25 1.5,8 1.25,7.75 1.125,7.375 1,7 1,6.5 1,6 1,5.5 1,5 1,4.5 1,4 1,3.5 1,3 1.125,2.625 1.25,2.25 1.5,2 1.75,1.75 2,1.5"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/core/assets-raw/fontgen/icons/command-attack.svg b/core/assets-raw/fontgen/icons/command-attack.svg
deleted file mode 100644
index ffd597b7a5..0000000000
--- a/core/assets-raw/fontgen/icons/command-attack.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg12"
-   width="5.875"
-   height="5.875"
-   viewBox="0 0 5.875 5.875"
-   sodipodi:docname="command-attack.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata18">
-    <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="defs16" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview14"
-     showgrid="false"
-     inkscape:zoom="29.5"
-     inkscape:cx="-7.706568"
-     inkscape:cy="1.5137712"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g61" />
-  <g
-     id="g61"
-     transform="translate(-1.0625,-1.0625)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 5,1.5 Q 5.25,1.25 5.625,1.125 6,1 6.375,1.125 6.75,1.25 6.875,1.625 7,2 6.875,2.375 6.75,2.75 6.5,3 6.25,3.25 6,3.5 5.75,3.75 5.5,4 5.25,4.25 5,4.5 4.75,4.75 4.5,5 4.25,5.25 4.25,5.5 4.25,5.75 4.5,6 4.75,6.25 4.75,6.5 4.75,6.75 4.5,6.75 4.25,6.75 4,6.5 3.75,6.25 3.5,6.25 3.25,6.25 3,6.5 2.75,6.75 2.375,6.875 2,7 1.625,6.875 1.25,6.75 1.125,6.375 1,6 1.125,5.625 1.25,5.25 1.5,5 1.75,4.75 1.75,4.5 1.75,4.25 1.5,4 1.25,3.75 1.25,3.5 1.25,3.25 1.5,3.25 1.75,3.25 2,3.5 2.25,3.75 2.5,3.75 2.75,3.75 3,3.5 3.25,3.25 3.5,3 3.75,2.75 4,2.5 4.25,2.25 4.5,2 4.75,1.75 5,1.5"
-       id="path59"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/core/assets-raw/fontgen/icons/command-rally.svg b/core/assets-raw/fontgen/icons/command-rally.svg
deleted file mode 100644
index b402671f69..0000000000
--- a/core/assets-raw/fontgen/icons/command-rally.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   width="6"
-   height="6"
-   viewBox="0 0 6 6"
-   sodipodi:docname="command-rally.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <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="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="29.5"
-     inkscape:cx="-12.118644"
-     inkscape:cy="2.7966102"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g88" />
-  <g
-     id="g88"
-     transform="translate(-1,-1)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 2,1.5 Q 2.25,1.25 2.625,1.125 3,1 3.5,1 4,1 4.5,1 5,1 5.375,1.125 5.75,1.25 6,1.5 6.25,1.75 6.5,2 6.75,2.25 6.875,2.625 7,3 7,3.5 7,4 7,4.5 7,5 6.875,5.375 6.75,5.75 6.5,6 6.25,6.25 6,6.5 5.75,6.75 5.375,6.875 5,7 4.5,7 4,7 3.5,7 3,7 2.625,6.875 2.25,6.75 2,6.5 1.75,6.25 1.5,6 1.25,5.75 1.125,5.375 1,5 1,4.5 1,4 1,3.5 1,3 1.125,2.625 1.25,2.25 1.5,2 1.75,1.75 2,1.5 M 3.625,5.875 Q 4,6 4.375,5.875 4.75,5.75 5,5.5 5.25,5.25 5.5,5 5.75,4.75 5.875,4.375 6,4 5.875,3.625 5.75,3.25 5.5,3 5.25,2.75 5,2.5 4.75,2.25 4.375,2.125 4,2 3.625,2.125 3.25,2.25 3,2.5 2.75,2.75 2.5,3 2.25,3.25 2.125,3.625 2,4 2.125,4.375 2.25,4.75 2.5,5 2.75,5.25 3,5.5 3.25,5.75 3.625,5.875"
-       id="path84"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/core/assets-raw/fontgen/icons/command-retreat.svg b/core/assets-raw/fontgen/icons/command-retreat.svg
deleted file mode 100644
index a608141b9b..0000000000
--- a/core/assets-raw/fontgen/icons/command-retreat.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg22"
-   width="5.875"
-   height="5.5"
-   viewBox="0 0 5.875 5.5"
-   sodipodi:docname="command-retreat.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata28">
-    <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="defs26" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview24"
-     showgrid="false"
-     inkscape:zoom="29.5"
-     inkscape:cx="-14.520127"
-     inkscape:cy="1.4618644"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g36" />
-  <g
-     id="g36"
-     transform="translate(-1.0625,-1.25)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 3,1.5 Q 3.25,1.25 3.5,1.25 3.75,1.25 3.875,1.625 4,2 4.125,2.375 4.25,2.75 4.625,2.875 5,3 5.5,3 6,3 6.375,3.125 6.75,3.25 6.875,3.625 7,4 6.875,4.375 6.75,4.75 6.375,4.875 6,5 5.5,5 5,5 4.625,5.125 4.25,5.25 4.125,5.625 4,6 3.875,6.375 3.75,6.75 3.5,6.75 3.25,6.75 3,6.5 2.75,6.25 2.5,6 2.25,5.75 2,5.5 1.75,5.25 1.5,5 1.25,4.75 1.125,4.375 1,4 1.125,3.625 1.25,3.25 1.5,3 1.75,2.75 2,2.5 2.25,2.25 2.5,2 2.75,1.75 3,1.5"
-       id="path34"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/core/assets-raw/fontgen/icons/crafting.svg b/core/assets-raw/fontgen/icons/crafting.svg
deleted file mode 100644
index 7f2e56d27c..0000000000
--- a/core/assets-raw/fontgen/icons/crafting.svg
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   width="10"
-   height="8.9375"
-   viewBox="0 0 10 8.9375"
-   sodipodi:docname="crafting.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <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="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="61.458335"
-     inkscape:cx="3.677966"
-     inkscape:cy="5.0935595"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <g
-     id="g5253"
-     transform="translate(-1,-2.0625)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 9.125,2.625 Q 9.25,2.25 9.625,2.125 10,2 10.375,2.125 10.75,2.25 10.875,2.625 11,3 11,3.5 q 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 -0.125,0.875 -0.125,0.375 -0.5,0.5 Q 10,11 9.5,11 9,11 8.5,11 8,11 7.5,11 7,11 6.5,11 6,11 5.5,11 5,11 4.5,11 4,11 3.5,11 3,11 2.5,11 2,11 1.625,10.875 1.25,10.75 1.125,10.375 1,10 1,9.5 1,9 1,8.5 1,8 1,7.5 1,7 1,6.5 1,6 1,5.5 1,5 1,4.5 1,4 1.125,3.625 1.25,3.25 1.5,3.25 1.75,3.25 2,3.5 2.25,3.75 2.5,4 2.75,4.25 3,4.5 3.25,4.75 3.5,5 3.75,5.25 4,5.5 4.25,5.75 4.5,5.75 4.75,5.75 4.875,5.375 5,5 5,4.5 5,4 5.125,3.625 5.25,3.25 5.5,3.25 5.75,3.25 6,3.5 6.25,3.75 6.5,4 6.75,4.25 7,4.5 7.25,4.75 7.5,5 7.75,5.25 8,5.5 8.25,5.75 8.5,5.75 8.75,5.75 8.875,5.375 9,5 9,4.5 9,4 9,3.5 9,3 9.125,2.625 M 8.5,10 Q 9,10 9.375,9.875 9.75,9.75 9.875,9.375 10,9 10,8.5 10,8 9.875,7.625 9.75,7.25 9.375,7.125 9,7 8.625,6.875 8.25,6.75 8,6.5 7.75,6.25 7.5,6 7.25,5.75 7,5.5 6.75,5.25 6.5,5.25 6.25,5.25 6.125,5.625 6,6 5.875,6.375 5.75,6.75 5.375,6.875 5,7 4.625,6.875 4.25,6.75 4,6.5 3.75,6.25 3.5,6 3.25,5.75 3,5.5 2.75,5.25 2.5,5.25 2.25,5.25 2.125,5.625 2,6 2,6.5 2,7 2,7.5 2,8 2,8.5 2,9 2.125,9.375 2.25,9.75 2.625,9.875 3,10 3.5,10 q 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0"
-       id="path5243"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="m 3.25,8.5 q 0,-0.25 0.25,-0.25 0.25,0 0.25,0.25 0,0.25 -0.25,0.25 -0.25,0 -0.25,-0.25"
-       id="path5247"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="m 5.25,8.5 q 0,-0.25 0.25,-0.25 0.25,0 0.25,0.25 0,0.25 -0.25,0.25 -0.25,0 -0.25,-0.25"
-       id="path5249"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="m 7.25,8.5 q 0,-0.25 0.25,-0.25 0.25,0 0.25,0.25 0,0.25 -0.25,0.25 -0.25,0 -0.25,-0.25"
-       id="path5251"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/core/assets-raw/fontgen/icons/defense.svg b/core/assets-raw/fontgen/icons/defense.svg
deleted file mode 100644
index 0891560c0a..0000000000
--- a/core/assets-raw/fontgen/icons/defense.svg
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg817"
-   width="10"
-   height="9.875"
-   viewBox="0 0 10 9.875"
-   sodipodi:docname="defense.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata823">
-    <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="defs821" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview819"
-     showgrid="false"
-     inkscape:zoom="43.457605"
-     inkscape:cx="10.243339"
-     inkscape:cy="4.6479408"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g5280" />
-  <g
-     transform="translate(-0.999269,-1.0631022)"
-     id="g5280">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="m -10.472656,-2.8027344 c -0.125,0 -0.25,0.020833 -0.375,0.0625 -0.25,0.083333 -0.416667,0.25 -0.5,0.5 -0.08333,0.25 -0.125,0.5416667 -0.125,0.875 v 1.00000002 1 0.99999998 c 0,0.3333334 0.04167,0.625 0.125,0.875 0.08333,0.25 0.208333,0.4583334 0.375,0.625 l 0.5,0.5 0.4999998,0.5 0.5,0.5 0.5,0.5 0.5,0.5 0.5,0.5 0.5,0.5 c 0.1666666,0.1666667 0.3749999,0.2916667 0.625,0.375 0.25,0.083333 0.4999999,0.083333 0.75,0 0.2499999,-0.083333 0.4583333,-0.2083333 0.625,-0.375 l 0.5,-0.5 0.5,-0.5 0.5,-0.5 0.5,-0.5 0.5,-0.5 0.5,-0.5 0.5,-0.5 c 0.1666666,-0.1666666 0.2916666,-0.375 0.375,-0.625 0.083333,-0.25 0.125,-0.5416666 0.125,-0.875 v -0.99999998 -1 -1.00000002 c 0,-0.3333333 -0.041667,-0.625 -0.125,-0.875 -0.083333,-0.25 -0.25,-0.4166666 -0.5,-0.5 -0.25,-0.083333 -0.5,-0.083333 -0.75,0 -0.2500001,0.083333 -0.4583334,0.2083334 -0.625,0.375 l -0.5,0.5 -0.5,0.5 c -0.1666667,0.1666667 -0.375,0.2916667 -0.625,0.37500002 -0.2500001,0.0833333 -0.5416667,0.125 -0.875,0.125 h -1 c -0.3333334,10e-9 -0.6250001,-0.0416667 -0.875,-0.125 -0.25,-0.0833333 -0.4583334,-0.20833332 -0.625,-0.37500002 l -0.5,-0.5 -0.5,-0.5 c -0.1666667,-0.1666666 -0.375,-0.2916666 -0.6249998,-0.375 -0.125,-0.041667 -0.25,-0.0625 -0.375,-0.0625 z m 0.4999998,1.1875 c 0.1666666,0 0.3333333,0.083333 0.5,0.25 l 0.5,0.50000002 0.5,0.5 c 0.1666666,0.16666667 0.375,0.29166667 0.625,0.37500001 0.2499999,0.08333333 0.5416666,0.12499999 0.875,0.12499999 h 1 c 0.3333333,0 0.6249999,-0.04166666 0.875,-0.12499999 0.25,-0.08333334 0.4583333,-0.20833334 0.625,-0.37500001 l 0.5,-0.5 0.5,-0.50000002 c 0.1666666,-0.1666666 0.3333333,-0.25 0.5,-0.25 0.1666666,0 0.2916666,0.125 0.375,0.375 0.083333,0.25000002 0.125,0.54166669 0.125,0.87500002 v 1 0.99999998 c 0,0.3333334 -0.041667,0.625 -0.125,0.875 -0.083333,0.25 -0.2083334,0.4583334 -0.375,0.625 l -0.5,0.5 -0.5,0.5 -0.5,0.5 -0.5,0.5 -0.5,0.5 c -0.1666667,0.1666667 -0.3750001,0.2916667 -0.625,0.375 -0.25,0.083333 -0.5000001,0.083333 -0.75,0 -0.2500001,-0.083333 -0.4583334,-0.2083333 -0.625,-0.375 l -0.5,-0.5 -0.5,-0.5 -0.5,-0.5 -0.5,-0.5 -0.5,-0.5 c -0.1666668,-0.1666666 -0.2916668,-0.375 -0.3749998,-0.625 -0.08333,-0.25 -0.125,-0.5416666 -0.125,-0.875 v -0.99999998 -1 c 0,-0.33333333 0.04167,-0.625 0.125,-0.87500002 0.08333,-0.25 0.208333,-0.375 0.3749998,-0.375 z"
-       transform="translate(12.471925,3.8658366)"
-       id="path5276"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/core/assets-raw/fontgen/icons/distribution.svg b/core/assets-raw/fontgen/icons/distribution.svg
deleted file mode 100644
index f60b2f7251..0000000000
--- a/core/assets-raw/fontgen/icons/distribution.svg
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg3799"
-   width="256"
-   height="256"
-   viewBox="0 0 10 10"
-   sodipodi:docname="icon-distribution-transparent.png.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata3805">
-    <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="defs3803" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="1318"
-     id="namedview3801"
-     showgrid="false"
-     inkscape:zoom="45.254834"
-     inkscape:cx="6.2899407"
-     inkscape:cy="4.0348889"
-     inkscape:window-x="1280"
-     inkscape:window-y="27"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="g3829" />
-  <g
-     id="g3829">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 0 0 L 0 0.5 L 0 1 L 0 1.5 L 0 2 L 0 2.5 L 0 3 L 0 3.5 L 0 4 L 0 4.5 L 0 5 L 0 5.5 L 0 6 L 0 6.5 L 0 7 L 0 7.5 L 0 8 L 0 8.5 L 0 9 L 0 9.5 L 0 10 L 0.5 10 L 1 10 L 1 9.5 L 1 8.5 L 1 7.5 L 1 6.5 L 1 5.5 L 1 4.5 L 1 3.5 L 1 2.5 L 1 1.5 L 1 0.5 L 1 0 L 0.5 0 L 0 0 z M 9 0 L 9 0.5 L 9 1.5 L 9 2.5 L 9 3.5 L 9 4.5 L 9 5.5 L 9 6.5 L 9 7.5 L 9 8.5 L 9 9.5 L 9 10 L 9.5 10 L 10 10 L 10 9.5 L 10 9 L 10 8.5 L 10 8 L 10 7.5 L 10 7 L 10 6.5 L 10 6 L 10 5.5 L 10 5 L 10 4.5 L 10 4 L 10 3.5 L 10 3 L 10 2.5 L 10 2 L 10 1.5 L 10 1 L 10 0.5 L 10 0 L 9.5 0 L 9 0 z M 5 1.0625 C 4.875 1.0625 4.75 1.0833335 4.625 1.125 C 4.375 1.2083333 4.1666667 1.3333333 4 1.5 L 3.5 2 C 3.3333333 2.1666667 3.25 2.3333333 3.25 2.5 C 3.25 2.6666667 3.375 2.7916667 3.625 2.875 C 3.875 2.9583333 4.1666667 3 4.5 3 L 5.5 3 C 5.9760929 2.9389882 6.4908205 3.0048105 6.75 2.5 C 6.75 2.3333333 6.6666667 2.1666667 6.5 2 L 6 1.5 C 5.8333333 1.3333333 5.625 1.2083333 5.375 1.125 C 5.25 1.0833335 5.125 1.0625 5 1.0625 z M 5 4.0625 C 4.875 4.0625 4.75 4.0833333 4.625 4.125 C 4.375 4.2083333 4.1666667 4.3333333 4 4.5 L 3.5 5 C 3.3333333 5.1666667 3.25 5.3333333 3.25 5.5 C 3.25 5.6666667 3.375 5.7916667 3.625 5.875 C 3.875 5.9583333 4.1666667 6 4.5 6 L 5.5 6 C 5.8333333 6 6.125 5.9583333 6.375 5.875 C 6.625 5.7916667 6.75 5.6666667 6.75 5.5 C 6.75 5.3333333 6.6666667 5.1666667 6.5 5 L 6 4.5 C 5.8333333 4.3333333 5.625 4.2083333 5.375 4.125 C 5.25 4.0833333 5.125 4.0625 5 4.0625 z M 5 7.0625 C 4.875 7.0625 4.75 7.0833333 4.625 7.125 C 4.375 7.2083333 4.1666667 7.3333333 4 7.5 L 3.5 8 C 3.3333333 8.1666667 3.25 8.3333333 3.25 8.5 C 3.25 8.6666667 3.375 8.7916667 3.625 8.875 C 3.875 8.9583333 4.1666667 9 4.5 9 L 5.5 9 C 5.8333333 9 6.125 8.9583333 6.375 8.875 C 6.625 8.7916667 6.75 8.6666667 6.75 8.5 C 6.75 8.3333333 6.6666667 8.1666667 6.5 8 L 6 7.5 C 5.8333333 7.3333333 5.625 7.2083333 5.375 7.125 C 5.25 7.0833333 5.125 7.0625 5 7.0625 z "
-       id="path3817" />
-  </g>
-</svg>
diff --git a/core/assets-raw/fontgen/icons/effect.svg b/core/assets-raw/fontgen/icons/effect.svg
deleted file mode 100644
index 004fecdb71..0000000000
--- a/core/assets-raw/fontgen/icons/effect.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg1370"
-   width="10"
-   height="10"
-   viewBox="0 0 10 10"
-   sodipodi:docname="effect.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata1376">
-    <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="defs1374" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview1372"
-     showgrid="false"
-     inkscape:zoom="61.458335"
-     inkscape:cx="3.4444574"
-     inkscape:cy="5.2674622"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g5329" />
-  <g
-     id="g5329"
-     transform="translate(-1,-1)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 3.5,1 C 3.1666667,1 2.875,1.0416667 2.625,1.125 2.375,1.2083333 2.1666667,1.3333333 2,1.5 L 1.5,2 C 1.3333333,2.1666667 1.2083333,2.375 1.125,2.625 1.0416667,2.875 1,3.1666667 1,3.5 v 1 1 1 1 1 C 1,8.8333333 1.0416667,9.125 1.125,9.375 1.2083333,9.625 1.3333333,9.8333333 1.5,10 L 2,10.5 c 0.1666667,0.166667 0.375,0.291667 0.625,0.375 C 2.875,10.958333 3.1666667,11 3.5,11 h 1 1 1 1 1 C 8.8333333,11 9.125,10.958333 9.375,10.875 9.625,10.791667 9.8333333,10.666667 10,10.5 L 10.5,10 C 10.666667,9.8333333 10.791667,9.625 10.875,9.375 10.958333,9.125 11,8.8333333 11,8.5 v -1 -1 -1 -1 -1 C 11,3.1666667 10.958333,2.875 10.875,2.625 10.791667,2.375 10.666667,2.1666667 10.5,2 L 10,1.5 C 9.8333333,1.3333333 9.625,1.2083333 9.375,1.125 9.125,1.0416667 8.8333333,1 8.5,1 h -1 -1 -1 -1 z m 1,1 h 1 1 1 C 7.8333333,2 8.125,2.0416667 8.375,2.125 8.625,2.2083333 8.8333333,2.3333333 9,2.5 L 9.5,3 C 9.6666667,3.1666667 9.7916667,3.375 9.875,3.625 9.9583333,3.875 10,4.1666667 10,4.5 v 1 1 1 C 10,7.8333333 9.9583333,8.125 9.875,8.375 9.7916667,8.625 9.6666667,8.8333333 9.5,9 L 9,9.5 C 8.8333333,9.6666667 8.625,9.7916667 8.375,9.875 8.125,9.9583333 7.8333333,10 7.5,10 h -1 -1 -1 C 4.1666667,10 3.875,9.9583333 3.625,9.875 3.375,9.7916667 3.1666667,9.6666667 3,9.5 L 2.5,9 C 2.3333333,8.8333333 2.2083333,8.625 2.125,8.375 2.0416667,8.125 2,7.8333333 2,7.5 v -1 -1 -1 C 2,4.1666667 2.0416667,3.875 2.125,3.625 2.2083333,3.375 2.3333333,3.1666667 2.5,3 L 3,2.5 C 3.1666667,2.3333333 3.375,2.2083333 3.625,2.125 3.875,2.0416667 4.1666667,2 4.5,2 Z M 6,4.0625 C 5.875,4.0625 5.75,4.0833333 5.625,4.125 5.375,4.2083333 5.1666667,4.3333333 5,4.5 L 4.5,5 C 4.3333333,5.1666667 4.2083333,5.375 4.125,5.625 c -0.083333,0.25 -0.083333,0.5 0,0.75 C 4.2083333,6.625 4.3333333,6.8333333 4.5,7 L 5,7.5 c 0.1666667,0.1666667 0.375,0.2916667 0.625,0.375 0.25,0.083333 0.5,0.083333 0.75,0 C 6.625,7.7916667 6.8333333,7.6666667 7,7.5 L 7.5,7 C 7.6666667,6.8333333 7.7916667,6.625 7.875,6.375 c 0.083333,-0.25 0.083333,-0.5 0,-0.75 C 7.7916667,5.375 7.6666667,5.1666667 7.5,5 L 7,4.5 C 6.8333333,4.3333333 6.625,4.2083333 6.375,4.125 6.25,4.0833333 6.125,4.0625 6,4.0625 Z"
-       id="path5323"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/core/assets-raw/fontgen/icons/exit.svg b/core/assets-raw/fontgen/icons/exit.svg
deleted file mode 100644
index 2a9a6ddc8f..0000000000
--- a/core/assets-raw/fontgen/icons/exit.svg
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   width="11.9375"
-   height="12"
-   viewBox="0 0 11.9375 12"
-   sodipodi:docname="exit.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <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="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="16.857143"
-     inkscape:cx="24.210938"
-     inkscape:cy="4.160156"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g18" />
-  <g
-     id="g18"
-     transform="translate(-1.000926,-0.99913925)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="m -14.710938,-0.83984375 c -0.333333,0 -0.625,0.0416667 -0.875,0.125 -0.25,0.0833333 -0.458333,0.20833333 -0.625,0.375 l -0.5,0.5 c -0.166666,0.16666667 -0.291666,0.375 -0.375,0.625 -0.08333,0.24999995 -0.125,0.54166665 -0.125,0.87499995 v 1 1 1 1 1 1 1 c 0,0.3333334 0.04167,0.625 0.125,0.875 0.08333,0.25 0.208334,0.4583334 0.375,0.6249998 l 0.5,0.5 c 0.166667,0.166667 0.375,0.291667 0.625,0.375 0.25,0.08333 0.541667,0.125 0.875,0.125 h 1 1 1 1 1.0000005 1 c 0.3333333,0 0.625,-0.04167 0.875,-0.125 0.25,-0.08333 0.4583333,-0.208333 0.625,-0.375 l 0.5,-0.5 c 0.1666667,-0.1666664 0.25,-0.3333331 0.25,-0.4999998 0,-0.1666666 -0.125,-0.2916666 -0.375,-0.375 -0.25,-0.083333 -0.5416667,-0.125 -0.875,-0.125 h -1 -1 -1.0000005 -1 -1 -1 c -0.333333,0 -0.625,-0.041667 -0.875,-0.125 -0.249999,-0.083333 -0.416666,-0.25 -0.5,-0.5 -0.08333,-0.2499999 -0.125,-0.5416666 -0.125,-0.875 v -1 -1 -1 -1 -1 c 0,-0.3333333 0.04167,-0.625 0.125,-0.875 0.08333,-0.2499999 0.25,-0.4166666 0.5,-0.5 0.25,-0.083333 0.541667,-0.125 0.875,-0.125 h 1 1 1 1.0000005 1 1 c 0.3333333,0 0.625,-0.041667 0.875,-0.125 0.25,-0.0833333 0.375,-0.20833328 0.375,-0.37499995 0,-0.16666667 -0.083333,-0.33333333 -0.25,-0.5 l -0.5,-0.5 c -0.1666667,-0.16666667 -0.375,-0.29166667 -0.625,-0.375 -0.25,-0.0833333 -0.5416667,-0.125 -0.875,-0.125 h -1 -1.0000005 -1 -1 -1 z m 7.0000005,3.24999995 c -0.1666667,0 -0.2916667,0.125 -0.375,0.375 l -0.25,0.75 c -0.083333,0.25 -0.25,0.4166667 -0.5,0.5 -0.25,0.083333 -0.5416667,0.125 -0.875,0.125 h -1.0000005 -1 c -0.333333,0 -0.625,0.041667 -0.875,0.125 -0.249999,0.083333 -0.416666,0.25 -0.5,0.5 -0.08333,0.25 -0.08333,0.5 0,0.75 0.08333,0.25 0.25,0.4166667 0.5,0.5 0.25,0.083333 0.541667,0.125 0.875,0.125 h 1 1.0000005 c 0.3333333,0 0.625,0.041667 0.875,0.125 0.25,0.083333 0.4166667,0.25 0.5,0.5 l 0.25,0.75 c 0.083333,0.25 0.2083333,0.375 0.375,0.375 0.1666667,0 0.3333333,-0.083333 0.5,-0.25 l 0.5,-0.5 0.5,-0.5 0.5,-0.5 c 0.1666667,-0.1666666 0.2916667,-0.375 0.375,-0.625 0.083333,-0.25 0.083333,-0.5 0,-0.75 -0.083333,-0.25 -0.2083333,-0.4583333 -0.375,-0.625 l -0.5,-0.5 -0.5,-0.5 -0.5,-0.5 c -0.1666667,-0.1666666 -0.3333333,-0.25 -0.5,-0.25 z"
-       transform="translate(18.211864,1.838983)"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/core/assets-raw/fontgen/icons/fill.svg b/core/assets-raw/fontgen/icons/fill.svg
deleted file mode 100644
index 4435469aac..0000000000
--- a/core/assets-raw/fontgen/icons/fill.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   width="13.9375"
-   height="13.9375"
-   viewBox="0 0 13.9375 13.9375"
-   sodipodi:docname="fill.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <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="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="-19.842161"
-     inkscape:cy="5.1069915"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g16" />
-  <g
-     id="g16"
-     transform="translate(-1.0625,-1)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 7,1.5 Q 7.25,1.25 7.625,1.125 8,1 8.5,1 9,1 9.375,1.125 9.75,1.25 10,1.5 10.25,1.75 10.5,2 10.75,2.25 10.875,2.625 11,3 11,3.5 11,4 10.875,4.375 10.75,4.75 10.5,5 q -0.25,0.25 -0.25,0.5 0,0.25 0.375,0.375 Q 11,6 11.5,6 12,6 12.375,6.125 12.75,6.25 13,6.5 13.25,6.75 13.5,7 13.75,7.25 14,7.5 14.25,7.75 14.5,8 14.75,8.25 14.875,8.625 15,9 15,9.5 q 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 -0.125,0.875 -0.125,0.375 -0.375,0.375 -0.25,0 -0.375,-0.375 Q 14,13 14,12.5 14,12 13.875,11.625 13.75,11.25 13.5,11 13.25,10.75 13.125,10.375 13,10 12.875,9.625 12.75,9.25 12.5,9.25 12.25,9.25 12,9.5 11.75,9.75 11.5,10 11.25,10.25 11,10.5 10.75,10.75 10.5,11 10.25,11.25 10,11.5 9.75,11.75 9.5,12 9.25,12.25 9,12.5 8.75,12.75 8.5,13 8.25,13.25 8,13.5 7.75,13.75 7.5,14 7.25,14.25 7,14.5 6.75,14.75 6.375,14.875 6,15 5.625,14.875 5.25,14.75 5,14.5 4.75,14.25 4.5,14 4.25,13.75 4,13.5 3.75,13.25 3.5,13 3.25,12.75 3,12.5 2.75,12.25 2.5,12 2.25,11.75 2,11.5 1.75,11.25 1.5,11 1.25,10.75 1.125,10.375 1,10 1.125,9.625 1.25,9.25 1.5,9 1.75,8.75 2,8.5 2.25,8.25 2.5,8 2.75,7.75 3,7.5 3.25,7.25 3.5,7 3.75,6.75 4,6.5 4.25,6.25 4.5,6.25 4.75,6.25 4.875,6.625 5,7 4.875,7.375 4.75,7.75 4.5,8 4.25,8.25 4,8.5 3.75,8.75 3.5,9 3.25,9.25 3.125,9.625 3,10 3.125,10.375 3.25,10.75 3.5,11 3.75,11.25 4,11.5 4.25,11.75 4.5,12 4.75,12.25 5,12.5 5.25,12.75 5.625,12.875 6,13 6.375,12.875 6.75,12.75 7,12.5 7.25,12.25 7.5,12 7.75,11.75 8,11.5 8.25,11.25 8.5,11 8.75,10.75 9,10.5 9.25,10.25 9.5,10 9.75,9.75 10,9.5 10.25,9.25 10.5,9 10.75,8.75 10.75,8.5 10.75,8.25 10.5,8 10.25,7.75 10,7.5 9.75,7.25 9.5,7 9.25,6.75 9,6.5 8.75,6.25 8.5,6 8.25,5.75 8.125,5.375 8,5 8.125,4.625 8.25,4.25 8.5,4.25 8.75,4.25 9,4.5 9.25,4.75 9.5,4.75 9.75,4.75 9.875,4.375 10,4 10,3.5 10,3 9.875,2.625 9.75,2.25 9.375,2.125 9,2 8.5,2 8,2 7.625,2.125 7.25,2.25 7.125,2.625 7,3 7,3.5 7,4 7,4.5 7,5 7,5.5 7,6 7,6.5 7,7 6.875,7.375 6.75,7.75 6.5,7.75 6.25,7.75 6.125,7.375 6,7 6,6.5 6,6 6,5.5 6,5 6,4.5 6,4 6,3.5 6,3 6.125,2.625 6.25,2.25 6.5,2 6.75,1.75 7,1.5"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/core/assets-raw/fontgen/icons/hammer.svg b/core/assets-raw/fontgen/icons/hammer.svg
deleted file mode 100644
index a9ec0312f5..0000000000
--- a/core/assets-raw/fontgen/icons/hammer.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   width="13.6875"
-   height="13.687497"
-   viewBox="0 0 13.6875 13.687497"
-   sodipodi:docname="hammer.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <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="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="41.7193"
-     inkscape:cx="4.0229218"
-     inkscape:cy="7.3618256"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g821" />
-  <g
-     id="g821"
-     transform="translate(-1.0625002,-1.25)">
-    <path
-       id="path819"
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 7.5,1.25 C 7.3333333,1.25 7.1666667,1.3333333 7,1.5 L 6.5,2 6,2.5 5.5,3 5,3.5 4.5,4 4,4.5 3.5,5 C 3.3333333,5.1666667 3.25,5.3333333 3.25,5.5 3.25,5.6666667 3.3333333,5.8333333 3.5,6 L 4,6.5 4.5,7 5,7.5 5.5,8 C 5.6666667,8.1666667 5.75,8.3333333 5.75,8.5 5.75,8.6666667 5.6666667,8.8333333 5.5,9 L 5,9.5 4.5,10 4,10.5 3.5,11 3,11.5 2.5,12 2,12.5 1.5,13 c -0.1666667,0.166667 -0.2916667,0.375 -0.375,0.625 -0.083333,0.25 -0.083333,0.5 0,0.75 0.083333,0.25 0.25,0.416667 0.5,0.5 0.25,0.08333 0.5,0.08333 0.75,0 C 2.625,14.791667 2.8333333,14.666667 3,14.5 L 3.5,14 4,13.5 4.5,13 5,12.5 5.5,12 6,11.5 6.5,11 7,10.5 c 0.1666667,-0.166667 0.3333333,-0.25 0.5,-0.25 0.1666667,0 0.3333333,0.08333 0.5,0.25 L 8.5,11 9,11.5 9.5,12 10,12.5 c 0.166667,0.166667 0.333333,0.25 0.5,0.25 0.166667,0 0.333333,-0.08333 0.5,-0.25 L 11.5,12 12,11.5 12.5,11 13,10.5 13.5,10 14,9.5 14.5,9 C 14.666667,8.8333333 14.75,8.6666667 14.75,8.5 14.75,8.3333333 14.666667,8.1666667 14.5,8 L 14,7.5 13.5,7 13,6.5 12.5,6 12,5.5 11.5,5 11,4.5 10.5,4 10,3.5 9.5,3 9,2.5 8.5,2 8,1.5 C 7.8333333,1.3333333 7.6666667,1.25 7.5,1.25 Z"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/core/assets-raw/fontgen/icons/host.svg b/core/assets-raw/fontgen/icons/host.svg
deleted file mode 100644
index e927c7af2f..0000000000
--- a/core/assets-raw/fontgen/icons/host.svg
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   width="12"
-   height="11"
-   viewBox="0 0 12 11"
-   sodipodi:docname="host.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <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="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="16.857143"
-     inkscape:cx="-19.567797"
-     inkscape:cy="4.1610169"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <g
-     id="g32"
-     transform="translate(-1,-2)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 1.125,2.625 Q 1.25,2.25 1.625,2.125 2,2 2.5,2 q 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 0.875,0.125 0.375,0.125 0.5,0.5 Q 13,3 13,3.5 13,4 12.875,4.375 12.75,4.75 12.375,4.875 12,5 11.5,5 11,5 10.5,5 10,5 9.5,5 9,5 8.5,5 8,5 7.5,5 7,5 6.5,5 6,5 5.5,5 5,5 4.5,5 4,5 3.5,5 3,5 2.5,5 2,5 1.625,4.875 1.25,4.75 1.125,4.375 1,4 1,3.5 1,3 1.125,2.625 M 5.5,4 Q 6,4 6.375,3.875 6.75,3.75 6.75,3.5 6.75,3.25 6.375,3.125 6,3 5.5,3 5,3 4.5,3 4,3 3.5,3 3,3 2.625,3.125 2.25,3.25 2.25,3.5 2.25,3.75 2.625,3.875 3,4 3.5,4 4,4 4.5,4 5,4 5.5,4 m 4.75,-0.5 q 0,0.25 0.25,0.25 0.25,0 0.25,-0.25 0,-0.25 -0.25,-0.25 -0.25,0 -0.25,0.25"
-       id="path14"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 1.125,6.625 Q 1.25,6.25 1.625,6.125 2,6 2.5,6 q 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 0.875,0.125 0.375,0.125 0.5,0.5 Q 13,7 13,7.5 13,8 12.875,8.375 12.75,8.75 12.375,8.875 12,9 11.5,9 11,9 10.5,9 10,9 9.5,9 9,9 8.5,9 8,9 7.5,9 7,9 6.5,9 6,9 5.5,9 5,9 4.5,9 4,9 3.5,9 3,9 2.5,9 2,9 1.625,8.875 1.25,8.75 1.125,8.375 1,8 1,7.5 1,7 1.125,6.625 M 5.5,8 Q 6,8 6.375,7.875 6.75,7.75 6.75,7.5 6.75,7.25 6.375,7.125 6,7 5.5,7 5,7 4.5,7 4,7 3.5,7 3,7 2.625,7.125 2.25,7.25 2.25,7.5 2.25,7.75 2.625,7.875 3,8 3.5,8 4,8 4.5,8 5,8 5.5,8 m 4.75,-0.5 q 0,0.25 0.25,0.25 0.25,0 0.25,-0.25 0,-0.25 -0.25,-0.25 -0.25,0 -0.25,0.25"
-       id="path20"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 1.125,10.625 Q 1.25,10.25 1.625,10.125 2,10 2.5,10 q 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 0.875,0.125 0.375,0.125 0.5,0.5 Q 13,11 13,11.5 q 0,0.5 -0.125,0.875 -0.125,0.375 -0.5,0.5 Q 12,13 11.5,13 11,13 10.5,13 10,13 9.5,13 9,13 8.5,13 8,13 7.5,13 7,13 6.5,13 6,13 5.5,13 5,13 4.5,13 4,13 3.5,13 3,13 2.5,13 2,13 1.625,12.875 1.25,12.75 1.125,12.375 1,12 1,11.5 1,11 1.125,10.625 M 5.5,12 Q 6,12 6.375,11.875 6.75,11.75 6.75,11.5 6.75,11.25 6.375,11.125 6,11 5.5,11 5,11 4.5,11 4,11 3.5,11 3,11 2.625,11.125 2.25,11.25 2.25,11.5 q 0,0.25 0.375,0.375 Q 3,12 3.5,12 q 0.5,0 1,0 0.5,0 1,0 m 4.75,-0.5 q 0,0.25 0.25,0.25 0.25,0 0.25,-0.25 0,-0.25 -0.25,-0.25 -0.25,0 -0.25,0.25"
-       id="path26"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/core/assets-raw/fontgen/icons/itchio.svg b/core/assets-raw/fontgen/icons/itchio.svg
deleted file mode 100644
index d26eb1780a..0000000000
--- a/core/assets-raw/fontgen/icons/itchio.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   width="14"
-   height="9.875"
-   viewBox="0 0 14 9.875"
-   sodipodi:docname="itchio.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <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="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="46.093751"
-     inkscape:cx="1.5599999"
-     inkscape:cy="10.3775"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g18" />
-  <g
-     id="g18"
-     transform="translate(-1,-3.0625)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 4,3.5 Q 4.25,3.25 4.625,3.125 5,3 5.375,3.125 5.75,3.25 6,3.5 6.25,3.75 6.625,3.875 7,4 7.5,4 8,4 8.5,4 9,4 9.375,3.875 9.75,3.75 10,3.5 10.25,3.25 10.625,3.125 11,3 11.375,3.125 11.75,3.25 12,3.5 12.25,3.75 12.5,4 12.75,4.25 12.875,4.625 13,5 13,5.5 13,6 13.125,6.375 13.25,6.75 13.5,7 13.75,7.25 14,7.5 14.25,7.75 14.5,8 14.75,8.25 14.875,8.625 15,9 15,9.5 q 0,0.5 0,1 0,0.5 -0.125,0.875 Q 14.75,11.75 14.5,12 14.25,12.25 14,12.5 13.75,12.75 13.375,12.875 13,13 12.625,12.875 12.25,12.75 12,12.5 11.75,12.25 11.5,12 11.25,11.75 11,11.5 10.75,11.25 10.375,11.125 10,11 9.5,11 9,11 8.5,11 8,11 7.5,11 7,11 6.5,11 6,11 5.625,11.125 5.25,11.25 5,11.5 4.75,11.75 4.5,12 4.25,12.25 4,12.5 3.75,12.75 3.375,12.875 3,13 2.625,12.875 2.25,12.75 2,12.5 1.75,12.25 1.5,12 1.25,11.75 1.125,11.375 1,11 1,10.5 1,10 1,9.5 1,9 1.125,8.625 1.25,8.25 1.5,8 1.75,7.75 2,7.5 2.25,7.25 2.5,7 2.75,6.75 2.875,6.375 3,6 3,5.5 3,5 3.125,4.625 3.25,4.25 3.5,4 3.75,3.75 4,3.5 M 7.625,9.875 Q 8,10 8.375,9.875 8.75,9.75 8.875,9.375 9,9 9.125,8.625 9.25,8.25 9.625,8.125 10,8 10.375,7.875 10.75,7.75 10.75,7.5 10.75,7.25 10.5,7 10.25,6.75 10,6.5 9.75,6.25 9.5,6 9.25,5.75 9,5.5 8.75,5.25 8.375,5.125 8,5 7.625,5.125 7.25,5.25 7,5.5 6.75,5.75 6.5,6 6.25,6.25 6,6.5 5.75,6.75 5.5,7 5.25,7.25 5.25,7.5 5.25,7.75 5.625,7.875 6,8 6.375,8.125 6.75,8.25 6.875,8.625 7,9 7.125,9.375 q 0.125,0.375 0.5,0.5"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/core/assets-raw/fontgen/icons/line.svg b/core/assets-raw/fontgen/icons/line.svg
deleted file mode 100644
index 91e2e2fb29..0000000000
--- a/core/assets-raw/fontgen/icons/line.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   width="11.875"
-   height="11.875"
-   viewBox="0 0 11.875 11.875"
-   sodipodi:docname="line.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <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="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="-19.350636"
-     inkscape:cy="7.9036017"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g16" />
-  <g
-     id="g16"
-     transform="translate(-2.0625,-2.0625)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 12,2.5 Q 12.25,2.25 12.625,2.125 13,2 13.375,2.125 13.75,2.25 13.875,2.625 14,3 13.875,3.375 13.75,3.75 13.5,4 13.25,4.25 13,4.5 12.75,4.75 12.5,5 12.25,5.25 12,5.5 11.75,5.75 11.5,6 11.25,6.25 11,6.5 10.75,6.75 10.5,7 10.25,7.25 10,7.5 9.75,7.75 9.5,8 9.25,8.25 9,8.5 8.75,8.75 8.5,9 8.25,9.25 8,9.5 7.75,9.75 7.5,10 7.25,10.25 7,10.5 6.75,10.75 6.5,11 6.25,11.25 6,11.5 5.75,11.75 5.5,12 5.25,12.25 5,12.5 4.75,12.75 4.5,13 4.25,13.25 4,13.5 3.75,13.75 3.375,13.875 3,14 2.625,13.875 2.25,13.75 2.125,13.375 2,13 2.125,12.625 2.25,12.25 2.5,12 2.75,11.75 3,11.5 3.25,11.25 3.5,11 3.75,10.75 4,10.5 4.25,10.25 4.5,10 4.75,9.75 5,9.5 5.25,9.25 5.5,9 5.75,8.75 6,8.5 6.25,8.25 6.5,8 6.75,7.75 7,7.5 7.25,7.25 7.5,7 7.75,6.75 8,6.5 8.25,6.25 8.5,6 8.75,5.75 9,5.5 9.25,5.25 9.5,5 9.75,4.75 10,4.5 10.25,4.25 10.5,4 10.75,3.75 11,3.5 11.25,3.25 11.5,3 11.75,2.75 12,2.5"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/core/assets-raw/fontgen/icons/link.svg b/core/assets-raw/fontgen/icons/link.svg
deleted file mode 100644
index 34b8a163d7..0000000000
--- a/core/assets-raw/fontgen/icons/link.svg
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   width="12"
-   height="12"
-   viewBox="0 0 12 12"
-   sodipodi:docname="link.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <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="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="16.857143"
-     inkscape:cx="-18.558594"
-     inkscape:cy="2.203125"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g18" />
-  <g
-     id="g18"
-     transform="translate(-0.999272,-0.9997352)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="m 28.058594,-2.796875 c -0.333334,0 -0.625,0.041667 -0.875,0.125 -0.25,0.083333 -0.458334,0.2083333 -0.625,0.375 l -0.5,0.5 c -0.166667,0.1666667 -0.291667,0.375 -0.375,0.625 -0.08333,0.25 -0.125,0.54166667 -0.125,0.875 v 1 1 1 1 1 1 1 c 0,0.3333333 0.04167,0.625 0.125,0.875 0.08333,0.25 0.208333,0.4583333 0.375,0.625 l 0.5,0.5 c 0.166666,0.1666667 0.375,0.2916667 0.625,0.375 0.25,0.083333 0.541666,0.125 0.875,0.125 h 1 1 1 1 1 1 1 c 0.333333,0 0.625,-0.041667 0.875,-0.125 0.25,-0.083333 0.458333,-0.2083333 0.625,-0.375 l 0.5,-0.5 c 0.166666,-0.1666667 0.291666,-0.375 0.375,-0.625 0.08333,-0.25 0.125,-0.5416667 0.125,-0.875 0,-0.3333333 -0.04167,-0.625 -0.125,-0.875 -0.08333,-0.25 -0.208334,-0.4583333 -0.375,-0.625 l -0.5,-0.5 c -0.166667,-0.1666667 -0.333334,-0.25 -0.5,-0.25 -0.166667,0 -0.291667,0.125 -0.375,0.375 -0.08333,0.25 -0.125,0.5416667 -0.125,0.875 0,0.3333333 -0.04167,0.625 -0.125,0.875 -0.08333,0.25 -0.25,0.4166667 -0.5,0.5 -0.25,0.083333 -0.541667,0.125 -0.875,0.125 h -1 -1 -1 -1 -1 c -0.333334,0 -0.625,-0.041667 -0.875,-0.125 -0.25,-0.083333 -0.416667,-0.25 -0.5,-0.5 -0.08333,-0.25 -0.125,-0.5416667 -0.125,-0.875 v -1 -1 -1 -1 -1 c 0,-0.33333333 0.04167,-0.625 0.125,-0.875 0.08333,-0.25 0.25,-0.41666667 0.5,-0.5 0.25,-0.0833333 0.541666,-0.125 0.875,-0.125 0.333333,0 0.625,-0.0416667 0.875,-0.125 0.25,-0.0833333 0.375,-0.2083333 0.375,-0.375 0,-0.1666667 -0.08333,-0.3333333 -0.25,-0.5 l -0.5,-0.5 c -0.166667,-0.1666667 -0.375,-0.2916667 -0.625,-0.375 -0.25,-0.083333 -0.541667,-0.125 -0.875,-0.125 z m 5,0 c -0.333334,0 -0.625,0.041667 -0.875,0.125 -0.25,0.083333 -0.375,0.2083333 -0.375,0.375 0,0.1666667 0.08333,0.3333333 0.25,0.5 l 0.5,0.5 0.5,0.5 c 0.166666,0.16666667 0.25,0.33333333 0.25,0.5 0,0.16666667 -0.08333,0.33333333 -0.25,0.5 l -0.5,0.5 -0.5,0.5 -0.5,0.5 -0.5,0.5 -0.5,0.5 -0.5,0.5 c -0.166667,0.1666667 -0.291667,0.375 -0.375,0.625 -0.08333,0.25 -0.08333,0.5 0,0.75 0.08333,0.25 0.25,0.4166667 0.5,0.5 0.25,0.083333 0.5,0.083333 0.75,0 0.25,-0.083333 0.458333,-0.2083333 0.625,-0.375 l 0.5,-0.5 0.5,-0.5 0.5,-0.5 0.5,-0.5 0.5,-0.5 0.5,-0.5 c 0.166666,-0.1666667 0.333333,-0.25 0.5,-0.25 0.166666,0 0.333333,0.083333 0.5,0.25 l 0.5,0.5 0.5,0.5 c 0.166666,0.1666667 0.333333,0.25 0.5,0.25 0.166666,0 0.291666,-0.125 0.375,-0.375 0.08333,-0.25 0.125,-0.5416667 0.125,-0.875 v -1 -1 -1 c 0,-0.3333333 -0.04167,-0.625 -0.125,-0.875 -0.08333,-0.25 -0.25,-0.4166667 -0.5,-0.5 -0.25,-0.083333 -0.541667,-0.125 -0.875,-0.125 h -1 -1 z"
-       transform="translate(-24.559322,3.7966102)"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/core/assets-raw/fontgen/icons/liquid.svg b/core/assets-raw/fontgen/icons/liquid.svg
deleted file mode 100644
index 6eb50596d8..0000000000
--- a/core/assets-raw/fontgen/icons/liquid.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   width="8.75"
-   height="8.75"
-   viewBox="0 0 8.75 8.75"
-   sodipodi:docname="liquid.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <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="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="30.729167"
-     inkscape:cx="-5.7555702"
-     inkscape:cy="11.13662"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g18" />
-  <g
-     id="g18"
-     transform="translate(-1.25,-2)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 1.25,2.5 Q 1.25,2.25 1.625,2.125 2,2 2.5,2 3,2 3.5,2 4,2 4.5,2 5,2 5.5,2 6,2 6.5,2 7,2 7.375,2.125 7.75,2.25 7.75,2.5 7.75,2.75 7.5,3 7.25,3.25 7.125,3.625 7,4 7.125,4.375 7.25,4.75 7.625,4.875 8,5 8.375,4.875 8.75,4.75 9,4.5 9.25,4.25 9.5,4.25 9.75,4.25 9.875,4.625 10,5 10,5.5 q 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 Q 10,10 9.875,10.375 9.75,10.75 9.5,10.75 9.25,10.75 9,10.5 8.75,10.25 8.375,10.125 8,10 7.5,10 7,10 6.5,10 6,10 5.5,10 5,10 4.625,9.875 4.25,9.75 4,9.5 3.75,9.25 3.5,9 3.25,8.75 3,8.5 2.75,8.25 2.5,8 2.25,7.75 2.125,7.375 2,7 2,6.5 2,6 2,5.5 2,5 2,4.5 2,4 1.875,3.625 1.75,3.25 1.5,3 1.25,2.75 1.25,2.5 M 7.5,9 Q 8,9 8.375,8.875 8.75,8.75 8.875,8.375 9,8 9,7.5 9,7 8.875,6.625 8.75,6.25 8.375,6.125 8,6 7.625,5.875 7.25,5.75 7,5.5 6.75,5.25 6.5,5 6.25,4.75 6.125,4.375 6,4 5.875,3.625 5.75,3.25 5.375,3.125 5,3 4.5,3 4,3 3.625,3.125 3.25,3.25 3.125,3.625 3,4 3,4.5 3,5 3,5.5 3,6 3,6.5 3,7 3.125,7.375 3.25,7.75 3.5,8 3.75,8.25 4,8.5 4.25,8.75 4.625,8.875 5,9 5.5,9 6,9 6.5,9 7,9 7.5,9"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/core/assets-raw/fontgen/icons/mode-attack.svg b/core/assets-raw/fontgen/icons/mode-attack.svg
deleted file mode 100644
index cc78940688..0000000000
--- a/core/assets-raw/fontgen/icons/mode-attack.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg12"
-   width="12.875"
-   height="12.875"
-   viewBox="0 0 12.875 12.875"
-   sodipodi:docname="mode-attack.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata18">
-    <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="defs16" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview14"
-     showgrid="false"
-     inkscape:zoom="46.093751"
-     inkscape:cx="1.4974999"
-     inkscape:cy="12.3775"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g869" />
-  <g
-     id="g869"
-     transform="translate(-1.0625,-2.0625)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 12,2.5 Q 12.25,2.25 12.625,2.125 13,2 13.375,2.125 13.75,2.25 13.875,2.625 14,3 13.875,3.375 13.75,3.75 13.5,4 13.25,4.25 13,4.5 12.75,4.75 12.5,5 12.25,5.25 12,5.5 11.75,5.75 11.5,6 11.25,6.25 11,6.5 10.75,6.75 10.5,7 10.25,7.25 10,7.5 9.75,7.75 9.5,8 9.25,8.25 9,8.5 8.75,8.75 8.5,9 8.25,9.25 8,9.5 7.75,9.75 7.5,10 7.25,10.25 7.125,10.625 7,11 7.125,11.375 7.25,11.75 7.5,12 7.75,12.25 7.875,12.625 8,13 7.875,13.375 7.75,13.75 7.375,13.875 7,14 6.625,13.875 6.25,13.75 6,13.5 5.75,13.25 5.375,13.125 5,13 4.625,13.125 4.25,13.25 4,13.5 3.75,13.75 3.5,14 3.25,14.25 3,14.5 2.75,14.75 2.375,14.875 2,15 1.625,14.875 1.25,14.75 1.125,14.375 1,14 1.125,13.625 1.25,13.25 1.5,13 1.75,12.75 2,12.5 2.25,12.25 2.5,12 2.75,11.75 2.875,11.375 3,11 2.875,10.625 2.75,10.25 2.5,10 2.25,9.75 2.125,9.375 2,9 2.125,8.625 2.25,8.25 2.625,8.125 3,8 3.375,8.125 3.75,8.25 4,8.5 4.25,8.75 4.625,8.875 5,9 5.375,8.875 5.75,8.75 6,8.5 6.25,8.25 6.5,8 6.75,7.75 7,7.5 7.25,7.25 7.5,7 7.75,6.75 8,6.5 8.25,6.25 8.5,6 8.75,5.75 9,5.5 9.25,5.25 9.5,5 9.75,4.75 10,4.5 10.25,4.25 10.5,4 10.75,3.75 11,3.5 11.25,3.25 11.5,3 11.75,2.75 12,2.5"
-       id="path867"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/core/assets-raw/fontgen/icons/mode-pvp.svg b/core/assets-raw/fontgen/icons/mode-pvp.svg
deleted file mode 100644
index 76c7f31f77..0000000000
--- a/core/assets-raw/fontgen/icons/mode-pvp.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   width="15.874997"
-   height="12.874997"
-   viewBox="0 0 15.874997 12.874997"
-   sodipodi:docname="mode-pvp.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <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="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="40.972221"
-     inkscape:cx="-1.9533477"
-     inkscape:cy="12.95987"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g20" />
-  <g
-     id="g20"
-     transform="translate(-1.0625002,-3.0625)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="m 5,3.0625 c -0.125,0 -0.25,0.020833 -0.375,0.0625 -0.25,0.083333 -0.4166667,0.25 -0.5,0.5 -0.083333,0.25 -0.083333,0.5 0,0.75 C 4.2083333,4.625 4.3333333,4.8333333 4.5,5 L 5,5.5 5.5,6 6,6.5 C 6.1666667,6.6666667 6.3333333,6.75 6.5,6.75 6.6666667,6.75 6.8333333,6.6666667 7,6.5 L 7.5,6 C 7.6666667,5.8333333 7.75,5.6666667 7.75,5.5 7.75,5.3333333 7.6666667,5.1666667 7.5,5 L 7,4.5 6.5,4 6,3.5 C 5.8333333,3.3333333 5.625,3.2083333 5.375,3.125 5.25,3.0833333 5.125,3.0625 5,3.0625 Z m 8,0 c -0.125,0 -0.25,0.020833 -0.375,0.0625 C 12.375,3.2083333 12.166667,3.3333333 12,3.5 L 11.5,4 11,4.5 10.5,5 10,5.5 9.5,6 9,6.5 8.5,7 8,7.5 7.5,8 7,8.5 6.5,9 6,9.5 C 5.8333333,9.6666667 5.625,9.7916667 5.375,9.875 c -0.25,0.083333 -0.5,0.083333 -0.75,0 C 4.375,9.7916667 4.1666667,9.6666667 4,9.5 3.8333333,9.3333333 3.625,9.2083333 3.375,9.125 c -0.25,-0.083333 -0.5,-0.083333 -0.75,0 -0.25,0.083333 -0.4166667,0.25 -0.5,0.5 -0.083333,0.25 -0.083333,0.5 0,0.75 0.083333,0.25 0.2083333,0.458333 0.375,0.625 0.1666667,0.166667 0.2916667,0.375 0.375,0.625 0.083333,0.25 0.083333,0.5 0,0.75 C 2.7916667,12.625 2.6666667,12.833333 2.5,13 L 2,13.5 1.5,14 c -0.1666667,0.166667 -0.2916667,0.375 -0.375,0.625 -0.083333,0.25 -0.083333,0.5 0,0.75 0.083333,0.25 0.25,0.416667 0.5,0.5 0.25,0.08333 0.5,0.08333 0.75,0 C 2.625,15.791667 2.8333333,15.666667 3,15.5 L 3.5,15 4,14.5 c 0.1666667,-0.166667 0.375,-0.291667 0.625,-0.375 0.25,-0.08333 0.5,-0.08333 0.75,0 0.25,0.08333 0.4583333,0.208333 0.625,0.375 0.1666667,0.166667 0.375,0.291667 0.625,0.375 0.25,0.08333 0.5,0.08333 0.75,0 0.25,-0.08333 0.4166667,-0.25 0.5,-0.5 0.083333,-0.25 0.083333,-0.5 0,-0.75 C 7.7916667,13.375 7.6666667,13.166667 7.5,13 7.3333333,12.833333 7.2083333,12.625 7.125,12.375 c -0.083333,-0.25 -0.083333,-0.5 0,-0.75 C 7.2083333,11.375 7.3333333,11.166667 7.5,11 L 8,10.5 8.5,10 9,9.5 9.5,9 10,8.5 10.5,8 11,7.5 11.5,7 12,6.5 12.5,6 13,5.5 13.5,5 c 0.166667,-0.1666667 0.291667,-0.375 0.375,-0.625 0.08333,-0.25 0.08333,-0.5 0,-0.75 -0.08333,-0.25 -0.25,-0.4166667 -0.5,-0.5 C 13.25,3.0833333 13.125,3.0625 13,3.0625 Z m 2,6 c -0.125,0 -0.25,0.020833 -0.375,0.0625 C 14.375,9.208333 14.166667,9.3333333 14,9.5 c -0.166667,0.1666667 -0.375,0.2916667 -0.625,0.375 -0.25,0.083333 -0.5,0.083333 -0.75,0 C 12.375,9.7916667 12.166667,9.6666667 12,9.5 11.833333,9.3333333 11.666667,9.25 11.5,9.25 11.333333,9.25 11.166667,9.3333333 11,9.5 L 10.5,10 c -0.166667,0.166667 -0.25,0.333333 -0.25,0.5 0,0.166667 0.08333,0.333333 0.25,0.5 0.166667,0.166667 0.291667,0.375 0.375,0.625 0.08333,0.25 0.08333,0.5 0,0.75 -0.08333,0.25 -0.208333,0.458333 -0.375,0.625 -0.166667,0.166667 -0.291667,0.375 -0.375,0.625 -0.08333,0.25 -0.08333,0.5 0,0.75 0.08333,0.25 0.25,0.416667 0.5,0.5 0.25,0.08333 0.5,0.08333 0.75,0 0.25,-0.08333 0.458333,-0.208333 0.625,-0.375 0.166667,-0.166667 0.375,-0.291667 0.625,-0.375 0.25,-0.08333 0.5,-0.08333 0.75,0 0.25,0.08333 0.458333,0.208333 0.625,0.375 l 0.5,0.5 0.5,0.5 c 0.166667,0.166667 0.375,0.291667 0.625,0.375 0.25,0.08333 0.5,0.08333 0.75,0 0.25,-0.08333 0.416667,-0.25 0.5,-0.5 0.08333,-0.25 0.08333,-0.5 0,-0.75 C 16.791667,14.375 16.666667,14.166667 16.5,14 L 16,13.5 15.5,13 c -0.166667,-0.166667 -0.291667,-0.375 -0.375,-0.625 -0.08333,-0.25 -0.08333,-0.5 0,-0.75 0.08333,-0.25 0.208333,-0.458333 0.375,-0.625 0.166667,-0.166667 0.291667,-0.375 0.375,-0.625 0.08333,-0.25 0.08333,-0.5 0,-0.75 -0.08333,-0.25 -0.25,-0.4166667 -0.5,-0.5 C 15.25,9.0833333 15.125,9.0625 15,9.0625 Z"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/core/assets-raw/fontgen/icons/mode-survival.svg b/core/assets-raw/fontgen/icons/mode-survival.svg
deleted file mode 100644
index aa5d0dcac8..0000000000
--- a/core/assets-raw/fontgen/icons/mode-survival.svg
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg22"
-   width="12"
-   height="12.9375"
-   viewBox="0 0 12 12.9375"
-   sodipodi:docname="mode-survival.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata28">
-    <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="defs26" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview24"
-     showgrid="false"
-     inkscape:zoom="46.093751"
-     inkscape:cx="0.55999994"
-     inkscape:cy="12.44"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g844" />
-  <g
-     id="g844"
-     inkscape:label="g844"
-     transform="translate(-2,-2.0625)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 2.125,2.625 Q 2.25,2.25 2.625,2.125 3,2 3.375,2.125 3.75,2.25 4,2.5 4.25,2.75 4.5,3 4.75,3.25 5,3.5 5.25,3.75 5.625,3.875 6,4 6.5,4 7,4 7.5,4 8,4 8.5,4 9,4 9.5,4 10,4 10.375,3.875 10.75,3.75 11,3.5 11.25,3.25 11.5,3 11.75,2.75 12,2.5 12.25,2.25 12.625,2.125 13,2 13.375,2.125 13.75,2.25 13.875,2.625 14,3 14,3.5 q 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 -0.125,0.875 Q 13.75,10.75 13.5,11 13.25,11.25 13,11.5 12.75,11.75 12.5,12 12.25,12.25 12,12.5 11.75,12.75 11.5,13 11.25,13.25 11,13.5 10.75,13.75 10.5,14 10.25,14.25 10,14.5 9.75,14.75 9.375,14.875 9,15 8.5,15 8,15 7.5,15 7,15 6.625,14.875 6.25,14.75 6,14.5 5.75,14.25 5.5,14 5.25,13.75 5,13.5 4.75,13.25 4.5,13 4.25,12.75 4,12.5 3.75,12.25 3.5,12 3.25,11.75 3,11.5 2.75,11.25 2.5,11 2.25,10.75 2.125,10.375 2,10 2,9.5 2,9 2,8.5 2,8 2,7.5 2,7 2,6.5 2,6 2,5.5 2,5 2,4.5 2,4 2,3.5 2,3 2.125,2.625"
-       id="path842"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/core/assets-raw/fontgen/icons/paste.svg b/core/assets-raw/fontgen/icons/paste.svg
deleted file mode 100644
index 67a323b6ea..0000000000
--- a/core/assets-raw/fontgen/icons/paste.svg
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   width="12"
-   height="14"
-   viewBox="0 0 12 14"
-   sodipodi:docname="paste.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <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="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="-21.253906"
-     inkscape:cy="8.220703"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g26" />
-  <g
-     id="g26"
-     transform="translate(-1.999669,-1.0003641)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="m 34.753906,2.2207031 c -0.333333,0 -0.625,0.041667 -0.875,0.125 -0.25,0.083333 -0.458333,0.2083334 -0.625,0.375 -0.166666,0.1666667 -0.375,0.2916667 -0.625,0.375 -0.25,0.083333 -0.541666,0.125 -0.875,0.125 -0.333333,0 -0.625,0.041667 -0.875,0.125 -0.25,0.083333 -0.458333,0.2083334 -0.625,0.375 l -0.5,0.5 c -0.166666,0.1666667 -0.291666,0.375 -0.375,0.625 -0.08333,0.25 -0.125,0.5416667 -0.125,0.875 v 1 1 1 1 0.9999999 1 1 1 c 0,0.333333 0.04167,0.625 0.125,0.875 0.08333,0.25 0.208334,0.458333 0.375,0.625 l 0.5,0.5 c 0.166667,0.166667 0.375,0.291667 0.625,0.375 0.25,0.08333 0.541667,0.125 0.875,0.125 h 1 1 1 1 1 1 1 c 0.333334,0 0.625,-0.04167 0.875,-0.125 0.25,-0.08333 0.458334,-0.208333 0.625,-0.375 l 0.5,-0.5 c 0.166667,-0.166667 0.291667,-0.375 0.375,-0.625 0.08333,-0.25 0.125,-0.541667 0.125,-0.875 v -1 -1 -1 -0.9999999 -1 -1 -1 -1 c 0,-0.3333333 -0.04167,-0.625 -0.125,-0.875 -0.08333,-0.25 -0.208333,-0.4583333 -0.375,-0.625 l -0.5,-0.5 c -0.166666,-0.1666666 -0.375,-0.2916666 -0.625,-0.375 -0.25,-0.083333 -0.541666,-0.125 -0.875,-0.125 -0.333333,0 -0.625,-0.041667 -0.875,-0.125 -0.25,-0.083333 -0.458333,-0.2083333 -0.625,-0.375 -0.166666,-0.1666666 -0.375,-0.2916666 -0.625,-0.375 -0.25,-0.083333 -0.541666,-0.125 -0.875,-0.125 z m 0.5,1.0625 c 0.125,0 0.25,0.020833 0.375,0.0625 0.25,0.083333 0.375,0.2083334 0.375,0.375 0,0.1666667 -0.125,0.2916667 -0.375,0.375 -0.25,0.083333 -0.5,0.083333 -0.75,0 -0.25,-0.083333 -0.375,-0.2083333 -0.375,-0.375 0,-0.1666666 0.125,-0.2916666 0.375,-0.375 0.125,-0.041667 0.25,-0.0625 0.375,-0.0625 z m -3,2 c 0.125,0 0.25,0.020833 0.375,0.0625 0.25,0.083333 0.458334,0.2083334 0.625,0.375 0.166667,0.1666667 0.375,0.2916667 0.625,0.375 0.25,0.083333 0.541667,0.125 0.875,0.125 h 1 c 0.333334,0 0.625,-0.041667 0.875,-0.125 0.25,-0.083333 0.458334,-0.2083333 0.625,-0.375 0.166667,-0.1666666 0.375,-0.2916666 0.625,-0.375 0.25,-0.083333 0.5,-0.083333 0.75,0 0.25,0.083333 0.416667,0.25 0.5,0.5 0.08333,0.25 0.125,0.5416667 0.125,0.875 v 1 1 1 0.9999999 1 1 c 0,0.333333 -0.04167,0.625 -0.125,0.875 -0.08333,0.25 -0.25,0.416667 -0.5,0.5 -0.25,0.08333 -0.541666,0.125 -0.875,0.125 h -1 -1 -1 -1 -1 c -0.333333,0 -0.625,-0.04167 -0.875,-0.125 -0.25,-0.08333 -0.416666,-0.25 -0.5,-0.5 -0.08333,-0.25 -0.125,-0.541667 -0.125,-0.875 v -1 -1 -0.9999999 -1 -1 -1 c 0,-0.3333333 0.04167,-0.625 0.125,-0.875 0.08333,-0.25 0.25,-0.4166666 0.5,-0.5 0.125,-0.041667 0.25,-0.0625 0.375,-0.0625 z m 1.5,2.9375 c -0.333333,0 -0.625,0.041667 -0.875,0.125 -0.25,0.083333 -0.375,0.2083334 -0.375,0.375 0,0.1666667 0.125,0.2916667 0.375,0.375 0.25,0.083333 0.541667,0.125 0.875,0.125 h 1 1 1 c 0.333334,0 0.625,-0.041667 0.875,-0.125 0.25,-0.083333 0.375,-0.2083333 0.375,-0.375 0,-0.1666666 -0.125,-0.2916666 -0.375,-0.375 -0.25,-0.083333 -0.541666,-0.125 -0.875,-0.125 h -1 -1 z m 0,1.9999999 c -0.333333,0 -0.625,0.04167 -0.875,0.125 -0.25,0.08333 -0.375,0.208333 -0.375,0.375 0,0.166667 0.125,0.291667 0.375,0.375 0.25,0.08333 0.541667,0.125 0.875,0.125 h 1 1 1 c 0.333334,0 0.625,-0.04167 0.875,-0.125 0.25,-0.08333 0.375,-0.208333 0.375,-0.375 0,-0.166667 -0.125,-0.291667 -0.375,-0.375 -0.25,-0.08333 -0.541666,-0.125 -0.875,-0.125 h -1 -1 z m 0,2 c -0.333333,0 -0.625,0.04167 -0.875,0.125 -0.25,0.08333 -0.375,0.208333 -0.375,0.375 0,0.166667 0.125,0.291667 0.375,0.375 0.25,0.08333 0.541667,0.125 0.875,0.125 h 1 1 1 c 0.333334,0 0.625,-0.04167 0.875,-0.125 0.25,-0.08333 0.375,-0.208333 0.375,-0.375 0,-0.166667 -0.125,-0.291667 -0.375,-0.375 -0.25,-0.08333 -0.541666,-0.125 -0.875,-0.125 h -1 -1 z"
-       transform="translate(-27.254237,-1.220339)"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/core/assets-raw/fontgen/icons/pencil.svg b/core/assets-raw/fontgen/icons/pencil.svg
deleted file mode 100644
index f2bfa70403..0000000000
--- a/core/assets-raw/fontgen/icons/pencil.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   width="13.75"
-   height="13.75"
-   viewBox="0 0 13.75 13.75"
-   sodipodi:docname="pencil.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <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="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="46.093751"
-     inkscape:cx="1.5599999"
-     inkscape:cy="12.44"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g20" />
-  <g
-     id="g20"
-     transform="translate(-1,-1.25)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 12.5,1.25 C 12.333333,1.25 12.166667,1.333333 12,1.5 L 11.5,2 11,2.5 10.5,3 c -0.166667,0.1666667 -0.25,0.3333333 -0.25,0.5 0,0.1666667 0.08333,0.3333333 0.25,0.5 L 11,4.5 11.5,5 12,5.5 c 0.166667,0.1666667 0.333333,0.25 0.5,0.25 0.166667,0 0.333333,-0.083333 0.5,-0.25 L 13.5,5 14,4.5 14.5,4 C 14.666667,3.8333333 14.75,3.6666667 14.75,3.5 14.75,3.3333333 14.666667,3.1666667 14.5,3 L 14,2.5 13.5,2 13,1.5 C 12.833333,1.3333333 12.666667,1.25 12.5,1.25 Z m -4,4 C 8.3333333,5.25 8.1666667,5.3333333 8,5.5 L 7.5,6 7,6.5 6.5,7 6,7.5 5.5,8 5,8.5 4.5,9 4,9.5 3.5,10 3,10.5 2.5,11 2,11.5 1.5,12 C 1.3333333,12.166667 1.2083333,12.375 1.125,12.625 1.0416667,12.875 1,13.166667 1,13.5 c 0,0.333333 0.041667,0.625 0.125,0.875 0.083333,0.25 0.25,0.416667 0.5,0.5 C 1.875,14.958333 2.1666667,15 2.5,15 2.8333333,15 3.125,14.958333 3.375,14.875 3.625,14.791667 3.8333333,14.666667 4,14.5 L 4.5,14 5,13.5 5.5,13 6,12.5 6.5,12 7,11.5 7.5,11 8,10.5 8.5,10 9,9.5 9.5,9 10,8.5 10.5,8 C 10.666667,7.8333333 10.75,7.6666667 10.75,7.5 10.75,7.3333333 10.666667,7.1666667 10.5,7 L 10,6.5 9.5,6 9,5.5 C 8.8333333,5.3333333 8.6666667,5.25 8.5,5.25 Z m -4,5 c 0.1666667,0 0.3333333,0.08333 0.5,0.25 L 5.5,11 c 0.1666667,0.166667 0.25,0.333333 0.25,0.5 0,0.166667 -0.083333,0.333333 -0.25,0.5 L 5,12.5 4.5,13 4,13.5 c -0.1666667,0.166667 -0.375,0.291667 -0.625,0.375 -0.25,0.08333 -0.5,0.08333 -0.75,0 -0.25,-0.08333 -0.4166667,-0.25 -0.5,-0.5 -0.083333,-0.25 -0.083333,-0.5 0,-0.75 C 2.2083333,12.375 2.3333333,12.166667 2.5,12 L 3,11.5 3.5,11 4,10.5 c 0.1666667,-0.166667 0.3333333,-0.25 0.5,-0.25 z"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/core/assets-raw/fontgen/icons/players.svg b/core/assets-raw/fontgen/icons/players.svg
deleted file mode 100644
index 3cdfa46245..0000000000
--- a/core/assets-raw/fontgen/icons/players.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   width="7.875"
-   height="7.9375"
-   viewBox="0 0 7.875 7.9375"
-   sodipodi:docname="players.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <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="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="23.6"
-     inkscape:cx="-14.960805"
-     inkscape:cy="3.4067797"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g16" />
-  <g
-     id="g16"
-     transform="translate(-1.0625,-1.0625)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 4,1.5 Q 4.25,1.25 4.625,1.125 5,1 5.375,1.125 5.75,1.25 6,1.5 6.25,1.75 6.5,2 6.75,2.25 6.875,2.625 7,3 6.875,3.375 6.75,3.75 6.5,4 6.25,4.25 6.25,4.5 6.25,4.75 6.5,5 6.75,5.25 7,5.5 7.25,5.75 7.5,6 7.75,6.25 8,6.5 8.25,6.75 8.5,7 8.75,7.25 8.875,7.625 9,8 8.875,8.375 8.75,8.75 8.375,8.875 8,9 7.5,9 7,9 6.5,9 6,9 5.5,9 5,9 4.5,9 4,9 3.5,9 3,9 2.5,9 2,9 1.625,8.875 1.25,8.75 1.125,8.375 1,8 1.125,7.625 1.25,7.25 1.5,7 1.75,6.75 2,6.5 2.25,6.25 2.5,6 2.75,5.75 3,5.5 3.25,5.25 3.5,5 3.75,4.75 3.75,4.5 3.75,4.25 3.5,4 3.25,3.75 3.125,3.375 3,3 3.125,2.625 3.25,2.25 3.5,2 3.75,1.75 4,1.5"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/core/assets-raw/fontgen/icons/power.svg b/core/assets-raw/fontgen/icons/power.svg
deleted file mode 100644
index 6d6a5063f2..0000000000
--- a/core/assets-raw/fontgen/icons/power.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   width="7.875"
-   height="5.5"
-   viewBox="0 0 7.875 5.5"
-   sodipodi:docname="power.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <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="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="61.458335"
-     inkscape:cx="-0.14250004"
-     inkscape:cy="6.83"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g16" />
-  <g
-     id="g16"
-     transform="translate(-2.0625,-3.25)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 9,3.5 Q 9.25,3.25 9.5,3.25 9.75,3.25 9.875,3.625 10,4 9.875,4.375 9.75,4.75 9.5,5 9.25,5.25 9.125,5.625 9,6 8.875,6.375 8.75,6.75 8.5,7 8.25,7.25 8,7.5 7.75,7.75 7.5,8 7.25,8.25 7,8.5 6.75,8.75 6.5,8.75 6.25,8.75 6,8.5 5.75,8.25 5.5,8 5.25,7.75 5,7.5 4.75,7.25 4.5,7.25 4.25,7.25 4,7.5 3.75,7.75 3.5,8 3.25,8.25 3,8.5 2.75,8.75 2.5,8.75 2.25,8.75 2.125,8.375 2,8 2.125,7.625 2.25,7.25 2.5,7 2.75,6.75 2.875,6.375 3,6 3.125,5.625 3.25,5.25 3.5,5 3.75,4.75 4,4.5 4.25,4.25 4.5,4.25 4.75,4.25 5,4.5 5.25,4.75 5.5,5 5.75,5.25 6,5.5 6.25,5.75 6.5,5.75 6.75,5.75 7,5.5 7.25,5.25 7.5,5 7.75,4.75 8,4.5 8.25,4.25 8.5,4 8.75,3.75 9,3.5"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/core/assets-raw/fontgen/icons/production.svg b/core/assets-raw/fontgen/icons/production.svg
deleted file mode 100644
index 74f0f882a9..0000000000
--- a/core/assets-raw/fontgen/icons/production.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   width="7.875"
-   height="8.9375"
-   viewBox="0 0 7.875 8.9375"
-   sodipodi:docname="production.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <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="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="43.457605"
-     inkscape:cx="-3.23046"
-     inkscape:cy="8.3742276"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g20" />
-  <g
-     id="g20"
-     transform="translate(-2.0625,-1)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 2.125,1.625 Q 2.25,1.25 2.625,1.125 3,1 3.5,1 4,1 4.5,1 5,1 5.5,1 6,1 6.5,1 7,1 7.5,1 8,1 8.5,1 9,1 9.375,1.125 9.75,1.25 9.875,1.625 10,2 9.875,2.375 9.75,2.75 9.5,3 9.25,3.25 9,3.5 8.75,3.75 8.5,4 8.25,4.25 8.125,4.625 8,5 8,5.5 8,6 8,6.5 8,7 8,7.5 8,8 7.875,8.375 7.75,8.75 7.5,9 7.25,9.25 7,9.5 6.75,9.75 6.375,9.875 6,10 5.625,9.875 5.25,9.75 5,9.5 4.75,9.25 4.5,9 4.25,8.75 4.125,8.375 4,8 4,7.5 4,7 4,6.5 4,6 4,5.5 4,5 3.875,4.625 3.75,4.25 3.5,4 3.25,3.75 3,3.5 2.75,3.25 2.5,3 2.25,2.75 2.125,2.375 2,2 2.125,1.625 m 3,6.75 Q 5.25,8.75 5.5,8.75 5.75,8.75 6,8.5 6.25,8.25 6.5,8 6.75,7.75 6.75,7.5 6.75,7.25 6.5,7 6.25,6.75 6.25,6.5 6.25,6.25 6.5,6 6.75,5.75 6.75,5.5 6.75,5.25 6.5,5 6.25,4.75 6,4.5 5.75,4.25 5.5,4.25 5.25,4.25 5.125,4.625 5,5 5,5.5 5,6 5,6.5 5,7 5,7.5 5,8 5.125,8.375 M 7.5,3 Q 8,3 8.375,2.875 8.75,2.75 8.75,2.5 8.75,2.25 8.375,2.125 8,2 7.5,2 7,2 6.5,2 6,2 5.5,2 5,2 4.5,2 4,2 3.625,2.125 3.25,2.25 3.25,2.5 3.25,2.75 3.625,2.875 4,3 4.5,3 5,3 5.5,3 6,3 6.5,3 7,3 7.5,3"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/core/assets-raw/fontgen/icons/refresh.svg b/core/assets-raw/fontgen/icons/refresh.svg
deleted file mode 100644
index 1cde3c7e11..0000000000
--- a/core/assets-raw/fontgen/icons/refresh.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   width="14"
-   height="14"
-   viewBox="0 0 14 14"
-   sodipodi:docname="refresh.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <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="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="46.093751"
-     inkscape:cx="1.5599999"
-     inkscape:cy="12.44"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g18" />
-  <g
-     id="g18"
-     transform="translate(-1,-1)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 3.5,1 C 3.1666667,1 2.875,1.0416667 2.625,1.125 2.375,1.2083333 2.1666667,1.3333333 2,1.5 L 1.5,2 C 1.3333333,2.1666667 1.2083333,2.375 1.125,2.625 1.0416667,2.875 1,3.1666667 1,3.5 v 1 1 1 1 c 0,0.3333333 0.041667,0.625 0.125,0.875 0.083333,0.25 0.25,0.4166667 0.5,0.5 0.25,0.083333 0.5,0.083333 0.75,0 0.25,-0.083333 0.4166667,-0.25 0.5,-0.5 C 2.9583333,8.125 3,7.8333333 3,7.5 v -1 -1 -1 C 3,4.1666667 3.0416667,3.875 3.125,3.625 3.2083333,3.375 3.375,3.2083333 3.625,3.125 3.875,3.0416667 4.1666667,3 4.5,3 h 1 1 1 1 1 c 0.3333333,0 0.625,0.041667 0.875,0.125 0.25,0.083333 0.375,0.2083333 0.375,0.375 0,0.1666667 -0.08333,0.3333333 -0.25,0.5 -0.166667,0.1666667 -0.25,0.3333333 -0.25,0.5 0,0.1666667 0.125,0.2916667 0.375,0.375 C 10.875,4.9583333 11.166667,5 11.5,5 h 1 c 0.333333,0 0.625,-0.041667 0.875,-0.125 0.25,-0.083333 0.416667,-0.25 0.5,-0.5 C 13.958333,4.125 14,3.8333333 14,3.5 v -1 C 14,2.1666667 13.958333,1.875 13.875,1.625 13.791667,1.375 13.666667,1.25 13.5,1.25 13.333333,1.25 13.166667,1.3333333 13,1.5 12.833333,1.6666667 12.666667,1.75 12.5,1.75 12.333333,1.75 12.166667,1.6666667 12,1.5 11.833333,1.3333333 11.625,1.2083333 11.375,1.125 11.125,1.0416667 10.833333,1 10.5,1 h -1 -1 -1 -1 -1 -1 z M 14,7.0625 c -0.125,0 -0.25,0.020833 -0.375,0.0625 -0.25,0.083333 -0.416667,0.25 -0.5,0.5 C 13.041667,7.875 13,8.1666667 13,8.5 v 1 1 1 c 0,0.333333 -0.04167,0.625 -0.125,0.875 -0.08333,0.25 -0.25,0.416667 -0.5,0.5 C 12.125,12.958333 11.833333,13 11.5,13 h -1 -1 -1 -1 -1 C 6.1666667,13 5.875,12.958333 5.625,12.875 5.375,12.791667 5.25,12.666667 5.25,12.5 5.25,12.333333 5.3333333,12.166667 5.5,12 5.6666667,11.833333 5.75,11.666667 5.75,11.5 5.75,11.333333 5.625,11.208333 5.375,11.125 5.125,11.041667 4.8333333,11 4.5,11 h -1 c -0.3333333,0 -0.625,0.04167 -0.875,0.125 -0.25,0.08333 -0.4166667,0.25 -0.5,0.5 C 2.0416667,11.875 2,12.166667 2,12.5 v 1 c 0,0.333333 0.041667,0.625 0.125,0.875 0.083333,0.25 0.2083333,0.375 0.375,0.375 0.1666667,0 0.3333333,-0.08333 0.5,-0.25 0.1666667,-0.166667 0.3333333,-0.25 0.5,-0.25 0.1666667,0 0.3333333,0.08333 0.5,0.25 0.1666667,0.166667 0.375,0.291667 0.625,0.375 C 4.875,14.958333 5.1666667,15 5.5,15 h 1 1 1 1 1 1 1 c 0.333333,0 0.625,-0.04167 0.875,-0.125 C 13.625,14.79167 13.833333,14.666667 14,14.5 L 14.5,14 c 0.166667,-0.166667 0.291667,-0.375 0.375,-0.625 C 14.958333,13.125 15,12.833333 15,12.5 v -1 -1 -1 -1 C 15,8.1666667 14.95833,7.875 14.875,7.625 14.79167,7.375 14.625,7.2083333 14.375,7.125 14.25,7.0833333 14.125,7.0625 14,7.0625 Z"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/core/assets-raw/fontgen/icons/save.svg b/core/assets-raw/fontgen/icons/save.svg
deleted file mode 100644
index d2b0776e95..0000000000
--- a/core/assets-raw/fontgen/icons/save.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   width="10"
-   height="11"
-   viewBox="0 0 10 11"
-   sodipodi:docname="save.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <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="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="16.857143"
-     inkscape:cx="5"
-     inkscape:cy="1.2542373"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g22" />
-  <g
-     id="g22"
-     transform="translate(-2,-2)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 2.125,2.625 Q 2.25,2.25 2.625,2.125 3,2 3.5,2 4,2 4.5,2 5,2 5.5,2 6,2 6.5,2 7,2 7.5,2 8,2 8.5,2 9,2 9.5,2 10,2 10.375,2.125 10.75,2.25 11,2.5 11.25,2.75 11.5,3 11.75,3.25 11.875,3.625 12,4 12,4.5 q 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 -0.125,0.875 -0.125,0.375 -0.5,0.5 Q 11,13 10.5,13 10,13 9.5,13 9,13 8.5,13 8,13 7.5,13 7,13 6.5,13 6,13 5.5,13 5,13 4.5,13 4,13 3.5,13 3,13 2.625,12.875 2.25,12.75 2.125,12.375 2,12 2,11.5 2,11 2,10.5 2,10 2,9.5 2,9 2,8.5 2,8 2,7.5 2,7 2,6.5 2,6 2,5.5 2,5 2,4.5 2,4 2,3.5 2,3 2.125,2.625 M 7.5,12 Q 8,12 8.375,11.875 8.75,11.75 8.875,11.375 9,11 9,10.5 9,10 8.875,9.625 8.75,9.25 8.375,9.125 8,9 7.5,9 7,9 6.5,9 6,9 5.625,9.125 5.25,9.25 5.125,9.625 5,10 5,10.5 5,11 5.125,11.375 5.25,11.75 5.625,11.875 6,12 6.5,12 q 0.5,0 1,0 m 2.625,-0.625 q 0.125,0.375 0.375,0.375 0.25,0 0.375,-0.375 Q 11,11 11,10.5 11,10 11,9.5 11,9 11,8.5 11,8 11,7.5 11,7 11,6.5 11,6 11,5.5 11,5 11,4.5 11,4 10.875,3.625 10.75,3.25 10.375,3.125 10,3 9.625,3.125 9.25,3.25 9.125,3.625 9,4 9,4.5 9,5 8.875,5.375 8.75,5.75 8.375,5.875 8,6 7.5,6 7,6 6.5,6 6,6 5.625,5.875 5.25,5.75 5.125,5.375 5,5 5,4.5 5,4 4.875,3.625 4.75,3.25 4.375,3.125 4,3 3.625,3.125 3.25,3.25 3.125,3.625 3,4 3,4.5 3,5 3,5.5 3,6 3,6.5 3,7 3,7.5 3,8 3,8.5 3,9 3,9.5 3,10 3,10.5 3,11 3.125,11.375 3.25,11.75 3.5,11.75 3.75,11.75 3.875,11.375 4,11 4,10.5 4,10 4,9.5 4,9 4.125,8.625 4.25,8.25 4.625,8.125 5,8 5.5,8 6,8 6.5,8 7,8 7.5,8 8,8 8.5,8 9,8 9.375,8.125 9.75,8.25 9.875,8.625 10,9 10,9.5 q 0,0.5 0,1 0,0.5 0.125,0.875 m -3.5,-6.5 Q 7,5 7.375,4.875 7.75,4.75 7.875,4.375 8,4 7.875,3.625 7.75,3.25 7.375,3.125 7,3 6.625,3.125 6.25,3.25 6.125,3.625 6,4 6.125,4.375 q 0.125,0.375 0.5,0.5"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/core/assets-raw/fontgen/icons/spray.svg b/core/assets-raw/fontgen/icons/spray.svg
deleted file mode 100644
index a1b0cf95f7..0000000000
--- a/core/assets-raw/fontgen/icons/spray.svg
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   width="10.75"
-   height="13.75"
-   viewBox="0 0 10.75 13.75"
-   sodipodi:docname="spray.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <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="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="-15.554688"
-     inkscape:cy="6.796875"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g833" />
-  <g
-     id="g833"
-     transform="translate(-1.249603,-1.2502648)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="m 23.804688,1.046875 c -0.166667,0 -0.25,0.083333 -0.25,0.25 0,0.1666667 0.08333,0.25 0.25,0.25 0.166666,0 0.25,-0.083333 0.25,-0.25 0,-0.1666667 -0.08333,-0.25 -0.25,-0.25 z m 6,0.75 c -0.333334,0 -0.625,0.041667 -0.875,0.125 -0.25,0.083333 -0.375,0.2083333 -0.375,0.375 0,0.1666667 0.08333,0.3333333 0.25,0.5 0.166666,0.1666667 0.25,0.3333333 0.25,0.5 0,0.1666667 -0.08333,0.3333333 -0.25,0.5 l -0.5,0.5 -0.5,0.5 -0.5,0.5 -0.5,0.5 c -0.166667,0.1666667 -0.25,0.3333333 -0.25,0.5 0,0.1666667 0.125,0.2916667 0.375,0.375 0.25,0.083333 0.541666,0.125 0.875,0.125 h 1 1 1 1 1 c 0.333333,0 0.625,-0.041667 0.875,-0.125 0.25,-0.083333 0.375,-0.2083333 0.375,-0.375 0,-0.1666667 -0.08333,-0.3333333 -0.25,-0.5 l -0.5,-0.5 -0.5,-0.5 c -0.166667,-0.1666667 -0.291667,-0.375 -0.375,-0.625 -0.08333,-0.25 -0.125,-0.5416667 -0.125,-0.875 0,-0.3333333 -0.04167,-0.625 -0.125,-0.875 -0.08333,-0.25 -0.25,-0.4166667 -0.5,-0.5 -0.25,-0.083333 -0.541667,-0.125 -0.875,-0.125 z m -4,0.25 c -0.166667,0 -0.25,0.083333 -0.25,0.25 0,0.1666667 0.08333,0.3333333 0.25,0.5 0.166666,0.1666667 0.25,0.3333333 0.25,0.5 0,0.1666667 -0.08333,0.3333333 -0.25,0.5 -0.166667,0.1666667 -0.25,0.3333333 -0.25,0.5 0,0.1666667 0.08333,0.25 0.25,0.25 0.166666,0 0.333333,-0.083333 0.5,-0.25 l 0.5,-0.5 c 0.166666,-0.1666667 0.25,-0.3333333 0.25,-0.5 0,-0.1666667 -0.08333,-0.3333333 -0.25,-0.5 l -0.5,-0.5 c -0.166667,-0.1666667 -0.333334,-0.25 -0.5,-0.25 z m -2,1 c -0.166667,0 -0.25,0.083333 -0.25,0.25 0,0.1666667 0.08333,0.25 0.25,0.25 0.166666,0 0.25,-0.083333 0.25,-0.25 0,-0.1666667 -0.08333,-0.25 -0.25,-0.25 z m 0,2 c -0.166667,0 -0.25,0.083333 -0.25,0.25 0,0.1666667 0.08333,0.25 0.25,0.25 0.166666,0 0.25,-0.083333 0.25,-0.25 0,-0.1666667 -0.08333,-0.25 -0.25,-0.25 z m 4,2.75 c -0.333334,0 -0.625,0.041667 -0.875,0.125 -0.25,0.083333 -0.416667,0.25 -0.5,0.5 -0.08333,0.25 -0.125,0.5416667 -0.125,0.875 v 1 1 c 0,0.333333 0.04167,0.625 0.125,0.875 0.08333,0.25 0.25,0.416667 0.5,0.5 0.25,0.08333 0.541666,0.125 0.875,0.125 h 1 1 1 1 1 c 0.333333,0 0.625,-0.04167 0.875,-0.125 0.25,-0.08333 0.416666,-0.25 0.5,-0.5 0.08333,-0.25 0.125,-0.541667 0.125,-0.875 v -1 -1 c 0,-0.3333333 -0.04167,-0.625 -0.125,-0.875 -0.08333,-0.25 -0.25,-0.4166667 -0.5,-0.5 -0.25,-0.083333 -0.541667,-0.125 -0.875,-0.125 h -1 -1 -1 -1 z m 0,6 c -0.333334,0 -0.625,0.04167 -0.875,0.125 -0.25,0.08333 -0.375,0.208333 -0.375,0.375 0,0.166667 0.125,0.291667 0.375,0.375 0.25,0.08333 0.541666,0.125 0.875,0.125 h 1 1 1 1 1 c 0.333333,0 0.625,-0.04167 0.875,-0.125 0.25,-0.08333 0.375,-0.208333 0.375,-0.375 0,-0.166667 -0.125,-0.291667 -0.375,-0.375 -0.25,-0.08333 -0.541667,-0.125 -0.875,-0.125 h -1 -1 -1 -1 z"
-       transform="translate(-22.305085,0.20338983)"
-       id="path819"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/core/assets-raw/fontgen/icons/terrain.svg b/core/assets-raw/fontgen/icons/terrain.svg
deleted file mode 100644
index acb45bd0de..0000000000
--- a/core/assets-raw/fontgen/icons/terrain.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   width="12"
-   height="11.75"
-   viewBox="0 0 12 11.75"
-   sodipodi:docname="terrain.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <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="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="37.249375"
-     inkscape:cx="-0.42986742"
-     inkscape:cy="6.6173436"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g18" />
-  <g
-     id="g18"
-     transform="translate(-1,-1.25)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 5,1.5 Q 5.25,1.25 5.5,1.25 5.75,1.25 6,1.5 6.25,1.75 6.5,2 6.75,2.25 7,2.5 7.25,2.75 7.5,3 7.75,3.25 8,3.5 8.25,3.75 8.5,3.75 8.75,3.75 9,3.5 9.25,3.25 9.5,3.25 9.75,3.25 10,3.5 10.25,3.75 10.5,4 10.75,4.25 11,4.5 11.25,4.75 11.5,5 11.75,5.25 12,5.5 12.25,5.75 12.5,6 12.75,6.25 12.875,6.625 13,7 13,7.5 q 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 -0.125,0.875 -0.125,0.375 -0.5,0.5 Q 12,13 11.5,13 11,13 10.5,13 10,13 9.5,13 9,13 8.5,13 8,13 7.5,13 7,13 6.5,13 6,13 5.5,13 5,13 4.5,13 4,13 3.5,13 3,13 2.5,13 2,13 1.625,12.875 1.25,12.75 1.125,12.375 1,12 1,11.5 1,11 1,10.5 1,10 1,9.5 1,9 1,8.5 1,8 1,7.5 1,7 1,6.5 1,6 1.125,5.625 1.25,5.25 1.5,5 1.75,4.75 2,4.5 2.25,4.25 2.5,4 2.75,3.75 3,3.5 3.25,3.25 3.5,3 3.75,2.75 4,2.5 4.25,2.25 4.5,2 4.75,1.75 5,1.5 M 10.5,12 q 0.5,0 0.875,-0.125 0.375,-0.125 0.5,-0.5 Q 12,11 12,10.5 12,10 12,9.5 12,9 12,8.5 12,8 11.875,7.625 11.75,7.25 11.5,7 11.25,6.75 11,6.5 10.75,6.25 10.5,6 10.25,5.75 10,5.5 9.75,5.25 9.5,5.25 9.25,5.25 9,5.5 8.75,5.75 8.5,5.75 8.25,5.75 8,5.5 7.75,5.25 7.5,5 7.25,4.75 7,4.5 6.75,4.25 6.5,4 6.25,3.75 6,3.5 5.75,3.25 5.5,3.25 5.25,3.25 5,3.5 4.75,3.75 4.5,4 4.25,4.25 4,4.5 3.75,4.75 3.5,5 3.25,5.25 3,5.5 2.75,5.75 2.5,6 2.25,6.25 2.125,6.625 2,7 2,7.5 q 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 0.125,0.875 0.125,0.375 0.5,0.5 Q 3,12 3.5,12 q 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/core/assets-raw/fontgen/icons/trash.svg b/core/assets-raw/fontgen/icons/trash.svg
deleted file mode 100644
index 22ed1dee35..0000000000
--- a/core/assets-raw/fontgen/icons/trash.svg
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   width="10"
-   height="12"
-   viewBox="0 0 10 12"
-   sodipodi:docname="trash.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <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="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:pagecheckerboard="true"
-     inkscape:zoom="16.857143"
-     inkscape:cx="-18.372881"
-     inkscape:cy="5.7627119"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g26" />
-  <g
-     id="g26"
-     transform="translate(-2,-1)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 5.125,1.625 Q 5.25,1.25 5.625,1.125 6,1 6.5,1 7,1 7.5,1 8,1 8.375,1.125 8.75,1.25 8.875,1.625 9,2 9.125,2.375 9.25,2.75 9.625,2.875 10,3 10.5,3 11,3 11.375,3.125 11.75,3.25 11.875,3.625 12,4 12,4.5 12,5 12,5.5 12,6 11.875,6.375 11.75,6.75 11.5,7 11.25,7.25 11.125,7.625 11,8 11,8.5 q 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 -0.125,0.875 -0.125,0.375 -0.5,0.5 Q 10,13 9.5,13 9,13 8.5,13 8,13 7.5,13 7,13 6.5,13 6,13 5.5,13 5,13 4.5,13 4,13 3.625,12.875 3.25,12.75 3.125,12.375 3,12 3,11.5 3,11 3,10.5 3,10 3,9.5 3,9 3,8.5 3,8 2.875,7.625 2.75,7.25 2.5,7 2.25,6.75 2.125,6.375 2,6 2,5.5 2,5 2,4.5 2,4 2.125,3.625 2.25,3.25 2.625,3.125 3,3 3.5,3 4,3 4.375,2.875 4.75,2.75 4.875,2.375 5,2 5.125,1.625 m -1,9.75 Q 4.25,11.75 4.5,11.75 4.75,11.75 4.875,11.375 5,11 5,10.5 5,10 5,9.5 5,9 5,8.5 5,8 4.875,7.625 4.75,7.25 4.5,7.25 4.25,7.25 4.125,7.625 4,8 4,8.5 q 0,0.5 0,1 0,0.5 0,1 0,0.5 0.125,0.875 m 2.5,0.5 Q 7,12 7.375,11.875 7.75,11.75 7.875,11.375 8,11 8,10.5 8,10 8,9.5 8,9 8,8.5 8,8 7.875,7.625 7.75,7.25 7.375,7.125 7,7 6.625,7.125 6.25,7.25 6.125,7.625 6,8 6,8.5 q 0,0.5 0,1 0,0.5 0,1 0,0.5 0.125,0.875 0.125,0.375 0.5,0.5 m 2.5,-0.5 Q 9.25,11.75 9.5,11.75 9.75,11.75 9.875,11.375 10,11 10,10.5 10,10 10,9.5 10,9 10,8.5 10,8 9.875,7.625 9.75,7.25 9.5,7.25 9.25,7.25 9.125,7.625 9,8 9,8.5 9,9 9,9.5 9,10 9,10.5 9,11 9.125,11.375 M 9.5,6 Q 10,6 10.375,5.875 10.75,5.75 10.875,5.375 11,5 10.875,4.625 10.75,4.25 10.375,4.125 10,4 9.5,4 9,4 8.5,4 8,4 7.5,4 7,4 6.5,4 6,4 5.5,4 5,4 4.5,4 4,4 3.625,4.125 3.25,4.25 3.125,4.625 3,5 3.125,5.375 3.25,5.75 3.625,5.875 4,6 4.5,6 5,6 5.5,6 6,6 6.5,6 7,6 7.5,6 8,6 8.5,6 9,6 9.5,6 M 6.625,2.875 Q 7,3 7.375,2.875 7.75,2.75 7.75,2.5 7.75,2.25 7.375,2.125 7,2 6.625,2.125 6.25,2.25 6.25,2.5 q 0,0.25 0.375,0.375"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/core/assets-raw/fontgen/icons/turret.svg b/core/assets-raw/fontgen/icons/turret.svg
deleted file mode 100644
index 12009fa1f3..0000000000
--- a/core/assets-raw/fontgen/icons/turret.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   width="8"
-   height="8.9375"
-   viewBox="0 0 8 8.9375"
-   sodipodi:docname="turret.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <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="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="61.458335"
-     inkscape:cx="-0.047457671"
-     inkscape:cy="7.9986441"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g18" />
-  <g
-     id="g18"
-     transform="translate(-2,-1.0625)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 3.125,1.625 Q 3.25,1.25 3.625,1.125 4,1 4.375,1.125 4.75,1.25 4.875,1.625 5,2 5.125,2.375 5.25,2.75 5.625,2.875 6,3 6.375,2.875 6.75,2.75 6.875,2.375 7,2 7.125,1.625 7.25,1.25 7.625,1.125 8,1 8.375,1.125 8.75,1.25 8.875,1.625 9,2 9,2.5 9,3 9,3.5 9,4 9.125,4.375 9.25,4.75 9.5,5 9.75,5.25 9.875,5.625 10,6 10,6.5 10,7 10,7.5 10,8 10,8.5 10,9 9.875,9.375 9.75,9.75 9.375,9.875 9,10 8.5,10 8,10 7.625,9.875 7.25,9.75 7,9.5 6.75,9.25 6.375,9.125 6,9 5.625,9.125 5.25,9.25 5,9.5 4.75,9.75 4.375,9.875 4,10 3.5,10 3,10 2.625,9.875 2.25,9.75 2.125,9.375 2,9 2,8.5 2,8 2,7.5 2,7 2,6.5 2,6 2.125,5.625 2.25,5.25 2.5,5 2.75,4.75 2.875,4.375 3,4 3,3.5 3,3 3,2.5 3,2 3.125,1.625 m 4.5,7.25 Q 8,9 8.375,8.875 8.75,8.75 8.875,8.375 9,8 9,7.5 9,7 9,6.5 9,6 8.875,5.625 8.75,5.25 8.5,5 8.25,4.75 8,4.5 7.75,4.25 7.375,4.125 7,4 6.5,4 6,4 5.5,4 5,4 4.625,4.125 4.25,4.25 4,4.5 3.75,4.75 3.5,5 3.25,5.25 3.125,5.625 3,6 3,6.5 3,7 3,7.5 3,8 3.125,8.375 3.25,8.75 3.625,8.875 4,9 4.375,8.875 4.75,8.75 5,8.5 5.25,8.25 5.625,8.125 6,8 6.375,8.125 6.75,8.25 7,8.5 7.25,8.75 7.625,8.875"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/core/assets-raw/fontgen/icons/units.svg b/core/assets-raw/fontgen/icons/units.svg
deleted file mode 100644
index 969b63e096..0000000000
--- a/core/assets-raw/fontgen/icons/units.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg32"
-   width="10"
-   height="7.9374995"
-   viewBox="0 0 10 7.9374995"
-   sodipodi:docname="units.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata38">
-    <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="defs36" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview34"
-     showgrid="false"
-     inkscape:zoom="43.457605"
-     inkscape:cx="-7.4980789"
-     inkscape:cy="8.8012544"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g60" />
-  <g
-     id="g60"
-     transform="translate(-1,-2)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 5.5,2 C 5.1666667,2 4.875,2.0416667 4.625,2.125 4.375,2.2083333 4.1666667,2.3333333 4,2.5 L 3.5,3 3,3.5 2.5,4 2,4.5 1.5,5 C 1.3333333,5.1666667 1.2083333,5.375 1.125,5.625 1.0416667,5.875 1,6.1666667 1,6.5 1,6.8333333 1.0416667,7.125 1.125,7.375 1.2083333,7.625 1.3333333,7.75 1.5,7.75 1.6666667,7.75 1.8333333,7.6666667 2,7.5 2.1666667,7.3333333 2.3333333,7.25 2.5,7.25 2.6666667,7.25 2.7916667,7.375 2.875,7.625 2.9583333,7.875 3,8.1666667 3,8.5 c 0,0.3333333 0.041667,0.625 0.125,0.875 0.083333,0.25 0.25,0.4166667 0.5,0.5 0.25,0.083333 0.5,0.083333 0.75,0 0.25,-0.083333 0.4166667,-0.25 0.5,-0.5 l 0.25,-0.75 c 0.083333,-0.25 0.25,-0.4166667 0.5,-0.5 0.25,-0.083333 0.5,-0.083333 0.75,0 0.25,0.083333 0.4166667,0.25 0.5,0.5 l 0.25,0.75 c 0.083333,0.25 0.25,0.4166667 0.5,0.5 0.25,0.083333 0.5,0.083333 0.75,0 0.25,-0.083333 0.4166667,-0.25 0.5,-0.5 C 8.9583333,9.125 9,8.8333333 9,8.5 9,8.1666667 9.0416667,7.875 9.125,7.625 9.2083333,7.375 9.3333333,7.25 9.5,7.25 c 0.1666667,0 0.3333333,0.083333 0.5,0.25 0.166667,0.1666667 0.333333,0.25 0.5,0.25 0.166667,0 0.291667,-0.125 0.375,-0.375 C 10.958333,7.125 11,6.8333333 11,6.5 11,6.1666667 10.958333,5.875 10.875,5.625 10.791667,5.375 10.666667,5.1666667 10.5,5 L 10,4.5 9.5,4 9,3.5 8.5,3 8,2.5 C 7.8333333,2.3333333 7.625,2.2083333 7.375,2.125 7.125,2.0416667 6.8333333,2 6.5,2 Z m 0,1 h 1 C 6.8333333,3 7.125,3.0416667 7.375,3.125 7.625,3.2083333 7.8333333,3.3333333 8,3.5 L 8.5,4 9,4.5 9.5,5 c 0.1666667,0.1666667 0.25,0.3333333 0.25,0.5 0,0.1666667 -0.125,0.2916667 -0.375,0.375 l -0.75,0.25 C 8.375,6.2083333 8.1666667,6.3333333 8,6.5 7.8333333,6.6666667 7.625,6.7916667 7.375,6.875 7.125,6.9583333 6.8333333,7 6.5,7 h -1 C 5.1666667,7 4.875,6.9583333 4.625,6.875 4.375,6.7916667 4.1666667,6.6666667 4,6.5 3.8333333,6.3333333 3.625,6.2083333 3.375,6.125 L 2.625,5.875 C 2.375,5.7916667 2.25,5.6666667 2.25,5.5 2.25,5.3333333 2.3333333,5.1666667 2.5,5 L 3,4.5 3.5,4 4,3.5 C 4.1666667,3.3333333 4.375,3.2083333 4.625,3.125 4.875,3.0416667 5.1666667,3 5.5,3 Z M 6,4.0625 C 5.875,4.0625 5.75,4.0833333 5.625,4.125 5.375,4.2083333 5.25,4.3333333 5.25,4.5 c 0,0.1666667 0.125,0.2916667 0.375,0.375 0.25,0.083333 0.5,0.083333 0.75,0 C 6.625,4.7916667 6.75,4.6666667 6.75,4.5 6.75,4.3333333 6.625,4.2083333 6.375,4.125 6.25,4.0833333 6.125,4.0625 6,4.0625 Z"
-       id="path54"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/core/assets-raw/fontgen/icons/upgrade.svg b/core/assets-raw/fontgen/icons/upgrade.svg
deleted file mode 100644
index 9cee75f283..0000000000
--- a/core/assets-raw/fontgen/icons/upgrade.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   width="9.875"
-   height="9.9375"
-   viewBox="0 0 9.875 9.9375"
-   sodipodi:docname="upgrade.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <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="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="61.458335"
-     inkscape:cx="0.89004233"
-     inkscape:cy="7.6969492"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g18" />
-  <g
-     id="g18"
-     transform="translate(-1.0625,-1.0625)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 5,1.5 Q 5.25,1.25 5.625,1.125 6,1 6.375,1.125 6.75,1.25 7,1.5 7.25,1.75 7.5,2 7.75,2.25 8,2.5 8.25,2.75 8.5,3 8.75,3.25 9,3.5 9.25,3.75 9.5,4 9.75,4.25 10,4.5 10.25,4.75 10.5,5 10.75,5.25 10.875,5.625 11,6 10.875,6.375 10.75,6.75 10.375,6.875 10,7 9.5,7 9,7 8.625,7.125 8.25,7.25 8.125,7.625 8,8 8,8.5 8,9 8,9.5 8,10 7.875,10.375 7.75,10.75 7.375,10.875 7,11 6.5,11 6,11 5.5,11 5,11 4.625,10.875 4.25,10.75 4.125,10.375 4,10 4,9.5 4,9 4,8.5 4,8 3.875,7.625 3.75,7.25 3.375,7.125 3,7 2.5,7 2,7 1.625,6.875 1.25,6.75 1.125,6.375 1,6 1.125,5.625 1.25,5.25 1.5,5 1.75,4.75 2,4.5 2.25,4.25 2.5,4 2.75,3.75 3,3.5 3.25,3.25 3.5,3 3.75,2.75 4,2.5 4.25,2.25 4.5,2 4.75,1.75 5,1.5 M 5.625,9.875 Q 6,10 6.375,9.875 6.75,9.75 6.875,9.375 7,9 7,8.5 7,8 7,7.5 7,7 7.125,6.625 7.25,6.25 7.625,6.125 8,6 8.375,5.875 8.75,5.75 8.75,5.5 8.75,5.25 8.5,5 8.25,4.75 8,4.5 7.75,4.25 7.5,4 7.25,3.75 7,3.5 6.75,3.25 6.375,3.125 6,3 5.625,3.125 5.25,3.25 5,3.5 4.75,3.75 4.5,4 4.25,4.25 4,4.5 3.75,4.75 3.5,5 3.25,5.25 3.25,5.5 3.25,5.75 3.625,5.875 4,6 4.375,6.125 4.75,6.25 4.875,6.625 5,7 5,7.5 5,8 5,8.5 5,9 5.125,9.375 q 0.125,0.375 0.5,0.5"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/core/assets-raw/fontgen/merge.pe b/core/assets-raw/fontgen/merge.pe
index 2dfaf77598..a4644c0c5e 100755
--- a/core/assets-raw/fontgen/merge.pe
+++ b/core/assets-raw/fontgen/merge.pe
@@ -1,3 +1,3 @@
-Open("core/assets/fonts/font.ttf")
-MergeFonts("core/assets-raw/fontgen/out/font.ttf")
-Generate("core/assets/fonts/font.ttf")
+Open("core/assets/fonts/font.woff")
+MergeFonts("core/assets-raw/fontgen/out/font.woff")
+Generate("core/assets/fonts/font.woff")
diff --git a/core/assets-raw/icons/about.png b/core/assets-raw/icons/about.png
new file mode 100644
index 0000000000..3943975b97
Binary files /dev/null and b/core/assets-raw/icons/about.png differ
diff --git a/core/assets-raw/icons/add.png b/core/assets-raw/icons/add.png
new file mode 100644
index 0000000000..328c8ca469
Binary files /dev/null and b/core/assets-raw/icons/add.png differ
diff --git a/core/assets-raw/icons/admin.png b/core/assets-raw/icons/admin.png
new file mode 100644
index 0000000000..f4101c0423
Binary files /dev/null and b/core/assets-raw/icons/admin.png differ
diff --git a/core/assets-raw/icons/book.png b/core/assets-raw/icons/book.png
new file mode 100644
index 0000000000..a4395e4ed5
Binary files /dev/null and b/core/assets-raw/icons/book.png differ
diff --git a/core/assets-raw/icons/break.png b/core/assets-raw/icons/break.png
new file mode 100644
index 0000000000..c4b079735c
Binary files /dev/null and b/core/assets-raw/icons/break.png differ
diff --git a/core/assets-raw/icons/cancel.png b/core/assets-raw/icons/cancel.png
new file mode 100644
index 0000000000..03ea12174f
Binary files /dev/null and b/core/assets-raw/icons/cancel.png differ
diff --git a/core/assets-raw/icons/changelog.png b/core/assets-raw/icons/changelog.png
new file mode 100644
index 0000000000..e6fbf8d3c1
Binary files /dev/null and b/core/assets-raw/icons/changelog.png differ
diff --git a/core/assets-raw/icons/chat.png b/core/assets-raw/icons/chat.png
new file mode 100644
index 0000000000..85f52fa41c
Binary files /dev/null and b/core/assets-raw/icons/chat.png differ
diff --git a/core/assets-raw/icons/check.png b/core/assets-raw/icons/check.png
new file mode 100644
index 0000000000..db96907362
Binary files /dev/null and b/core/assets-raw/icons/check.png differ
diff --git a/core/assets-raw/icons/command-attack.png b/core/assets-raw/icons/command-attack.png
new file mode 100644
index 0000000000..655f819338
Binary files /dev/null and b/core/assets-raw/icons/command-attack.png differ
diff --git a/core/assets-raw/icons/command-rally.png b/core/assets-raw/icons/command-rally.png
new file mode 100644
index 0000000000..4271a5a321
Binary files /dev/null and b/core/assets-raw/icons/command-rally.png differ
diff --git a/core/assets-raw/icons/command-retreat.png b/core/assets-raw/icons/command-retreat.png
new file mode 100644
index 0000000000..f40dcfe5cf
Binary files /dev/null and b/core/assets-raw/icons/command-retreat.png differ
diff --git a/core/assets-raw/icons/copy.png b/core/assets-raw/icons/copy.png
new file mode 100644
index 0000000000..0f03ee5d04
Binary files /dev/null and b/core/assets-raw/icons/copy.png differ
diff --git a/core/assets-raw/icons/crafting.png b/core/assets-raw/icons/crafting.png
new file mode 100644
index 0000000000..3f7022e87b
Binary files /dev/null and b/core/assets-raw/icons/crafting.png differ
diff --git a/core/assets-raw/icons/cursor.png b/core/assets-raw/icons/cursor.png
new file mode 100644
index 0000000000..1025a08a9e
Binary files /dev/null and b/core/assets-raw/icons/cursor.png differ
diff --git a/core/assets-raw/icons/defense.png b/core/assets-raw/icons/defense.png
new file mode 100644
index 0000000000..2ae509685e
Binary files /dev/null and b/core/assets-raw/icons/defense.png differ
diff --git a/core/assets-raw/icons/diagonal.png b/core/assets-raw/icons/diagonal.png
new file mode 100644
index 0000000000..262be1cebc
Binary files /dev/null and b/core/assets-raw/icons/diagonal.png differ
diff --git a/core/assets-raw/icons/distribution.png b/core/assets-raw/icons/distribution.png
new file mode 100644
index 0000000000..3a202b38e8
Binary files /dev/null and b/core/assets-raw/icons/distribution.png differ
diff --git a/core/assets-raw/icons/donate.png b/core/assets-raw/icons/donate.png
new file mode 100644
index 0000000000..cad39eb1ba
Binary files /dev/null and b/core/assets-raw/icons/donate.png differ
diff --git a/core/assets-raw/icons/dots.png b/core/assets-raw/icons/dots.png
new file mode 100644
index 0000000000..a8d656d6cc
Binary files /dev/null and b/core/assets-raw/icons/dots.png differ
diff --git a/core/assets-raw/icons/editor.png b/core/assets-raw/icons/editor.png
new file mode 100644
index 0000000000..6cb0a64f9f
Binary files /dev/null and b/core/assets-raw/icons/editor.png differ
diff --git a/core/assets-raw/icons/effect.png b/core/assets-raw/icons/effect.png
new file mode 100644
index 0000000000..212034645b
Binary files /dev/null and b/core/assets-raw/icons/effect.png differ
diff --git a/core/assets-raw/icons/elevation.png b/core/assets-raw/icons/elevation.png
new file mode 100644
index 0000000000..cbc30c8cc1
Binary files /dev/null and b/core/assets-raw/icons/elevation.png differ
diff --git a/core/assets-raw/icons/eraser.png b/core/assets-raw/icons/eraser.png
new file mode 100644
index 0000000000..fc72acc9f2
Binary files /dev/null and b/core/assets-raw/icons/eraser.png differ
diff --git a/core/assets-raw/icons/exit.png b/core/assets-raw/icons/exit.png
new file mode 100644
index 0000000000..e5cc257e39
Binary files /dev/null and b/core/assets-raw/icons/exit.png differ
diff --git a/core/assets-raw/icons/fdroid.png b/core/assets-raw/icons/fdroid.png
new file mode 100644
index 0000000000..24c7cb884d
Binary files /dev/null and b/core/assets-raw/icons/fdroid.png differ
diff --git a/core/assets-raw/icons/file-image.png b/core/assets-raw/icons/file-image.png
new file mode 100644
index 0000000000..254ea95f3d
Binary files /dev/null and b/core/assets-raw/icons/file-image.png differ
diff --git a/core/assets-raw/icons/file-text.png b/core/assets-raw/icons/file-text.png
new file mode 100644
index 0000000000..41b4fbc342
Binary files /dev/null and b/core/assets-raw/icons/file-text.png differ
diff --git a/core/assets-raw/icons/file.png b/core/assets-raw/icons/file.png
new file mode 100644
index 0000000000..0f41e17cbf
Binary files /dev/null and b/core/assets-raw/icons/file.png differ
diff --git a/core/assets-raw/icons/fill.png b/core/assets-raw/icons/fill.png
new file mode 100644
index 0000000000..79bc8b2c39
Binary files /dev/null and b/core/assets-raw/icons/fill.png differ
diff --git a/core/assets-raw/icons/flip.png b/core/assets-raw/icons/flip.png
new file mode 100644
index 0000000000..d81d741434
Binary files /dev/null and b/core/assets-raw/icons/flip.png differ
diff --git a/core/assets-raw/icons/folder-parent.png b/core/assets-raw/icons/folder-parent.png
new file mode 100644
index 0000000000..160f2be902
Binary files /dev/null and b/core/assets-raw/icons/folder-parent.png differ
diff --git a/core/assets-raw/icons/folder.png b/core/assets-raw/icons/folder.png
new file mode 100644
index 0000000000..c55313ef32
Binary files /dev/null and b/core/assets-raw/icons/folder.png differ
diff --git a/core/assets-raw/icons/grid.png b/core/assets-raw/icons/grid.png
new file mode 100644
index 0000000000..5427571a16
Binary files /dev/null and b/core/assets-raw/icons/grid.png differ
diff --git a/core/assets-raw/icons/hammer.png b/core/assets-raw/icons/hammer.png
new file mode 100644
index 0000000000..1ee4a5c3bf
Binary files /dev/null and b/core/assets-raw/icons/hammer.png differ
diff --git a/core/assets-raw/icons/home.png b/core/assets-raw/icons/home.png
new file mode 100644
index 0000000000..b97dba2a11
Binary files /dev/null and b/core/assets-raw/icons/home.png differ
diff --git a/core/assets-raw/icons/host.png b/core/assets-raw/icons/host.png
new file mode 100644
index 0000000000..6253c986bd
Binary files /dev/null and b/core/assets-raw/icons/host.png differ
diff --git a/core/assets-raw/icons/info.png b/core/assets-raw/icons/info.png
new file mode 100644
index 0000000000..7e2bb40037
Binary files /dev/null and b/core/assets-raw/icons/info.png differ
diff --git a/core/assets-raw/icons/itchio.png b/core/assets-raw/icons/itchio.png
new file mode 100644
index 0000000000..ec92eb3725
Binary files /dev/null and b/core/assets-raw/icons/itchio.png differ
diff --git a/core/assets-raw/icons/item.png b/core/assets-raw/icons/item.png
new file mode 100644
index 0000000000..9dd6da2249
Binary files /dev/null and b/core/assets-raw/icons/item.png differ
diff --git a/core/assets-raw/icons/line.png b/core/assets-raw/icons/line.png
new file mode 100644
index 0000000000..5ce2cfdc78
Binary files /dev/null and b/core/assets-raw/icons/line.png differ
diff --git a/core/assets-raw/icons/link.png b/core/assets-raw/icons/link.png
new file mode 100644
index 0000000000..71446afcc0
Binary files /dev/null and b/core/assets-raw/icons/link.png differ
diff --git a/core/assets-raw/icons/liquid-consume.png b/core/assets-raw/icons/liquid-consume.png
new file mode 100644
index 0000000000..48c93ed9d2
Binary files /dev/null and b/core/assets-raw/icons/liquid-consume.png differ
diff --git a/core/assets-raw/icons/liquid.png b/core/assets-raw/icons/liquid.png
new file mode 100644
index 0000000000..1306834469
Binary files /dev/null and b/core/assets-raw/icons/liquid.png differ
diff --git a/core/assets-raw/icons/load-image.png b/core/assets-raw/icons/load-image.png
new file mode 100644
index 0000000000..88a162b628
Binary files /dev/null and b/core/assets-raw/icons/load-image.png differ
diff --git a/core/assets-raw/icons/load-map.png b/core/assets-raw/icons/load-map.png
new file mode 100644
index 0000000000..4aa244ab7c
Binary files /dev/null and b/core/assets-raw/icons/load-map.png differ
diff --git a/core/assets-raw/icons/load.png b/core/assets-raw/icons/load.png
new file mode 100644
index 0000000000..ecbd0c08cf
Binary files /dev/null and b/core/assets-raw/icons/load.png differ
diff --git a/core/assets-raw/icons/loading.png b/core/assets-raw/icons/loading.png
new file mode 100644
index 0000000000..0fd2d5265d
Binary files /dev/null and b/core/assets-raw/icons/loading.png differ
diff --git a/core/assets-raw/icons/lock-open.png b/core/assets-raw/icons/lock-open.png
new file mode 100644
index 0000000000..36b637b0b9
Binary files /dev/null and b/core/assets-raw/icons/lock-open.png differ
diff --git a/core/assets-raw/icons/lock.png b/core/assets-raw/icons/lock.png
new file mode 100644
index 0000000000..cdf11fe658
Binary files /dev/null and b/core/assets-raw/icons/lock.png differ
diff --git a/core/assets-raw/icons/map.png b/core/assets-raw/icons/map.png
new file mode 100644
index 0000000000..92ff76d74f
Binary files /dev/null and b/core/assets-raw/icons/map.png differ
diff --git a/core/assets-raw/icons/menu.png b/core/assets-raw/icons/menu.png
new file mode 100644
index 0000000000..0469f99721
Binary files /dev/null and b/core/assets-raw/icons/menu.png differ
diff --git a/core/assets-raw/icons/missing.png b/core/assets-raw/icons/missing.png
new file mode 100644
index 0000000000..6a9c5d9012
Binary files /dev/null and b/core/assets-raw/icons/missing.png differ
diff --git a/core/assets-raw/icons/mode-attack.png b/core/assets-raw/icons/mode-attack.png
new file mode 100644
index 0000000000..c6aac86259
Binary files /dev/null and b/core/assets-raw/icons/mode-attack.png differ
diff --git a/core/assets-raw/icons/mode-pvp.png b/core/assets-raw/icons/mode-pvp.png
new file mode 100644
index 0000000000..3a0c63ceb6
Binary files /dev/null and b/core/assets-raw/icons/mode-pvp.png differ
diff --git a/core/assets-raw/icons/mode-survival.png b/core/assets-raw/icons/mode-survival.png
new file mode 100644
index 0000000000..c88da7b3b6
Binary files /dev/null and b/core/assets-raw/icons/mode-survival.png differ
diff --git a/core/assets-raw/icons/none.png b/core/assets-raw/icons/none.png
new file mode 100644
index 0000000000..fcf22bc9da
Binary files /dev/null and b/core/assets-raw/icons/none.png differ
diff --git a/core/assets-raw/icons/paste.png b/core/assets-raw/icons/paste.png
new file mode 100644
index 0000000000..606165ed34
Binary files /dev/null and b/core/assets-raw/icons/paste.png differ
diff --git a/core/assets-raw/icons/pause.png b/core/assets-raw/icons/pause.png
new file mode 100644
index 0000000000..7471836eaa
Binary files /dev/null and b/core/assets-raw/icons/pause.png differ
diff --git a/core/assets-raw/icons/pencil.png b/core/assets-raw/icons/pencil.png
new file mode 100644
index 0000000000..053a283d08
Binary files /dev/null and b/core/assets-raw/icons/pencil.png differ
diff --git a/core/assets-raw/icons/pick.png b/core/assets-raw/icons/pick.png
new file mode 100644
index 0000000000..dfd7743030
Binary files /dev/null and b/core/assets-raw/icons/pick.png differ
diff --git a/core/assets-raw/icons/play-2.png b/core/assets-raw/icons/play-2.png
new file mode 100644
index 0000000000..c001e60b04
Binary files /dev/null and b/core/assets-raw/icons/play-2.png differ
diff --git a/core/assets-raw/icons/play.png b/core/assets-raw/icons/play.png
new file mode 100644
index 0000000000..8530e6b09d
Binary files /dev/null and b/core/assets-raw/icons/play.png differ
diff --git a/core/assets-raw/icons/players.png b/core/assets-raw/icons/players.png
new file mode 100644
index 0000000000..be4746291f
Binary files /dev/null and b/core/assets-raw/icons/players.png differ
diff --git a/core/assets-raw/icons/power.png b/core/assets-raw/icons/power.png
new file mode 100644
index 0000000000..57fbb2f2bd
Binary files /dev/null and b/core/assets-raw/icons/power.png differ
diff --git a/core/assets-raw/icons/production.png b/core/assets-raw/icons/production.png
new file mode 100644
index 0000000000..fe6c3523c0
Binary files /dev/null and b/core/assets-raw/icons/production.png differ
diff --git a/core/assets-raw/icons/quit.png b/core/assets-raw/icons/quit.png
new file mode 100644
index 0000000000..26a9634945
Binary files /dev/null and b/core/assets-raw/icons/quit.png differ
diff --git a/core/assets-raw/icons/redo.png b/core/assets-raw/icons/redo.png
new file mode 100644
index 0000000000..4c53eb56ef
Binary files /dev/null and b/core/assets-raw/icons/redo.png differ
diff --git a/core/assets-raw/icons/refresh.png b/core/assets-raw/icons/refresh.png
new file mode 100644
index 0000000000..cd1050f017
Binary files /dev/null and b/core/assets-raw/icons/refresh.png differ
diff --git a/core/assets-raw/icons/rename.png b/core/assets-raw/icons/rename.png
new file mode 100644
index 0000000000..4a6731a31b
Binary files /dev/null and b/core/assets-raw/icons/rename.png differ
diff --git a/core/assets-raw/icons/resize.png b/core/assets-raw/icons/resize.png
new file mode 100644
index 0000000000..ee53c8470f
Binary files /dev/null and b/core/assets-raw/icons/resize.png differ
diff --git a/core/assets-raw/icons/rotate-arrow.png b/core/assets-raw/icons/rotate-arrow.png
new file mode 100644
index 0000000000..22039f3020
Binary files /dev/null and b/core/assets-raw/icons/rotate-arrow.png differ
diff --git a/core/assets-raw/icons/rotate-left.png b/core/assets-raw/icons/rotate-left.png
new file mode 100644
index 0000000000..9b05efec5f
Binary files /dev/null and b/core/assets-raw/icons/rotate-left.png differ
diff --git a/core/assets-raw/icons/rotate-right.png b/core/assets-raw/icons/rotate-right.png
new file mode 100644
index 0000000000..2009c9394d
Binary files /dev/null and b/core/assets-raw/icons/rotate-right.png differ
diff --git a/core/assets-raw/icons/rotate.png b/core/assets-raw/icons/rotate.png
new file mode 100644
index 0000000000..3c989a555f
Binary files /dev/null and b/core/assets-raw/icons/rotate.png differ
diff --git a/core/assets-raw/icons/save-image.png b/core/assets-raw/icons/save-image.png
new file mode 100644
index 0000000000..5234c4f2f4
Binary files /dev/null and b/core/assets-raw/icons/save-image.png differ
diff --git a/core/assets-raw/icons/save-map.png b/core/assets-raw/icons/save-map.png
new file mode 100644
index 0000000000..9066752d13
Binary files /dev/null and b/core/assets-raw/icons/save-map.png differ
diff --git a/core/assets-raw/icons/save.png b/core/assets-raw/icons/save.png
new file mode 100644
index 0000000000..e8ba657ab7
Binary files /dev/null and b/core/assets-raw/icons/save.png differ
diff --git a/core/assets-raw/icons/settings.png b/core/assets-raw/icons/settings.png
new file mode 100644
index 0000000000..51a969c401
Binary files /dev/null and b/core/assets-raw/icons/settings.png differ
diff --git a/core/assets-raw/icons/spray.png b/core/assets-raw/icons/spray.png
new file mode 100644
index 0000000000..17198d657b
Binary files /dev/null and b/core/assets-raw/icons/spray.png differ
diff --git a/core/assets-raw/icons/terrain.png b/core/assets-raw/icons/terrain.png
new file mode 100644
index 0000000000..cc9c57380e
Binary files /dev/null and b/core/assets-raw/icons/terrain.png differ
diff --git a/core/assets-raw/icons/tools.png b/core/assets-raw/icons/tools.png
new file mode 100644
index 0000000000..2ece1ae8f4
Binary files /dev/null and b/core/assets-raw/icons/tools.png differ
diff --git a/core/assets-raw/icons/trash-16.png b/core/assets-raw/icons/trash-16.png
new file mode 100644
index 0000000000..a1de49233b
Binary files /dev/null and b/core/assets-raw/icons/trash-16.png differ
diff --git a/core/assets-raw/icons/trash.png b/core/assets-raw/icons/trash.png
new file mode 100644
index 0000000000..e0f419f2f3
Binary files /dev/null and b/core/assets-raw/icons/trash.png differ
diff --git a/core/assets-raw/icons/tree.png b/core/assets-raw/icons/tree.png
new file mode 100644
index 0000000000..0901a7a721
Binary files /dev/null and b/core/assets-raw/icons/tree.png differ
diff --git a/core/assets-raw/icons/turret.png b/core/assets-raw/icons/turret.png
new file mode 100644
index 0000000000..32fd01b464
Binary files /dev/null and b/core/assets-raw/icons/turret.png differ
diff --git a/core/assets-raw/icons/tutorial.png b/core/assets-raw/icons/tutorial.png
new file mode 100644
index 0000000000..40ba90a5e4
Binary files /dev/null and b/core/assets-raw/icons/tutorial.png differ
diff --git a/core/assets-raw/icons/undo.png b/core/assets-raw/icons/undo.png
new file mode 100644
index 0000000000..cf5dd4c154
Binary files /dev/null and b/core/assets-raw/icons/undo.png differ
diff --git a/core/assets-raw/icons/units.png b/core/assets-raw/icons/units.png
new file mode 100644
index 0000000000..1ee9cd9f55
Binary files /dev/null and b/core/assets-raw/icons/units.png differ
diff --git a/core/src/mindustry/ui/fragments/ChatFragment.java b/core/src/mindustry/ui/fragments/ChatFragment.java
index dd553b647f..1020a74af9 100644
--- a/core/src/mindustry/ui/fragments/ChatFragment.java
+++ b/core/src/mindustry/ui/fragments/ChatFragment.java
@@ -183,7 +183,7 @@ public class ChatFragment extends Table{
 
         if(!shown){
             scene.setKeyboardFocus(chatfield);
-            shown = !shown;
+            shown = true;
             if(mobile){
                 TextInput input = new TextInput();
                 input.maxLength = maxTextLength;
@@ -199,10 +199,13 @@ public class ChatFragment extends Table{
                 chatfield.fireClick();
             }
         }else{
-            scene.setKeyboardFocus(null);
-            shown = !shown;
-            scrollPos = 0;
-            sendMessage();
+            //sending chat has a delay; workaround for issue #1943
+            Time.run(2f, () ->{
+                scene.setKeyboardFocus(null);
+                shown = false;
+                scrollPos = 0;
+                sendMessage();
+            });
         }
     }
 
diff --git a/gradle.properties b/gradle.properties
index 5719c2429e..3976157a39 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=83cae56974fabfec535ae7d53a1f83a5f795d28b
+archash=73b7d84c43621e935d0281160b4d3caed7d77222
diff --git a/tools/build.gradle b/tools/build.gradle
index 42b27b3ccb..d00a04075b 100644
--- a/tools/build.gradle
+++ b/tools/build.gradle
@@ -421,3 +421,10 @@ task fontgen(dependsOn: classes, type: JavaExec){
     standardInput = System.in
     workingDir = "../"
 }
+
+task icongen(dependsOn: classes, type: JavaExec){
+    main = "mindustry.tools.IconConverter"
+    classpath = sourceSets.main.runtimeClasspath
+    standardInput = System.in
+    workingDir = "../core/assets-raw"
+}
\ No newline at end of file
diff --git a/tools/src/mindustry/tools/FontGenerator.java b/tools/src/mindustry/tools/FontGenerator.java
index 05f2715d29..ba9f76c007 100644
--- a/tools/src/mindustry/tools/FontGenerator.java
+++ b/tools/src/mindustry/tools/FontGenerator.java
@@ -24,12 +24,12 @@ public class FontGenerator{
 
         Log.info("Session...");
 
-        OS.exec("curl", "--fail", "--output", "core/assets-raw/fontgen/out/session", "--form", "config=@core/assets-raw/fontgen/config.json", "http://fontello.com");
+        OS.exec("curl", "--fail", "--output", "core/assets-raw/fontgen/out/session", "--form", "config=@core/assets-raw/fontgen/config.json", "https://fontello.com");
 
         Log.info("Zip...");
 
         String session = folder.child("session").readString();
-        net.httpGet("http://fontello.com/" + session + "/get", result -> {
+        net.httpGet("https://fontello.com/" + session + "/get", result -> {
             try{
                 Streams.copy(result.getResultAsStream(), folder.child("font.zip").write());
             }catch(IOException e){
@@ -46,8 +46,7 @@ public class FontGenerator{
 
         Log.info("Merge...");
 
-        //don't merge since it breaks the font
-        //OS.exec("fontforge", "-script", "core/assets-raw/fontgen/merge.pe");
+        OS.exec("fontforge", "-script", "core/assets-raw/fontgen/merge.pe");
 
         Log.info("Done.");
     }
diff --git a/tools/src/mindustry/tools/SquareMarcher.java b/tools/src/mindustry/tools/IconConverter.java
similarity index 50%
rename from tools/src/mindustry/tools/SquareMarcher.java
rename to tools/src/mindustry/tools/IconConverter.java
index 0caf7642ff..c672e2a119 100644
--- a/tools/src/mindustry/tools/SquareMarcher.java
+++ b/tools/src/mindustry/tools/IconConverter.java
@@ -1,40 +1,62 @@
 package mindustry.tools;
 
-import arc.*;
 import arc.files.*;
 import arc.graphics.*;
-import arc.graphics.g2d.*;
-import arc.graphics.gl.*;
+import arc.struct.*;
 import arc.util.*;
 
-public class SquareMarcher{
-    final int resolution;
-    FrameBuffer buffer;
+public class IconConverter{
+    StringBuilder out = new StringBuilder();
+    float width, height;
 
-    SquareMarcher(int resolution){
-        this.resolution = resolution;
-        this.buffer = new FrameBuffer(resolution, resolution);
+    public static void main(String[] __){
+
+        Log.info("Converting icons...");
+        Time.mark();
+        Fi.get("fontgen/icons").deleteDirectory();
+        Fi.get("fontgen/icon_parts").deleteDirectory();
+        Fi[] list = new Fi("icons").list();
+
+        ArcNativesLoader.load();
+        Seq<Fi> files = new Seq<>();
+
+        for(Fi img : list){
+            if(img.extension().equals("png")){
+                Fi dst = new Fi("fontgen/icons").child(img.nameWithoutExtension().replace("icon-", "") + ".svg");
+                new IconConverter().convert(new Pixmap(img), dst);
+                dst.copyTo(new Fi("fontgen/icon_parts/").child(dst.name()));
+                files.add(dst);
+            }
+        }
+
+        Seq<String> args = Seq.with("inkscape", "--batch-process", "--verb", "EditSelectAll;SelectionUnion;FitCanvasToSelectionOrDrawing;FileSave");
+        args.addAll(files.map(Fi::absolutePath));
+
+        Fi.get("fontgen/extra").findAll().each(f -> f.copyTo(Fi.get("fontgen/icons").child(f.name())));
+
+        Log.info("Merging paths...");
+        Log.info(OS.exec(args.toArray(String.class)));
+
+        Log.info("Done converting icons in &lm@&lgs.", Time.elapsed()/1000f);
+        System.exit(0);
     }
 
-    void render(Pixmap pixmap, Fi file){
+    void convert(Pixmap pixmap, Fi output){
         boolean[][] grid = new boolean[pixmap.getWidth()][pixmap.getHeight()];
 
         for(int x = 0; x < pixmap.getWidth(); x++){
             for(int y = 0; y < pixmap.getHeight(); y++){
-                Tmp.c1.set(pixmap.getPixel(x, y));
-                grid[x][pixmap.getHeight() - 1 - y] = Tmp.c1.a > 0.01f;
+                grid[x][pixmap.getHeight() - 1 - y] = !Pixmaps.empty(pixmap.getPixel(x, y));
             }
         }
 
-        float xscl = resolution / (float)pixmap.getWidth(), yscl = resolution / (float)pixmap.getHeight();
+        float xscl = 1f, yscl = 1f;//resolution / (float)pixmap.getWidth(), yscl = resolution / (float)pixmap.getHeight();
         float scl = xscl;
 
-        Draw.flush();
-        Draw.proj().setOrtho(-xscl / 2f, -yscl / 2f, resolution, resolution);
+        width = pixmap.getWidth();
+        height = pixmap.getHeight();
 
-        buffer.begin();
-        Core.graphics.clear(Color.clear);
-        Draw.color(Color.white);
+        out.append("<svg width=\"").append(pixmap.getWidth()).append("\" height=\"").append(pixmap.getHeight()).append("\">\n");
 
         for(int x = -1; x < pixmap.getWidth(); x++){
             for(int y = -1; y < pixmap.getHeight(); y++){
@@ -47,24 +69,24 @@ public class SquareMarcher{
                     case 0:
                         break;
                     case 1:
-                        Fill.tri(
+                        tri(
                         leftx, midy,
                         leftx, topy,
                         midx, topy
                         );
                         break;
                     case 2:
-                        Fill.tri(
+                        tri(
                         midx, topy,
                         rightx, topy,
                         rightx, midy
                         );
                         break;
                     case 3:
-                        Fill.crect(leftx, midy, scl, scl / 2f);
+                        rect(leftx, midy, scl, scl / 2f);
                         break;
                     case 4:
-                        Fill.tri(
+                        tri(
                         midx, boty,
                         rightx, boty,
                         rightx, midy
@@ -74,125 +96,148 @@ public class SquareMarcher{
                         //ambiguous
 
                         //7
-                        Fill.tri(
+                        tri(
                         leftx, midy,
                         midx, midy,
                         midx, boty
                         );
 
                         //13
-                        Fill.tri(
+                        tri(
                         midx, topy,
                         midx, midy,
                         rightx, midy
                         );
 
-                        Fill.crect(leftx, midy, scl / 2f, scl / 2f);
-                        Fill.crect(midx, boty, scl / 2f, scl / 2f);
+                        rect(leftx, midy, scl / 2f, scl / 2f);
+                        rect(midx, boty, scl / 2f, scl / 2f);
 
                         break;
                     case 6:
-                        Fill.crect(midx, boty, scl / 2f, scl);
+                        rect(midx, boty, scl / 2f, scl);
                         break;
                     case 7:
                         //invert triangle
-                        Fill.tri(
+                        tri(
                         leftx, midy,
                         midx, midy,
                         midx, boty
                         );
 
                         //3
-                        Fill.crect(leftx, midy, scl, scl / 2f);
+                        rect(leftx, midy, scl, scl / 2f);
 
-                        Fill.crect(midx, boty, scl / 2f, scl / 2f);
+                        rect(midx, boty, scl / 2f, scl / 2f);
                         break;
                     case 8:
-                        Fill.tri(
+                        tri(
                         leftx, boty,
                         leftx, midy,
                         midx, boty
                         );
                         break;
                     case 9:
-                        Fill.crect(leftx, boty, scl / 2f, scl);
+                        rect(leftx, boty, scl / 2f, scl);
                         break;
                     case 10:
                         //ambiguous
 
                         //11
-                        Fill.tri(
+                        tri(
                         midx, boty,
                         midx, midy,
                         rightx, midy
                         );
 
                         //14
-                        Fill.tri(
+                        tri(
                         leftx, midy,
                         midx, midy,
                         midx, topy
                         );
 
-                        Fill.crect(midx, midy, scl / 2f, scl / 2f);
-                        Fill.crect(leftx, boty, scl / 2f, scl / 2f);
+                        rect(midx, midy, scl / 2f, scl / 2f);
+                        rect(leftx, boty, scl / 2f, scl / 2f);
 
                         break;
                     case 11:
                         //invert triangle
 
-                        Fill.tri(
+                        tri(
                         midx, boty,
                         midx, midy,
                         rightx, midy
                         );
 
                         //3
-                        Fill.crect(leftx, midy, scl, scl / 2f);
+                        rect(leftx, midy, scl, scl / 2f);
 
-                        Fill.crect(leftx, boty, scl / 2f, scl / 2f);
+                        rect(leftx, boty, scl / 2f, scl / 2f);
                         break;
                     case 12:
-                        Fill.crect(leftx, boty, scl, scl / 2f);
+                        rect(leftx, boty, scl, scl / 2f);
                         break;
                     case 13:
                         //invert triangle
 
-                        Fill.tri(
+                        tri(
                         midx, topy,
                         midx, midy,
                         rightx, midy
                         );
 
                         //12
-                        Fill.crect(leftx, boty, scl, scl / 2f);
+                        rect(leftx, boty, scl, scl / 2f);
 
-                        Fill.crect(leftx, midy, scl / 2f, scl / 2f);
+                        rect(leftx, midy, scl / 2f, scl / 2f);
                         break;
                     case 14:
                         //invert triangle
 
-                        Fill.tri(
+                        tri(
                         leftx, midy,
                         midx, midy,
                         midx, topy
                         );
 
                         //12
-                        Fill.crect(leftx, boty, scl, scl / 2f);
+                        rect(leftx, boty, scl, scl / 2f);
 
-                        Fill.crect(midx, midy, scl / 2f, scl / 2f);
+                        rect(midx, midy, scl / 2f, scl / 2f);
                         break;
                     case 15:
-                        Fill.square(midx, midy, scl / 2f);
+                        square(midx, midy, scl);
                         break;
                 }
             }
         }
 
-        Draw.flush();
-        ScreenUtils.saveScreenshot(file, 0, 0, resolution, resolution);
-        buffer.end();
+        out.append("</svg>");
+
+        output.writeString(out.toString());
+    }
+    
+    void square(float x, float y, float size){
+        rect(x - size/2f, y - size/2f, size, size);
+    }
+
+    void tri(float x1, float y1, float x2, float y2, float x3, float y3){
+        out.append("<polygon points=\"");
+        out.append(x1 + 0.5f).append(",").append(flip(y1 + 0.5f)).append(" ");
+        out.append(x2 + 0.5f).append(",").append(flip(y2 + 0.5f)).append(" ");
+        out.append(x3 + 0.5f).append(",").append(flip(y3 + 0.5f)).append("\" ");
+        out.append("style=\"fill:white\" />\n");
+    }
+
+    void rect(float x1, float y1, float width, float height){
+        out.append("<rect x=\"")
+            .append(x1 + 0.5f).append("\" y=\"").append(flip(y1 + 0.5f) - height)
+            .append("\" width=\"").append(width).append("\" height=\"")
+            .append(height).append("\" style=\"fill:white\" />\n");
+    }
+
+    float flip(float y){
+        return height - y;
     }
 
     int index(int x, int y, int w, int h, boolean[][] grid){
@@ -204,6 +249,6 @@ public class SquareMarcher{
     }
 
     int sample(boolean[][] grid, int x, int y){
-        return (x < 0 || y < 0 || x >= grid.length || y >= grid.length) ? 0 : grid[x][y] ? 1 : 0;
+        return (x < 0 || y < 0 || x >= grid.length || y >= grid[0].length) ? 0 : grid[x][y] ? 1 : 0;
     }
 }