diff --git a/Gruntfile.js b/Gruntfile.js
index ef0f62db..8e3ea6f0 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -163,7 +163,9 @@ module.exports = function(grunt) {
     sprite:{
       all : {
         src: 'src/img/icons/**/*.png',
+        retinaSrcFilter: 'src/img/icons/**/*@2x.png',
         dest: 'src/img/icons.png',
+        retinaDest: 'src/img/icons@2x.png',
         destCss: 'src/css/icons.css'
       }
     },
diff --git a/misc/icons/SVG/swap-colors.svg b/misc/icons/SVG/swap-colors.svg
deleted file mode 100644
index fd652981..00000000
--- a/misc/icons/SVG/swap-colors.svg
+++ /dev/null
@@ -1,97 +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"
-   width="305.0015"
-   height="340.10172"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   inkscape:export-filename="C:\Development\git\piskel\src\img\tools\swap.png"
-   inkscape:export-xdpi="28.799999"
-   inkscape:export-ydpi="28.799999"
-   sodipodi:docname="swap-colors.svg">
-  <defs
-     id="defs2994" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.979899"
-     inkscape:cx="8.3838947"
-     inkscape:cy="209.5365"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1148"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata7">
-    <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>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-253.81175,62.601668)">
-    <path
-       style="fill:none;stroke:#ffffff;stroke-width:25;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 281.31983,48.818994 c 3.33333,70.714286 6.66667,141.428566 10,212.142856 61.21871,3.33294 122.57845,5.69263 183.84823,2.1217 15.38711,-0.63513 30.77146,-1.33859 46.15177,-2.1217 3.33333,-70.71429 6.66667,-141.42857 10,-212.142856 -62.39939,12.482847 -126.73342,18.836303 -190.05871,9.668003 -20.08786,-2.492087 -40.09989,-5.6543 -59.94129,-9.668003 z"
-       id="path3907"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="C:\Development\git\piskel\src\img\tools\swap.png"
-       inkscape:export-xdpi="28.799999"
-       inkscape:export-ydpi="28.799999" />
-    <path
-       style="fill:none;stroke:#ffffff;stroke-width:15;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 261.31983,63.818994 c 0,-10 0,-20 0,-30 17.1189,-42.7715577 62.54009,-66.510405 106.22509,-72.841714 51.17865,-7.022275 108.04464,-2.652241 150.47229,29.6746917 14.38134,11.798678 28.46011,26.7242963 33.30262,44.9943353 0,9.390896 0,18.781791 0,28.172687"
-       id="path3909"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="C:\Development\git\piskel\src\img\tools\swap.png"
-       inkscape:export-xdpi="28.799999"
-       inkscape:export-ydpi="28.799999" />
-    <path
-       style="fill:none;stroke:#ffffff;stroke-width:35;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 364.53412,-41.538146 c 25.60486,-3.886191 51.66473,-4.881507 77.20839,0.0707 l 3.09159,0.466979 1.12859,0.176599"
-       id="path3915"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="C:\Development\git\piskel\src\img\tools\swap.png"
-       inkscape:export-xdpi="28.799999"
-       inkscape:export-ydpi="28.799999" />
-    <path
-       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 154.55334,129.87795 0.68071,15.85947 c 0,0 -57.346456,21.06263 -57.436416,36.51009 -0.09,15.44746 36.662436,29.96772 55.746256,42.34379 19.08382,12.37606 46.83462,28.70031 47.51123,48.36912 C 200.90809,289.78491 152.86,310.7174 152.86,310.7174 l 0.68319,14.23203 111.11677,-2.02031 11.11168,-206.07112 z"
-       id="path3764"
-       inkscape:connector-curvature="0"
-       transform="translate(253.81175,-62.601668)"
-       sodipodi:nodetypes="cczzcccccc"
-       inkscape:export-filename="C:\Development\git\piskel\src\img\tools\swap.png"
-       inkscape:export-xdpi="28.799999"
-       inkscape:export-ydpi="28.799999" />
-  </g>
-</svg>
diff --git a/misc/icons/source/common-keyboard-gold.svg b/misc/icons/source/common-keyboard-gold.svg
new file mode 100644
index 00000000..976a54ad
--- /dev/null
+++ b/misc/icons/source/common-keyboard-gold.svg
@@ -0,0 +1,188 @@
+<?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"
+   width="72"
+   height="42"
+   id="svg2985"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="common-keyboard-gold.svg"
+   inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\common-keyboard-gold.png"
+   inkscape:export-xdpi="45"
+   inkscape:export-ydpi="45">
+  <defs
+     id="defs2987" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.5"
+     inkscape:cx="26.67815"
+     inkscape:cy="34.113438"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1148"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2993"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2990">
+    <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>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,-22)">
+    <rect
+       style="fill:#ffffff;fill-opacity:0;stroke:#ffd700;stroke-width:4;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:3.20000005;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect3769"
+       width="68"
+       height="38"
+       x="2"
+       y="24.000002"
+       ry="5.010262" />
+    <rect
+       style="fill:#ffd700;fill-opacity:1;stroke:none"
+       id="rect3771"
+       width="6"
+       height="6"
+       x="8"
+       y="30" />
+    <rect
+       style="fill:#ffd700;fill-opacity:1;stroke:none"
+       id="rect3771-7"
+       width="6"
+       height="6"
+       x="18"
+       y="30" />
+    <rect
+       style="fill:#ffd700;fill-opacity:1;stroke:none"
+       id="rect3771-6"
+       width="6"
+       height="6"
+       x="28"
+       y="30" />
+    <rect
+       style="fill:#ffd700;fill-opacity:1;stroke:none"
+       id="rect3771-7-1"
+       width="6"
+       height="6"
+       x="38"
+       y="30" />
+    <rect
+       style="fill:#ffd700;fill-opacity:1;stroke:none"
+       id="rect3771-6-4"
+       width="6"
+       height="6"
+       x="48"
+       y="30" />
+    <rect
+       style="fill:#ffd700;fill-opacity:1;stroke:none"
+       id="rect3771-7-1-2"
+       width="6"
+       height="6"
+       x="58"
+       y="30" />
+    <rect
+       style="fill:#ffd700;fill-opacity:1;stroke:none"
+       id="rect3771-3"
+       width="6"
+       height="6"
+       x="8"
+       y="40" />
+    <rect
+       style="fill:#ffd700;fill-opacity:1;stroke:none"
+       id="rect3771-7-2"
+       width="6"
+       height="6"
+       x="18"
+       y="40" />
+    <rect
+       style="fill:#ffd700;fill-opacity:1;stroke:none"
+       id="rect3771-6-2"
+       width="6"
+       height="6"
+       x="28"
+       y="40" />
+    <rect
+       style="fill:#ffd700;fill-opacity:1;stroke:none"
+       id="rect3771-7-1-1"
+       width="6"
+       height="6"
+       x="38"
+       y="40" />
+    <rect
+       style="fill:#ffd700;fill-opacity:1;stroke:none"
+       id="rect3771-6-4-6"
+       width="6"
+       height="6"
+       x="48"
+       y="40" />
+    <rect
+       style="fill:#ffd700;fill-opacity:1;stroke:none"
+       id="rect3771-7-1-2-8"
+       width="6"
+       height="6"
+       x="58"
+       y="40" />
+    <rect
+       style="fill:#ffd700;fill-opacity:1;stroke:none"
+       id="rect3771-3-5"
+       width="6"
+       height="6"
+       x="8"
+       y="50" />
+    <rect
+       style="fill:#ffd700;fill-opacity:1;stroke:none"
+       id="rect3771-7-2-7"
+       width="26"
+       height="6"
+       x="18"
+       y="50" />
+    <rect
+       style="fill:#ffd700;fill-opacity:1;stroke:none"
+       id="rect3771-6-4-6-8"
+       width="6"
+       height="6"
+       x="48"
+       y="50" />
+    <rect
+       style="fill:#ffd700;fill-opacity:1;stroke:none"
+       id="rect3771-7-1-2-8-9"
+       width="6"
+       height="6"
+       x="58"
+       y="50" />
+  </g>
+</svg>
diff --git a/misc/icons/source/common-swapcolors-arrow-grey.svg b/misc/icons/source/common-swapcolors-arrow-grey.svg
new file mode 100644
index 00000000..27c64b58
--- /dev/null
+++ b/misc/icons/source/common-swapcolors-arrow-grey.svg
@@ -0,0 +1,90 @@
+<?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"
+   width="92"
+   height="92"
+   id="svg2985"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="common-swapcolors-arrow-grey.svg"
+   inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\common-swapcolors-arrow-grey.png"
+   inkscape:export-xdpi="17.608696"
+   inkscape:export-ydpi="17.608696">
+  <defs
+     id="defs2987" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.7781746"
+     inkscape:cx="16.14554"
+     inkscape:cy="49.212884"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1148"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2993"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2990">
+    <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>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,28)">
+    <g
+       id="g4103"
+       transform="translate(-0.25712974,0.12856487)">
+      <path
+         sodipodi:nodetypes="cssccsscc"
+         inkscape:connector-curvature="0"
+         id="path4026"
+         d="m 12.47907,-1.5191789 c -0.01145,0.4495825 -0.0584,0.89084271 -0.0584,1.34311551 0,28.93185239 23.566484,52.49831239 52.498334,52.49831239 0.452274,0 0.893533,-0.04696 1.343116,-0.05839 l 3.53e-4,-15.31869 c -0.449194,0.01447 -0.890299,0.05839 -1.343117,0.05839 -22.670403,0 -37.179915,-14.509218 -37.179915,-37.17962239 0,-0.4528173 0.04393,-0.89392351 0.05839,-1.34311551 z"
+         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ebebeb;fill-opacity:1;stroke:none;stroke-width:24.10000038;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+      <path
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="rect4044"
+         d="m 19.97984,-27.481641 19.501672,26.0022305 -39.00334084,0 z"
+         style="fill:#ebebeb;fill-opacity:1;stroke:#ebebeb;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0" />
+      <path
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="rect4044-9"
+         d="m 91.9782,43.78346 -26.002227,19.501672 0,-39.003341 z"
+         style="fill:#ebebeb;fill-opacity:1;stroke:#ebebeb;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0" />
+    </g>
+  </g>
+</svg>
diff --git a/misc/icons/source/file-icon-base.svg b/misc/icons/source/file-icon-base.svg
new file mode 100644
index 00000000..4a3ae595
--- /dev/null
+++ b/misc/icons/source/file-icon-base.svg
@@ -0,0 +1,80 @@
+<?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"
+   width="92"
+   height="92"
+   id="svg2985"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="frame-duplicate-white.svg"
+   inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\frame-dragndrop-white.png"
+   inkscape:export-xdpi="29.347826"
+   inkscape:export-ydpi="29.347826">
+  <defs
+     id="defs2987" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4"
+     inkscape:cx="-40.318382"
+     inkscape:cy="41.563249"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1148"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2993"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2990">
+    <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>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,28)">
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff;fill-opacity:1;stroke:#0000ff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0"
+       d="m 27.655907,-3.4322964 0,45.0000004 35,0 0,-30.56369 -12,0 -2.524699,0 0,-2.4363104 0,-12 z"
+       id="rect2998"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+       d="m 50.794831,-2.0706524 10.616902,10.4746871 -10.616902,0 z"
+       id="rect3907"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
diff --git a/misc/icons/source/frame-dragndrop-white.svg b/misc/icons/source/frame-dragndrop-white.svg
new file mode 100644
index 00000000..897503f9
--- /dev/null
+++ b/misc/icons/source/frame-dragndrop-white.svg
@@ -0,0 +1,107 @@
+<?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"
+   width="60"
+   height="60"
+   id="svg2985"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="frame-dragndrop-white.svg"
+   inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\frame-dragndrop-white.png"
+   inkscape:export-xdpi="45"
+   inkscape:export-ydpi="45">
+  <defs
+     id="defs2987" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8"
+     inkscape:cx="28.16371"
+     inkscape:cy="14.767709"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1148"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2993"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2990">
+    <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>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,-4)">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect4294"
+       width="4"
+       height="24"
+       x="28"
+       y="22" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:#ebebeb;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+       d="m 30,14 6,8 -12,0 z"
+       id="rect4044"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect4294-9"
+       width="4"
+       height="24"
+       x="-36"
+       y="18"
+       transform="matrix(0,-1,1,0,0,0)" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:#ebebeb;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+       d="m 30,54 6,-8 -12,0 z"
+       id="rect4044-2"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:#ebebeb;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+       d="m 50,34 -8,6 0,-12 z"
+       id="rect4044-4"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:#ebebeb;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+       d="m 10,34 8,6 0,-12 z"
+       id="rect4044-2-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
diff --git a/misc/icons/source/frame-duplicate-white-base.pdn b/misc/icons/source/frame-duplicate-white-base.pdn
new file mode 100644
index 00000000..f5112c74
Binary files /dev/null and b/misc/icons/source/frame-duplicate-white-base.pdn differ
diff --git a/misc/icons/source/frame-duplicate-white-base@2x.pdn b/misc/icons/source/frame-duplicate-white-base@2x.pdn
new file mode 100644
index 00000000..ba223257
Binary files /dev/null and b/misc/icons/source/frame-duplicate-white-base@2x.pdn differ
diff --git a/misc/icons/source/frame-duplicate-white.svg b/misc/icons/source/frame-duplicate-white.svg
new file mode 100644
index 00000000..d9847be1
--- /dev/null
+++ b/misc/icons/source/frame-duplicate-white.svg
@@ -0,0 +1,81 @@
+<?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"
+   width="92"
+   height="92"
+   id="svg2985"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="frame-duplicate-white.svg"
+   inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\frame-dragndrop-white.png"
+   inkscape:export-xdpi="29.347826"
+   inkscape:export-ydpi="29.347826">
+  <defs
+     id="defs2987" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22"
+     inkscape:cx="59.306213"
+     inkscape:cy="69.457322"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1148"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2993"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2990">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,28)">
+    <rect
+       style="fill:#ff50ff;fill-opacity:1;stroke:#0000ff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect2998"
+       width="35"
+       height="45"
+       x="23.885006"
+       y="-8" />
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m 45.875,-9 0,1 0,12 0,1 1,0 12,0 1,0 0,-3 -11,-11 z m 2,2 10,10 -10,0 z"
+       id="rect2998-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccc" />
+  </g>
+</svg>
diff --git a/misc/icons/SVG/swap-colors-sq.svg b/misc/icons/source/frame-plus-white.svg
similarity index 53%
rename from misc/icons/SVG/swap-colors-sq.svg
rename to misc/icons/source/frame-plus-white.svg
index 6dfafcb7..892a5f24 100644
--- a/misc/icons/SVG/swap-colors-sq.svg
+++ b/misc/icons/source/frame-plus-white.svg
@@ -9,14 +9,17 @@
    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"
