diff --git a/src/editor/images/copy.png b/src/editor/images/copy.png
deleted file mode 100644
index b1555e00..00000000
Binary files a/src/editor/images/copy.png and /dev/null differ
diff --git a/src/editor/images/fontsize.png b/src/editor/images/fontsize.png
deleted file mode 100644
index 944e107f..00000000
Binary files a/src/editor/images/fontsize.png and /dev/null differ
diff --git a/src/editor/images/hello_world.svg b/src/editor/images/hello_world.svg
new file mode 100644
index 00000000..97dfc758
--- /dev/null
+++ b/src/editor/images/hello_world.svg
@@ -0,0 +1,11 @@
+
+<svg width="102" height="102" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <!-- Created with SVG-edit - https://github.com/SVG-Edit/svgedit -->
+  <g>
+    <title>Layer 1</title>
+    <rect ry="30" rx="30" x="2.5" y="2.5" width="97" height="97" id="svg_3" fill="#008000" stroke="#000000" stroke-width="5"/>
+    <text x="52.668" y="42.5" id="svg_1" fill="#ffffff" stroke="#000000" stroke-width="0" font-size="24" font-family="Monospace" text-anchor="middle" xml:space="preserve">Hello</text>
+    <text x="52.668" y="71.5" fill="#ffffff" stroke="#000000" stroke-width="0" font-size="24" font-family="Monospace" text-anchor="middle" xml:space="preserve" id="svg_2">World!</text>
+  </g>
+</svg>
+
diff --git a/src/editor/images/helloworld-icon.xml b/src/editor/images/helloworld-icon.xml
deleted file mode 100644
index 8778308f..00000000
--- a/src/editor/images/helloworld-icon.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg">
-<!--
-  Sample icons file. This file looks like an SVG file with groups as its
-  children. Each group element has an ID that must match the ID of the button given
-  in the extension. The SVG inside the group makes up the actual icon, and
-  needs use a viewBox instead of width/height for it to scale  properly.
-
-  Multiple icons can be included, each within their own group.
--->
-  <g id="hello_world">
-    <svg width="102" height="102" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-     <!-- Created with SVG-edit - https://github.com/SVG-Edit/svgedit -->
-     <g>
-      <title>Layer 1</title>
-      <rect ry="30" rx="30" x="2.5" y="2.5" width="97" height="97" id="svg_3" fill="#008000" stroke="#000000" stroke-width="5"/>
-      <text x="52.668" y="42.5" id="svg_1" fill="#ffffff" stroke="#000000" stroke-width="0" font-size="24" font-family="Monospace" text-anchor="middle" xml:space="preserve">Hello</text>
-      <text x="52.668" y="71.5" fill="#ffffff" stroke="#000000" stroke-width="0" font-size="24" font-family="Monospace" text-anchor="middle" xml:space="preserve" id="svg_2">World!</text>
-     </g>
-    </svg>
-  </g>
-</svg>
diff --git a/src/editor/images/markers-icons.xml b/src/editor/images/markers-icons.xml
deleted file mode 100644
index 08c28f40..00000000
--- a/src/editor/images/markers-icons.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg">
-    <!-- Created with SVG-edit - https://github.com/SVG-Edit/svgedit -->
-    <g id="nomarker">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="#f9bc01" d="m-50,0l100,0"/>
-        </svg>
-    </g>
-    <g id="leftarrow">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="#f9bc01" d="m-50,0l100,40l-30,-40l30,-40z"/>
-        </svg>
-    </g>
-    <g id="rightarrow">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="#f9bc01" d="m50,0l-100,40l30,-40l-30,-40z"/>
-        </svg>
-    </g>
-    <g id="leftarrow_o">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="none" d="m-50,0l100,40l-30,-40l30,-40z"/>
-        </svg>
-    </g>
-    <g id="rightarrow_o">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="none" d="m50,0l-100,40l30,-40l-30,-40z"/>
-        </svg>
-    </g>
-    <g id="forwardslash">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="none" d="m-20,50l40,-100"/>
-        </svg>
-    </g>
-    <g id="reverseslash">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="none" d="m-20,-50l40,100"/>
-        </svg>
-    </g>
-    <g id="verticalslash">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="none" d="m0,-50l0,100"/>
-        </svg>
-    </g>
-    <g id="mcircle">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <circle stroke-width="10" stroke="#f9bc01" fill="#f9bc01" cy="0" cx="0" r="30"/>
-        </svg>
-    </g>
-    <g id="mcircle_o">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <circle stroke-width="10" stroke="#f9bc01" fill="none" cy="0" cx="0" r="30"/>
-        </svg>
-    </g>
-    <g id="xmark">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="#f9bc01" d="m-30,30l60,-60m0,60l-60,-60"/>
-        </svg>
-    </g>
-    <g id="box">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="#f9bc01" d="m-30,-30l0,60l60,0l0,-60z"/>
-        </svg>
-    </g>
-    <g id="box_o">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="none" d="m-30,-30l0,60l60,0l0,-60z"/>
-        </svg>
-    </g>
-    <g id="star_o">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="none" d="m-40,-20l80,0l-70,60l30,-80l30,80z"/>
-        </svg>
-    </g>
-     <g id="triangle_o">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="none" d="M-30,30 L0,-30 L30,30 Z"/>
-        </svg>
-    </g>
-     <g id="triangle">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="#f9bc01" d="M-30,30 L0,-30 L30,30 Z"/>
-        </svg>
-    </g>
-   <g id="textmarker">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-      <text xml:space="preserve" text-anchor="middle" font-family="serif" font-size="120"  y="40" x="0" stroke-width="0" stroke="#f9bc01" fill="#f9bc01">T</text>
-        </svg>
-    </g>
-  <g id="mkr_markers_off">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-       <line y2="0" x2="50" y1="0" x1="-50" stroke-width="5" stroke="#f9bc01" fill="none"/>
-       </svg>
-    </g>
-  <g id="mkr_markers_dimension">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-        <line y2="0" x2="40" y1="0" x1="20" stroke-width="5" stroke="#f9bc01" fill="none"/>
-       <line y2="0" x2="-40" y1="0" x1="-20" stroke-width="5" stroke="#f9bc01" fill="none"/>
-       <text text-anchor="middle" font-family="serif" font-size="80"  y="20" x="0" stroke-width="0" stroke="#f9bc01" fill="#f9bc01">T</text>
-           <path stroke-width="5" stroke="#f9bc01" fill="#f9bc01" d="M-50,0 L-30,-15 L-30,15 Z"/>
-           <path stroke-width="5" stroke="#f9bc01" fill="#f9bc01" d="M50,0 L30,-15 L30,15 Z"/>
-     </svg>
-    </g>
-     <g id="mkr_markers_label">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-         <line y2="0" x2="40" y1="0" x1="-20" stroke-width="5" stroke="#f9bc01" fill="none"/>
-       <text text-anchor="middle" font-family="serif" font-size="80"  y="20" x="-40" stroke-width="0" stroke="#f9bc01" fill="#f9bc01">T</text>
-           <path stroke-width="5" stroke="#f9bc01" fill="#f9bc01" d="M50,0 L30,-15 L30,15 Z"/>
-        </svg>
-    </g>
-  <g id="svg_eof"/>
-</svg>
diff --git a/src/editor/images/mkr_markers_dimension.svg b/src/editor/images/mkr_markers_dimension.svg
new file mode 100644
index 00000000..0008641e
--- /dev/null
+++ b/src/editor/images/mkr_markers_dimension.svg
@@ -0,0 +1,7 @@
+ <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
+        <line y2="0" x2="40" y1="0" x1="20" stroke-width="5" stroke="#f9bc01" fill="none"/>
+       <line y2="0" x2="-40" y1="0" x1="-20" stroke-width="5" stroke="#f9bc01" fill="none"/>
+       <text text-anchor="middle" font-family="serif" font-size="80"  y="20" x="0" stroke-width="0" stroke="#f9bc01" fill="#f9bc01">T</text>
+           <path stroke-width="5" stroke="#f9bc01" fill="#f9bc01" d="M-50,0 L-30,-15 L-30,15 Z"/>
+           <path stroke-width="5" stroke="#f9bc01" fill="#f9bc01" d="M50,0 L30,-15 L30,15 Z"/>
+     </svg>
\ No newline at end of file
diff --git a/src/editor/images/mkr_markers_label.svg b/src/editor/images/mkr_markers_label.svg
new file mode 100644
index 00000000..6562d05d
--- /dev/null
+++ b/src/editor/images/mkr_markers_label.svg
@@ -0,0 +1,5 @@
+<svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
+    <line y2="0" x2="40" y1="0" x1="-20" stroke-width="5" stroke="#f9bc01" fill="none"/>
+    <text text-anchor="middle" font-family="serif" font-size="80"  y="20" x="-40" stroke-width="0" stroke="#f9bc01" fill="#f9bc01">T</text>
+    <path stroke-width="5" stroke="#f9bc01" fill="#f9bc01" d="M50,0 L30,-15 L30,15 Z"/>
+</svg>
\ No newline at end of file
diff --git a/src/editor/images/mkr_markers_off.svg b/src/editor/images/mkr_markers_off.svg
new file mode 100644
index 00000000..46981a24
--- /dev/null
+++ b/src/editor/images/mkr_markers_off.svg
@@ -0,0 +1,3 @@
+<svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
+    <line y2="0" x2="50" y1="0" x1="-50" stroke-width="5" stroke="#f9bc01" fill="none"/>
+</svg>
\ No newline at end of file
diff --git a/src/editor/images/placemark-icons.xml b/src/editor/images/placemark-icons.xml
deleted file mode 100644
index 6707f9cc..00000000
--- a/src/editor/images/placemark-icons.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg">
-    <!-- Created with SVG-edit - https://github.com/SVG-Edit/svgedit -->
-    <g id="nomarker">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="#f9bc01" d="m-50,0l100,0"/>
-        </svg>
-    </g>
-    <g id="leftarrow">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="#f9bc01" d="m-50,0l100,40l-30,-40l30,-40z"/>
-        </svg>
-    </g>
-    <g id="rightarrow">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="#f9bc01" d="m50,0l-100,40l30,-40l-30,-40z"/>
-        </svg>
-    </g>
-    <g id="leftarrow_o">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="none" d="m-50,0l100,40l-30,-40l30,-40z"/>
-        </svg>
-    </g>
-    <g id="rightarrow_o">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="none" d="m50,0l-100,40l30,-40l-30,-40z"/>
-        </svg>
-    </g>
-    <g id="forwardslash">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="none" d="m-20,50l40,-100"/>
-        </svg>
-    </g>
-    <g id="reverseslash">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="none" d="m-20,-50l40,100"/>
-        </svg>
-    </g>
-    <g id="verticalslash">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="none" d="m0,-50l0,100"/>
-        </svg>
-    </g>
-    <g id="mcircle">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <circle stroke-width="10" stroke="#f9bc01" fill="#f9bc01" cy="0" cx="0" r="30"/>
-        </svg>
-    </g>
-    <g id="mcircle_o">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <circle stroke-width="10" stroke="#f9bc01" fill="none" cy="0" cx="0" r="30"/>
-        </svg>
-    </g>
-    <g id="xmark">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="#f9bc01" d="m-30,30l60,-60m0,60l-60,-60"/>
-        </svg>
-    </g>
-    <g id="box">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="#f9bc01" d="m-30,-30l0,60l60,0l0,-60z"/>
-        </svg>
-    </g>
-    <g id="star">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="#f9bc01" d="m-40,-20l80,0l-70,60l30,-80l30,80z"/>
-        </svg>
-    </g>
-    <g id="box_o">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="none" d="m-30,-30l0,60l60,0l0,-60z"/>
-        </svg>
-    </g>
-    <g id="star_o">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="none" d="m-40,-20l80,0l-70,60l30,-80l30,80z"/>
-        </svg>
-    </g>
-     <g id="triangle_o">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="none" d="M-30,30 L0,-30 L30,30 Z"/>
-        </svg>
-    </g>
-     <g id="triangle">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="10" stroke="#f9bc01" fill="#f9bc01" d="M-30,30 L0,-30 L30,30 Z"/>
-        </svg>
-    </g>
-   <g id="textmarker">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-      <text xml:space="preserve" text-anchor="middle" font-family="serif" font-size="120"  y="40" x="0" stroke-width="0" stroke="#f9bc01" fill="#f9bc01">T</text>
-        </svg>
-    </g>
-    <g id="textmarker_top">
-        <svg viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="4" stroke="#f9bc01" fill="none" d="M 0 60 h 100 z M 30 30 h 40 v 20 h -40 z"/>
-        </svg>
-    </g>
-    <g id="textmarker_bottom">
-        <svg viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
-            <path stroke-width="4" stroke="#f9bc01" fill="none" d="M 0 30 h 100 z M 30 40 h 40 v 20 h -40 z"/>
-        </svg>
-    </g>
-  <g id="tool_placemark">
-    <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-1 -1 110 110">
-     <line fill="none" id="svg_4" marker-start="url(#se_marker_start_svg_4)" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="5" x1="0" x2="42.58373" y1="0" y2="56.42415"/>
-     <line fill="none" id="svg_5" stroke="#000000" stroke-linecap="round" stroke-width="5" x1="99.99999" x2="42.58373" y1="56.42415" y2="56.42415"/>
-     <rect fill="none" height="26.47059" id="svg_2" stroke="#000000" stroke-dasharray="10,10" stroke-linecap="round" stroke-linejoin="round" stroke-width="5" width="55.02392" x="44.01914" y="16.71827"/>
-     <rect fill="none" height="32.73994" id="svg_3" stroke="#000000" stroke-dasharray="10,10" stroke-linecap="round" stroke-linejoin="null" stroke-width="5" width="55.98086" x="44.01914" y="67.56966"/>
-     <defs>
-      <marker class="leftarrow" id="se_marker_start_svg_4" markerHeight="5" markerUnits="strokeWidth" markerWidth="5" orient="auto" refX="0" refY="50" viewBox="0 0 100 100">
-        <path d="m0,50l100,40l-30,-40l30,-40l-100,40z" fill="#000000" id="svg_1" stroke="#000000" stroke-width="10"/>
-      </marker>
-    </defs>
-    </svg>
-  </g>
-  <g id="mkr_markers_off">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-       <line y2="0" x2="50" y1="0" x1="-50" stroke-width="5" stroke="#f9bc01" fill="none"/>
-       </svg>
-    </g>
-  <g id="mkr_markers_dimension">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-        <line y2="0" x2="40" y1="0" x1="20" stroke-width="5" stroke="#f9bc01" fill="none"/>
-       <line y2="0" x2="-40" y1="0" x1="-20" stroke-width="5" stroke="#f9bc01" fill="none"/>
-       <text text-anchor="middle" font-family="serif" font-size="80"  y="20" x="0" stroke-width="0" stroke="#f9bc01" fill="#f9bc01">T</text>
-           <path stroke-width="5" stroke="#f9bc01" fill="#f9bc01" d="M-50,0 L-30,-15 L-30,15 Z"/>
-           <path stroke-width="5" stroke="#f9bc01" fill="#f9bc01" d="M50,0 L30,-15 L30,15 Z"/>
-     </svg>
-    </g>
-     <g id="mkr_markers_label">
-        <svg viewBox="-60 -60 120 120" xmlns="http://www.w3.org/2000/svg">
-         <line y2="0" x2="40" y1="0" x1="-20" stroke-width="5" stroke="#f9bc01" fill="none"/>
-       <text text-anchor="middle" font-family="serif" font-size="80"  y="20" x="-40" stroke-width="0" stroke="#f9bc01" fill="#f9bc01">T</text>
-           <path stroke-width="5" stroke="#f9bc01" fill="#f9bc01" d="M50,0 L30,-15 L30,15 Z"/>
-        </svg>
-    </g>
-  <g id="svg_eof"/>
-</svg>
diff --git a/src/editor/images/textmarker_bottom.svg b/src/editor/images/textmarker_bottom.svg
new file mode 100644
index 00000000..e69de29b
diff --git a/src/editor/images/textmarker_top.svg b/src/editor/images/textmarker_top.svg
new file mode 100644
index 00000000..f5929042
--- /dev/null
+++ b/src/editor/images/textmarker_top.svg
@@ -0,0 +1,3 @@
+  <svg viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+            <path stroke-width="4" stroke="#f9bc01" fill="none" d="M 0 60 h 100 z M 30 30 h 40 v 20 h -40 z"/>
+        </svg>
\ No newline at end of file
diff --git a/src/editor/images/tool_placemark.svg b/src/editor/images/tool_placemark.svg
new file mode 100644
index 00000000..e69de29b