-   width="435"
-   height="409.28125"
-   id="svg3768"
+   width="52"
+   height="52"
+   id="svg2985"
    version="1.1"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="New document 3">
+   sodipodi:docname="frame-plus-white.svg"
+   inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\frame-dragndrop-white@2x.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
   <defs
-     id="defs3770" />
+     id="defs2987" />
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -24,23 +27,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.98994949"
-     inkscape:cx="87.95854"
-     inkscape:cy="195.23297"
-     inkscape:document-units="px"
+     inkscape:zoom="8"
+     inkscape:cx="28.16371"
+     inkscape:cy="14.767709"
      inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
      inkscape:window-width="1920"
      inkscape:window-height="1148"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2993"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
-     id="metadata3773">
+     id="metadata2990">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -52,21 +60,24 @@
     </rdf:RDF>
   </metadata>
   <g
+     id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-151.0625,-197.71875)">
+     transform="translate(0,-12)">
     <rect
-       style="fill:none;stroke:#ffffff;stroke-width:35;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect3784"
-       width="400"
-       height="374.28571"
-       x="168.57143"
-       y="215.21933" />
-    <path
        style="fill:#ffffff;fill-opacity:1;stroke:none"
-       d="m 368.5625,209.5 0,97.0625 c -18.16488,0.20304 -36.33513,0.39071 -54.5,0.59375 l 0,-51.1875 c -36.22093,27.13868 -72.43533,54.2988 -108.65625,81.4375 l 107.375,91.46875 1.28125,-53.5 54.5,0.96875 0,62.25 c 20.86255,0.2332 41.73121,0.45431 62.59375,0.6875 l 0,-51.1875 C 467.37718,415.23243 503.59158,442.3613 539.8125,469.5 l -107.40625,91.5 -1.25,-53.5 -62.59375,1.09375 0,75.1875 200,0 0,-365.71875 -200,-8.5625 z"
-       id="path4296"
-       inkscape:connector-curvature="0" />
+       id="rect4572"
+       width="8"
+       height="32"
+       x="22"
+       y="22" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect4572-5"
+       width="8"
+       height="32"
+       x="34"
+       y="-42"
+       transform="matrix(0,1,-1,0,0,0)" />
   </g>
 </svg>
diff --git a/misc/icons/source/frame-recyclebin-white.svg b/misc/icons/source/frame-recyclebin-white.svg
new file mode 100644
index 00000000..f9b75f7b
--- /dev/null
+++ b/misc/icons/source/frame-recyclebin-white.svg
@@ -0,0 +1,86 @@
+<?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"
+   width="60"
+   height="60"
+   id="svg2985"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="frame-recyclebin-white.svg"
+   inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\frame-recyclebin-white.png"
+   inkscape:export-xdpi="45"
+   inkscape:export-ydpi="45">
+  <defs
+     id="defs2987" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313709"
+     inkscape:cx="15.845994"
+     inkscape:cy="27.458733"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1148"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2993"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2990">
+    <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>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,-4)">
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       d="m 18,24 2,26 20,0 2,-26 z m 4,4 4,0 0,18 -3,0 z m 6,0 4,0 0,18 -4,0 z m 6,0 4,0 -1,18 -3,0 z"
+       id="rect4592"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccccccccc"
+       inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\frame-recyclebin-white.png"
+       inkscape:export-xdpi="45"
+       inkscape:export-ydpi="45" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       d="m 20,18 c 4,-2 10,-2 10,-2 0,0 6,0 10,2 4,2 4,4 4,4 l -28,0 c 0,0 0,-2 4,-4 z"
+       id="rect4594"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="zczccz"
+       inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\frame-recyclebin-white.png"
+       inkscape:export-xdpi="45"
+       inkscape:export-ydpi="45" />
+  </g>
+</svg>
diff --git a/misc/icons/source/minimap-popup-preview-arrow.svg b/misc/icons/source/minimap-popup-preview-arrow.svg
new file mode 100644
index 00000000..6a47ee5e
--- /dev/null
+++ b/misc/icons/source/minimap-popup-preview-arrow.svg
@@ -0,0 +1,82 @@
+<?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"
+   width="36"
+   height="36"
+   id="svg2985"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="minimap-popup-preview-arrow.svg"
+   inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\frame-recyclebin-white@2x.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs2987" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8"
+     inkscape:cx="-14.163164"
+     inkscape:cy="10.036061"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1148"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2993"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2990">
+    <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>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,-28)">
+    <path
+       style="fill:#ffd700;fill-opacity:1;stroke:#ebebeb;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+       d="M 24,40 24,56 8,40 z"
+       id="rect4044"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <rect
+       style="fill:#ffd700;fill-opacity:1;stroke:none"
+       id="rect4670"
+       width="27.200001"
+       height="8"
+       x="-45.26516"
+       y="41.246574"
+       transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
+  </g>
+</svg>
diff --git a/misc/icons/source/settings-export-white.svg b/misc/icons/source/settings-export-white.svg
new file mode 100644
index 00000000..2a6609e3
--- /dev/null
+++ b/misc/icons/source/settings-export-white.svg
@@ -0,0 +1,87 @@
+<?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"
+   width="92"
+   height="92"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="settings-export-white.svg"
+   inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\settings-export-white.png"
+   inkscape:export-xdpi="45"
+   inkscape:export-ydpi="45">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="11.509715"
+     inkscape:cy="30.803375"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1148"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <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>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-960.36218)">
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999976000000010;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m 16,978.36218 0,2 0,52.00002 0,2 2,0 56,0 2,0 0,-2 0,-52.00002 0,-2 -2,0 -56,0 z m 4,4 52,0 0,48.00002 -52,0 z"
+       id="rect3805"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccccccc" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       d="m 38,992.36218 24,36.00002 -40,2e-4 z"
+       id="rect3807"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       d="m 56,1006.3622 14,21.9872 -28,0.013 z"
+       id="rect3807-0"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="path3851"
+       sodipodi:cx="66.071426"
+       sodipodi:cy="32.892857"
+       sodipodi:rx="6.6071429"
+       sodipodi:ry="6.6071429"
+       d="m 72.678569,32.892857 a 6.6071429,6.6071429 0 1 1 -13.214286,0 6.6071429,6.6071429 0 1 1 13.214286,0 z"
+       transform="matrix(1.0594594,0,0,1.0594594,-8.9999941,960.51353)" />
+  </g>
+</svg>
diff --git a/misc/icons/source/settings-gear-white.svg b/misc/icons/source/settings-gear-white.svg
new file mode 100644
index 00000000..b2735d1b
--- /dev/null
+++ b/misc/icons/source/settings-gear-white.svg
@@ -0,0 +1,145 @@
+<?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"
+   width="92"
+   height="92"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="settings-gear-white.svg"
+   inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\settings-gear-white@2x.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9195959"
+     inkscape:cx="18.001875"
+     inkscape:cy="52.507896"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1148"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <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>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-960.36218)">
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:0;stroke:#000000;stroke-width:12.85330105000000100;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path2985"
+       sodipodi:cx="49.813148"
+       sodipodi:cy="42.691929"
+       sodipodi:rx="24.433065"
+       sodipodi:ry="21.907682"
+       d="m 74.246214,42.691929 a 24.433065,21.907682 0 1 1 -48.866131,0 24.433065,21.907682 0 1 1 48.866131,0 z"
+       transform="matrix(0.73670657,0,0,0.82162958,9.302326,971.28523)" />
+    <g
+       id="g4001"
+       style="fill:#000000;fill-opacity:1">
+      <g
+         id="g3932"
+         style="fill:#000000;fill-opacity:1">
+        <path
+           style="fill:#000000;fill-opacity:1;stroke:none"
+           d="m 40,978.27311 c 0,0 0.827331,-2.91093 6,-2.91093 5.172669,0 6,2.91093 6,2.91093 l 0,9.08907 -12,0 z"
+           id="rect3757"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="czcccc" />
+        <path
+           style="fill:#000000;fill-opacity:1;stroke:none"
+           d="m 40,1034.4513 c 0,0 0.827331,2.9109 6,2.9109 5.172669,0 6,-2.9109 6,-2.9109 l 0,-9.0891 -12,0 z"
+           id="rect3757-2"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="czcccc" />
+      </g>
+      <g
+         id="g3932-4"
+         transform="matrix(0,1,-1,0,1052.3622,960.36218)"
+         style="fill:#000000;fill-opacity:1">
+        <path
+           style="fill:#000000;fill-opacity:1;stroke:none"
+           d="m 40,978.27311 c 0,0 0.827331,-2.91093 6,-2.91093 5.172669,0 6,2.91093 6,2.91093 l 0,9.08907 -12,0 z"
+           id="rect3757-5"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="czcccc" />
+        <path
+           style="fill:#000000;fill-opacity:1;stroke:none"
+           d="m 40,1034.4513 c 0,0 0.827331,2.9109 6,2.9109 5.172669,0 6,-2.9109 6,-2.9109 l 0,-9.0891 -12,0 z"
+           id="rect3757-2-5"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="czcccc" />
+      </g>
+      <g
+         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,-715.27528,351.15831)"
+         id="g3993"
+         style="fill:#000000;fill-opacity:1">
+        <g
+           transform="translate(29.003817,-4.7601755)"
+           id="g3932-1"
+           style="fill:#000000;fill-opacity:1">
+          <path
+             sodipodi:nodetypes="czcccc"
+             inkscape:connector-curvature="0"
+             id="rect3757-7"
+             d="m 40,978.27311 c 0,0 0.827331,-2.91093 6,-2.91093 5.172669,0 6,2.91093 6,2.91093 l 0,9.08907 -12,0 z"
+             style="fill:#000000;fill-opacity:1;stroke:none" />
+          <path
+             sodipodi:nodetypes="czcccc"
+             inkscape:connector-curvature="0"
+             id="rect3757-2-1"
+             d="m 40,1034.4513 c 0,0 0.827331,2.9109 6,2.9109 5.172669,0 6,-2.9109 6,-2.9109 l 0,-9.0891 -12,0 z"
+             style="fill:#000000;fill-opacity:1;stroke:none" />
+        </g>
+        <g
+           transform="matrix(0,1,-1,0,1081.366,955.602)"
+           id="g3932-4-1"
+           style="fill:#000000;fill-opacity:1">
+          <path
+             sodipodi:nodetypes="czcccc"
+             inkscape:connector-curvature="0"
+             id="rect3757-5-5"
+             d="m 40,978.27311 c 0,0 0.827331,-2.91093 6,-2.91093 5.172669,0 6,2.91093 6,2.91093 l 0,9.08907 -12,0 z"
+             style="fill:#000000;fill-opacity:1;stroke:none" />
+          <path
+             sodipodi:nodetypes="czcccc"
+             inkscape:connector-curvature="0"
+             id="rect3757-2-5-2"
+             d="m 40,1034.4513 c 0,0 0.827331,2.9109 6,2.9109 5.172669,0 6,-2.9109 6,-2.9109 l 0,-9.0891 -12,0 z"
+             style="fill:#000000;fill-opacity:1;stroke:none" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/misc/icons/source/settings-open-folder-white.svg b/misc/icons/source/settings-open-folder-white.svg
new file mode 100644
index 00000000..c3c4de53
--- /dev/null
+++ b/misc/icons/source/settings-open-folder-white.svg
@@ -0,0 +1,77 @@
+<?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"
+   width="92"
+   height="92"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="settings-open-folder-white.svg"
+   inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\settings-open-folder-white.png"
+   inkscape:export-xdpi="45"
+   inkscape:export-ydpi="45">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.919596"
+     inkscape:cx="2.8312198"
+     inkscape:cy="32.280099"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1148"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-960.36218)">
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       d="m 16.23344,990.36217 0,31.34623 c 0,1.2425 0.711623,2.271 1.711835,2.6538 l 7.21604,-19.9761 c 0.131637,-0.3642 0.267576,-0.7159 0.421375,-1.0498 l 1.73817,-4.81171 c 0.526549,-1.45708 1.364939,-4.16241 6.554583,-4.16241 l 32.357997,0 0,-1.14212 c 0,-1.56942 -1.13726,-2.85787 -2.554584,-2.85787 -15.815139,-7e-5 -31.630277,10e-5 -47.445416,-2e-5 z"
+       id="rect4023"
+       sodipodi:nodetypes="csccccscscc" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+       d="m 17.993222,984.36217 13.591028,0 c 0.977036,0 1.29274,0.90752 1.763602,1.7636 l 3.010153,5.4728 c 0.470867,0.85609 -0.786566,1.7636 -1.763602,1.7636 l -16.601181,0 c -0.977035,0 -1.763601,-0.78656 -1.763601,-1.7636 l 0,-5.4728 c 0,-0.97703 0.786566,-1.7636 1.763601,-1.7636 z"
+       id="rect4023-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssssssss" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+       d="m 35.862699,998.36226 37.13355,0 c 1.479338,0 3.219898,1.4239 2.670285,2.93194 l -8.796234,24.1361 c -0.549613,1.5081 -1.190947,2.9319 -2.670285,2.9319 l -39.196684,0 c -1.479338,0 -3.219874,-1.4238 -2.670286,-2.9319 l 8.796232,-24.1361 c 0.459142,-1.2598 1.202211,-2.93194 4.733422,-2.93194 z"
+       id="rect4020-6-1"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssssssss" />
+  </g>
+</svg>
diff --git a/misc/icons/source/settings-resize-white.svg b/misc/icons/source/settings-resize-white.svg
new file mode 100644
index 00000000..508950b0
--- /dev/null
+++ b/misc/icons/source/settings-resize-white.svg
@@ -0,0 +1,95 @@
+<?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"
+   width="92"
+   height="92"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="settings-resize-white.svg"
+   inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\settings-resize-white.png"
+   inkscape:export-xdpi="45"
+   inkscape:export-ydpi="45">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="-34.569916"
+     inkscape:cy="31.51548"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1148"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <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>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-960.36218)">
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m 16,976.375 0,2 0,56 0,1.9872 2,0 56,0 2,0 0,-1.9872 0,-56 0,-2 -2,0 -56,0 z m 4,4 52,0 0,52 -52,0 z"
+       id="rect3765"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccccccc"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m 16,1002.3622 0,2.0128 0,30 0,1.9872 2,0 30,0 2,0 0,-1.9872 0,-30 0,-2.0128 -2,0 -30,0 z m 6,6 22,0 0,22 -22,0 z"
+       id="rect3765-1"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccccccc"
+       inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\rect3765.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:#ebebeb;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+       d="m 62.02106,990.36218 0,15.16432 -16,-15.16432 z"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc"
+       inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\rect3765.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect4670"
+       width="15.057212"
+       height="7.1074939"
+       x="-677.65375"
+       y="740.44189"
+       transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
+       inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\rect3765.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+  </g>
+</svg>
diff --git a/misc/icons/source/settings-save-white.svg b/misc/icons/source/settings-save-white.svg
new file mode 100644
index 00000000..bb7a5e57
--- /dev/null
+++ b/misc/icons/source/settings-save-white.svg
@@ -0,0 +1,87 @@
+<?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"
+   width="92"
+   height="92"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="settings-save-white.svg"
+   inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\settings-save-white@2x.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="42.666667"
+     inkscape:cy="41.568856"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1148"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <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>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-960.36218)">
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+       d="m 20,18 0,56 52,0 0,-44 -12,-12 z m 12,4 14,0 0,10 8,0 0,-10 6,0 0,14 -28,0 z M 52.5,45.96875 C 56.001587,45.95825 60.006348,45.958 62,46 c 3.987305,0.084 4,6 4,6 l 0,16 -40,0 0,-16 c 0,0 -0.124714,-6 4,-6 l 16,0 c 0,0 2.998413,-0.02075 6.5,-0.03125 z"
+       transform="translate(0,960.36218)"
+       id="rect2985"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccccssccccscs" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect3767"
+       width="24"
+       height="2"
+       x="34"
+       y="1010.3622" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect3767-1"
+       width="24"
+       height="2"
+       x="34"
+       y="1016.3622" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect3767-1-7"
+       width="24"
+       height="2"
+       x="34"
+       y="1022.3622" />
+  </g>
+</svg>
diff --git a/misc/icons/source/tool-center.svg b/misc/icons/source/tool-center.svg
new file mode 100644
index 00000000..b163a87f
--- /dev/null
+++ b/misc/icons/source/tool-center.svg
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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="Layer_1"
+   x="0px"
+   y="0px"
+   width="92"
+   height="92"
+   viewBox="0 0 91.999998 91.999998"
+   enable-background="new 0 0 99.997 69.373"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="tool-center.svg"
+   inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\tool-center@2x.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"><metadata
+   id="metadata9"><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="defs7" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1148"
+   id="namedview5"
+   showgrid="false"
+   inkscape:zoom="4.4690489"
+   inkscape:cx="-26.75515"
+   inkscape:cy="32.402807"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1" />
+
+<path
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+   d="m 38,20 0,18 -18,0 0,4 20,0 2,0 0,-22 z"
+   id="rect3760"
+   inkscape:connector-curvature="0"
+   sodipodi:nodetypes="cccccccc" /><rect
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+   id="rect3838-9"
+   width="3.9999998"
+   height="2"
+   x="20"
+   y="46" /><rect
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+   id="rect3838-9-8"
+   width="3.9999998"
+   height="2"
+   x="30"
+   y="46" /><rect
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+   id="rect3838-9-2"
+   width="4"
+   height="2"
+   x="40.000004"
+   y="46" /><rect
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+   id="rect3838-9-8-5"
+   width="3.9999998"
+   height="2"
+   x="60"
+   y="46" /><rect
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+   id="rect3838-9-1"
+   width="3.9999998"
+   height="2"
+   x="70"
+   y="46" /><rect
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+   id="rect3838-9-5"
+   width="3.9999998"
+   height="2"
+   x="20.000002"
+   y="-48"
+   transform="matrix(0,1,-1,0,0,0)" /><rect
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+   id="rect3838-9-8-7"
+   width="3.9999998"
+   height="2"
+   x="29.999998"
+   y="-48"
+   transform="matrix(0,1,-1,0,0,0)" /><rect
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+   id="rect3838-9-8-5-2"
+   width="3.9999998"
+   height="2"
+   x="59.999996"
+   y="-48"
+   transform="matrix(0,1,-1,0,0,0)" /><rect
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+   id="rect3838-9-1-2"
+   width="3.9999998"
+   height="2"
+   x="70"
+   y="-48"
+   transform="matrix(0,1,-1,0,0,0)" /><rect
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+   id="rect3838-4-4-4-6"
+   width="3.9999998"
+   height="2"
+   x="50"
+   y="-48"
+   transform="matrix(0,1,-1,0,0,0)" /><rect
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+   id="rect3838-4-4-8"
+   width="3.9999998"
+   height="2"
+   x="50"
+   y="46" /><rect
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+   id="rect3838-8-6-5"
+   width="3.9999998"
+   height="2"
+   x="40"
+   y="-48"
+   transform="matrix(0,1,-1,0,0,0)" /><path
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+   d="m 73.999998,37.999999 -18,0 0,-17.999999 -3.999999,0 0,19.999999 0,2 21.999999,0 z"
+   id="rect3760-7"
+   inkscape:connector-curvature="0"
+   sodipodi:nodetypes="cccccccc" /><path
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+   d="m 37.999999,73.999995 0,-17.999999 -17.999999,0 0,-4 19.999999,0 2,0 0,21.999999 z"
+   id="rect3760-6"
+   inkscape:connector-curvature="0"
+   sodipodi:nodetypes="cccccccc" /><path
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+   d="m 73.999997,55.999996 -18,0 0,17.999999 -3.999999,0 0,-19.999999 0,-2 21.999999,0 z"
+   id="rect3760-7-1"
+   inkscape:connector-curvature="0"
+   sodipodi:nodetypes="cccccccc" /></svg>
\ No newline at end of file
diff --git a/misc/icons/source/tool-circle.svg b/misc/icons/source/tool-circle.svg
new file mode 100644
index 00000000..37481eb1
--- /dev/null
+++ b/misc/icons/source/tool-circle.svg
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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="Layer_1"
+   x="0px"
+   y="0px"
+   width="92"
+   height="92"
+   viewBox="0 0 91.999998 91.999998"
+   enable-background="new 0 0 99.997 69.373"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="tool-circle.svg"
+   inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\tool-circle@2x.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"><metadata
+   id="metadata9"><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="defs7" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1148"
+   id="namedview5"
+   showgrid="false"
+   inkscape:zoom="8.9380977"
+   inkscape:cx="18.834886"
+   inkscape:cy="47.620332"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1" />
+
+<path
+   sodipodi:type="arc"
+   style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.26638484000000020;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+   id="path3751"
+   sodipodi:cx="36.081505"
+   sodipodi:cy="37.402252"
+   sodipodi:rx="16.390512"
+   sodipodi:ry="17.005856"
+   d="m 52.472017,37.402252 a 16.390512,17.005856 0 1 1 -32.781025,0 16.390512,17.005856 0 1 1 32.781025,0 z"
+   transform="matrix(1.3422399,0,0,1.1172622,-2.4300364,4.2118764)" /></svg>
\ No newline at end of file
diff --git a/misc/icons/source/tool-clone.svg b/misc/icons/source/tool-clone.svg
new file mode 100644
index 00000000..79e18870
--- /dev/null
+++ b/misc/icons/source/tool-clone.svg
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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="Layer_1"
+   x="0px"
+   y="0px"
+   width="92"
+   height="92"
+   viewBox="0 0 91.999998 91.999998"
+   enable-background="new 0 0 99.997 69.373"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="tool-clone.svg"><metadata
+   id="metadata9"><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="defs7" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1148"
+   id="namedview5"
+   showgrid="false"
+   inkscape:zoom="3.1600948"
+   inkscape:cx="0.63289242"
+   inkscape:cy="34.686501"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1" />
+<path
+   d="m 64.983449,26.127731 c 0.331817,-0.188552 0.745237,-0.126278 1.110056,-0.07669 0.901245,0.170678 1.594879,0.822251 2.119906,1.510728 0.364818,-0.218537 0.751237,-0.448029 1.189859,-0.485509 0.357018,-0.0086 0.654033,0.239872 0.836441,0.51261 0.340818,0.524142 0.456024,1.16476 0.865244,1.651422 0.09781,0.120512 0.245412,0.185093 0.387018,0.244484 0.58083,0.235835 1.107657,0.574307 1.612882,0.931231 0.216611,0.128585 0.237611,0.398441 0.317416,0.608905 0.286814,0.910473 0.183609,1.868805 0.0894,2.798306 -0.021,0.468211 -0.0624,0.956603 0.103206,1.405785 0.252012,0.550089 0.737436,0.954296 1.047652,1.468635 0.714636,1.228188 1.287664,2.575734 1.337467,3.99997 v 0.05074 c -0.0426,0.731147 -0.121806,1.526297 -0.637233,2.106371 -0.42422,0.487815 -1.110055,0.634851 -1.737686,0.705198 -0.448222,0.05997 -0.904845,0.07323 -1.354869,0.0444 -1.147257,-0.158569 -2.287314,-0.362114 -3.43457,-0.525296 -0.204011,-0.02998 -0.431422,-0.03171 -0.60003,0.09629 -0.234612,0.162028 -0.296415,0.453218 -0.322216,0.712118 -0.0408,0.678674 0.0798,1.386756 -0.18721,2.0366 -0.136207,0.348275 -0.460823,0.576037 -0.759639,0.790537 -0.655231,0.434191 -1.387868,0.744409 -2.064702,1.142272 -0.0984,0.06631 -0.075,0.200662 -0.075,0.300416 0.045,0.528178 0.19921,1.050014 0.151809,1.583958 -0.0126,0.344239 -0.162608,0.685018 -0.432023,0.915086 -0.460823,0.40882 -0.860443,0.875877 -1.240861,1.352736 -0.0624,0.08188 -0.133206,0.163182 -0.153608,0.265819 -0.158407,0.733453 -0.231012,1.485358 -0.444023,2.208431 -0.120606,0.36961 -0.249612,0.772663 -0.565828,1.033869 -0.379819,0.283694 -0.873644,-0.197202 -1.258863,0.09457 -0.714635,0.508573 -0.934846,1.390792 -1.427471,2.06543 -0.281414,0.343085 -0.662433,0.599102 -1.083053,0.760554 -0.198611,2.519802 -0.37502,5.040181 -0.537627,7.56229 h -3.099756 c 0.096,-1.604716 0.192011,-3.210009 0.291615,-4.815302 0.121806,-0.996389 -0.0582,-1.985858 -0.18721,-2.970714 -0.0102,-0.209888 -0.258013,-0.40882 -0.471023,-0.313102 -0.622231,0.172985 -1.278664,0.264666 -1.922496,0.166642 -0.522027,-0.130892 -0.921647,-0.505691 -1.266064,-0.883949 -1.059053,0.97736 -2.595729,1.311796 -4.027401,1.167643 -0.282614,-0.418622 -0.475224,-0.939304 -0.961848,-1.181482 -0.323416,-0.186823 -0.718836,-0.08937 -1.037452,0.05651 -0.728436,0.321751 -1.167058,1.040788 -1.918296,1.329095 -0.660033,0.294073 -1.415471,0.108403 -2.046102,-0.167795 -0.676234,-0.311371 -1.305665,-0.716154 -1.911696,-1.138812 -0.312015,0.136081 -0.502225,0.419775 -0.673833,0.689054 -0.580829,0.06746 -1.178459,0.258899 -1.753888,0.05939 -0.928846,-0.230069 -1.575079,-0.952566 -2.364118,-1.425389 -0.531627,0.380565 -0.964848,0.911049 -1.60808,1.128433 -0.418821,0.138387 -0.880844,0.230069 -1.317666,0.119359 -0.495025,-0.104367 -0.965449,-0.288307 -1.455073,-0.406513 -0.162008,-0.04498 -0.334817,-0.02133 -0.484224,0.04728 -0.859843,0.372493 -1.318266,1.285849 -2.212911,1.60241 -0.184209,0.08534 -0.379219,0.0248 -0.561628,-0.0271 -0.20761,2.198052 -0.474024,4.392644 -0.695435,6.590696 -1.086654,0.0035 -2.173908,-0.0012 -3.260562,0.0023 -0.0468,-0.378249 -0.178209,-0.756508 -0.112806,-1.140532 0.162008,-1.315833 0.382219,-2.62417 0.540027,-3.940003 0.108606,-1.092683 -0.501025,-2.103487 -1.257663,-2.869807 0.0924,-0.424964 -0.0336,-0.866073 -0.316815,-1.198203 -0.744038,-0.951413 -2.017301,-1.35043 -2.727737,-2.33125 -0.21421,-0.305605 -0.418821,-0.724227 -0.19681,-1.074808 0.171009,-0.417468 0.564029,-0.796304 0.461423,-1.274316 -0.024,-0.151073 -0.09901,-0.289461 -0.20821,-0.398441 -0.642032,-0.685017 -1.182659,-1.449607 -1.709485,-2.216503 -0.241812,-0.340202 -0.223212,-0.771509 -0.262814,-1.16476 -0.0846,-0.688477 0.439222,-1.269127 0.478824,-1.939729 -0.117605,-0.383448 -0.504025,-0.618706 -0.715235,-0.953719 -0.480024,-0.799187 -0.816641,-1.695245 -0.862843,-2.624169 v -0.25717 c 0.0516,-0.433037 0.0468,-0.886256 0.237611,-1.291039 0.313216,-0.580073 0.939647,-0.935844 1.245063,-1.519954 -0.133207,-0.558162 -0.448223,-1.056933 -0.579629,-1.613942 -0.0582,-0.845315 0.255012,-1.703893 0.842442,-2.334709 0.39842,-0.02018 0.791439,-0.09053 1.180859,-0.170678 0.379819,-0.07208 0.660033,-0.363843 0.868843,-0.660222 0.421821,-0.602562 0.499225,-1.35562 0.887445,-1.973173 0.153007,-0.256016 0.364218,-0.493005 0.648032,-0.619283 0.415221,-0.188553 0.837042,-0.363843 1.271464,-0.50742 0.228011,-0.06746 0.467423,-0.136658 0.708035,-0.09629 0.536427,0.07727 1.062653,0.208158 1.59908,0.288307 0.374419,0.05074 0.792639,-0.04901 1.044052,-0.334436 0.227412,-0.244484 0.289815,-0.578344 0.344418,-0.890292 0.555626,-0.176444 1.157458,-0.372492 1.744287,-0.224302 0.820241,0.179326 1.632081,0.387484 2.454722,0.553549 0.448822,-0.211617 0.662433,-0.69655 1.109456,-0.912203 0.530426,-0.277351 1.168257,-0.192013 1.723885,-0.0369 0.678035,0.18567 1.19466,0.673485 1.824691,0.954296 0.441023,-0.252557 0.78244,-0.758823 1.347668,-0.735182 1.018852,0.256016 1.854692,1.039634 2.939548,1.077114 0.737436,5.77e-4 1.067453,-0.780735 1.747287,-0.919122 0.446422,-0.131468 0.897644,0.07208 1.262462,0.311371 0.447023,0.29811 0.859244,0.640042 1.279265,0.971018 0.631232,-0.358654 1.350667,-0.625626 2.095305,-0.591606 0.868843,0.150496 1.708285,0.434767 2.576528,0.582957 0.369019,-0.01499 0.580229,-0.374223 0.893445,-0.520106 0.637232,-0.286577 1.342267,-0.435343 2.045502,-0.43592 0.78964,0.09745 1.525877,0.410549 2.292115,0.600832 0.373819,-0.0986 0.681034,-0.379989 1.081854,-0.395557 0.615631,-0.01442 1.233062,-0.0035 1.848092,-0.0046 0.240612,-0.185093 0.461423,-0.408819 0.756038,-0.518953 0.521426,-0.213347 1.046452,-0.482049 1.621881,-0.517799 0.59643,0.04613 1.185059,0.165488 1.778489,0.231799 0.141007,-0.807836 0.505225,-1.558587 0.888644,-2.282238 0.744638,-0.130891 1.477874,-0.334436 2.19611,-0.561045 0.442822,-0.279081 0.771039,-0.697703 1.178459,-1.02176 z"
+   id="path3"
+   inkscape:connector-curvature="0"
+   style="fill:#ffffff;fill-opacity:1" />
+</svg>
\ No newline at end of file
diff --git a/misc/icons/source/tool-colorpicker-big.png b/misc/icons/source/tool-colorpicker-big.png
deleted file mode 100644
index 1153aed8..00000000
Binary files a/misc/icons/source/tool-colorpicker-big.png and /dev/null differ
diff --git a/misc/icons/source/tool-colorpicker.svg b/misc/icons/source/tool-colorpicker.svg
new file mode 100644
index 00000000..52c44002
--- /dev/null
+++ b/misc/icons/source/tool-colorpicker.svg
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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="Layer_1"
+   x="0px"
+   y="0px"
+   width="92"
+   height="92"
+   viewBox="0 0 91.999998 91.999998"
+   enable-background="new 0 0 99.997 69.373"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="tool-colorpicker.svg"
+   inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\tool-colorpicker@2x.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"><metadata
+   id="metadata9"><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="defs7" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1148"
+   id="namedview5"
+   showgrid="false"
+   inkscape:zoom="4.4690489"
+   inkscape:cx="-11.462522"
+   inkscape:cy="23.210237"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1" />
+
+<g
+   id="g4584"
+   transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,46.899678,-18.681164)"
+   style="fill:#ffffff;fill-opacity:1"><path
+     sodipodi:nodetypes="cczcccccczcc"
+     inkscape:connector-curvature="0"
+     id="rect4410"
+     d="m 38.999999,35.970487 0,31.741537 c 0,0 5.388908,10.83265 7,10.832651 1.611092,-10e-7 7,-10.832651 7,-10.832651 l 0,-31.741538 z m 4,3.029512 c 0,-1.288277 5.999999,-1.288277 5.999999,0 0,9.795299 1e-6,17.407064 1e-6,27.202363 0,0 -2.092806,5.797636 -2.999999,5.797636 -0.907193,10e-7 -3,-5.797636 -3,-5.797636 -10e-7,-9.795299 0,-17.407064 -10e-7,-27.202363 z"
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" /><path
+     inkscape:connector-curvature="0"
+     id="rect4559"
+     d="m 35.898676,32 20.202645,0 c 1.051867,0 1.898677,0.705675 1.898677,1.582231 l 0,2.835538 C 57.999999,37.294325 57.153188,38 56.101322,38 L 35.898676,38 C 34.846809,38 34,37.294325 34,36.417769 l 0,-2.835538 C 34,32.705675 34.846809,32 35.898676,32 z"
+     style="fill:#ffffff;fill-opacity:1;stroke:none" /><path
+     sodipodi:nodetypes="sccsss"
+     inkscape:connector-curvature="0"
+     id="path4563"
+     d="m 53.999999,24.201011 c 0,2.264646 0,3.798988 0,3.798988 l -16,0 c 0,0 0,-1.534342 0,-3.798988 0,-4.529294 3.581721,-8.201012 7.999998,-8.201012 4.418279,0 8.000002,3.671718 8.000002,8.201012 z"
+     style="fill:#ffffff;fill-opacity:1;stroke:none" /></g></svg>
\ No newline at end of file
diff --git a/misc/icons/source/tool-colorswap.svg b/misc/icons/source/tool-colorswap.svg
new file mode 100644
index 00000000..8edc9f87
--- /dev/null
+++ b/misc/icons/source/tool-colorswap.svg
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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="Layer_1"
+   x="0px"
+   y="0px"
+   width="92"
+   height="92"
+   viewBox="0 0 91.999998 91.999998"
+   enable-background="new 0 0 99.997 69.373"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="tool-colorswap.svg"
+   inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\tool-paint-bucket@2x.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"><metadata
+   id="metadata9"><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="defs7" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1148"
+   id="namedview5"
+   showgrid="false"
+   inkscape:zoom="2.8284271"
+   inkscape:cx="-77.447714"
+   inkscape:cy="52.784711"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1" />
+
+<path
+   style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:3.43830036999999990;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+   d="M 46.25 16.96875 C 31.783535 16.97245 18.410981 27.62145 16.25 42.84375 L 16.21875 43.125 C 14.261923 57.996821 24.21985 72.689404 39.0625 74.78125 C 41.480463 75.122024 43.882061 75.054665 46.21875 74.6875 L 42.46875 70.9375 C 41.515736 70.945639 40.552446 70.916362 39.59375 70.78125 C 26.925293 68.995824 18.370161 56.20788 20.1875 43.40625 C 22.243799 28.921355 36.182536 19.173751 50.15625 21.34375 C 60.076387 22.884263 68.583951 30.053319 72.21875 39.625 C 72.524486 40.694536 73.795381 41.334004 74.8125 40.9375 C 75.829618 40.540996 76.372549 39.194444 75.90625 38.1875 C 71.761114 27.271926 62.134522 19.08042 50.75 17.3125 C 49.241167 17.078191 47.746531 16.968364 46.25 16.96875 z M 46.25 28.28125 C 36.819448 28.23764 28.029719 35.22238 27.0625 45.28125 C 26.25244 53.705714 31.723001 62.01095 40 63.5 C 40.432423 62.222877 41.20052 60.918367 42.21875 59.6875 C 42.06461 59.686494 41.904458 59.699284 41.75 59.6875 C 35.017017 59.173826 30.317367 52.461741 30.96875 45.6875 C 31.778437 37.266919 39.818814 31.450908 47.90625 32.40625 C 56.589176 33.431935 62.786265 41.338733 63.125 50 L 66.9375 53.8125 C 66.94024 53.791796 66.934789 53.77076 66.9375 53.75 L 66.96875 53.59375 C 68.461475 41.645747 60.389657 29.825501 48.375 28.40625 L 48.15625 28.375 C 47.524176 28.308219 46.878703 28.284157 46.25 28.28125 z M 45.8125 39.4375 C 43.673764 39.49185 41.607649 40.371934 40.0625 41.875 C 38.517351 43.378067 37.461215 45.66893 37.84375 48.15625 C 38.011536 49.211784 39.094165 50.015556 40.125 49.84375 C 41.155835 49.671945 41.949036 48.555534 41.78125 47.5 C 41.614192 46.413754 41.986931 45.616435 42.78125 44.84375 C 43.563966 44.082351 44.768579 43.541459 45.84375 43.5 L 45.875 43.5 C 47.120829 43.46834 48.258363 43.902835 49.21875 44.59375 C 50.831294 44.368471 52.663952 44.450674 54.59375 44.75 C 52.829609 41.614921 49.705423 39.338573 45.8125 39.4375 z "
+   id="path4688" /><path
+   inkscape:export-xdpi="45"
+   inkscape:export-ydpi="45"
+   style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+   d="m 75.035981,59.940655 c -2.26793,-2.265903 -4.34567,-2.935856 -7.1564,-3.288076 l -6.29481,-6.29482 -3.8859,-3.885907 -3.32325,-0.615415 c -5.898961,-1.040147 -11.02695,-0.373026 -12.04455,5.398071 -0.61646,3.496134 0.84367,5.733668 3.39357,7.191566 l -0.45716,0.457166 c -3.68959,3.689589 -5.2262,8.17227 -2.03966,11.358805 l 7.56081,7.560815 c 3.18654,3.186538 7.66922,1.649927 11.35881,-2.039662 l 9.54772,-9.547725 c 0.87175,0.205641 2.04585,0.627772 3.27049,2.004496 2.48298,2.791331 0.98609,7.928992 2.19791,8.949893 1.93735,-0.594631 4.08451,-9.278917 0.0528,-14.682046 -0.76706,-1.027972 -1.4847,-1.872156 -2.18033,-2.567161 z m -17.6712,-9.02023 12.76546,12.765471 -10.04005,10.040057 c -2.40472,2.404723 -4.83337,3.782434 -6.91023,1.705579 l -7.56082,-7.560812 c -2.07685,-2.076856 -0.69914,-4.505512 1.70558,-6.910234 L 48.6083,59.676905 c 1.002041,0.309412 2.091661,0.557522 3.217751,0.756081 1.14049,0.2011 8.4393,1.486168 9.51256,1.670414 1.07326,0.184246 1.58152,0.03614 1.95174,-0.334083 0.62151,-0.621502 0.62151,-1.629159 0,-2.250661 -0.22465,-0.224652 -0.50059,-0.375467 -1.24841,-0.509916 -0.74782,-0.134448 -8.49633,-1.516069 -9.67081,-1.723163 -0.40026,-0.07058 -0.77901,-0.138213 -1.1605,-0.210999 l -3.25291,-0.861582 c -1.85109,-0.754079 -2.92512,-1.966837 -2.49683,-4.395823 0.70707,-4.009964 4.26085,-3.558504 8.38724,-2.83091 l 1.14291,0.193417 -5.907991,5.907986 3.252911,0.861581 z"
+   id="rect4589-7-4-2"
+   inkscape:connector-curvature="0"
+   sodipodi:nodetypes="sccccscsssscscssccsssscssssssccsccccc" /></svg>
\ No newline at end of file
diff --git a/misc/icons/source/tool-dithering.svg b/misc/icons/source/tool-dithering.svg
new file mode 100644
index 00000000..65b647e4
--- /dev/null
+++ b/misc/icons/source/tool-dithering.svg
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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="Layer_1"
+   x="0px"
+   y="0px"
+   width="92"
+   height="92"
+   viewBox="0 0 91.999998 91.999998"
+   enable-background="new 0 0 99.997 69.373"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="tool-dithering.svg"
+   inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\tool-circle@2x.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"><metadata
+   id="metadata9"><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="defs7" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1148"
+   id="namedview5"
+   showgrid="false"
+   inkscape:zoom="8.9380977"
+   inkscape:cx="18.834886"
+   inkscape:cy="43.487882"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1" />
+
+<g
+   id="g3836"
+   transform="matrix(1,0,0,-1,21.999999,114)"
+   style="fill:#ffffff;fill-opacity:1"><rect
+     y="80"
+     x="0"
+     height="12"
+     width="12"
+     id="rect3753"
+     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /><rect
+     y="80"
+     x="24"
+     height="12"
+     width="12"
+     id="rect3753-1"
+     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /><rect
+     y="56"
+     x="3.5527137e-015"
+     height="12"
+     width="12"
+     id="rect3753-7"
+     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /><rect
+     y="56"
+     x="24"
+     height="12"
+     width="12"
+     id="rect3753-1-4"
+     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /><rect
+     y="68"
+     x="12"
+     height="12"
+     width="12"
+     id="rect3753-7-0"
+     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /><rect
+     y="68"
+     x="36"
+     height="12"
+     width="12"
+     id="rect3753-1-4-9"
+     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /><rect
+     y="44"
+     x="12"
+     height="12"
+     width="12"
+     id="rect3753-7-0-4"
+     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /><rect
+     y="44"
+     x="36"
+     height="12"
+     width="12"
+     id="rect3753-1-4-9-8"
+     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /></g></svg>
\ No newline at end of file
diff --git a/misc/icons/source/tool-eraser.svg b/misc/icons/source/tool-eraser.svg
new file mode 100644
index 00000000..2b51c175
--- /dev/null
+++ b/misc/icons/source/tool-eraser.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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="Layer_1"
+   x="0px"
+   y="0px"
+   width="92"
+   height="92"
+   viewBox="0 0 91.999998 91.999998"
+   enable-background="new 0 0 99.997 69.373"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="tool-eraser.svg"
+   inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\tool-eraser.png"
+   inkscape:export-xdpi="45"
+   inkscape:export-ydpi="45"><metadata
+   id="metadata9"><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="defs7" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1148"
+   id="namedview5"
+   showgrid="false"
+   inkscape:zoom="8"
+   inkscape:cx="65.852862"
+   inkscape:cy="36.923143"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1" />
+
+<path
+   style="fill:#ffffff;fill-opacity:1;stroke:none"
+   d="m 51.656249,23.781249 c -1.22299,0 -2.440125,0.471375 -3.375,1.40625 l -27.1875,27.1875 c -1.86975,1.86975 -1.86975,4.880249 0,6.75 l 9.09375,9.09375 0.6875,0 4.96875,0 9,0 5.28125,0 0.375,0 20.40625,-20.40625 c 1.86975,-1.86975 1.86975,-4.880249 0,-6.75 l -15.875,-15.875 c -0.934876,-0.934875 -2.15201,-1.40625 -3.375,-1.40625 z m -14.15625,17.8125 17,17 -5.65625,5.625 -17,0 -6.34375,-6.34375 c -1.172304,-1.172304 -1.046693,-3.203308 0.3125,-4.5625 l 11.6875,-11.71875 z"
+   id="rect4883"
+   inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/misc/icons/source/tool-flip.svg b/misc/icons/source/tool-flip.svg
new file mode 100644
index 00000000..6a7f7d90
--- /dev/null
+++ b/misc/icons/source/tool-flip.svg
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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="Layer_1"
+   x="0px"
+   y="0px"
+   width="92"
+   height="92"
+   viewBox="0 0 91.999998 91.999998"
+   enable-background="new 0 0 99.997 69.373"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="tool-flip.svg"
+   inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\tool-flip@2x.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"><metadata
+   id="metadata9"><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="defs7" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1148"
+   id="namedview5"
+   showgrid="false"
+   inkscape:zoom="4.4690489"
+   inkscape:cx="-26.75515"
+   inkscape:cy="32.402807"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1" />
+
+<rect
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+   id="rect3838-9-5"
+   width="3.9999998"
+   height="2"
+   x="20.000002"
+   y="-48"
+   transform="matrix(0,1,-1,0,0,0)" /><rect
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+   id="rect3838-9-8-7"
+   width="3.9999998"
+   height="2"
+   x="29.999998"
+   y="-48"
+   transform="matrix(0,1,-1,0,0,0)" /><rect
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+   id="rect3838-9-8-5-2"
+   width="3.9999998"
+   height="2"
+   x="59.999996"
+   y="-48"
+   transform="matrix(0,1,-1,0,0,0)" /><rect
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+   id="rect3838-9-1-2"
+   width="3.9999998"
+   height="2"
+   x="70"
+   y="-48"
+   transform="matrix(0,1,-1,0,0,0)" /><rect
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+   id="rect3838-4-4-4-6"
+   width="3.9999998"
+   height="2"
+   x="50"
+   y="-48"
+   transform="matrix(0,1,-1,0,0,0)" /><rect
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+   id="rect3838-8-6-5"
+   width="3.9999998"
+   height="2"
+   x="40"
+   y="-48"
+   transform="matrix(0,1,-1,0,0,0)" /><path
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+   d="m 39.999999,19.999999 0,53.999999 -26,0 z"
+   id="rect4199"
+   inkscape:connector-curvature="0"
+   sodipodi:nodetypes="cccc" /><path
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+   d="m 54,20 0,54 26,0 -26,-54 z m 4,16 16,34 -16,0 0,-34 z"
+   id="rect4199-8"
+   inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/misc/icons/source/tool-lasso-select.svg b/misc/icons/source/tool-lasso-select.svg
new file mode 100644
index 00000000..30eec17c
--- /dev/null
+++ b/misc/icons/source/tool-lasso-select.svg
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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="Layer_1"
+   x="0px"
+   y="0px"
+   width="92"
+   height="92"
+   viewBox="0 0 91.999998 91.999998"
+   enable-background="new 0 0 99.997 69.373"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="tool-lasso-select.svg"
+   inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\tool-lasso-select@2x.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"><metadata
+   id="metadata9"><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="defs7" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1148"
+   id="namedview5"
+   showgrid="false"
+   inkscape:zoom="11.313709"
+   inkscape:cx="28.848556"
+   inkscape:cy="56.05112"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1" />
+
+<path
+   style="fill:none;stroke:#ffffff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:5.99999987, 5.99999987;stroke-dashoffset:9.59999979"
+   d="m 27.137305,45.116922 c 4.348192,3.354775 13.757306,5.64287 20.485225,5.05984 6.727919,-0.583031 15.989555,-2.799751 19.954403,-8.454605 3.964848,-5.654854 2.6921,-13.891707 -3.122398,-15.860913 -6.608117,-2.237981 -9.882928,4.099594 -19.471426,4.899951 -7.474124,0.623869 -14.014171,-4.834533 -18.728321,-1.630028 -7.360138,5.003149 -3.465675,12.63098 0.882517,15.985755 z"
+   id="path4945"
+   inkscape:connector-curvature="0"
+   sodipodi:nodetypes="zszsssz" /><path
+   style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+   d="M 26.563739,67.114661 C 33.855127,59.408496 44.134234,57.708412 44.506573,51.469924"
+   id="path4947"
+   inkscape:connector-curvature="0"
+   sodipodi:nodetypes="cc" /></svg>
\ No newline at end of file
diff --git a/misc/icons/source/tool-lighten.svg b/misc/icons/source/tool-lighten.svg
new file mode 100644
index 00000000..9e290945
--- /dev/null
+++ b/misc/icons/source/tool-lighten.svg
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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="Layer_1"
+   x="0px"
+   y="0px"
+   width="92"
+   height="92"
+   viewBox="0 0 91.999998 91.999998"
+   enable-background="new 0 0 99.997 69.373"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="tool-lighten.svg"
+   inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\tool-lighten.png"
+   inkscape:export-xdpi="45"
+   inkscape:export-ydpi="45"><metadata
+   id="metadata9"><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="defs7" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1148"
+   id="namedview5"
+   showgrid="false"
+   inkscape:zoom="5.6568543"
+   inkscape:cx="112.22609"
+   inkscape:cy="52.174379"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1" />
+
+<path
+   style="fill:#ffffff;fill-opacity:1;stroke:none"
+   d="M 46,16 C 29.431457,16 16,29.431458 16,46 16,62.568542 29.431457,76 46,76 62.568543,76 76,62.568542 76,46 76,29.431458 62.568543,16 46,16 z m 0,8 c 2.740787,0 5,0.552164 5,2 0,2.570512 -8.97335,6.288411 -8.97335,19.28125 C 42.02665,58.274089 51,63.252327 51,66 51,68.059378 48.190019,68 46,68 33.849736,68 24,58.150265 24,46 24,33.849735 33.849736,24 46,24 z m 6,19.999999 12,0 0,4 -12,0 z"
+   id="path4854"
+   inkscape:connector-curvature="0"
+   sodipodi:nodetypes="ssssssszssssccccc" /><path
+   style="fill:#ffffff;fill-opacity:1;stroke:none"
+   d="m 31.999999,39.999999 0,4 -4,0 0,4 4,0 0,4 4,0 0,-4 4,0 0,-4 -4,0 0,-4 -4,0 z"
+   id="rect4862"
+   inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/misc/icons/source/tool-move.svg b/misc/icons/source/tool-move.svg
new file mode 100644
index 00000000..aba243e5
--- /dev/null
+++ b/misc/icons/source/tool-move.svg
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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="Layer_1"
+   x="0px"
+   y="0px"
+   width="92"
+   height="92"
+   viewBox="0 0 91.999998 91.999998"
+   enable-background="new 0 0 99.997 69.373"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="tool-move.svg"
+   inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\tool-move.png"
+   inkscape:export-xdpi="45"
+   inkscape:export-ydpi="45"><metadata
+   id="metadata9"><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="defs7" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1148"
+   id="namedview5"
+   showgrid="false"
+   inkscape:zoom="5.6568543"
+   inkscape:cx="-34.614081"
+   inkscape:cy="20.191418"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1" />
+
+<g
+   id="g4836"
+   transform="translate(-4.2675963e-4,-2.984376)"
+   style="fill:#ffffff;fill-opacity:1"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"><path
+     sodipodi:nodetypes="ssccsssccccsczssccsssccssscscss"
+     inkscape:connector-curvature="0"
+     id="path4755"
+     d="m 45,22 c -1.662,0 -3,1.445543 -3,3.25 l 0,21.125 c -0.676561,0.07586 -1.345615,0.13844 -2,0.21875 L 40,29.25 C 40,27.445543 38.662,26 37,26 c -1.662,0 -3,1.445543 -3,3.25 l 0,18.15625 c 0,0 0.06308,4.152765 0.115584,5.230135 -0.247037,0.365135 -0.525606,0.449153 -0.740581,0.285493 C 32.742845,52.149078 29.21875,46.84375 29.21875,46.84375 28.027143,45.141954 25.701788,44.745899 24,45.9375 c -1.701787,1.191609 -2.129105,3.516966 -0.9375,5.21875 0,0 12.565294,18.035587 13.826019,19.62701 1.260725,1.591423 6.894029,5.18549 11.705231,5.18549 C 57.087654,75.96875 64,70.907512 64,60.65625 L 64,56.75 64,50.40625 64,33.25 C 64,31.445543 62.662,30 61,30 c -1.662,0 -3,1.445543 -3,3.25 l 0,14.90625 c -0.649708,-0.223638 -1.324524,-0.409046 -2,-0.625 L 56,27.25 C 56,25.445543 54.662,24 53,24 c -1.662,0 -3,1.445543 -3,3.25 L 50,46 c -0.511381,-0.0741 -1.003571,-0.125 -1.40625,-0.125 -0.171066,0 -0.403931,0.02643 -0.59375,0.03125 L 48,25.25 C 48,23.445543 46.662,22 45,22 z"
+     style="fill:#ffffff;fill-opacity:1;stroke:none" /></g></svg>
\ No newline at end of file
diff --git a/misc/icons/source/tool-paint-bucket.svg b/misc/icons/source/tool-paint-bucket.svg
new file mode 100644
index 00000000..85e3e721
--- /dev/null
+++ b/misc/icons/source/tool-paint-bucket.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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="Layer_1"
+   x="0px"
+   y="0px"
+   width="92"
+   height="92"
+   viewBox="0 0 91.999998 91.999998"
+   enable-background="new 0 0 99.997 69.373"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="tool-paint-bucket.svg"
+   inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\tool-paint-bucket@2x.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"><metadata
+   id="metadata9"><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="defs7" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1148"
+   id="namedview5"
+   showgrid="false"
+   inkscape:zoom="8"
+   inkscape:cx="66.407246"
+   inkscape:cy="58.733165"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1" />
+
+<path
+   inkscape:export-xdpi="45"
+   inkscape:export-ydpi="45"
+   style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+   d="m 56.581145,27.28125 c -4.028888,0.0018 -6.470567,1.252802 -9.28125,3.4375 l -11.1875,0 -6.90625,0 -3.5,2.40625 c -6.16629,4.317683 -10.130339,9.467376 -5.90625,15.5 2.558956,3.654567 5.844809,4.345383 9.40625,3.375 l 0,0.8125 c 0,6.557341 2.61796,11.90625 8.28125,11.90625 l 13.4375,0 c 5.663291,0 8.28125,-5.348909 8.28125,-11.90625 l 0,-16.96875 c 0.957398,-0.591921 2.375857,-1.260146 4.6875,-1.125 4.686902,0.274012 7.92219,6.169659 9.90625,6 1.193177,-2.249988 -4.615895,-11.875114 -13,-13.09375 -1.595115,-0.231851 -2.982991,-0.344306 -4.21875,-0.34375 z m -23.71875,7.6875 22.6875,0 0,17.84375 c 0,4.273806 -0.933899,7.65625 -4.625,7.65625 l -13.4375,0 c -3.691101,0 -4.625,-3.382444 -4.625,-7.65625 l 0,-2.28125 c 1.165391,-0.615487 2.354128,-1.36327 3.53125,-2.1875 1.192176,-0.834771 8.820045,-6.178747 9.9375,-6.96875 1.117456,-0.790003 1.4375,-1.373269 1.4375,-2.03125 0,-1.104569 -0.895431,-2 -2,-2 -0.399263,0 -0.778495,0.111194 -1.5625,0.65625 -0.784005,0.545056 -8.897295,6.202853 -10.125,7.0625 -0.4184,0.292967 -0.815069,0.569429 -1.21875,0.84375 l -3.65625,2.125 c -2.315031,0.974839 -4.347131,0.85156 -6.125,-1.6875 -2.935047,-4.191682 0.624117,-6.948487 4.9375,-9.96875 l 1.1875,-0.84375 0,10.5 3.65625,-2.125 z"
+   id="rect4589"
+   inkscape:connector-curvature="0"
+   sodipodi:nodetypes="sccccscsssscscssccsssscssssssccsccccc" /></svg>
\ No newline at end of file
diff --git a/misc/icons/source/tool-pen.svg b/misc/icons/source/tool-pen.svg
new file mode 100644
index 00000000..01a1ab84
--- /dev/null
+++ b/misc/icons/source/tool-pen.svg
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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="Layer_1"
+   x="0px"
+   y="0px"
+   width="92"
+   height="92"
+   viewBox="0 0 91.999998 91.999998"
+   enable-background="new 0 0 99.997 69.373"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="tool-pen.svg"
+   inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\tool-pen@2x.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"><metadata
+   id="metadata9"><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="defs7" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1148"
+   id="namedview5"
+   showgrid="false"
+   inkscape:zoom="8.9380977"
+   inkscape:cx="38.069393"
+   inkscape:cy="42.837564"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1" />
+
+<path
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+   d="m 62.943671,23.602795 c -3.792519,-0.320676 -12.440757,11.026543 -18.318485,16.904271 -5.877728,5.877728 -16.965953,15.87359 -17.854445,17.412505 -2.155889,3.734109 5.053966,11.128594 8.905126,8.905126 1.875005,-1.082534 11.556872,-11.954621 17.434601,-17.83235 5.877727,-5.877727 16.904271,-14.990586 16.904271,-18.318485 0,-3.327899 -3.278548,-6.750392 -7.071068,-7.071067 z m 2.96101,8.352698 C 65.562292,34.513405 56.25497,41.605206 51.055439,46.804735 45.855911,52.004263 35.374437,64.091451 33.664654,64.19552 31.954873,64.299592 29.288573,61.620934 29.422014,59.952879 29.555454,58.284825 41.613271,47.761622 46.812799,42.562094 52.012328,37.362565 59.394034,27.89949 61.66204,27.712853 c 2.268007,-0.186638 4.585031,1.684728 4.242641,4.24264 z"
+   id="rect4239"
+   inkscape:connector-curvature="0"
+   sodipodi:nodetypes="zsssszzzsssszz" /><path
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+   d="m 27.66097,59.606048 6.363961,6.363961 c 0,0 -8.169951,5.13174 -9.839549,3.462142 -1.669597,-1.669597 3.475588,-9.826103 3.475588,-9.826103 z"
+   id="rect4261"
+   inkscape:connector-curvature="0"
+   sodipodi:nodetypes="cczc" /></svg>
\ No newline at end of file
diff --git a/misc/icons/source/tool-rectangle-select.svg b/misc/icons/source/tool-rectangle-select.svg
new file mode 100644
index 00000000..e5ece4a6
--- /dev/null
+++ b/misc/icons/source/tool-rectangle-select.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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="Layer_1"
+   x="0px"
+   y="0px"
+   width="92"
+   height="92"
+   viewBox="0 0 91.999998 91.999998"
+   enable-background="new 0 0 99.997 69.373"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="tool-rectangle-select.svg"
+   inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\tool-lasso-select@2x.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"><metadata
+   id="metadata9"><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="defs7" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1148"
+   id="namedview5"
+   showgrid="false"
+   inkscape:zoom="11.313709"
+   inkscape:cx="28.848556"
+   inkscape:cy="48.980052"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1" />
+
+<rect
+   style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3.99999951999999980;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3.99999942999999990, 7.99999887999999970;stroke-dashoffset:11.99999842000000100"
+   id="rect4955"
+   width="52"
+   height="40"
+   x="19.999998"
+   y="25.999998"
+   ry="0" /></svg>
\ No newline at end of file
diff --git a/misc/icons/source/tool-rectangle.svg b/misc/icons/source/tool-rectangle.svg
new file mode 100644
index 00000000..4b5e0ed3
--- /dev/null
+++ b/misc/icons/source/tool-rectangle.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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="Layer_1"
+   x="0px"
+   y="0px"
+   width="92"
+   height="92"
+   viewBox="0 0 91.999998 91.999998"
+   enable-background="new 0 0 99.997 69.373"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="tool-rectangle.svg"
+   inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\tool-rectangle.png"
+   inkscape:export-xdpi="45"
+   inkscape:export-ydpi="45"><metadata
+   id="metadata9"><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="defs7" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1148"
+   id="namedview5"
+   showgrid="false"
+   inkscape:zoom="4"
+   inkscape:cx="26.605336"
+   inkscape:cy="30.85662"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1" />
+
+<rect
+   style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.99999942999999990;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:11.99999842000000100"
+   id="rect4955"
+   width="52"
+   height="40"
+   x="19.999998"
+   y="25.999998"
+   ry="0" /></svg>
\ No newline at end of file
diff --git a/misc/icons/source/tool-rotate.svg b/misc/icons/source/tool-rotate.svg
new file mode 100644
index 00000000..45e4e493
--- /dev/null
+++ b/misc/icons/source/tool-rotate.svg
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="92"
+   height="92"
+   viewBox="0 0 91.999997 92"
+   enable-background="new 0 0 89.231 100"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="tool-rotate.svg"
+   inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\tool-rotate.png"
+   inkscape:export-xdpi="45"
+   inkscape:export-ydpi="45"><metadata
+   id="metadata15"><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="defs13" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1148"
+   id="namedview11"
+   showgrid="false"
+   inkscape:zoom="7.75"
+   inkscape:cx="25.222341"
+   inkscape:cy="47.301719"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1" />
+
+
+
+<g
+   id="g3760"
+   transform="matrix(0.97677741,0,0,0.97203982,-1.3552542,0.87380042)"
+   style="fill:#ff00ff;fill-opacity:1"><path
+     style="fill:#ff00ff;fill-opacity:1"
+     inkscape:connector-curvature="0"
+     id="path3"
+     d="m 29.229405,55.37008 c -0.387431,-1.333059 -0.642506,-2.72161 -0.738881,-4.152895 h -8.675106 c 0.115651,2.460738 0.552554,4.838559 1.260594,7.099021 l 8.153393,-2.946126 z" /><path
+     style="fill:#ff00ff;fill-opacity:1"
+     inkscape:connector-curvature="0"
+     id="path5"
+     d="m 29.023802,70.783821 5.579515,-6.601516 c -1.862622,-1.780814 -3.387929,-3.907969 -4.44999,-6.287065 l -8.152106,2.946124 c 1.604978,3.800815 4.017584,7.185766 7.022581,9.942457 z" /><path
+     style="fill:#ff00ff;fill-opacity:1"
+     inkscape:connector-curvature="0"
+     id="path7"
+     d="m 47.110967,69.703978 c -3.887799,-0.260871 -7.469766,-1.6322 -10.437498,-3.790608 l -5.577588,6.598963 c 4.487901,3.403448 10.011517,5.524225 16.015086,5.803594 v -8.611949 z" /><path
+     style="fill:#ff00ff;fill-opacity:1;stroke:none"
+     inkscape:connector-curvature="0"
+     id="path9"
+     d="M 48.464084,21.400659 V 14.532532 L 28.981398,25.698341 48.464084,36.86415 v -6.867489 c 11.042093,0 20.024317,8.91683 20.024317,19.877897 0,10.509484 -8.258763,19.134189 -18.671845,19.828145 v 8.611948 c 15.190751,-0.703524 27.330245,-13.189635 27.330245,-28.440093 0,-15.700763 -12.86681,-28.473899 -28.682717,-28.473899 z" /></g>
+</svg>
\ No newline at end of file
diff --git a/misc/icons/source/tool-shape-select.svg b/misc/icons/source/tool-shape-select.svg
new file mode 100644
index 00000000..05c8771f
--- /dev/null
+++ b/misc/icons/source/tool-shape-select.svg
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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="Layer_1"
+   x="0px"
+   y="0px"
+   width="92"
+   height="92"
+   viewBox="0 0 91.999998 91.999998"
+   enable-background="new 0 0 99.997 69.373"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="tool-shape-select.svg"
+   inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\tool-shape-select@2x.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"><metadata
+   id="metadata9"><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="defs7" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1148"
+   id="namedview5"
+   showgrid="false"
+   inkscape:zoom="8.9380977"
+   inkscape:cx="27.470446"
+   inkscape:cy="50.702772"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1" />
+
+<path
+   style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+   d="M 54.920882,32.150851 23.207014,63.864718 c 0,0 -1.426625,3.647594 -0.07284,5.00138 1.353787,1.353786 5.00138,-0.07284 5.00138,-0.07284 L 59.849422,37.07939 c 0,0 1.426626,-3.647593 0.07284,-5.001379 -1.353786,-1.353786 -5.00138,0.07284 -5.00138,0.07284 z m -2.537109,5.074219 c 0,0 1.701964,-0.835146 2.46427,-0.07284 0.762306,0.762306 -0.07284,2.464269 -0.07284,2.464269 l -26.639649,26.63965 c 0,0 -1.701963,0.835146 -2.464269,0.07284 -0.762306,-0.762305 0.07284,-2.464269 0.07284,-2.464269 z"
+   id="rect4410"
+   inkscape:connector-curvature="0"
+   sodipodi:nodetypes="cczcczcczcczcc" /><path
+   style="fill:#ffffff;fill-opacity:1;stroke:none"
+   d="m 65.382992,26.557817 c -1.336351,-1.336351 -4.471336,0.166748 -6.005814,-0.218033 -1.534477,-0.384781 -4.453577,-4.236478 -6.283309,-3.746201 -1.831703,0.490802 -1.319793,5.125457 -2.279435,6.085099 -0.959642,0.959642 -5.574475,0.42791 -6.065277,2.259613 -0.489931,1.828441 2.183735,5.885906 3.389379,8.355208 0.722054,-0.09453 2.337766,-0.97768 2.944081,-1.15367 -0.73009,-1.435268 -3.187641,-4.770069 -2.673349,-5.848283 0.374988,-0.786163 3.947033,-0.639039 4.586495,-1.208781 1.128552,-1.005505 0.773177,-4.374192 1.525211,-4.495337 0.707934,-0.114042 2.902293,2.774661 3.870663,3.017486 0.96837,0.242826 3.452741,-1.187023 4.296078,-0.343686 0.843337,0.843338 -0.580569,3.431867 -0.360871,4.278893 0.219698,0.847026 3.055774,3.098442 2.829356,3.786428 -0.218361,0.663515 -3.192883,0.563861 -4.272837,1.643815 -0.695435,0.695436 -0.769636,4.339534 -1.517872,4.407916 -1.453717,0.132854 -4.096929,-1.820727 -5.436371,-2.460684 -0.181097,0.639037 -0.943635,2.40381 -1.106515,3.009794 1.963642,1.027905 6.397641,3.81721 8.239373,3.323723 1.831703,-0.490805 1.157628,-4.963293 2.259613,-6.065278 1.101986,-1.101986 5.594293,-0.447731 6.085099,-2.279435 0.492898,-1.83952 -3.457532,-5.000578 -3.805664,-6.342773 -0.348133,-1.342195 1.118317,-4.669463 -0.218034,-6.005814 z"
+   id="path4424-1-3"
+   inkscape:connector-curvature="0"
+   sodipodi:nodetypes="sssssccsssssssssccsssss" /></svg>
\ No newline at end of file
diff --git a/misc/icons/source/tool-stroke.svg b/misc/icons/source/tool-stroke.svg
new file mode 100644
index 00000000..a308563d
--- /dev/null
+++ b/misc/icons/source/tool-stroke.svg
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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="Layer_1"
+   x="0px"
+   y="0px"
+   width="92"
+   height="92"
+   viewBox="0 0 91.999998 91.999998"
+   enable-background="new 0 0 99.997 69.373"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="tool-stroke.svg"
+   inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\tool-stroke@2x.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"><metadata
+   id="metadata9"><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="defs7" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1148"
+   id="namedview5"
+   showgrid="false"
+   inkscape:zoom="8.9380977"
+   inkscape:cx="37.407071"
+   inkscape:cy="38.669882"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1" />
+
+<path
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+   d="m 60.176031,20.643724 c -3.835616,0.36759 -11.856527,10.857867 -17.370629,16.371969 -5.691978,5.691977 -16.41943,15.365888 -17.279844,16.856168 -0.521939,0.904026 -0.479769,2.03136 -0.06052,3.177555 -1.352282,2.373827 -3.622367,6.818169 -2.451256,7.989281 1.165641,1.165638 5.573156,-1.07017 7.959017,-2.420996 1.125048,0.403572 2.26219,0.407436 3.177554,-0.121043 1.815751,-1.048322 11.194453,-11.557602 16.886432,-17.24958 5.69198,-5.691982 16.34171,-14.511057 16.34171,-17.733785 0,-3.222729 -3.16664,-6.559029 -6.839306,-6.869569 -0.114767,-0.0097 -0.23942,-0.01181 -0.363149,0 z m -0.87761,3.994639 c 2.196331,-0.180739 4.447259,1.638614 4.115689,4.115689 -0.331569,2.477076 -9.339438,9.33944 -14.37465,14.374652 -5.035211,5.035208 -15.20042,16.725125 -16.85617,16.825905 -0.827873,0.0504 -1.887291,-0.554251 -2.723617,-1.392072 -0.836326,-0.83782 -1.426421,-1.915948 -1.361809,-2.723618 0.129222,-1.615339 11.790697,-11.790695 16.825905,-16.825906 5.035212,-5.03521 12.17832,-14.193911 14.374652,-14.37465 z"
+   id="rect4239"
+   inkscape:connector-curvature="0" /><path
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+   d="m 75.999998,58.276962 -1e-6,4.729127 L 22,72.993909 22,68.26478 z"
+   id="rect4265"
+   inkscape:connector-curvature="0"
+   sodipodi:nodetypes="ccccc" /></svg>
\ No newline at end of file
diff --git a/misc/icons/source/tool-vertical-mirror-pen.svg b/misc/icons/source/tool-vertical-mirror-pen.svg
new file mode 100644
index 00000000..3af65f5b
--- /dev/null
+++ b/misc/icons/source/tool-vertical-mirror-pen.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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="Layer_1"
+   x="0px"
+   y="0px"
+   width="92"
+   height="92"
+   viewBox="0 0 91.999998 91.999998"
+   enable-background="new 0 0 99.997 69.373"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="tool-vertical-mirror-pen.svg"
+   inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\tool-vertical-mirror-pen@2x.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"><metadata
+   id="metadata9"><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="defs7" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1148"
+   id="namedview5"
+   showgrid="false"
+   inkscape:zoom="25.280758"
+   inkscape:cx="20.79507"
+   inkscape:cy="40.704496"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1" />
+
+<path
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+   d="m 74.147874,33.437461 c -3.116508,0.298674 -9.633644,8.822215 -14.113953,13.302523 -4.624835,4.624835 -13.341085,12.485064 -14.040187,13.695944 -0.424085,0.734537 -0.389821,1.650516 -0.04918,2.581821 -1.098755,1.928777 -2.943239,5.539886 -1.991691,6.491435 0.947104,0.947103 4.528291,-0.869532 6.466846,-1.967102 0.914122,0.327909 1.838071,0.331049 2.581821,-0.09835 C 54.47686,66.591951 62.097227,58.05297 66.722063,53.428134 71.3469,48.803295 80,41.637637 80,39.019111 c 0,-2.618526 -2.572953,-5.32933 -5.557061,-5.58165 -0.09325,-0.0079 -0.194533,-0.0096 -0.295065,0 z m -0.713075,3.245717 c 1.78456,-0.146854 3.613479,1.331404 3.344073,3.344073 -0.269406,2.012669 -7.588463,7.588464 -11.679665,11.679665 -4.0912,4.091199 -12.350617,13.589469 -13.695944,13.671355 -0.672663,0.04095 -1.533459,-0.450339 -2.212989,-1.131084 -0.67953,-0.680744 -1.158993,-1.556742 -1.106495,-2.212989 0.104996,-1.312492 9.580156,-9.580155 13.671355,-13.671355 4.091201,-4.0912 9.895106,-11.532811 11.679665,-11.679665 z"
+   id="rect4239"
+   inkscape:connector-curvature="0" /><rect
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+   id="rect4265"
+   width="2"
+   height="46"
+   x="40"
+   y="23.999998" /><path
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+   d="m 16,40.5 0,3.53125 c 0.668196,0.747265 1.343957,1.47661 2,2.1875 l 0,-3.5 C 17.334196,41.980953 16.672286,41.237627 16,40.5 z m 4,4.40625 0,3.4375 c 0.07838,0.07933 0.17283,0.17283 0.25,0.25 0.466813,0.466813 1.165263,1.128823 1.75,1.6875 L 22,47 c -0.0091,-0.0091 -0.02215,-0.02215 -0.03125,-0.03125 C 21.348779,46.348779 20.684806,45.64672 20,44.90625 z m 4,4.03125 0,3.25 c 4.411652,4.129245 9.82685,9.069965 9.90625,10.0625 0.0525,0.656247 -0.41422,1.538006 -1.09375,2.21875 -0.67953,0.680745 -1.546087,1.16595 -2.21875,1.125 C 29.855961,65.548843 27.044135,62.675924 24,59.4375 l 0,3.3125 c 2.318478,2.442406 4.332418,4.520822 5,4.90625 0.74375,0.429399 1.679628,0.452909 2.59375,0.125 1.938555,1.09757 5.521646,2.915853 6.46875,1.96875 0.951548,-0.951549 -0.901245,-4.571223 -2,-6.5 C 36.403141,62.318695 36.424085,61.390787 36,60.65625 35.388974,59.597921 28.773513,53.553442 24,48.9375 z m -8,2.125 0,3.34375 c 0.610208,0.620055 1.329046,1.362485 2,2.0625 L 18,53.0625 C 17.658021,52.708645 17.207531,52.238781 16.90625,51.9375 16.627819,51.659069 16.304394,51.353142 16,51.0625 z m 4,4.09375 0,3.375 c 0.703913,0.74332 1.306814,1.389628 2,2.125 l 0,-3.34375 c -0.676013,-0.725237 -1.35513,-1.468855 -2,-2.15625 z"
+   id="rect4239-7"
+   inkscape:connector-curvature="0"
+   sodipodi:nodetypes="cccccccsccscccsscccscscscccccscccccc" /></svg>
\ No newline at end of file
diff --git a/src/img/icons/common/common-keyboard-gold.png b/src/img/icons/common/common-keyboard-gold.png
index c765e6d6..f2173c76 100644
Binary files a/src/img/icons/common/common-keyboard-gold.png and b/src/img/icons/common/common-keyboard-gold.png differ
diff --git a/src/img/icons/common/common-keyboard-gold@2x.png b/src/img/icons/common/common-keyboard-gold@2x.png
new file mode 100644
index 00000000..c647658d
Binary files /dev/null and b/src/img/icons/common/common-keyboard-gold@2x.png differ
diff --git a/src/img/icons/common/common-swapcolors-arrow-grey.png b/src/img/icons/common/common-swapcolors-arrow-grey.png
index d8b57c3f..e80406a6 100644
Binary files a/src/img/icons/common/common-swapcolors-arrow-grey.png and b/src/img/icons/common/common-swapcolors-arrow-grey.png differ
diff --git a/src/img/icons/common/common-swapcolors-arrow-grey@2x.png b/src/img/icons/common/common-swapcolors-arrow-grey@2x.png
new file mode 100644
index 00000000..ea1b4242
Binary files /dev/null and b/src/img/icons/common/common-swapcolors-arrow-grey@2x.png differ
diff --git a/src/img/icons/frame/frame-dragndrop-white.png b/src/img/icons/frame/frame-dragndrop-white.png
index 22c620db..e6515b62 100644
Binary files a/src/img/icons/frame/frame-dragndrop-white.png and b/src/img/icons/frame/frame-dragndrop-white.png differ
diff --git a/src/img/icons/frame/frame-dragndrop-white@2x.png b/src/img/icons/frame/frame-dragndrop-white@2x.png
new file mode 100644
index 00000000..c1011816
Binary files /dev/null and b/src/img/icons/frame/frame-dragndrop-white@2x.png differ
diff --git a/src/img/icons/frame/frame-duplicate-white.png b/src/img/icons/frame/frame-duplicate-white.png
index 0795aeb7..6ec8948d 100644
Binary files a/src/img/icons/frame/frame-duplicate-white.png and b/src/img/icons/frame/frame-duplicate-white.png differ
diff --git a/src/img/icons/frame/frame-duplicate-white@2x.png b/src/img/icons/frame/frame-duplicate-white@2x.png
new file mode 100644
index 00000000..d6c28c6e
Binary files /dev/null and b/src/img/icons/frame/frame-duplicate-white@2x.png differ
diff --git a/src/img/icons/frame/frame-plus-white.png b/src/img/icons/frame/frame-plus-white.png
index 2a4104ce..5227e9cf 100644
Binary files a/src/img/icons/frame/frame-plus-white.png and b/src/img/icons/frame/frame-plus-white.png differ
diff --git a/src/img/icons/frame/frame-plus-white@2x.png b/src/img/icons/frame/frame-plus-white@2x.png
new file mode 100644
index 00000000..090f9a6a
Binary files /dev/null and b/src/img/icons/frame/frame-plus-white@2x.png differ
diff --git a/src/img/icons/frame/frame-recyclebin-white.png b/src/img/icons/frame/frame-recyclebin-white.png
index 8554e55a..98a6e4ea 100644
Binary files a/src/img/icons/frame/frame-recyclebin-white.png and b/src/img/icons/frame/frame-recyclebin-white.png differ
diff --git a/src/img/icons/frame/frame-recyclebin-white@2x.png b/src/img/icons/frame/frame-recyclebin-white@2x.png
new file mode 100644
index 00000000..1ed1955f
Binary files /dev/null and b/src/img/icons/frame/frame-recyclebin-white@2x.png differ
diff --git a/src/img/icons/minimap/minimap-popup-preview-arrow-gold.png b/src/img/icons/minimap/minimap-popup-preview-arrow-gold.png
index c437ae00..f2aeb33d 100644
Binary files a/src/img/icons/minimap/minimap-popup-preview-arrow-gold.png and b/src/img/icons/minimap/minimap-popup-preview-arrow-gold.png differ
diff --git a/src/img/icons/minimap/minimap-popup-preview-arrow-gold@2x.png b/src/img/icons/minimap/minimap-popup-preview-arrow-gold@2x.png
new file mode 100644
index 00000000..648c3e84
Binary files /dev/null and b/src/img/icons/minimap/minimap-popup-preview-arrow-gold@2x.png differ
diff --git a/src/img/icons/minimap/minimap-popup-preview-arrow-white.png b/src/img/icons/minimap/minimap-popup-preview-arrow-white.png
index b97bd38b..4afa0e5d 100644
Binary files a/src/img/icons/minimap/minimap-popup-preview-arrow-white.png and b/src/img/icons/minimap/minimap-popup-preview-arrow-white.png differ
diff --git a/src/img/icons/minimap/minimap-popup-preview-arrow-white@2x.png b/src/img/icons/minimap/minimap-popup-preview-arrow-white@2x.png
new file mode 100644
index 00000000..6ffe2bf1
Binary files /dev/null and b/src/img/icons/minimap/minimap-popup-preview-arrow-white@2x.png differ
diff --git a/src/img/icons/settings/settings-export-white.png b/src/img/icons/settings/settings-export-white.png
index b869cd09..45d76e67 100644
Binary files a/src/img/icons/settings/settings-export-white.png and b/src/img/icons/settings/settings-export-white.png differ
diff --git a/src/img/icons/settings/settings-export-white@2x.png b/src/img/icons/settings/settings-export-white@2x.png
new file mode 100644
index 00000000..5c9f5d94
Binary files /dev/null and b/src/img/icons/settings/settings-export-white@2x.png differ
diff --git a/src/img/icons/settings/settings-gear-white.png b/src/img/icons/settings/settings-gear-white.png
index 1c638b6f..267daa67 100644
Binary files a/src/img/icons/settings/settings-gear-white.png and b/src/img/icons/settings/settings-gear-white.png differ
diff --git a/src/img/icons/settings/settings-gear-white@2x.png b/src/img/icons/settings/settings-gear-white@2x.png
new file mode 100644
index 00000000..b874fc52
Binary files /dev/null and b/src/img/icons/settings/settings-gear-white@2x.png differ
diff --git a/src/img/icons/settings/settings-open-folder-white.png b/src/img/icons/settings/settings-open-folder-white.png
index 3630df10..fd68fbf4 100644
Binary files a/src/img/icons/settings/settings-open-folder-white.png and b/src/img/icons/settings/settings-open-folder-white.png differ
diff --git a/src/img/icons/settings/settings-open-folder-white@2x.png b/src/img/icons/settings/settings-open-folder-white@2x.png
new file mode 100644
index 00000000..0a1fb21d
Binary files /dev/null and b/src/img/icons/settings/settings-open-folder-white@2x.png differ
diff --git a/src/img/icons/settings/settings-resize-white.png b/src/img/icons/settings/settings-resize-white.png
index f2f17eaf..f85cae21 100644
Binary files a/src/img/icons/settings/settings-resize-white.png and b/src/img/icons/settings/settings-resize-white.png differ
diff --git a/src/img/icons/settings/settings-resize-white@2x.png b/src/img/icons/settings/settings-resize-white@2x.png
new file mode 100644
index 00000000..2db490a8
Binary files /dev/null and b/src/img/icons/settings/settings-resize-white@2x.png differ
diff --git a/src/img/icons/settings/settings-save-white.png b/src/img/icons/settings/settings-save-white.png
index d8dfeadd..bf131536 100644
Binary files a/src/img/icons/settings/settings-save-white.png and b/src/img/icons/settings/settings-save-white.png differ
diff --git a/src/img/icons/settings/settings-save-white@2x.png b/src/img/icons/settings/settings-save-white@2x.png
new file mode 100644
index 00000000..1b514ed3
Binary files /dev/null and b/src/img/icons/settings/settings-save-white@2x.png differ
diff --git a/src/img/icons/tools/tool-circle.png b/src/img/icons/tools/tool-circle.png
index 7f4dbd97..52a14811 100644
Binary files a/src/img/icons/tools/tool-circle.png and b/src/img/icons/tools/tool-circle.png differ
diff --git a/src/img/icons/tools/tool-circle@2x.png b/src/img/icons/tools/tool-circle@2x.png
new file mode 100644
index 00000000..524de8b1
Binary files /dev/null and b/src/img/icons/tools/tool-circle@2x.png differ
diff --git a/src/img/icons/tools/tool-colorpicker.png b/src/img/icons/tools/tool-colorpicker.png
index fe4cbcb8..59090d0e 100644
Binary files a/src/img/icons/tools/tool-colorpicker.png and b/src/img/icons/tools/tool-colorpicker.png differ
diff --git a/src/img/icons/tools/tool-colorpicker@2x.png b/src/img/icons/tools/tool-colorpicker@2x.png
new file mode 100644
index 00000000..bebff88b
Binary files /dev/null and b/src/img/icons/tools/tool-colorpicker@2x.png differ
diff --git a/src/img/icons/tools/tool-colorswap.png b/src/img/icons/tools/tool-colorswap.png
index ac316bc2..778a53d3 100644
Binary files a/src/img/icons/tools/tool-colorswap.png and b/src/img/icons/tools/tool-colorswap.png differ
diff --git a/src/img/icons/tools/tool-colorswap@2x.png b/src/img/icons/tools/tool-colorswap@2x.png
new file mode 100644
index 00000000..91a95860
Binary files /dev/null and b/src/img/icons/tools/tool-colorswap@2x.png differ
diff --git a/src/img/icons/tools/tool-dithering.png b/src/img/icons/tools/tool-dithering.png
index 7290eb86..00180e69 100644
Binary files a/src/img/icons/tools/tool-dithering.png and b/src/img/icons/tools/tool-dithering.png differ
diff --git a/src/img/icons/tools/tool-dithering@2x.png b/src/img/icons/tools/tool-dithering@2x.png
new file mode 100644
index 00000000..2eafde8e
Binary files /dev/null and b/src/img/icons/tools/tool-dithering@2x.png differ
diff --git a/src/img/icons/tools/tool-eraser.png b/src/img/icons/tools/tool-eraser.png
index 88fa7583..263a9c04 100644
Binary files a/src/img/icons/tools/tool-eraser.png and b/src/img/icons/tools/tool-eraser.png differ
diff --git a/src/img/icons/tools/tool-eraser@2x.png b/src/img/icons/tools/tool-eraser@2x.png
new file mode 100644
index 00000000..1fc02334
Binary files /dev/null and b/src/img/icons/tools/tool-eraser@2x.png differ
diff --git a/src/img/icons/tools/tool-lasso-select.png b/src/img/icons/tools/tool-lasso-select.png
index 0e9abc14..cd8d04df 100644
Binary files a/src/img/icons/tools/tool-lasso-select.png and b/src/img/icons/tools/tool-lasso-select.png differ
diff --git a/src/img/icons/tools/tool-lasso-select@2x.png b/src/img/icons/tools/tool-lasso-select@2x.png
new file mode 100644
index 00000000..39e3359b
Binary files /dev/null and b/src/img/icons/tools/tool-lasso-select@2x.png differ
diff --git a/src/img/icons/tools/tool-lighten.png b/src/img/icons/tools/tool-lighten.png
index 4a3a993e..74a2ef42 100644
Binary files a/src/img/icons/tools/tool-lighten.png and b/src/img/icons/tools/tool-lighten.png differ
diff --git a/src/img/icons/tools/tool-lighten@2x.png b/src/img/icons/tools/tool-lighten@2x.png
new file mode 100644
index 00000000..c45feacc
Binary files /dev/null and b/src/img/icons/tools/tool-lighten@2x.png differ
diff --git a/src/img/icons/tools/tool-move.png b/src/img/icons/tools/tool-move.png
index 7911e1a7..91816987 100644
Binary files a/src/img/icons/tools/tool-move.png and b/src/img/icons/tools/tool-move.png differ
diff --git a/src/img/icons/tools/tool-move@2x.png b/src/img/icons/tools/tool-move@2x.png
new file mode 100644
index 00000000..78fcc514
Binary files /dev/null and b/src/img/icons/tools/tool-move@2x.png differ
diff --git a/src/img/icons/tools/tool-paint-bucket.png b/src/img/icons/tools/tool-paint-bucket.png
index cea3ed36..c3dbd17a 100644
Binary files a/src/img/icons/tools/tool-paint-bucket.png and b/src/img/icons/tools/tool-paint-bucket.png differ
diff --git a/src/img/icons/tools/tool-paint-bucket@2x.png b/src/img/icons/tools/tool-paint-bucket@2x.png
new file mode 100644
index 00000000..aafd114a
Binary files /dev/null and b/src/img/icons/tools/tool-paint-bucket@2x.png differ
diff --git a/src/img/icons/tools/tool-pen.png b/src/img/icons/tools/tool-pen.png
index 6f3a0317..68e3b7e7 100644
Binary files a/src/img/icons/tools/tool-pen.png and b/src/img/icons/tools/tool-pen.png differ
diff --git a/src/img/icons/tools/tool-pen@2x.png b/src/img/icons/tools/tool-pen@2x.png
new file mode 100644
index 00000000..5a8c1569
Binary files /dev/null and b/src/img/icons/tools/tool-pen@2x.png differ
diff --git a/src/img/icons/tools/tool-rectangle-select.png b/src/img/icons/tools/tool-rectangle-select.png
index 421e0f96..a613bd9b 100644
Binary files a/src/img/icons/tools/tool-rectangle-select.png and b/src/img/icons/tools/tool-rectangle-select.png differ
diff --git a/src/img/icons/tools/tool-rectangle-select@2x.png b/src/img/icons/tools/tool-rectangle-select@2x.png
new file mode 100644
index 00000000..cc2e5650
Binary files /dev/null and b/src/img/icons/tools/tool-rectangle-select@2x.png differ
diff --git a/src/img/icons/tools/tool-rectangle.png b/src/img/icons/tools/tool-rectangle.png
index 3fa778d3..a2d43856 100644
Binary files a/src/img/icons/tools/tool-rectangle.png and b/src/img/icons/tools/tool-rectangle.png differ
diff --git a/src/img/icons/tools/tool-rectangle@2x.png b/src/img/icons/tools/tool-rectangle@2x.png
new file mode 100644
index 00000000..b1897a13
Binary files /dev/null and b/src/img/icons/tools/tool-rectangle@2x.png differ
diff --git a/src/img/icons/tools/tool-shape-select.png b/src/img/icons/tools/tool-shape-select.png
index 10da42f1..2c7ed31b 100644
Binary files a/src/img/icons/tools/tool-shape-select.png and b/src/img/icons/tools/tool-shape-select.png differ
diff --git a/src/img/icons/tools/tool-shape-select@2x.png b/src/img/icons/tools/tool-shape-select@2x.png
new file mode 100644
index 00000000..5430e5b7
Binary files /dev/null and b/src/img/icons/tools/tool-shape-select@2x.png differ
diff --git a/src/img/icons/tools/tool-stroke.png b/src/img/icons/tools/tool-stroke.png
index 39b9bc14..5ae9bf3c 100644
Binary files a/src/img/icons/tools/tool-stroke.png and b/src/img/icons/tools/tool-stroke.png differ
diff --git a/src/img/icons/tools/tool-stroke@2x.png b/src/img/icons/tools/tool-stroke@2x.png
new file mode 100644
index 00000000..86648058
Binary files /dev/null and b/src/img/icons/tools/tool-stroke@2x.png differ
diff --git a/src/img/icons/tools/tool-vertical-mirror-pen.png b/src/img/icons/tools/tool-vertical-mirror-pen.png
index f5ffc49c..618bd5a6 100644
Binary files a/src/img/icons/tools/tool-vertical-mirror-pen.png and b/src/img/icons/tools/tool-vertical-mirror-pen.png differ
diff --git a/src/img/icons/tools/tool-vertical-mirror-pen@2x.png b/src/img/icons/tools/tool-vertical-mirror-pen@2x.png
new file mode 100644
index 00000000..27a29229
Binary files /dev/null and b/src/img/icons/tools/tool-vertical-mirror-pen@2x.png differ
diff --git a/src/img/icons/transform/tool-center.png b/src/img/icons/transform/tool-center.png
index f0b21bb4..8786d162 100644
Binary files a/src/img/icons/transform/tool-center.png and b/src/img/icons/transform/tool-center.png differ
diff --git a/src/img/icons/transform/tool-center@2x.png b/src/img/icons/transform/tool-center@2x.png
new file mode 100644
index 00000000..64ff4e92
Binary files /dev/null and b/src/img/icons/transform/tool-center@2x.png differ
diff --git a/src/img/icons/transform/tool-clone.png b/src/img/icons/transform/tool-clone.png
index 0425befd..03234558 100644
Binary files a/src/img/icons/transform/tool-clone.png and b/src/img/icons/transform/tool-clone.png differ
diff --git a/src/img/icons/transform/tool-clone@2x.png b/src/img/icons/transform/tool-clone@2x.png
new file mode 100644
index 00000000..8f265323
Binary files /dev/null and b/src/img/icons/transform/tool-clone@2x.png differ
diff --git a/src/img/icons/transform/tool-flip.png b/src/img/icons/transform/tool-flip.png
index 4df04b16..8369b2b4 100644
Binary files a/src/img/icons/transform/tool-flip.png and b/src/img/icons/transform/tool-flip.png differ
diff --git a/src/img/icons/transform/tool-flip@2x.png b/src/img/icons/transform/tool-flip@2x.png
new file mode 100644
index 00000000..ace55c60
Binary files /dev/null and b/src/img/icons/transform/tool-flip@2x.png differ
diff --git a/src/img/icons/transform/tool-rotate.png b/src/img/icons/transform/tool-rotate.png
index 986837a8..20ee6374 100644
Binary files a/src/img/icons/transform/tool-rotate.png and b/src/img/icons/transform/tool-rotate.png differ
diff --git a/src/img/icons/transform/tool-rotate@2x.png b/src/img/icons/transform/tool-rotate@2x.png
new file mode 100644
index 00000000..af99739a
Binary files /dev/null and b/src/img/icons/transform/tool-rotate@2x.png differ
diff --git a/src/img/icons@2x.png b/src/img/icons@2x.png
new file mode 100644
index 00000000..00275b74
Binary files /dev/null and b/src/img/icons@2x.png differ