From 81ba8fd9fa0e2fbbee1ef3534a96104de4cd7079 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@sugarlabs.org>
Date: Wed, 17 Mar 2010 18:39:20 +0000
Subject: Merge branch 'master' of git://git.sugarlabs.org/turtleart/refactoring

Conflicts:
	NEWS
	activity/activity.info
	tagplay.py
	tawindow.py
---
(limited to 'icons')

diff --git a/icons/UCB-save.svg b/icons/UCB-save.svg
deleted file mode 100644
index 08fb9e8..0000000
--- a/icons/UCB-save.svg
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-	<!ENTITY stroke_color "#ffffff">
-]>
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.0"
-   width="55"
-   height="55"
-   viewBox="0 0 55 55"
-   id="svg2"
-   xml:space="preserve">
-<g
-   transform="translate(-0.5507515,-1.7569535)">
-  <line
-   fill="none"
-   stroke="&stroke_color;" 
-   style="stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-   id="line3290"
-   y2="4.9169998"
-   y1="16.188"
-   x2="52.441002"
-   x1="41.169998" />
-  <polyline
-   fill="none"
-   stroke="&stroke_color;"
-   style="stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-   id="polyline3292"
-   points="51.562,15.306 41.17,16.188 42.053,5.794" />
-</g>
-<g
-   transform="translate(-6,2)">
-  <polygon
-   points="10.932,6.088 31.874,6.088 43.818,18.027 43.818,48.914 10.932,48.914 10.932,6.088 "
-   id="polygon9"
-   fill="none"
-   stroke="&stroke_color;" 
-   style="stroke-width:3.5" />
-  <polyline
-   fill="none"
-   stroke="&stroke_color;" 
-   style="stroke-width:3.5"
-   id="polyline11"
-   points="43.818,18.027 31.874,18.027 31.874,6.088" />
-
-  <path
-     d="M 27.379465,42.19975 C 27.102965,42.19975 26.829965,42.18225 26.560965,42.14975 L 27.254965,43.32425 L 27.938965,42.16775 C 27.753465,42.18275 27.568465,42.19975 27.379465,42.19975 z"
-     fill="none"
-     stroke="&stroke_color;" 
-     style="stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-   <g
-     transform="matrix(0.5,0,0,0.5,13.630965,18.06025)"
-     fill="none"
-     stroke="&stroke_color;" 
-     style="stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-    <path
-       d="M 40.16,11.726 C 37.996,11.726 36.202,13.281 35.817,15.333 C 37.676,16.678 39.274,18.448 40.492,20.541 C 42.777,20.369 44.586,18.48 44.586,16.151 C 44.586,13.707 42.604,11.726 40.16,11.726 z"
-       fill="none"
-       stroke="&stroke_color;" 
-       style="stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 40.713,39.887 C 39.489,42.119 37.853,44.018 35.916,45.443 C 36.437,47.307 38.129,48.682 40.16,48.682 C 42.603,48.682 44.586,46.702 44.586,44.258 C 44.586,42.003 42.893,40.162 40.713,39.887 z"
-       fill="none"
-       stroke="&stroke_color;" 
-       style="stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 14.273,39.871 C 12.02,40.077 10.249,41.95 10.249,44.258 C 10.249,46.701 12.229,48.682 14.673,48.682 C 16.737,48.682 18.457,47.262 18.945,45.35 C 17.062,43.934 15.47,42.061 14.273,39.871 z"
-       fill="none"
-       stroke="&stroke_color;" 
-       style="stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 19.026,15.437 C 18.683,13.334 16.872,11.726 14.673,11.726 C 12.229,11.726 10.249,13.707 10.249,16.15 C 10.249,18.532 12.135,20.46 14.494,20.556 C 15.68,18.513 17.226,16.772 19.026,15.437 z"
-       fill="none"
-       stroke="&stroke_color;" 
-       style="stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-   </g>
-   <path
-     d="M 27.379465,24.34175 C 28.333465,24.34175 29.243465,24.54725 30.088465,24.90575 C 30.458965,24.36775 30.677465,23.71725 30.677465,23.01425 C 30.677465,21.17075 29.182965,19.67575 27.338965,19.67575 C 25.495465,19.67575 24.000965,21.17075 24.000965,23.01425 C 24.000965,23.72825 24.226965,24.38875 24.608965,24.93125 C 25.470965,24.55675 26.402465,24.34175 27.379465,24.34175 z"
-     fill="none"
-     stroke="&stroke_color;" 
-     style="stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-   <g
-     transform="matrix(0.5,0,0,0.5,13.630965,18.06025)"
-     fill="none"
-     stroke="&stroke_color;" 
-     style="stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-    <path
-       d="M 43.102,30.421 C 43.102,35.1554 41.4568,39.7008 38.5314,43.0485 C 35.606,46.3963 31.6341,48.279 27.497,48.279 C 23.3599,48.279 19.388,46.3963 16.4626,43.0485 C 13.5372,39.7008 11.892,35.1554 11.892,30.421 C 11.892,20.6244 18.9364,12.563 27.497,12.563 C 36.0576,12.563 43.102,20.6244 43.102,30.421 z"
-       id="path2988"
-       fill="none"
-       stroke="&stroke_color;" 
-       style="stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-   </g>
-   <g
-     transform="matrix(0.5,0,0,0.5,13.630965,18.06025)"
-     fill="none"
-     stroke="&stroke_color;" 
-     style="stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-    <path
-       d="M 25.875,33.75 L 24.333,29.125 L 27.497,26.538 L 31.112,29.164 L 29.625,33.833 L 25.875,33.75 z"
-       fill="none"
-       stroke="&stroke_color;" 
-       style="stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 27.501,41.551 C 23.533,41.391 21.958,39.542 21.958,39.542 L 25.528,35.379 L 29.993,35.547 L 33.125,39.667 C 33.125,39.667 30.235,41.661 27.501,41.551 z"
-       fill="none"
-       stroke="&stroke_color;" 
-       style="stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 18.453,33.843 C 17.604,30.875 18.625,26.959 18.625,26.959 L 22.625,29.126 L 24.118,33.755 L 20.536,37.988 C 20.536,37.987 19.071,35.998 18.453,33.843 z"
-       fill="none"
-       stroke="&stroke_color;" 
-       style="stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 19.458,25.125 C 19.458,25.125 19.958,23.167 22.497,21.303 C 24.734,19.66 26.962,19.583 26.962,19.583 L 26.925,24.564 L 23.404,27.314 L 19.458,25.125 z"
-       id="path2998"
-       fill="none"
-       stroke="&stroke_color;" 
-       style="stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 32.084,27.834 L 28.625,24.959 L 29,19.75 C 29,19.75 30.834,19.708 32.959,21.417 C 35.187,23.208 36.321,26.4 36.321,26.4 L 32.084,27.834 z"
-       fill="none"
-       stroke="&stroke_color;" 
-       style="stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 31.292,34.042 L 32.605,29.578 L 36.792,28.042 C 36.792,28.042 37.469,30.705 36.75,33.709 C 36.21,35.965 34.666,38.07 34.666,38.07 L 31.292,34.042 z"
-       id="path3002"
-       style="stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-   </g>
-</g>
-</svg>
diff --git a/icons/blocksoff.svg b/icons/blocksoff.svg
index 8efee24..560981b 100644
--- a/icons/blocksoff.svg
+++ b/icons/blocksoff.svg
@@ -1,32 +1,96 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    version="1.0"
-   width="45.000004"
-   height="45"
+   width="55"
+   height="55"
    id="svg2">
   <defs
-     id="defs19" />
+     id="defs5">
+    <linearGradient
+       x1="0"
+       y1="22"
+       x2="74"
+       y2="22"
+       id="linearGradient2431"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3333,0,0,0.3333,27.031478,32.193732)" />
+    <linearGradient
+       x1="0"
+       y1="22"
+       x2="74"
+       y2="22"
+       id="linearGradient2428"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3333,0,0,0.3333,27.031478,45.064925)" />
+    <linearGradient
+       x1="0"
+       y1="22"
+       x2="74"
+       y2="22"
+       id="linearGradient3172"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3166">
+      <stop
+         id="stop3168"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3170"
+         style="stop-color:#ffff00;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="0"
+       y1="22"
+       x2="74"
+       y2="22"
+       id="linearGradient2557"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3333,0,0,0.3333,9.2560985,9.9123239)" />
+    <linearGradient
+       x1="0"
+       y1="22"
+       x2="74"
+       y2="22"
+       id="linearGradient2561"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3333,0,0,0.3333,8.962951,22.783517)" />
+    <linearGradient
+       x1="0"
+       y1="22"
+       x2="74"
+       y2="22"
+       id="linearGradient2461"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3333,0,0,0.3333,27.031478,32.193732)" />
+    <linearGradient
+       x1="0"
+       y1="22"
+       x2="74"
+       y2="22"
+       id="linearGradient2463"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3333,0,0,0.3333,27.031478,45.064925)" />
+  </defs>
   <path
-     d="M 0.5,44.502878 L 0.5,30.353117 C 0.81811663,28.149435 1.1818834,25.945754 1.5,23.742073 C 1.9963269,22.444548 2.5036731,21.147023 3,19.849497 C 3.6783755,19.065372 4.3216245,18.281246 5,17.49712 L 39.7494,17.49712 L 42,20.014991 C 42.605837,21.615977 42.894162,23.216963 43.5,24.817948 C 43.777382,27.520068 44.222619,30.222187 44.5,32.924307 L 44.5,44.502878 L 0.5,44.502878 z"
-     id="path4"
-     style="fill:#808080;fill-opacity:1;stroke:#a0a0a0;stroke-width:0.99423993px;stroke-opacity:1" />
+     d="m 31.1663,14.065103 c 5.3328,0 5.3328,0 5.3328,0 0,0 1.377128,0.828768 1.83315,1.3332 0.465777,0.515223 1.16655,1.9998 1.16655,1.9998 l 0,6.332701 c 0,0 -0.738943,1.231094 -1.16655,1.6665 -0.476472,0.485161 -1.83315,1.3332 -1.83315,1.3332 l -5.6661,0 0,0 0,1.333199 -6.666,0 0,-1.333199 -5.6661,0 c 0,0 -1.356677,-0.848039 -1.83315,-1.3332 -0.427607,-0.435406 -1.16655,-1.6665 -1.16655,-1.6665 l 0,-6.332701 c 0,0 0.700773,-1.484577 1.16655,-1.9998 0.456022,-0.504432 1.83315,-1.3332 1.83315,-1.3332 l 5.3328,0 0,1.6665 7.3326,0 0,-1.6665 z"
+     id="path9"
+     style="fill:none;stroke:#ffffff;stroke-width:2.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
   <path
-     d="M 30.875,30.999999 C 30.875,35.624929 27.12538,39.374181 22.5,39.374181 C 17.87462,39.374181 14.125,35.624929 14.125,30.999999 C 14.125,26.37507 17.87462,22.625817 22.5,22.625817 C 27.12538,22.625817 30.875,26.37507 30.875,30.999999 L 30.875,30.999999 z"
-     id="path27"
-     style="fill:#404040;fill-opacity:1;stroke:#404040;stroke-width:1px;stroke-opacity:1" />
-  <text
-     x="-50.760925"
-     y="-462.48117"
-     transform="scale(0.9850096,1.0152185)"
-     id="text29"
-     style="font-size:12.18262196px;font-weight:bold;font-family:Bitstream Vera Sans">
-    <tspan
-       x="18.273933"
-       y="34.975887"
-       id="tspan31"
-       style="font-size:12.18262196px;font-weight:bold;fill:#ffffff">X</tspan>
-  </text>
+     d="m 31.1663,26.936297 c 5.3328,0 5.3328,0 5.3328,0 0,0 1.377128,0.828767 1.83315,1.333199 0.465777,0.515223 1.16655,1.9998 1.16655,1.9998 l 0,6.332701 c 0,0 -0.738943,1.231095 -1.16655,1.666499 -0.476472,0.485162 -1.83315,1.333201 -1.83315,1.333201 l -5.6661,0 0,0 0,1.3332 -6.666,0 0,-1.3332 -5.6661,0 c 0,0 -1.356677,-0.848039 -1.83315,-1.333201 -0.427607,-0.435404 -1.16655,-1.666499 -1.16655,-1.666499 l 0,-6.332701 c 0,0 0.700773,-1.484577 1.16655,-1.9998 0.456022,-0.504432 1.83315,-1.333199 1.83315,-1.333199 l 5.3328,0 0,1.666499 7.3326,0 0,-1.666499 z"
+     id="path2559"
+     style="fill:none;stroke:#ffffff;stroke-width:2.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
 </svg>
diff --git a/icons/blockson.svg b/icons/blockson.svg
index be6b729..df19fdb 100644
--- a/icons/blockson.svg
+++ b/icons/blockson.svg
@@ -1,34 +1,108 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    version="1.0"
-   width="45.000004"
-   height="45"
+   width="55"
+   height="55"
    id="svg2">
   <defs
-     id="defs19" />
-  <path
-     d="M 0.5,44.502878 L 0.5,30.353117 C 0.81811663,28.149435 1.1818834,25.945754 1.5,23.742073 C 1.9963269,22.444548 2.5036731,21.147023 3,19.849497 C 3.6783755,19.065372 4.3216245,18.281246 5,17.49712 L 39.7494,17.49712 L 42,20.014991 C 42.605837,21.615977 42.894162,23.216963 43.5,24.817948 C 43.777382,27.520068 44.222619,30.222187 44.5,32.924307 L 44.5,44.502878 L 0.5,44.502878 z"
-     id="path4"
-     style="fill:#ffd000;fill-opacity:1;stroke:#e0a000;stroke-width:0.99423993px;stroke-opacity:1" />
+     id="defs5">
+    <linearGradient
+       x1="0"
+       y1="22"
+       x2="74"
+       y2="22"
+       id="linearGradient2431"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3333,0,0,0.3333,27.031478,32.193732)" />
+    <linearGradient
+       x1="0"
+       y1="22"
+       x2="74"
+       y2="22"
+       id="linearGradient2428"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3333,0,0,0.3333,27.031478,45.064925)" />
+    <linearGradient
+       x1="0"
+       y1="22"
+       x2="74"
+       y2="22"
+       id="linearGradient3172"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3166">
+      <stop
+         id="stop3168"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3170"
+         style="stop-color:#ffff00;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="0"
+       y1="22"
+       x2="74"
+       y2="22"
+       id="linearGradient2557"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3333,0,0,0.3333,9.2560985,9.9123239)" />
+    <linearGradient
+       x1="0"
+       y1="22"
+       x2="74"
+       y2="22"
+       id="linearGradient2561"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3333,0,0,0.3333,8.962951,22.783517)" />
+    <linearGradient
+       x1="0"
+       y1="22"
+       x2="74"
+       y2="22"
+       id="linearGradient2461"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3333,0,0,0.3333,27.031478,32.193732)" />
+    <linearGradient
+       x1="0"
+       y1="22"
+       x2="74"
+       y2="22"
+       id="linearGradient2463"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3333,0,0,0.3333,27.031478,45.064925)" />
+  </defs>
+  <rect
+     width="55"
+     height="55"
+     rx="0"
+     x="0"
+     y="0"
+     id="rect2839"
+     style="fill:#ffd200;fill-opacity:1;fill-rule:evenodd;stroke:none" />
   <g
-     transform="matrix(1,0,0,1.0306686,-108,16.956129)"
-     id="g6">
+     transform="translate(-11.863578,-18.461929)"
+     id="g2457">
     <path
-       d="M 79.5,438.375 C 79.5,442.86231 75.750385,446.5 71.125,446.5 C 66.499615,446.5 62.75,442.86231 62.75,438.375 C 62.75,433.88769 66.499615,430.25 71.125,430.25 C 75.750385,430.25 79.5,433.88769 79.5,438.375 L 79.5,438.375 z"
-       transform="translate(59.375,-424.74902)"
-       id="path8"
-       style="fill:#00e000;fill-opacity:1;stroke:#00e000;stroke-width:0.98500961;stroke-opacity:1" />
-    <text
-       id="text10"
-       style="font-size:12px;font-weight:bold;font-family:Bitstream Vera Sans">
-      <tspan
-         x="125.5"
-         y="17.5"
-         id="tspan12"
-         style="font-size:12px;font-weight:bold;fill:#ffffff;font-family:Bitstream Vera Sans">+</tspan>
-    </text>
+       d="m 43.029878,32.527032 c 5.3328,0 5.3328,0 5.3328,0 0,0 1.377128,0.828768 1.83315,1.3332 0.465777,0.515223 1.16655,1.9998 1.16655,1.9998 l 0,6.332701 c 0,0 -0.738943,1.231094 -1.16655,1.6665 -0.476472,0.485161 -1.83315,1.3332 -1.83315,1.3332 l -5.6661,0 0,0 0,1.333199 -6.666,0 0,-1.333199 -5.6661,0 c 0,0 -1.356677,-0.848039 -1.83315,-1.3332 -0.427607,-0.435406 -1.16655,-1.6665 -1.16655,-1.6665 l 0,-6.332701 c 0,0 0.700773,-1.484577 1.16655,-1.9998 0.456022,-0.504432 1.83315,-1.3332 1.83315,-1.3332 l 5.3328,0 0,1.6665 7.3326,0 0,-1.6665 z"
+       id="path9"
+       style="fill:url(#linearGradient2461);fill-opacity:1;stroke:#c0a000;stroke-width:0.66659999;stroke-opacity:1" />
+    <path
+       d="m 43.029878,45.398226 c 5.3328,0 5.3328,0 5.3328,0 0,0 1.377128,0.828767 1.83315,1.333199 0.465777,0.515223 1.16655,1.9998 1.16655,1.9998 l 0,6.332701 c 0,0 -0.738943,1.231095 -1.16655,1.666499 -0.476472,0.485162 -1.83315,1.333201 -1.83315,1.333201 l -5.6661,0 0,0 0,1.3332 -6.666,0 0,-1.3332 -5.6661,0 c 0,0 -1.356677,-0.848039 -1.83315,-1.333201 -0.427607,-0.435404 -1.16655,-1.666499 -1.16655,-1.666499 l 0,-6.332701 c 0,0 0.700773,-1.484577 1.16655,-1.9998 0.456022,-0.504432 1.83315,-1.333199 1.83315,-1.333199 l 5.3328,0 0,1.666499 7.3326,0 0,-1.666499 z"
+       id="path2559"
+       style="fill:url(#linearGradient2463);fill-opacity:1;stroke:#c0a000;stroke-width:0.66659999;stroke-opacity:1" />
   </g>
 </svg>
diff --git a/icons/colorsoff.svg b/icons/colorsoff.svg
new file mode 100644
index 0000000..b542d6b
--- /dev/null
+++ b/icons/colorsoff.svg
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="55"
+   height="55"
+   id="svg2">
+  <defs
+     id="defs5" />
+  <path
+     d="m 17.245763,13.050847 a 2.9131355,3.0296609 0 1 1 -5.826271,0 2.9131355,3.0296609 0 1 1 5.826271,0 z"
+     transform="matrix(1.2080617,0,0,1.1615978,-2.8452066,0.4706725)"
+     id="path2824"
+     style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:2.5;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     d="m 17.245763,13.050847 a 2.9131355,3.0296609 0 1 1 -5.826271,0 2.9131355,3.0296609 0 1 1 5.826271,0 z"
+     transform="matrix(1.2080617,0,0,1.1615978,13.785302,8.1401646)"
+     id="path2824-4"
+     style="fill:#ff00ff;fill-opacity:1;fill-rule:evenodd;stroke:#ff00ff;stroke-width:2.5;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     d="m 17.245763,13.050847 a 2.9131355,3.0296609 0 1 1 -5.826271,0 2.9131355,3.0296609 0 1 1 5.826271,0 z"
+     transform="matrix(1.2080617,0,0,1.1615978,3.185302,13.640165)"
+     id="path2824-6"
+     style="fill:#00ff00;fill-opacity:1;fill-rule:evenodd;stroke:#00ff00;stroke-width:2.5;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     d="m 17.245763,13.050847 a 2.9131355,3.0296609 0 1 1 -5.826271,0 2.9131355,3.0296609 0 1 1 5.826271,0 z"
+     transform="matrix(1.2080617,0,0,1.1615978,23.985302,19.740165)"
+     id="path2824-69"
+     style="fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:2.5;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     d="m 17.245763,13.050847 a 2.9131355,3.0296609 0 1 1 -5.826271,0 2.9131355,3.0296609 0 1 1 5.826271,0 z"
+     transform="matrix(1.2080617,0,0,1.1615978,9.085302,26.940165)"
+     id="path2824-7"
+     style="fill:#ffd000;fill-opacity:1;fill-rule:evenodd;stroke:#ffd000;stroke-width:2.5;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     d="m 17.245763,13.050847 a 2.9131355,3.0296609 0 1 1 -5.826271,0 2.9131355,3.0296609 0 1 1 5.826271,0 z"
+     transform="matrix(1.2080617,0,0,1.1615978,20.485302,-2.2598352)"
+     id="path2824-5"
+     style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#ffff00;stroke-width:2.5;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     d="m 17.245763,13.050847 a 2.9131355,3.0296609 0 1 1 -5.826271,0 2.9131355,3.0296609 0 1 1 5.826271,0 z"
+     transform="matrix(1.2080617,0,0,1.1615978,-3.6146981,22.540165)"
+     id="path2824-54"
+     style="fill:#00ffff;fill-opacity:1;fill-rule:evenodd;stroke:#00ffff;stroke-width:2.5;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+</svg>
diff --git a/icons/colorson.svg b/icons/colorson.svg
new file mode 100644
index 0000000..9cd4ef1
--- /dev/null
+++ b/icons/colorson.svg
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="55"
+   height="55"
+   id="svg2">
+  <defs
+     id="defs5" />
+  <rect
+     width="55"
+     height="55"
+     rx="0"
+     x="0"
+     y="0"
+     id="rect2839"
+     style="fill:#ffd200;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+  <g
+     id="g3702">
+    <path
+       d="m 17.245763,13.050847 a 2.9131355,3.0296609 0 1 1 -5.826271,0 2.9131355,3.0296609 0 1 1 5.826271,0 z"
+       transform="matrix(1.2080617,0,0,1.1615978,-2.8452066,0.4706725)"
+       id="path2824"
+       style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:2.5;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 17.245763,13.050847 a 2.9131355,3.0296609 0 1 1 -5.826271,0 2.9131355,3.0296609 0 1 1 5.826271,0 z"
+       transform="matrix(1.2080617,0,0,1.1615978,13.785302,8.1401646)"
+       id="path2824-4"
+       style="fill:#ff00ff;fill-opacity:1;fill-rule:evenodd;stroke:#ff00ff;stroke-width:2.5;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 17.245763,13.050847 a 2.9131355,3.0296609 0 1 1 -5.826271,0 2.9131355,3.0296609 0 1 1 5.826271,0 z"
+       transform="matrix(1.2080617,0,0,1.1615978,3.185302,13.640165)"
+       id="path2824-6"
+       style="fill:#00ff00;fill-opacity:1;fill-rule:evenodd;stroke:#00ff00;stroke-width:2.5;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 17.245763,13.050847 a 2.9131355,3.0296609 0 1 1 -5.826271,0 2.9131355,3.0296609 0 1 1 5.826271,0 z"
+       transform="matrix(1.2080617,0,0,1.1615978,23.985302,19.740165)"
+       id="path2824-69"
+       style="fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:2.5;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 17.245763,13.050847 a 2.9131355,3.0296609 0 1 1 -5.826271,0 2.9131355,3.0296609 0 1 1 5.826271,0 z"
+       transform="matrix(1.2080617,0,0,1.1615978,9.085302,26.940165)"
+       id="path2824-7"
+       style="fill:#ffd000;fill-opacity:1;fill-rule:evenodd;stroke:#ffd000;stroke-width:2.5;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 17.245763,13.050847 a 2.9131355,3.0296609 0 1 1 -5.826271,0 2.9131355,3.0296609 0 1 1 5.826271,0 z"
+       transform="matrix(1.2080617,0,0,1.1615978,20.485302,-2.2598352)"
+       id="path2824-5"
+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#ffff00;stroke-width:2.5;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 17.245763,13.050847 a 2.9131355,3.0296609 0 1 1 -5.826271,0 2.9131355,3.0296609 0 1 1 5.826271,0 z"
+       transform="matrix(1.2080617,0,0,1.1615978,-3.6146981,22.540165)"
+       id="path2824-54"
+       style="fill:#00ffff;fill-opacity:1;fill-rule:evenodd;stroke:#00ffff;stroke-width:2.5;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  </g>
+</svg>
diff --git a/icons/debugoff.svg b/icons/debugoff.svg
index 6ba2790..cf70e7e 100644
--- a/icons/debugoff.svg
+++ b/icons/debugoff.svg
@@ -1,141 +1,141 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.0"
-   width="55"
-   height="55"
+   width="45"
+   height="45"
    id="svg2">
   <defs
      id="defs4" />
-  <path
-     d="M 12.3583,20.48583 C 12.3583,27.434109 10.713354,33.066802 8.6842109,33.066802 C 6.6550675,33.066802 5.0101218,27.434109 5.0101218,20.48583 C 5.0101218,13.537551 6.6550675,7.9048577 8.6842109,7.9048577 C 10.713354,7.9048577 12.3583,13.537551 12.3583,20.48583 L 12.3583,20.48583 z"
-     transform="matrix(7.4848487,0,0,2.1858407,-37.500004,-17.278762)"
-     id="path3188"
-     style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   <g
-     transform="matrix(1.5,0,0,1.5,-13.078338,-13.158384)"
-     id="g2418">
-    <path
-       d="M 27.377856,20.343519 C 28.321,19.020469 30.286922,18.112089 30.821749,18.291101 C 31.638084,18.564336 33.456136,19.576235 33.650054,20.161715 C 34.013498,21.259028 33.209093,22.374586 32.988611,23.481022"
-       id="path3252"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.51091182px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="M 31.312226,33.70644 C 28.236767,39.033292 23.160414,41.860147 19.973874,40.020398 C 16.787334,38.180648 16.697287,32.37097 19.772746,27.044118 C 22.848206,21.717266 27.924558,18.890411 31.111098,20.73016 C 34.297638,22.56991 34.387686,28.379588 31.312226,33.70644 L 31.312226,33.70644 z"
-       id="path3197"
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.51091182;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 30.640788,20.96543 C 27.28475,27.009989 27.339614,26.914963 27.339614,26.914963"
-       id="path3199"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.51091182px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="M 23.640267,22.485322 C 24.595846,24.37818 25.974761,25.728012 27.471512,26.982445 C 27.498847,27.005355 31.460104,28.392057 33.385523,28.013934"
-       id="path3201"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.51091182px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
-    <path
-       d="M 22.8141,25.484531 C 25.194146,27.945239 25.221038,27.960765 25.221038,27.960765"
-       id="path3203"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 21.785315,26.831706 C 24.165361,29.292415 24.336387,29.493024 24.336387,29.493024"
-       id="path3207"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 20.834693,28.29192 C 23.214739,30.752628 23.451737,31.025283 23.451737,31.025283"
-       id="path3209"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 20.016015,29.896225 C 22.39606,32.356934 22.567086,32.557543 22.567086,32.557543"
-       id="path3211"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 19.370877,31.63468 C 21.750923,34.095389 21.682436,34.089803 21.682436,34.089803"
-       id="path3213"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 19.111902,33.697954 C 21.364647,36.254945 20.797785,35.622064 20.797785,35.622064"
-       id="path3215"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 19.133652,36.330772 C 19.703029,36.897193 19.913135,37.154321 19.913135,37.154321"
-       id="path3217"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 30.786085,30.087159 C 27.465026,29.256333 27.438134,29.240807 27.438134,29.240807"
-       id="path3230"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 30.133789,31.6517 C 26.81273,30.820874 26.553484,30.773066 26.553484,30.773066"
-       id="path3232"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 29.344518,33.20507 C 26.023459,32.374244 25.668834,32.305325 25.668834,32.305325"
-       id="path3234"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 28.364488,34.716219 C 25.043429,33.885393 24.784183,33.837585 24.784183,33.837585"
-       id="path3236"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 27.18151,36.144152 C 23.860451,35.313326 23.899532,35.369845 23.899532,35.369845"
-       id="path3238"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 25.524151,37.400068 C 22.183359,36.727629 23.014881,36.902105 23.014881,36.902105"
-       id="path3240"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 23.233189,38.697641 C 22.457965,38.487756 22.130232,38.434363 22.130232,38.434363"
-       id="path3242"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 38.499043,20.363658 C 37.800794,21.573059 36.199476,21.955755 34.922399,21.218434 C 33.645322,20.481114 33.176087,18.902983 33.874335,17.693582 C 34.572584,16.48418 36.173902,16.101484 37.450979,16.838805 C 38.728056,17.576125 39.197291,19.154256 38.499043,20.363658 z"
-       id="path3244"
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.84691685;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 36.397626,17.843099 C 36.200351,18.18479 35.747932,18.292914 35.38712,18.084599 C 35.026308,17.876284 34.893736,17.430416 35.091011,17.088724 C 35.288287,16.747033 35.740706,16.63891 36.101518,16.847225 C 36.46233,17.05554 36.594902,17.501408 36.397626,17.843099 z"
-       id="path3246"
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.79813904;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 32.748117,16.754734 C 32.049869,17.964135 30.44855,18.346831 29.171473,17.60951 C 27.894396,16.87219 27.425162,15.294059 28.12341,14.084658 C 28.821659,12.875256 30.422977,12.49256 31.700054,13.229881 C 32.977131,13.967201 33.446366,15.545332 32.748117,16.754734 z"
-       id="path3248"
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.84691685;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 30.781161,14.311805 C 30.583886,14.653496 30.131467,14.76162 29.770655,14.553305 C 29.409842,14.34499 29.27727,13.899122 29.474546,13.55743 C 29.671821,13.215739 30.124241,13.107616 30.485053,13.315931 C 30.845865,13.524246 30.978437,13.970114 30.781161,14.311805 z"
-       id="path3250"
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.79813904;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 32.6771,18.762402 C 34.592724,15.340936 37.749452,14.220631 37.749452,14.220631 L 37.749452,14.220631"
-       id="path3254"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 32.234792,18.337256 C 34.240057,14.967544 33.631905,11.673585 33.631905,11.673585 L 33.631905,11.673585"
-       id="path3258"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 26.988213,20.231746 L 25.8722,15.229742 L 22.062204,17.274526"
-       id="path3260"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.51091182px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="M 33.361036,23.684723 L 36.94565,22.754865 L 39.828331,26.456535"
-       id="path3262"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.51091182px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="M 23.851158,22.042526 L 22.753536,18.975309 L 14.588602,21.731577"
-       id="path3264"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.51091182px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="M 33.777334,27.207476 L 37.251354,26.779696 L 37.749256,34.197896"
-       id="path3266"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.51091182px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="M 20.388485,25.668558 L 19.349188,23.00868 L 12.485021,29.515384"
-       id="path3268"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.51091182px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="M 32.410841,31.851473 L 35.330898,30.934083 L 33.3031,40.346252"
-       id="path3270"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.51091182px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+     transform="matrix(0.81818179,0,0,0.81818179,2.9325954e-7,1.8913349e-6)"
+     id="g2941">
+    <g
+       transform="matrix(1.5,0,0,1.5,-13.078338,-13.158384)"
+       id="g2418">
+      <path
+         d="m 27.377856,20.343519 c 0.943144,-1.32305 2.909066,-2.23143 3.443893,-2.052418 0.816335,0.273235 2.634387,1.285134 2.828305,1.870614 0.363444,1.097313 -0.440961,2.212871 -0.661443,3.319307"
+         id="path3252"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.51091182px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         d="m 31.312226,33.70644 c -3.075459,5.326852 -8.151812,8.153707 -11.338352,6.313958 -3.18654,-1.83975 -3.276587,-7.649428 -0.201128,-12.97628 3.07546,-5.326852 8.151812,-8.153707 11.338352,-6.313958 3.18654,1.83975 3.276588,7.649428 0.201128,12.97628 l 0,0 z"
+         id="path3197"
+         style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.51091182;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 30.640788,20.96543 c -3.356038,6.044559 -3.301174,5.949533 -3.301174,5.949533"
+         id="path3199"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.51091182px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         d="m 23.640267,22.485322 c 0.955579,1.892858 2.334494,3.24269 3.831245,4.497123 0.02734,0.02291 3.988592,1.409612 5.914011,1.031489"
+         id="path3201"
+         style="fill:none;stroke:#ffffff;stroke-width:1.51091182px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         d="m 22.8141,25.484531 c 2.380046,2.460708 2.406938,2.476234 2.406938,2.476234"
+         id="path3203"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 21.785315,26.831706 c 2.380046,2.460709 2.551072,2.661318 2.551072,2.661318"
+         id="path3207"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 20.834693,28.29192 c 2.380046,2.460708 2.617044,2.733363 2.617044,2.733363"
+         id="path3209"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 20.016015,29.896225 c 2.380045,2.460709 2.551071,2.661318 2.551071,2.661318"
+         id="path3211"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 19.370877,31.63468 c 2.380046,2.460709 2.311559,2.455123 2.311559,2.455123"
+         id="path3213"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 19.111902,33.697954 c 2.252745,2.556991 1.685883,1.92411 1.685883,1.92411"
+         id="path3215"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 19.133652,36.330772 c 0.569377,0.566421 0.779483,0.823549 0.779483,0.823549"
+         id="path3217"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="M 30.786085,30.087159 C 27.465026,29.256333 27.438134,29.240807 27.438134,29.240807"
+         id="path3230"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="M 30.133789,31.6517 C 26.81273,30.820874 26.553484,30.773066 26.553484,30.773066"
+         id="path3232"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="M 29.344518,33.20507 C 26.023459,32.374244 25.668834,32.305325 25.668834,32.305325"
+         id="path3234"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="M 28.364488,34.716219 C 25.043429,33.885393 24.784183,33.837585 24.784183,33.837585"
+         id="path3236"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="M 27.18151,36.144152 C 23.860451,35.313326 23.899532,35.369845 23.899532,35.369845"
+         id="path3238"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 25.524151,37.400068 c -3.340792,-0.672439 -2.50927,-0.497963 -2.50927,-0.497963"
+         id="path3240"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="M 23.233189,38.697641 C 22.457965,38.487756 22.130232,38.434363 22.130232,38.434363"
+         id="path3242"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 38.499043,20.363658 c -0.698249,1.209401 -2.299567,1.592097 -3.576644,0.854776 -1.277077,-0.73732 -1.746312,-2.315451 -1.048064,-3.524852 0.698249,-1.209402 2.299567,-1.592098 3.576644,-0.854777 1.277077,0.73732 1.746312,2.315451 1.048064,3.524853 z"
+         id="path3244"
+         style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0.84691685;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 36.397626,17.843099 c -0.197275,0.341691 -0.649694,0.449815 -1.010506,0.2415 -0.360812,-0.208315 -0.493384,-0.654183 -0.296109,-0.995875 0.197276,-0.341691 0.649695,-0.449814 1.010507,-0.241499 0.360812,0.208315 0.493384,0.654183 0.296108,0.995874 z"
+         id="path3246"
+         style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0.79813904;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 32.748117,16.754734 c -0.698248,1.209401 -2.299567,1.592097 -3.576644,0.854776 -1.277077,-0.73732 -1.746311,-2.315451 -1.048063,-3.524852 0.698249,-1.209402 2.299567,-1.592098 3.576644,-0.854777 1.277077,0.73732 1.746312,2.315451 1.048063,3.524853 z"
+         id="path3248"
+         style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0.84691685;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 30.781161,14.311805 c -0.197275,0.341691 -0.649694,0.449815 -1.010506,0.2415 -0.360813,-0.208315 -0.493385,-0.654183 -0.296109,-0.995875 0.197275,-0.341691 0.649695,-0.449814 1.010507,-0.241499 0.360812,0.208315 0.493384,0.654183 0.296108,0.995874 z"
+         id="path3250"
+         style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0.79813904;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 32.6771,18.762402 c 1.915624,-3.421466 5.072352,-4.541771 5.072352,-4.541771 l 0,0"
+         id="path3254"
+         style="fill:none;stroke:#ffffff;stroke-width:0.75545591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 32.234792,18.337256 c 2.005265,-3.369712 1.397113,-6.663671 1.397113,-6.663671 l 0,0"
+         id="path3258"
+         style="fill:none;stroke:#ffffff;stroke-width:0.75545591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="M 26.988213,20.231746 L 25.8722,15.229742 22.062204,17.274526"
+         id="path3260"
+         style="fill:none;stroke:#ffffff;stroke-width:1.51091182px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         d="m 33.361036,23.684723 l 3.584614,-0.929858 2.882681,3.70167"
+         id="path3262"
+         style="fill:none;stroke:#ffffff;stroke-width:1.51091182px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         d="m 23.851158,22.042526 l -1.097622,-3.067217 -8.164934,2.756268"
+         id="path3264"
+         style="fill:none;stroke:#ffffff;stroke-width:1.51091182px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         d="m 33.777334,27.207476 l 3.47402,-0.42778 0.497902,7.4182"
+         id="path3266"
+         style="fill:none;stroke:#ffffff;stroke-width:1.51091182px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         d="M 20.388485,25.668558 L 19.349188,23.00868 12.485021,29.515384"
+         id="path3268"
+         style="fill:none;stroke:#ffffff;stroke-width:1.51091182px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         d="m 32.410841,31.851473 l 2.920057,-0.91739 -2.027798,9.412169"
+         id="path3270"
+         style="fill:none;stroke:#ffffff;stroke-width:1.51091182px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
   </g>
 </svg>
diff --git a/icons/debugon.svg b/icons/debugon.svg
index 491ae78..6232a99 100644
--- a/icons/debugon.svg
+++ b/icons/debugon.svg
@@ -1,141 +1,146 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.0"
-   width="55"
-   height="55"
+   width="45"
+   height="45"
    id="svg2">
   <defs
      id="defs4" />
-  <path
-     d="M 12.3583,20.48583 C 12.3583,27.434109 10.713354,33.066802 8.6842109,33.066802 C 6.6550675,33.066802 5.0101218,27.434109 5.0101218,20.48583 C 5.0101218,13.537551 6.6550675,7.9048577 8.6842109,7.9048577 C 10.713354,7.9048577 12.3583,13.537551 12.3583,20.48583 L 12.3583,20.48583 z"
-     transform="matrix(7.4848487,0,0,2.1858407,-37.500004,-17.278762)"
-     id="path3188"
-     style="opacity:1;fill:#00ff00;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   <g
-     transform="matrix(1.5,0,0,1.5,-13.078338,-13.158384)"
-     id="g3188">
-    <path
-       d="M 27.377856,20.343519 C 28.321,19.020469 30.286922,18.112089 30.821749,18.291101 C 31.638084,18.564336 33.456136,19.576235 33.650054,20.161715 C 34.013498,21.259028 33.209093,22.374586 32.988611,23.481022"
-       id="path3252"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.51091182px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="M 31.312226,33.70644 C 28.236767,39.033292 23.160414,41.860147 19.973874,40.020398 C 16.787334,38.180648 16.697287,32.37097 19.772746,27.044118 C 22.848206,21.717266 27.924558,18.890411 31.111098,20.73016 C 34.297638,22.56991 34.387686,28.379588 31.312226,33.70644 L 31.312226,33.70644 z"
-       id="path3197"
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.51091182;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 30.640788,20.96543 C 27.28475,27.009989 27.339614,26.914963 27.339614,26.914963"
-       id="path3199"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.51091182px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="M 23.640267,22.485322 C 24.595846,24.37818 25.974761,25.728012 27.471512,26.982445 C 27.498847,27.005355 31.460104,28.392057 33.385523,28.013934"
-       id="path3201"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.51091182px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
-    <path
-       d="M 22.8141,25.484531 C 25.194146,27.945239 25.221038,27.960765 25.221038,27.960765"
-       id="path3203"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 21.785315,26.831706 C 24.165361,29.292415 24.336387,29.493024 24.336387,29.493024"
-       id="path3207"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 20.834693,28.29192 C 23.214739,30.752628 23.451737,31.025283 23.451737,31.025283"
-       id="path3209"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 20.016015,29.896225 C 22.39606,32.356934 22.567086,32.557543 22.567086,32.557543"
-       id="path3211"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 19.370877,31.63468 C 21.750923,34.095389 21.682436,34.089803 21.682436,34.089803"
-       id="path3213"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 19.111902,33.697954 C 21.364647,36.254945 20.797785,35.622064 20.797785,35.622064"
-       id="path3215"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 19.133652,36.330772 C 19.703029,36.897193 19.913135,37.154321 19.913135,37.154321"
-       id="path3217"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 30.786085,30.087159 C 27.465026,29.256333 27.438134,29.240807 27.438134,29.240807"
-       id="path3230"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 30.133789,31.6517 C 26.81273,30.820874 26.553484,30.773066 26.553484,30.773066"
-       id="path3232"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 29.344518,33.20507 C 26.023459,32.374244 25.668834,32.305325 25.668834,32.305325"
-       id="path3234"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 28.364488,34.716219 C 25.043429,33.885393 24.784183,33.837585 24.784183,33.837585"
-       id="path3236"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 27.18151,36.144152 C 23.860451,35.313326 23.899532,35.369845 23.899532,35.369845"
-       id="path3238"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 25.524151,37.400068 C 22.183359,36.727629 23.014881,36.902105 23.014881,36.902105"
-       id="path3240"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 23.233189,38.697641 C 22.457965,38.487756 22.130232,38.434363 22.130232,38.434363"
-       id="path3242"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 38.499043,20.363658 C 37.800794,21.573059 36.199476,21.955755 34.922399,21.218434 C 33.645322,20.481114 33.176087,18.902983 33.874335,17.693582 C 34.572584,16.48418 36.173902,16.101484 37.450979,16.838805 C 38.728056,17.576125 39.197291,19.154256 38.499043,20.363658 z"
-       id="path3244"
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.84691685;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 36.397626,17.843099 C 36.200351,18.18479 35.747932,18.292914 35.38712,18.084599 C 35.026308,17.876284 34.893736,17.430416 35.091011,17.088724 C 35.288287,16.747033 35.740706,16.63891 36.101518,16.847225 C 36.46233,17.05554 36.594902,17.501408 36.397626,17.843099 z"
-       id="path3246"
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.79813904;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 32.748117,16.754734 C 32.049869,17.964135 30.44855,18.346831 29.171473,17.60951 C 27.894396,16.87219 27.425162,15.294059 28.12341,14.084658 C 28.821659,12.875256 30.422977,12.49256 31.700054,13.229881 C 32.977131,13.967201 33.446366,15.545332 32.748117,16.754734 z"
-       id="path3248"
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.84691685;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 30.781161,14.311805 C 30.583886,14.653496 30.131467,14.76162 29.770655,14.553305 C 29.409842,14.34499 29.27727,13.899122 29.474546,13.55743 C 29.671821,13.215739 30.124241,13.107616 30.485053,13.315931 C 30.845865,13.524246 30.978437,13.970114 30.781161,14.311805 z"
-       id="path3250"
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.79813904;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 32.6771,18.762402 C 34.592724,15.340936 37.749452,14.220631 37.749452,14.220631 L 37.749452,14.220631"
-       id="path3254"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 32.234792,18.337256 C 34.240057,14.967544 33.631905,11.673585 33.631905,11.673585 L 33.631905,11.673585"
-       id="path3258"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 26.988213,20.231746 L 25.8722,15.229742 L 22.062204,17.274526"
-       id="path3260"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.51091182px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="M 33.361036,23.684723 L 36.94565,22.754865 L 39.828331,26.456535"
-       id="path3262"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.51091182px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="M 23.851158,22.042526 L 22.753536,18.975309 L 14.588602,21.731577"
-       id="path3264"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.51091182px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="M 33.777334,27.207476 L 37.251354,26.779696 L 37.749256,34.197896"
-       id="path3266"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.51091182px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="M 20.388485,25.668558 L 19.349188,23.00868 L 12.485021,29.515384"
-       id="path3268"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.51091182px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="M 32.410841,31.851473 L 35.330898,30.934083 L 33.3031,40.346252"
-       id="path3270"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.51091182px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+     transform="matrix(0.81818179,0,0,0.81818179,2.9325954e-7,1.8913349e-6)"
+     id="g2886">
+    <path
+       d="m 12.3583,20.48583 c 0,6.948279 -1.644946,12.580972 -3.6740891,12.580972 -2.0291434,0 -3.6740891,-5.632693 -3.6740891,-12.580972 0,-6.948279 1.6449457,-12.5809723 3.6740891,-12.5809723 2.0291431,0 3.6740891,5.6326933 3.6740891,12.5809723 l 0,0 z"
+       transform="matrix(7.4848487,0,0,2.1858407,-37.500004,-17.278762)"
+       id="path3188"
+       style="fill:#00ff00;fill-opacity:1;stroke:none" />
+    <g
+       transform="matrix(1.5,0,0,1.5,-13.078338,-13.158384)"
+       id="g3188">
+      <path
+         d="m 27.377856,20.343519 c 0.943144,-1.32305 2.909066,-2.23143 3.443893,-2.052418 0.816335,0.273235 2.634387,1.285134 2.828305,1.870614 0.363444,1.097313 -0.440961,2.212871 -0.661443,3.319307"
+         id="path3252"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.51091182px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         d="m 31.312226,33.70644 c -3.075459,5.326852 -8.151812,8.153707 -11.338352,6.313958 -3.18654,-1.83975 -3.276587,-7.649428 -0.201128,-12.97628 3.07546,-5.326852 8.151812,-8.153707 11.338352,-6.313958 3.18654,1.83975 3.276588,7.649428 0.201128,12.97628 l 0,0 z"
+         id="path3197"
+         style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.51091182;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 30.640788,20.96543 c -3.356038,6.044559 -3.301174,5.949533 -3.301174,5.949533"
+         id="path3199"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.51091182px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         d="m 23.640267,22.485322 c 0.955579,1.892858 2.334494,3.24269 3.831245,4.497123 0.02734,0.02291 3.988592,1.409612 5.914011,1.031489"
+         id="path3201"
+         style="fill:none;stroke:#000000;stroke-width:1.51091182px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         d="m 22.8141,25.484531 c 2.380046,2.460708 2.406938,2.476234 2.406938,2.476234"
+         id="path3203"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 21.785315,26.831706 c 2.380046,2.460709 2.551072,2.661318 2.551072,2.661318"
+         id="path3207"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 20.834693,28.29192 c 2.380046,2.460708 2.617044,2.733363 2.617044,2.733363"
+         id="path3209"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 20.016015,29.896225 c 2.380045,2.460709 2.551071,2.661318 2.551071,2.661318"
+         id="path3211"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 19.370877,31.63468 c 2.380046,2.460709 2.311559,2.455123 2.311559,2.455123"
+         id="path3213"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 19.111902,33.697954 c 2.252745,2.556991 1.685883,1.92411 1.685883,1.92411"
+         id="path3215"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 19.133652,36.330772 c 0.569377,0.566421 0.779483,0.823549 0.779483,0.823549"
+         id="path3217"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="M 30.786085,30.087159 C 27.465026,29.256333 27.438134,29.240807 27.438134,29.240807"
+         id="path3230"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="M 30.133789,31.6517 C 26.81273,30.820874 26.553484,30.773066 26.553484,30.773066"
+         id="path3232"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="M 29.344518,33.20507 C 26.023459,32.374244 25.668834,32.305325 25.668834,32.305325"
+         id="path3234"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="M 28.364488,34.716219 C 25.043429,33.885393 24.784183,33.837585 24.784183,33.837585"
+         id="path3236"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="M 27.18151,36.144152 C 23.860451,35.313326 23.899532,35.369845 23.899532,35.369845"
+         id="path3238"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 25.524151,37.400068 c -3.340792,-0.672439 -2.50927,-0.497963 -2.50927,-0.497963"
+         id="path3240"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="M 23.233189,38.697641 C 22.457965,38.487756 22.130232,38.434363 22.130232,38.434363"
+         id="path3242"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.75545591;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 38.499043,20.363658 c -0.698249,1.209401 -2.299567,1.592097 -3.576644,0.854776 -1.277077,-0.73732 -1.746312,-2.315451 -1.048064,-3.524852 0.698249,-1.209402 2.299567,-1.592098 3.576644,-0.854777 1.277077,0.73732 1.746312,2.315451 1.048064,3.524853 z"
+         id="path3244"
+         style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.84691685;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 36.397626,17.843099 c -0.197275,0.341691 -0.649694,0.449815 -1.010506,0.2415 -0.360812,-0.208315 -0.493384,-0.654183 -0.296109,-0.995875 0.197276,-0.341691 0.649695,-0.449814 1.010507,-0.241499 0.360812,0.208315 0.493384,0.654183 0.296108,0.995874 z"
+         id="path3246"
+         style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.79813904;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 32.748117,16.754734 c -0.698248,1.209401 -2.299567,1.592097 -3.576644,0.854776 -1.277077,-0.73732 -1.746311,-2.315451 -1.048063,-3.524852 0.698249,-1.209402 2.299567,-1.592098 3.576644,-0.854777 1.277077,0.73732 1.746312,2.315451 1.048063,3.524853 z"
+         id="path3248"
+         style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.84691685;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 30.781161,14.311805 c -0.197275,0.341691 -0.649694,0.449815 -1.010506,0.2415 -0.360813,-0.208315 -0.493385,-0.654183 -0.296109,-0.995875 0.197275,-0.341691 0.649695,-0.449814 1.010507,-0.241499 0.360812,0.208315 0.493384,0.654183 0.296108,0.995874 z"
+         id="path3250"
+         style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.79813904;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 32.6771,18.762402 c 1.915624,-3.421466 5.072352,-4.541771 5.072352,-4.541771 l 0,0"
+         id="path3254"
+         style="fill:none;stroke:#000000;stroke-width:0.75545591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 32.234792,18.337256 c 2.005265,-3.369712 1.397113,-6.663671 1.397113,-6.663671 l 0,0"
+         id="path3258"
+         style="fill:none;stroke:#000000;stroke-width:0.75545591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="M 26.988213,20.231746 L 25.8722,15.229742 22.062204,17.274526"
+         id="path3260"
+         style="fill:none;stroke:#000000;stroke-width:1.51091182px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         d="m 33.361036,23.684723 l 3.584614,-0.929858 2.882681,3.70167"
+         id="path3262"
+         style="fill:none;stroke:#000000;stroke-width:1.51091182px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         d="m 23.851158,22.042526 l -1.097622,-3.067217 -8.164934,2.756268"
+         id="path3264"
+         style="fill:none;stroke:#000000;stroke-width:1.51091182px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         d="m 33.777334,27.207476 l 3.47402,-0.42778 0.497902,7.4182"
+         id="path3266"
+         style="fill:none;stroke:#000000;stroke-width:1.51091182px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         d="M 20.388485,25.668558 L 19.349188,23.00868 12.485021,29.515384"
+         id="path3268"
+         style="fill:none;stroke:#000000;stroke-width:1.51091182px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         d="m 32.410841,31.851473 l 2.920057,-0.91739 -2.027798,9.412169"
+         id="path3270"
+         style="fill:none;stroke:#000000;stroke-width:1.51091182px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
   </g>
 </svg>
diff --git a/icons/eraseroff.svg b/icons/eraseroff.svg
index dcb3ae3..5ced823 100644
--- a/icons/eraseroff.svg
+++ b/icons/eraseroff.svg
@@ -1,91 +1,33 @@
 <?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"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
+   version="1.0"
    width="50"
    height="43"
-   version="1.0"
-   sodipodi:docname="eraseron.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <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" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+   id="svg2">
   <defs
-     id="defs5">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective9" />
-    <inkscape:perspective
-       id="perspective3267"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-height="1000"
-     inkscape:window-width="1679"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     showgrid="false"
-     inkscape:zoom="10"
-     inkscape:cx="25"
-     inkscape:cy="30.833333"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:current-layer="svg2" />
+     id="defs5" />
   <path
-     style="fill:#c44000;stroke:#a00000;stroke-width:1.5;stroke-opacity:1;fill-opacity:1;stroke-dasharray:none"
-     d="M 37.612208,24.238779 L 36,17.5 L 48.5,4 L 47,14.5 L 37.612208,24.238779 z"
+     d="m 36.61535,26.125 l 0,-8.375 12.5,-13.5 -1.5,10.5 -11,11.375 z"
      id="path2394"
-     sodipodi:nodetypes="ccccc" />
+     style="fill:#c44000;fill-opacity:1;stroke:#a00000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none" />
   <path
-     style="fill:#c44000;stroke:#a00000;stroke-width:1.5;stroke-opacity:1;fill-opacity:1;stroke-dasharray:none"
-     d="M 15,17.5 L 28.5,4 L 48.5,4 L 36,17.5 L 15,17.5 z"
+     d="m 15.61535,17.75 l 13.5,-13.5 20,0 -12.5,13.5 -21,0 z"
      id="path2390"
-     sodipodi:nodetypes="ccccc" />
+     style="fill:#c44000;fill-opacity:1;stroke:#a00000;stroke-width:1.5;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
   <path
-     style="fill:#a09400;stroke:#a00000;stroke-width:1.50000000000000000;stroke-opacity:1;fill-opacity:1;stroke-dasharray:none"
-     d="M 22.800718,38.5 L 25.493716,28.5 L 36,17.5 L 37.432675,24.418312 L 22.800718,38.5 z"
+     d="m 23.416068,38.75 l 2.692998,-10 10.506284,-11 0,8.375 -13.199282,12.625 z"
      id="path2392"
-     sodipodi:nodetypes="ccccc" />
+     style="fill:#c4a000;fill-opacity:1;stroke:#a00000;stroke-width:1.5;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none" />
   <path
-     style="fill:#c4a000;stroke:#a00000;stroke-width:1.50000000000000000;stroke-opacity:1;fill-opacity:1;stroke-dasharray:none"
-     d="M 3.9497307,28.5 L 15,17.5 L 36,17.5 L 25.13465,28.5 L 3.9497307,28.5 z"
+     d="m 4.5650808,28.75 l 11.0502692,-11 21,0 -10.86535,11 -21.1849192,0 z"
      id="path2388"
-     sodipodi:nodetypes="ccccc" />
+     style="fill:#c4a000;fill-opacity:1;stroke:#a00000;stroke-width:1.5;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none" />
   <path
-     style="fill:#e0d000;stroke:#a00000;stroke-width:1.50000000000000000;stroke-opacity:1;fill-opacity:1;stroke-dasharray:none"
-     d="M 0.26929982,38.5 L 3.8599641,28.5 L 25.044883,28.5 L 22.441652,38.5 L 0.26929982,38.5 z"
+     d="m 0.88464991,38.75 l 3.59066429,-10 21.1849188,0 -2.603231,10 -22.17235209,0 z"
      id="path2384"
-     sodipodi:nodetypes="ccccc" />
+     style="fill:#e0d000;fill-opacity:1;stroke:#a00000;stroke-width:1.5;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none" />
 </svg>
diff --git a/icons/eraseron.svg b/icons/eraseron.svg
index 9ffbb5e..27a5ffd 100644
--- a/icons/eraseron.svg
+++ b/icons/eraseron.svg
@@ -1,91 +1,38 @@
 <?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"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
+   version="1.0"
    width="50"
    height="43"
-   version="1.0"
-   sodipodi:docname="eraseroff.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <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" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+   id="svg2">
   <defs
-     id="defs5">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective9" />
-    <inkscape:perspective
-       id="perspective3267"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-height="1000"
-     inkscape:window-width="1679"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     showgrid="false"
-     inkscape:zoom="10"
-     inkscape:cx="25"
-     inkscape:cy="30.833333"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:current-layer="svg2" />
-  <path
-     style="fill:#808080;stroke:#a0a0a0;stroke-width:1.50000000000000000;stroke-opacity:1;fill-opacity:1;stroke-dasharray:none"
-     d="M 37.612208,24.238779 L 36,17.5 L 48.5,4 L 47,14.5 L 37.612208,24.238779 z"
-     id="path2394"
-     sodipodi:nodetypes="ccccc" />
-  <path
-     style="fill:#808080;stroke:#a0a0a0;stroke-width:1.50000000000000000;stroke-opacity:1;fill-opacity:1;stroke-dasharray:none"
-     d="M 15,17.5 L 28.5,4 L 48.5,4 L 36,17.5 L 15,17.5 z"
-     id="path2390"
-     sodipodi:nodetypes="ccccc" />
-  <path
-     style="fill:#a0a0a0;stroke:#a0a0a0;stroke-width:1.50000000000000000;stroke-opacity:1;fill-opacity:1;stroke-dasharray:none"
-     d="M 22.800718,38.5 L 25.493716,28.5 L 36,17.5 L 37.432675,24.418312 L 22.800718,38.5 z"
-     id="path2392"
-     sodipodi:nodetypes="ccccc" />
-  <path
-     style="fill:#c4c4c4;stroke:#a0a0a0;stroke-width:1.50000000000000000;stroke-opacity:1;fill-opacity:1;stroke-dasharray:none"
-     d="M 3.9497307,28.5 L 15,17.5 L 36,17.5 L 25.13465,28.5 L 3.9497307,28.5 z"
-     id="path2388"
-     sodipodi:nodetypes="ccccc" />
-  <path
-     style="fill:#e0e0e0;stroke:#a0a0a0;stroke-width:1.50000000000000000;stroke-opacity:1;fill-opacity:1;stroke-dasharray:none"
-     d="M 0.26929982,38.5 L 3.8599641,28.5 L 25.044883,28.5 L 22.441652,38.5 L 0.26929982,38.5 z"
-     id="path2384"
-     sodipodi:nodetypes="ccccc" />
+     id="defs5" />
+  <g
+     transform="translate(0.61535009,0.25)"
+     id="g3589"
+     style="fill:#404040;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
+    <path
+       d="M 36,25.875 L 36,17.5 48.5,4 47,14.5 36,25.875 z"
+       id="path2394"
+       style="fill:#404040;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="M 15,17.5 L 28.5,4 48.5,4 36,17.5 l -21,0 z"
+       id="path2390"
+       style="fill:#404040;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="M 22.800718,38.5 L 25.493716,28.5 36,17.5 36,25.875 22.800718,38.5 z"
+       id="path2392"
+       style="fill:#404040;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="M 3.9497307,28.5 L 15,17.5 l 21,0 -10.86535,11 -21.1849193,0 z"
+       id="path2388"
+       style="fill:#404040;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 0.26929982,38.5 l 3.59066428,-10 21.1849189,0 -2.603231,10 -22.17235218,0 z"
+       id="path2384"
+       style="fill:#404040;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  </g>
 </svg>
diff --git a/icons/extrasoff.svg b/icons/extrasoff.svg
new file mode 100644
index 0000000..9d863d0
--- /dev/null
+++ b/icons/extrasoff.svg
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="55"
+   height="55"
+   id="svg2">
+  <defs
+     id="defs4" />
+  <g
+     transform="translate(51.861336,-0.235324)"
+     id="g3247"
+     style="fill:none;stroke:#ffffff;stroke-width:2.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
+    <path
+       d="M -36.1417,31.566802 l 0.114372,5.261133 11.437247,6.290486 0.228745,-13.495951"
+       id="path2463"
+       style="fill:none;stroke:#ffffff;stroke-width:2.29999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="M -24.132592,29.736843 l 0.05719,13.381578 11.723178,-7.548583 0,-4.689272 -5.947368,3.545548"
+       id="path2465"
+       style="fill:none;stroke:#ffffff;stroke-width:2.29999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="M -41.860324,27.563765 l 5.604251,-5.146761 -5.832996,-2.973684 12.123482,-7.091093 5.718623,3.316801 5.489879,-3.088056 12.1234818,7.319838 -5.8329958,2.401822 5.4898784,5.032388 -11.3228744,7.205466 -5.947369,-5.261134 -6.290485,5.261134 -11.322875,-6.976721 z"
+       id="path2459"
+       style="fill:none;stroke:#ffffff;stroke-width:2.29999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="M -35.455466,22.188259 l 10.751013,-6.747976 11.780364,6.862349 -11.322875,6.747975 -11.208502,-6.862348 z"
+       id="path2461"
+       style="fill:none;stroke:#ffffff;stroke-width:2.29999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  </g>
+</svg>
diff --git a/icons/extrason.svg b/icons/extrason.svg
new file mode 100644
index 0000000..3d2cd85
--- /dev/null
+++ b/icons/extrason.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="55"
+   height="55"
+   id="svg2">
+  <defs
+     id="defs4" />
+  <rect
+     width="55"
+     height="55"
+     rx="0"
+     x="0"
+     y="0"
+     id="rect2839"
+     style="fill:#ffd200;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+  <g
+     transform="translate(51.861336,-0.235324)"
+     id="g3247"
+     style="stroke:#800000;stroke-opacity:1">
+    <path
+       d="M -36.1417,31.566802 l 0.114372,5.261133 11.437247,6.290486 0.228745,-13.495951"
+       id="path2463"
+       style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#800000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       d="M -24.132592,29.736843 l 0.05719,13.381578 11.723178,-7.548583 0,-4.689272 -5.947368,3.545548"
+       id="path2465"
+       style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#800000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       d="M -41.860324,27.563765 l 5.604251,-5.146761 -5.832996,-2.973684 12.123482,-7.091093 5.718623,3.316801 5.489879,-3.088056 12.1234818,7.319838 -5.8329958,2.401822 5.4898784,5.032388 -11.3228744,7.205466 -5.947369,-5.261134 -6.290485,5.261134 -11.322875,-6.976721 z"
+       id="path2459"
+       style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#800000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       d="M -35.455466,22.188259 l 10.751013,-6.747976 11.780364,6.862349 -11.322875,6.747975 -11.208502,-6.862348 z"
+       id="path2461"
+       style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#800000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/icons/filesave.svg b/icons/filesave.svg
new file mode 100644
index 0000000..b84a374
--- /dev/null
+++ b/icons/filesave.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#FFFFFF">
+]>
+<svg enable-background="new 0 0 55 55" height="55px" id="Layer_1" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g display="block" id="document-save">
+	<g>
+		<g>
+			<g>
+				<path d="M6.736,49.002      h24.52c2.225,0,3.439-1.447,3.439-3.441V18.281c0-1.73-1.732-3.441-3.439-3.441h-4.389" fill="&fill_color;" stroke="&stroke_color;" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.5"/>
+			</g>
+		</g>
+		<g>
+			<g>
+				<path d="M26.867,38.592      c0,1.836-1.345,3.201-3.441,4.047l-16.69,6.363V14.84l16.69-8.599c2.228-0.394,3.441,0.84,3.441,2.834V38.592z" fill="&fill_color;" stroke="&stroke_color;" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.5"/>
+			</g>
+		</g>
+		<path d="M9.424,42.607    c0,0-1.351-0.543-2.702-0.543s-2.703,0.543-2.703,0.543" fill="none" stroke="&stroke_color;" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.25"/>
+		<path d="M9.424,32.006    c0,0-1.239-0.543-2.815-0.543c-1.577,0-2.59,0.543-2.59,0.543" fill="none" stroke="&stroke_color;" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.25"/>
+		<path d="M9.424,21.678    c0,0-1.125-0.544-2.927-0.544c-1.802,0-2.478,0.544-2.478,0.544" fill="none" stroke="&stroke_color;" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.25"/>
+		
+		<line fill="none" stroke="&stroke_color;" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.25" x1="13.209" x2="13.209" y1="46.533" y2="11.505"/>
+		
+		<g>
+			<line fill="none" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.5" x1="41.17" x2="52.441" y1="16.188" y2="4.917"/>
+			<polyline fill="none" points="     51.562,15.306 41.17,16.188 42.053,5.794    " stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.5"/>
+		</g>
+	</g>
+</g>
+</svg>
\ No newline at end of file
diff --git a/icons/flowoff.svg b/icons/flowoff.svg
new file mode 100644
index 0000000..13b11c5
--- /dev/null
+++ b/icons/flowoff.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="55"
+   height="55"
+   id="svg2">
+  <defs
+     id="defs5" />
+  <path
+     d="M 14.85,27.1 l -0.45,13.15 4.35,-2.4 c 0,0 6.349418,4.294879 10.2,4.05 4.946317,-0.314563 11.65,-7.5 11.65,-7.5 l -2.25,-2.3 c 0,0 -5.615371,6.15399 -9.4,6.65 -2.286298,0.29964 -7.05,-2.5 -7.05,-2.5 L 26,34.1 14.85,27.1 z"
+     id="path3590"
+     style="fill:none;stroke:#ffffff;stroke-width:2.29999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     d="M 40.15,28.955044 l 0.45,-13.150001 -4.35,2.4 c 0,0 -6.349418,-4.294879 -10.2,-4.05 -4.946317,0.314563 -11.65,7.5 -11.65,7.5 l 2.25,2.3 c 0,0 5.615371,-6.15399 9.4,-6.65 2.286298,-0.29964 7.05,2.5 7.05,2.5 l -4.1,2.15 11.15,7.000001 z"
+     id="path3590-4"
+     style="fill:none;stroke:#ffffff;stroke-width:2.29999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+</svg>
diff --git a/icons/flowon.svg b/icons/flowon.svg
new file mode 100644
index 0000000..b115fa7
--- /dev/null
+++ b/icons/flowon.svg
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="55"
+   height="55"
+   id="svg2">
+  <defs
+     id="defs5" />
+  <rect
+     width="55"
+     height="55"
+     rx="0"
+     x="0"
+     y="0"
+     id="rect2839"
+     style="fill:#ffd200;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+  <g
+     transform="translate(4.9228669,-0.04294974)"
+     id="g3163">
+    <path
+       d="M 27.560785,16.470589 l -1.511002,10.315514 -8.177996,-6.466322 9.688998,-3.849192 z"
+       transform="translate(8.1558824,1.1284313)"
+       id="path2386"
+       style="fill:#a06400;fill-opacity:1;stroke:#a06400;stroke-width:3;stroke-opacity:1" />
+    <path
+       d="M 27.560785,16.470589 l -1.511002,10.315514 -8.177996,-6.466322 9.688998,-3.849192 z"
+       transform="matrix(-0.9848078,-0.1736482,-0.1736482,0.9848078,39.742987,17.127786)"
+       id="path2388"
+       style="fill:#a06400;fill-opacity:1;stroke:#a06400;stroke-width:3;stroke-opacity:1" />
+    <path
+       d="M 14.52451,37.473529 c 0,0.101391 2.070056,1.496645 4.373345,2.252558 1.606134,0.527115 3.382089,0.517702 4.410968,0.492541 1.751835,-0.04284 3.76231,-1.081811 5.486138,-2.294795 2.373956,-1.670452 4.204281,-3.670923 4.066804,-3.854225 l 0,0 0.109804,0"
+       id="path2390"
+       style="fill:none;stroke:#a06400;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+    <path
+       d="M 30.716667,18.403553 c 0,-0.101391 -5.19216,-3.579099 -9.384313,-3.545099 -4.192153,0.034 -9.701252,5.965718 -9.552942,6.14902 0,0 0,0 0,0 -0.0366,0 -0.0732,0 -0.109804,0"
+       id="path3162"
+       style="fill:none;stroke:#a06400;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/icons/help-toolbar.svg b/icons/help-toolbar.svg
index d997562..40d6369 100644
--- a/icons/help-toolbar.svg
+++ b/icons/help-toolbar.svg
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
@@ -11,10 +13,11 @@
   <defs
      id="defs11" />
   <path
-     d="M 50,27.625 C 50,39.9681 39.8431,50.125 27.5,50.125 C 15.1569,50.125 5,39.9681 5,27.625 C 5,15.2819 15.1569,5.125 27.5,5.125 C 39.8431,5.125 50,15.2819 50,27.625 z"
-     id="path6" />
+     d="m 50,27.625 c 0,12.3431 -10.1569,22.5 -22.5,22.5 C 15.1569,50.125 5,39.9681 5,27.625 5,15.2819 15.1569,5.125 27.5,5.125 c 12.3431,0 22.5,10.1569 22.5,22.5 z"
+     id="path6"
+     style="fill:#404040;fill-opacity:1" />
   <path
-     d="M 23.956,27.167 C 23.956,25.546 25.756,25.277 27.601,24.781 C 29.401,24.286 31.201,23.566 31.201,20.956 C 31.201,18.976 29.356,17.536 27.467,17.536 C 23.687,17.536 23.102,21.991 20.221,21.991 C 18.601,21.991 17.476,20.731 17.476,18.751 C 17.476,14.025 23.416,11.326 27.467,11.326 C 33.273,11.326 38.223,14.926 38.223,20.957 C 38.223,25.952 35.073,28.878 30.438,30.048 L 30.438,31.667 C 30.438,33.468 29.087,34.772 27.197,34.772 C 25.172,34.772 23.957,33.467 23.957,31.667 L 23.957,27.167 L 23.956,27.167 z M 23.686,40.937 C 23.686,39.002 25.261,37.427 27.196,37.427 C 29.132,37.427 30.706,39.002 30.706,40.937 C 30.706,42.873 29.132,44.449 27.196,44.449 C 25.261,44.448 23.686,42.872 23.686,40.937 z"
+     d="m 23.956,27.167 c 0,-1.621 1.8,-1.89 3.645,-2.386 1.8,-0.495 3.6,-1.215 3.6,-3.825 0,-1.98 -1.845,-3.42 -3.734,-3.42 -3.78,0 -4.365,4.455 -7.246,4.455 -1.62,0 -2.745,-1.26 -2.745,-3.24 0,-4.726 5.94,-7.425 9.991,-7.425 5.806,0 10.756,3.6 10.756,9.631 0,4.995 -3.15,7.921 -7.785,9.091 l 0,1.619 c 0,1.801 -1.351,3.105 -3.241,3.105 -2.025,0 -3.24,-1.305 -3.24,-3.105 l 0,-4.5 -0.001,0 z m -0.27,13.77 c 0,-1.935 1.575,-3.51 3.51,-3.51 1.936,0 3.51,1.575 3.51,3.51 0,1.936 -1.574,3.512 -3.51,3.512 -1.935,-10e-4 -3.51,-1.577 -3.51,-3.512 z"
      id="path8"
-     style="fill:#ffffff;stroke:#ffffff;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+     style="fill:#ffffff;stroke:#ffffff;stroke-width:0.25;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
 </svg>
diff --git a/icons/hideshowoff.svg b/icons/hideshowoff.svg
index 19b49a3..3db14c9 100644
--- a/icons/hideshowoff.svg
+++ b/icons/hideshowoff.svg
@@ -1,134 +1,28 @@
 <?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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="53"
-   height="43"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="hideshowoff.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0">
-  <metadata
-     id="metadata28">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     inkscape:window-height="1000"
-     inkscape:window-width="1679"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     showgrid="false"
-     inkscape:zoom="1"
-     inkscape:cx="44.444505"
-     inkscape:cy="21.242368"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:current-layer="svg2" />
+   version="1.0"
+   width="55"
+   height="55"
+   id="svg2">
   <defs
-     id="defs5">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 22 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="87 : 22 : 1"
-       inkscape:persp3d-origin="43.5 : 14.666667 : 1"
-       id="perspective30" />
-    <linearGradient
-       id="linearGradient3166">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3168" />
-      <stop
-         style="stop-color:#ffff00;stop-opacity:1;"
-         offset="1"
-         id="stop3170" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#linearGradient3166"
-       id="linearGradient3172"
-       x1="0"
-       y1="22"
-       x2="74"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-    <inkscape:perspective
-       id="perspective2472"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3166"
-       id="linearGradient2487"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="22"
-       x2="74"
-       y2="22" />
-    <inkscape:perspective
-       id="perspective2590"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
+     id="defs6" />
   <path
-     style="fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:1.59263432;stroke-opacity:1"
-     d="M 34.341481,1.8366553 C 45.747271,1.8366553 45.747271,1.8366553 45.747271,1.8366553 C 45.747271,1.8366553 48.692673,4.0485498 49.668012,5.3948257 C 50.664216,6.7699023 52.163028,10.732081 52.163028,10.732081 L 52.163028,27.633391 C 52.163028,27.633391 50.582578,30.919053 49.668012,32.081104 C 48.648933,33.375948 45.747271,35.639274 45.747271,35.639274 L 33.628619,35.639274 L 33.628619,35.639274 L 33.628619,39.197444 L 19.371381,39.197444 L 19.371381,35.639274 L 7.2527289,35.639274 C 7.2527289,35.639274 4.3510677,33.375948 3.3319885,32.081104 C 2.4174221,30.919053 0.8369718,27.633391 0.8369718,27.633391 L 0.8369718,10.732081 C 0.8369718,10.732081 2.3357841,6.7699023 3.3319885,5.3948257 C 4.3073276,4.0485498 7.2527289,1.8366553 7.2527289,1.8366553 L 18.658519,1.8366553 L 18.658519,6.2843683 L 34.341481,6.2843683 L 34.341481,1.8366553 z"
-     id="path9"
-     sodipodi:nodetypes="ccsccscccccccsccsccccc" />
-  <rect
-     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-opacity:1"
-     id="rect3375"
-     width="53"
-     height="3"
-     x="0"
-     y="7.9999986" />
-  <rect
-     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-opacity:1"
-     id="rect3377"
-     width="53"
-     height="3"
-     x="0"
-     y="30" />
-  <rect
-     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-opacity:1"
-     id="rect3379"
-     width="53"
-     height="3"
-     x="0"
-     y="22.666666" />
+     d="m 1.5,25.5 0,-8 a 8,8 0 0 1 8,-8 l 8,0 0,4 20,0 0,-4 8,0 a 8,8 0 0 1 8,8 l 0,8 0,8 a 8,8 0 0 1 -8,8 l -8,0 -2,0 0,4 -16,0 0,-4 -2,0 -8,0 a 8,8 0 0 1 -8,-8 l 0,-8 z"
+     id="path2882"
+     style="fill:#404040;fill-opacity:1;stroke:#ffffff;stroke-width:2.5;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     d="m 35.875,27.5 c 0,4.62493 -3.74962,8.374182 -8.375,8.374182 -4.62538,0 -8.375,-3.749252 -8.375,-8.374182 0,-4.624929 3.74962,-8.374182 8.375,-8.374182 4.62538,0 8.375,3.749253 8.375,8.374182 l 0,0 z"
+     id="path5"
+     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1px;stroke-opacity:1" />
   <rect
-     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-opacity:1"
-     id="rect3381"
-     width="53"
-     height="3"
-     x="0"
-     y="15.333332" />
+     width="10"
+     height="2"
+     x="22.5"
+     y="26.5"
+     id="rect2844"
+     style="fill:#404040;fill-opacity:1;fill-rule:nonzero;stroke:#404040;stroke-width:1.5;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
 </svg>
diff --git a/icons/hideshowon.svg b/icons/hideshowon.svg
index b6c328d..326b32c 100644
--- a/icons/hideshowon.svg
+++ b/icons/hideshowon.svg
@@ -1,54 +1,39 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    version="1.0"
-   width="53"
-   height="43"
+   width="55"
+   height="55"
    id="svg2">
   <defs
      id="defs5">
     <linearGradient
-       id="linearGradient3166">
+       id="linearGradient3689">
       <stop
-         id="stop3168"
+         id="stop3691"
          style="stop-color:#ffffff;stop-opacity:1"
          offset="0" />
       <stop
-         id="stop3170"
+         id="stop3693"
          style="stop-color:#ffff00;stop-opacity:1"
          offset="1" />
     </linearGradient>
     <linearGradient
        x1="0"
-       y1="22"
-       x2="74"
-       y2="22"
-       id="linearGradient3172"
-       xlink:href="#linearGradient3166"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="0"
-       y1="22"
-       x2="74"
-       y2="22"
-       id="linearGradient2487"
-       xlink:href="#linearGradient3166"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="0"
-       y1="22"
-       x2="74"
-       y2="22"
-       id="linearGradient2399"
-       xlink:href="#linearGradient3166"
+       y1="19"
+       x2="54"
+       y2="19"
+       id="linearGradient3695"
+       xlink:href="#linearGradient3689"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7128619,0,0,0.8895426,-6.102877e-4,0.9471127)" />
+       gradientTransform="translate(0.5,8.5)" />
   </defs>
   <path
-     d="M 34.216761,1.8366553 C 45.622551,1.8366553 45.622551,1.8366553 45.622551,1.8366553 C 45.622551,1.8366553 48.567953,4.0485498 49.543292,5.3948257 C 50.539496,6.7699023 52.038308,10.732081 52.038308,10.732081 L 52.038308,27.633391 C 52.038308,27.633391 50.457858,30.919053 49.543292,32.081104 C 48.524213,33.375948 45.622551,35.639274 45.622551,35.639274 L 33.503899,35.639274 L 33.503899,35.639274 L 33.503899,39.197444 L 19.246661,39.197444 L 19.246661,35.639274 L 7.1280087,35.639274 C 7.1280087,35.639274 4.2263475,33.375948 3.2072683,32.081104 C 2.2927019,30.919053 0.71225161,27.633391 0.71225161,27.633391 L 0.71225161,10.732081 C 0.71225161,10.732081 2.2110639,6.7699023 3.2072683,5.3948257 C 4.1826074,4.0485498 7.1280087,1.8366553 7.1280087,1.8366553 L 18.533799,1.8366553 L 18.533799,6.2843683 L 34.216761,6.2843683 L 34.216761,1.8366553 z"
-     id="path9"
-     style="fill:url(#linearGradient2399);fill-opacity:1;stroke:#c0a000;stroke-width:1.59263432;stroke-opacity:1" />
+     d="m 1.5,25.5 0,-8 a 8,8 0 0 1 8,-8 l 8,0 0,4 20,0 0,-4 8,0 a 8,8 0 0 1 8,8 l 0,8 0,8 a 8,8 0 0 1 -8,8 l -8,0 -2,0 0,4 -16,0 0,-4 -2,0 -8,0 a 8,8 0 0 1 -8,-8 l 0,-8 z"
+     id="path2882"
+     style="fill:url(#linearGradient3695);fill-opacity:1;stroke:#a08000;stroke-width:2;stroke-linecap:square;stroke-opacity:1" />
 </svg>
diff --git a/icons/htmloff.svg b/icons/htmloff.svg
index fe0c01a..d6f83c6 100644
--- a/icons/htmloff.svg
+++ b/icons/htmloff.svg
@@ -1,81 +1,23 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.0"
-   width="55"
-   height="55"
-   viewBox="0 0 55 55"
-   id="svg2"
-   xml:space="preserve"><defs
-   id="defs29" />
-<g
-   transform="translate(-0.25,-1.75)"
-   id="g4">
-  <line
-   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-   y2="5"
-   y1="16"
-   x2="52.5"
-   x1="41"
-   id="line6" />
-  <polyline
-   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-   points="51.5,15.5 41,16 42,5.75"
-   id="polyline8" />
-</g>
-   <polygon
-   points="10.932,6.088 31.874,6.088 43.818,18.027 43.818,48.914 10.932,48.914 10.932,6.088 "
-   transform="translate(-5.182,3.336)"
-   id="polygon10"
-   style="fill:none;stroke:#ffffff;stroke-width:3.5" />
-   <polyline
-   points="43.818,18.027 31.874,18.027 31.874,6.088    "
-   id="polyline12"
-   transform="translate(-5.182,3.336)"
-   style="fill:none;stroke:#ffffff;stroke-width:3.5" />
-   
-   
-   
-   
-   
-   
-   <circle
-   cx="27.375"
-   cy="33.5"
-   r="9.9510002"
-   transform="translate(-5.1815003,1.7989998)"
-   id="circle14"
-   style="fill:#ffffff;fill-opacity:1" /><path
-   d="M 22.1945,25.348 C 22.1945,25.348 16.5915,29.545 16.5915,35.336 C 16.5915,41.127 22.1945,45.25 22.1945,45.25"
-   id="path16"
-   style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.5" /><path
-   d="M 22.1945,25.348 C 22.1945,25.348 27.7265,29.918 27.7265,35.336 C 27.7265,40.755 22.1945,45.25 22.1945,45.25"
-   id="path18"
-   style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.5" /><line
-   style="fill:#ff0000;fill-opacity:1;stroke:#000000;stroke-width:1.5"
-   x1="22.1945"
-   x2="22.1945"
-   y1="25.348"
-   y2="45.25"
-   id="line20" /><line
-   style="fill:#ff0000;fill-opacity:1;stroke:#000000;stroke-width:1.5"
-   x1="22.1945"
-   x2="22.1945"
-   y1="25.348"
-   y2="45.25"
-   id="line22" /><line
-   style="fill:#ff0000;fill-opacity:1;stroke:#000000;stroke-width:1.5"
-   x1="22.1945"
-   x2="22.1945"
-   y1="25.348"
-   y2="45.25"
-   id="line24" /><line
-   style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-opacity:1"
-   x1="12.2415"
-   x2="32.144501"
-   y1="35.299"
-   y2="35.299"
-   id="line26" />
-</svg>
\ No newline at end of file
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#666666">
+]><svg enable-background="new 0 0 58.5 55" height="55px" version="1.1" viewBox="0 0 58.5 55" width="58.5px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="transfer-from-url">
+	<g>
+		<polygon fill="&fill_color;" points="50.056,32.715 50.056,2 8.433,2     8.433,32.715 1.75,34.542 29.252,52.581 56.75,34.543   " stroke="&stroke_color;" stroke-linejoin="round" stroke-width="3.5"/>
+	</g>
+	<g>
+		<g>
+			<polygon fill="#ffffff" points="18.435,10.583 32.046,10.583 39.811,18.343 39.811,38.42      18.435,38.42    " stroke="&fill_color;" stroke-width="2.275"/>
+			<polyline fill="none" points="39.811,18.343 32.046,18.343 32.046,10.583    " stroke="&fill_color;" stroke-width="2.275"/>
+		</g>
+	</g>
+	<g>
+		<circle cx="29.123" cy="28.4" fill="&fill_color;" r="6.469"/>
+		<g>
+			<path d="M29.124,21.932c0,0,3.596,2.971,3.596,6.492     c0,3.523-3.596,6.445-3.596,6.445" fill="none" stroke="#ffffff" stroke-width="0.975"/>
+			<path d="M29.124,21.932c0,0-3.642,2.728-3.642,6.492     c0,3.765,3.642,6.445,3.642,6.445" fill="none" stroke="#ffffff" stroke-width="0.975"/>
+			<line fill="none" stroke="#ffffff" stroke-width="0.975" x1="29.124" x2="29.124" y1="21.932" y2="34.869"/>
+			<line fill="none" stroke="#ffffff" stroke-width="0.975" x1="22.654" x2="35.591" y1="28.4" y2="28.4"/>
+		</g>
+	</g>
+</g></svg>
diff --git a/icons/htmlon.svg b/icons/htmlon.svg
index af7331e..c4e50b8 100644
--- a/icons/htmlon.svg
+++ b/icons/htmlon.svg
@@ -1,66 +1,70 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   version="1.0"
-   width="55"
+   version="1.1"
+   width="58.5"
    height="55"
-   viewBox="0 0 55 55"
+   viewBox="0 0 58.5 55"
    id="svg2"
    xml:space="preserve"><defs
-   id="defs29" />
-
-   <polygon
-   points="10.932,6.088 31.874,6.088 43.818,18.027 43.818,48.914 10.932,48.914 10.932,6.088 "
-   transform="translate(-5.182,3.336)"
-   id="polygon10"
-   style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-   <polyline
-   points="43.818,18.027 31.874,18.027 31.874,6.088    "
-   id="polyline12"
-   style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-   transform="translate(-5.182,3.336)" />
-   <circle
-   cx="27.375"
-   cy="33.5"
-   r="9.9510002"
-   transform="translate(-5.182,2.549)"
-   id="circle14" />
-   <path
-   d="M 22.194,26.098 C 22.194,26.098 16.591,30.295 16.591,36.086 C 16.591,41.877 22.194,46 22.194,46"
-   id="path16"
-   style="stroke:#ffffff;stroke-opacity:1" />
-   <path
-   d="M 22.194,26.098 C 22.194,26.098 27.726,30.668 27.726,36.086 C 27.726,41.505 22.194,46 22.194,46"
-   id="path18"
-   style="stroke:#ffffff;stroke-opacity:1" />
-   <line
-   x1="22.194"
-   x2="22.194"
-   y1="26.098"
-   y2="46"
-   id="line20"
-   style="stroke:#0000ff;stroke-opacity:1" />
-   <line
-   x1="22.194"
-   x2="22.194"
-   y1="26.098"
-   y2="46"
-   id="line22"
-   style="stroke:#0000ff;stroke-opacity:1" />
-   <line
-   x1="22.194"
-   x2="22.194"
-   y1="26.098"
-   y2="46"
-   id="line24"
-   style="stroke:#ffffff;stroke-opacity:1" />
-   <line
-   x1="12.241"
-   x2="32.144001"
-   y1="36.049"
-   y2="36.049"
-   id="line26"
-   style="stroke:#ffffff;stroke-opacity:1" />
-</svg>
\ No newline at end of file
+     id="defs33">
+	
+	
+	
+</defs><g
+     id="g5"
+     style="fill:#00ff00;fill-opacity:1">
+		<polygon
+   points="8.433,32.715 1.75,34.542 29.252,52.581 56.75,34.543 50.056,32.715 50.056,2 8.433,2 "
+   id="polygon7"
+   style="fill:#00ff00;fill-opacity:1;stroke:#010101;stroke-width:3.5;stroke-linejoin:round" />
+	</g><g
+     id="g9">
+		<g
+   id="g11">
+			<polygon
+   points="39.811,38.42 18.435,38.42 18.435,10.583 32.046,10.583 39.811,18.343 "
+   id="polygon13"
+   style="fill:#ffffff;stroke:#666666;stroke-width:2.2750001" />
+			<polyline
+   style="fill:none;stroke:#666666;stroke-width:2.2750001"
+   id="polyline15"
+   points="39.811,18.343 32.046,18.343 32.046,10.583    " />
+		</g>
+	</g><g
+     id="g17">
+		<circle
+   cx="29.122999"
+   cy="28.4"
+   r="6.4689999"
+   id="circle19"
+   style="fill:#666666" />
+		<g
+   id="g21">
+			<path
+   d="m 29.124,21.932 c 0,0 3.596,2.971 3.596,6.492 0,3.523 -3.596,6.445 -3.596,6.445"
+   id="path23"
+   style="fill:none;stroke:#ffffff;stroke-width:0.97500002" />
+			<path
+   d="m 29.124,21.932 c 0,0 -3.642,2.728 -3.642,6.492 0,3.765 3.642,6.445 3.642,6.445"
+   id="path25"
+   style="fill:none;stroke:#ffffff;stroke-width:0.97500002" />
+			<line
+   style="fill:none;stroke:#ffffff;stroke-width:0.97500002"
+   id="line27"
+   y2="34.868999"
+   y1="21.931999"
+   x2="29.124001"
+   x1="29.124001" />
+			<line
+   style="fill:none;stroke:#ffffff;stroke-width:0.97500002"
+   id="line29"
+   y2="28.4"
+   y1="28.4"
+   x2="35.591"
+   x1="22.653999" />
+		</g>
+	</g></svg>
\ No newline at end of file
diff --git a/icons/image-saveoff.svg b/icons/image-saveoff.svg
index 2a8b197..b1b485f 100644
--- a/icons/image-saveoff.svg
+++ b/icons/image-saveoff.svg
@@ -1,66 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.0"
-   width="55"
-   height="55"
-   viewBox="0 0 55 55"
-   id="svg2"
-   xml:space="preserve"><defs
-   id="defs41">
-</defs>
-<g
-   transform="translate(-0.5507515,-1.7569535)"
-   id="g3"
-   style="fill:none">
-  <line
-   style="fill:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-   id="line3290"
-   y2="4.9169998"
-   y1="16.188"
-   x2="52.441002"
-   x1="41.169998" />
-  <polyline
-   style="fill:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-   id="polyline3292"
-   points="51.562,15.306 41.17,16.188 42.053,5.794" />
-</g>
-<polygon
-   points="10.932,6.088 31.874,6.088 43.818,18.027 43.818,48.914 10.932,48.914 10.932,6.088 "
-   transform="translate(-6,2)"
-   id="polygon9"
-   style="fill:none;stroke:#ffffff;stroke-width:3.5" /><polyline
-   points="43.818,18.027 31.874,18.027 31.874,6.088"
-   id="polyline11"
-   style="fill:none;stroke:#ffffff;stroke-width:3.5"
-   transform="translate(-6,2)" />
-<line
-   x1="40.75"
-   x2="52.021004"
-   y1="15.249998"
-   y2="3.9789984"
-   id="line2513"
-   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><polyline
-   points="51.562,15.306 41.17,16.188 42.053,5.794"
-   id="polyline2515"
-   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-   transform="translate(-0.4199989,-0.938)" /><polyline
-   points="43.818,18.027 31.874,18.027 31.874,6.088"
-   id="polyline2519"
-   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-opacity:1"
-   transform="translate(45.97349,37.199819)" /><g
-   transform="matrix(0.6016528,0,0,0.5962542,20.149385,7.0668138)"
-   id="g2488"
-   style="fill:#ffffff;fill-opacity:1"><path
-     d="M 3.196409,27.818399 C -6.063591,27.818399 -13.778591,37.053399 -13.778591,37.053399 C -13.778591,37.053399 -6.064591,46.330398 3.196409,46.325398 C 12.456409,46.318399 20.174409,37.040399 20.174409,37.040399 C 20.174409,37.040399 12.457409,27.811399 3.196409,27.818399 z M 3.196409,43.566399 C -0.388591,43.566399 -3.295591,40.656399 -3.295591,37.072398 C -3.295591,33.493399 -0.389591,30.578398 3.196409,30.578398 C 6.777409,30.578398 9.686409,33.493399 9.686409,37.072398 C 9.686409,40.656399 6.777409,43.566399 3.196409,43.566399 z"
-     id="path2465"
-     style="fill:#ffffff;fill-opacity:1;display:inline" /><circle
-     cx="27.504"
-     cy="27.598"
-     r="2.9460001"
-     transform="translate(-24.306591,9.4763985)"
-     id="circle2467"
-     style="fill:#ffffff;fill-opacity:1;display:inline" /></g>
-</svg>
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#666666">
+]><svg enable-background="new 0 0 58.5 55" height="55px" version="1.1" viewBox="0 0 58.5 55" width="58.5px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="transfer-from-image">
+	<g display="inline">
+		<polygon fill="&fill_color;" points="50.056,32.715 50.056,2 8.433,2     8.433,32.715 1.75,34.542 29.252,52.581 56.75,34.543   " stroke="&stroke_color;" stroke-linejoin="round" stroke-width="3.5"/>
+	</g>
+	<g display="inline">
+		<g>
+			<polygon fill="#ffffff" points="43.041,35.189 43.041,21.577 35.281,13.812      15.204,13.812 15.204,35.189    " stroke="&fill_color;" stroke-width="2.275"/>
+			<polyline fill="none" points="35.281,13.812 35.281,21.577 43.041,21.577    " stroke="&fill_color;" stroke-width="2.275"/>
+		</g>
+	</g>
+	<path d="M29.206,21.798c-4.067,0-7.456,4.056-7.456,4.056s3.389,4.076,7.456,4.074   c4.069-0.004,7.458-4.078,7.458-4.078S33.275,21.795,29.206,21.798z M29.206,28.715c-1.575,0-2.852-1.277-2.852-2.853   c0-1.572,1.277-2.852,2.852-2.852c1.573,0,2.85,1.28,2.85,2.852C32.056,27.438,30.779,28.715,29.206,28.715z" display="inline" fill="&fill_color;"/>
+	<circle cx="29.207" cy="25.863" display="inline" fill="&fill_color;" r="1.294"/>
+</g></svg>
diff --git a/icons/image-saveon.svg b/icons/image-saveon.svg
index 933aa9e..b4e9270 100644
--- a/icons/image-saveon.svg
+++ b/icons/image-saveon.svg
@@ -1,53 +1,47 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   version="1.0"
-   width="55"
+   version="1.1"
+   width="58.5"
    height="55"
-   viewBox="0 0 55 55"
+   viewBox="0 0 58.5 55"
    id="svg2"
    xml:space="preserve"><defs
-   id="defs41">
-   
-</defs>
-<g
-   transform="translate(-0.5507515,-1.7569535)"
-   id="g3"
-   style="fill:none;stroke:#ffffff;stroke-opacity:1">
-  <line
-   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-   id="line3290"
-   y2="4.9169998"
-   y1="16.188"
-   x2="52.441002"
-   x1="41.169998" />
-  <polyline
-   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-   id="polyline3292"
-   points="51.562,15.306 41.17,16.188 42.053,5.794" />
-</g>
-<polygon
-   points="10.932,6.088 31.874,6.088 43.818,18.027 43.818,48.914 10.932,48.914 10.932,6.088 "
-   transform="translate(-6,2)"
-   id="polygon9"
-   style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3.5;stroke-opacity:1" /><polyline
-   points="43.818,18.027 31.874,18.027 31.874,6.088"
-   id="polyline11"
-   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-opacity:1"
-   transform="translate(-6,2)" />
-<g
-   transform="matrix(0.6016528,0,0,0.5962542,20.149385,7.0668138)"
-   id="g2488"
-   style="fill:#000000;fill-opacity:1"><path
-     d="M 3.196409,27.818399 C -6.063591,27.818399 -13.778591,37.053399 -13.778591,37.053399 C -13.778591,37.053399 -6.064591,46.330398 3.196409,46.325398 C 12.456409,46.318399 20.174409,37.040399 20.174409,37.040399 C 20.174409,37.040399 12.457409,27.811399 3.196409,27.818399 z M 3.196409,43.566399 C -0.388591,43.566399 -3.295591,40.656399 -3.295591,37.072398 C -3.295591,33.493399 -0.389591,30.578398 3.196409,30.578398 C 6.777409,30.578398 9.686409,33.493399 9.686409,37.072398 C 9.686409,40.656399 6.777409,43.566399 3.196409,43.566399 z"
-     id="path2465"
-     style="fill:#000000;fill-opacity:1;display:inline" /><circle
-     cx="27.504"
-     cy="27.598"
-     r="2.9460001"
-     transform="translate(-24.306591,9.4763985)"
-     id="circle2467"
-     style="fill:#000000;fill-opacity:1;display:inline" /></g>
-</svg>
\ No newline at end of file
+     id="defs23">
+	
+	
+	
+	
+</defs><g
+     id="g5"
+     style="fill:#00ff00;fill-opacity:1;display:inline">
+		<polygon
+   points="8.433,32.715 1.75,34.542 29.252,52.581 56.75,34.543 50.056,32.715 50.056,2 8.433,2 "
+   id="polygon7"
+   style="fill:#00ff00;fill-opacity:1;stroke:#010101;stroke-width:3.5;stroke-linejoin:round" />
+	</g><g
+     id="g9"
+     style="display:inline">
+		<g
+   id="g11">
+			<polygon
+   points="15.204,13.812 15.204,35.189 43.041,35.189 43.041,21.577 35.281,13.812 "
+   id="polygon13"
+   style="fill:#ffffff;stroke:#666666;stroke-width:2.2750001" />
+			<polyline
+   style="fill:none;stroke:#666666;stroke-width:2.2750001"
+   id="polyline15"
+   points="35.281,13.812 35.281,21.577 43.041,21.577    " />
+		</g>
+	</g><path
+     d="m 29.206,21.798 c -4.067,0 -7.456,4.056 -7.456,4.056 0,0 3.389,4.076 7.456,4.074 4.069,-0.004 7.458,-4.078 7.458,-4.078 0,0 -3.389,-4.055 -7.458,-4.052 z m 0,6.917 c -1.575,0 -2.852,-1.277 -2.852,-2.853 0,-1.572 1.277,-2.852 2.852,-2.852 1.573,0 2.85,1.28 2.85,2.852 0,1.576 -1.277,2.853 -2.85,2.853 z"
+     id="path17"
+     style="fill:#666666;display:inline" /><circle
+     cx="29.207001"
+     cy="25.863001"
+     r="1.294"
+     id="circle19"
+     style="fill:#666666;display:inline" /></svg>
\ No newline at end of file
diff --git a/icons/load-from-journal.svg b/icons/load-from-journal.svg
index f111ac2..f30a6f1 100644
--- a/icons/load-from-journal.svg
+++ b/icons/load-from-journal.svg
@@ -1,148 +1,84 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   version="1.0"
-   width="55"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   width="58.5"
    height="55"
-   viewBox="0 0 55 55"
+   viewBox="0 0 58.5 55"
    id="svg2"
    xml:space="preserve"><defs
-   id="defs41">
-  
-  
-
-  
-   
-   
-   
-   
-
-  
-  
-
-  
-   
-   
-   
-   
-
-    
-    
-    
-    
-    
-    
-   
-    
-   
-    
-    
-    
-    
-   
-  
-  
-</defs>
-<g
-   transform="translate(-0.5507515,-1.7569535)"
-   id="g3"
-   style="fill:none">
-  <line
-   style="fill:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-   id="line3290"
-   y2="4.9169998"
-   y1="16.188"
-   x2="52.441002"
-   x1="41.169998" />
-  <polyline
-   style="fill:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-   id="polyline3292"
-   points="51.562,15.306 41.17,16.188 42.053,5.794" />
-</g>
-<polygon
-   points="10.932,6.088 31.874,6.088 43.818,18.027 43.818,48.914 10.932,48.914 10.932,6.088 "
-   transform="translate(-6,2)"
-   id="polygon9"
-   style="fill:none;stroke:#ffffff;stroke-width:3.5" /><polyline
-   points="43.818,18.027 31.874,18.027 31.874,6.088"
-   id="polyline11"
-   style="fill:none;stroke:#ffffff;stroke-width:3.5"
-   transform="translate(-6,2)" /><path
-   d="M 21.379465,44.19975 C 21.102965,44.19975 20.829965,44.18225 20.560965,44.14975 L 21.254965,45.32425 L 21.938965,44.16775 C 21.753465,44.18275 21.568465,44.19975 21.379465,44.19975 z"
-   id="path11"
-   style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g
-   transform="matrix(0.5,0,0,0.5,7.630965,20.06025)"
-   id="g13"
-   style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-    <path
-   d="M 40.16,11.726 C 37.996,11.726 36.202,13.281 35.817,15.333 C 37.676,16.678 39.274,18.448 40.492,20.541 C 42.777,20.369 44.586,18.48 44.586,16.151 C 44.586,13.707 42.604,11.726 40.16,11.726 z"
-   id="path15"
-   style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-   d="M 40.713,39.887 C 39.489,42.119 37.853,44.018 35.916,45.443 C 36.437,47.307 38.129,48.682 40.16,48.682 C 42.603,48.682 44.586,46.702 44.586,44.258 C 44.586,42.003 42.893,40.162 40.713,39.887 z"
-   id="path17"
-   style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-   d="M 14.273,39.871 C 12.02,40.077 10.249,41.95 10.249,44.258 C 10.249,46.701 12.229,48.682 14.673,48.682 C 16.737,48.682 18.457,47.262 18.945,45.35 C 17.062,43.934 15.47,42.061 14.273,39.871 z"
-   id="path19"
-   style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-   d="M 19.026,15.437 C 18.683,13.334 16.872,11.726 14.673,11.726 C 12.229,11.726 10.249,13.707 10.249,16.15 C 10.249,18.532 12.135,20.46 14.494,20.556 C 15.68,18.513 17.226,16.772 19.026,15.437 z"
-   id="path21"
-   style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-   </g><path
-   d="M 21.379465,26.34175 C 22.333465,26.34175 23.243465,26.54725 24.088465,26.90575 C 24.458965,26.36775 24.677465,25.71725 24.677465,25.01425 C 24.677465,23.17075 23.182965,21.67575 21.338965,21.67575 C 19.495465,21.67575 18.000965,23.17075 18.000965,25.01425 C 18.000965,25.72825 18.226965,26.38875 18.608965,26.93125 C 19.470965,26.55675 20.402465,26.34175 21.379465,26.34175 z"
-   id="path23"
-   style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g
-   transform="matrix(0.5,0,0,0.5,7.630965,20.06025)"
-   id="g25"
-   style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-    <path
-   d="M 43.102,30.421 C 43.102,35.1554 41.4568,39.7008 38.5314,43.0485 C 35.606,46.3963 31.6341,48.279 27.497,48.279 C 23.3599,48.279 19.388,46.3963 16.4626,43.0485 C 13.5372,39.7008 11.892,35.1554 11.892,30.421 C 11.892,20.6244 18.9364,12.563 27.497,12.563 C 36.0576,12.563 43.102,20.6244 43.102,30.421 z"
-   id="path2988"
-   style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-   </g><g
-   transform="matrix(0.5,0,0,0.5,7.630965,20.06025)"
-   id="g28"
-   style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-    <path
-   d="M 25.875,33.75 L 24.333,29.125 L 27.497,26.538 L 31.112,29.164 L 29.625,33.833 L 25.875,33.75 z"
-   id="path30"
-   style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-   d="M 27.501,41.551 C 23.533,41.391 21.958,39.542 21.958,39.542 L 25.528,35.379 L 29.993,35.547 L 33.125,39.667 C 33.125,39.667 30.235,41.661 27.501,41.551 z"
-   id="path32"
-   style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-   d="M 18.453,33.843 C 17.604,30.875 18.625,26.959 18.625,26.959 L 22.625,29.126 L 24.118,33.755 L 20.536,37.988 C 20.536,37.987 19.071,35.998 18.453,33.843 z"
-   id="path34"
-   style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-   d="M 19.458,25.125 C 19.458,25.125 19.958,23.167 22.497,21.303 C 24.734,19.66 26.962,19.583 26.962,19.583 L 26.925,24.564 L 23.404,27.314 L 19.458,25.125 z"
-   id="path2998"
-   style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-   d="M 32.084,27.834 L 28.625,24.959 L 29,19.75 C 29,19.75 30.834,19.708 32.959,21.417 C 35.187,23.208 36.321,26.4 36.321,26.4 L 32.084,27.834 z"
-   id="path37"
-   style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-   d="M 31.292,34.042 L 32.605,29.578 L 36.792,28.042 C 36.792,28.042 37.469,30.705 36.75,33.709 C 36.21,35.965 34.666,38.07 34.666,38.07 L 31.292,34.042 z"
-   id="path3002"
-   style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-   </g>
-<polyline
-   points="43.818,18.027 31.874,18.027 31.874,6.088"
-   id="polyline2519"
-   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-opacity:1"
-   transform="translate(45.97349,37.199819)" /><text
-   x="31.578125"
-   y="20.0625"
-   id="text2406"
-   xml:space="preserve"
-   style="font-size:32px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"><tspan
-     x="31.578125"
-     y="20.0625"
-     id="tspan2408">+</tspan></text>
-</svg>
\ No newline at end of file
+     id="defs25">
+	
+	
+	
+	
+	
+<linearGradient
+   x1="0.94254935"
+   y1="-31.669659"
+   x2="104.37702"
+   y2="20.434471"
+   id="linearGradient3172"
+   xlink:href="#linearGradient3166"
+   gradientUnits="userSpaceOnUse"
+   gradientTransform="matrix(0.7083638,0,0,1.0012565,0.1338084,32.632067)" /><linearGradient
+   id="linearGradient3166"><stop
+     id="stop3168"
+     style="stop-color:#ffffff;stop-opacity:1"
+     offset="0" /><stop
+     id="stop3170"
+     style="stop-color:#ffff00;stop-opacity:1"
+     offset="1" /></linearGradient></defs><g
+     id="g5"
+     style="display:inline">
+		<polygon
+   points="50.067,21.866 56.75,20.039 29.248,2 1.75,20.038 8.443,21.866 8.443,52.581 50.067,52.58 "
+   id="polygon7"
+   style="fill:#666666;stroke:#010101;stroke-width:3.5;stroke-linejoin:round" />
+	</g><line
+     style="fill:none;stroke:#666666;stroke-width:2.2750001;display:inline"
+     id="line17"
+     y2="29.688"
+     y1="29.688"
+     x2="35.298"
+     x1="22.948"
+     display="inline" /><line
+     style="fill:none;stroke:#666666;stroke-width:2.2750001;display:inline"
+     id="line19"
+     y2="34.237999"
+     y1="34.237999"
+     x2="35.298"
+     x1="22.948"
+     display="inline" /><line
+     style="fill:none;stroke:#666666;stroke-width:2.2750001;display:inline"
+     id="line21"
+     y2="38.786999"
+     y1="38.786999"
+     x2="35.298"
+     x1="22.948"
+     display="inline" /><g
+     transform="matrix(0.67,0,0,0.67,11.410915,13.075)"
+     id="activity-journal"
+     style="stroke:#000000;stroke-opacity:1;display:block"><path
+       d="M 45.866,44.669 C 45.866,47.18 44.338,49 41.534,49 l -29.457,0 0,-43 29.458,0 c 2.15,0 4.332,2.154 4.332,4.33 l -10e-4,34.339 0,0 z"
+       id="path2458"
+       style="fill:#ffffff;stroke:#000000;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><line
+       style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       x1="21.341"
+       x2="21.341"
+       y1="6.1209998"
+       y2="48.881001"
+       id="line2460" /><path
+       d="m 7.384,14.464 c 0,0 2.084,0.695 4.17,0.695 2.086,0 4.173,-0.695 4.173,-0.695"
+       id="path2462"
+       style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+       d="m 7.384,28.021 c 0,0 1.912,0.695 4.345,0.695 2.433,0 3.999,-0.695 3.999,-0.695"
+       id="path2464"
+       style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+       d="m 7.384,41.232 c 0,0 1.736,0.695 4.518,0.695 2.781,0 3.825,-0.695 3.825,-0.695"
+       id="path2466"
+       style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /></g></svg>
\ No newline at end of file
diff --git a/icons/logo-saveoff.svg b/icons/logo-saveoff.svg
index 602af75..0c3dfe2 100644
--- a/icons/logo-saveoff.svg
+++ b/icons/logo-saveoff.svg
@@ -1,23 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   version="1.0"
-   width="55"
+   version="1.1"
+   width="58.5"
    height="55"
-   viewBox="0 0 55 55"
+   viewBox="0 0 58.5 55"
    id="svg2"
    xml:space="preserve"><defs
-   id="defs41">
-  
-  
-
-  
-   
-   
-   
-   
+     id="defs33">
+	
+	
+	
 
   
   
@@ -27,123 +23,74 @@
    
    
    
-
-    
-    
-    
-    
-    
-    
-   
-    
-   
-    
-    
-    
-    
-   
-  
-  
-</defs>
-<g
-   transform="translate(-0.5507515,-1.7569535)"
-   id="g3"
-   style="fill:none">
-  <line
-   style="fill:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-   id="line3290"
-   y2="4.9169998"
-   y1="16.188"
-   x2="52.441002"
-   x1="41.169998" />
-  <polyline
-   style="fill:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-   id="polyline3292"
-   points="51.562,15.306 41.17,16.188 42.053,5.794" />
-</g>
-<polygon
-   points="10.932,6.088 31.874,6.088 43.818,18.027 43.818,48.914 10.932,48.914 10.932,6.088 "
-   transform="translate(-6,2)"
-   id="polygon9"
-   style="fill:none;stroke:#ffffff;stroke-width:3.5" /><polyline
-   points="43.818,18.027 31.874,18.027 31.874,6.088"
-   id="polyline11"
-   style="fill:none;stroke:#ffffff;stroke-width:3.5"
-   transform="translate(-6,2)" /><path
-   d="M 21.379465,44.19975 C 21.102965,44.19975 20.829965,44.18225 20.560965,44.14975 L 21.254965,45.32425 L 21.938965,44.16775 C 21.753465,44.18275 21.568465,44.19975 21.379465,44.19975 z"
-   id="path11"
-   style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g
-   transform="matrix(0.5,0,0,0.5,7.630965,20.06025)"
-   id="g13"
-   style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+</defs><g
+     id="g5">
+		<polygon
+   points="1.75,34.542 29.252,52.581 56.75,34.543 50.056,32.715 50.056,2 8.433,2 8.433,32.715 "
+   id="polygon7"
+   style="fill:#666666;stroke:#010101;stroke-width:3.5;stroke-linejoin:round" />
+	</g><g
+     transform="translate(16.080508,-9.0889831)"
+     id="g3105"><path
+       d="m 12.896306,44.429676 c -0.2765,0 -0.5495,-0.0175 -0.8185,-0.05 l 0.694,1.1745 0.684,-1.1565 c -0.1855,0.015 -0.3705,0.032 -0.5595,0.032 z"
+       id="path11"
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><g
+       transform="matrix(0.5,0,0,0.5,-0.8521941,20.290176)"
+       id="g13"
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
     <path
-   d="M 40.16,11.726 C 37.996,11.726 36.202,13.281 35.817,15.333 C 37.676,16.678 39.274,18.448 40.492,20.541 C 42.777,20.369 44.586,18.48 44.586,16.151 C 44.586,13.707 42.604,11.726 40.16,11.726 z"
+   d="m 40.16,11.726 c -2.164,0 -3.958,1.555 -4.343,3.607 1.859,1.345 3.457,3.115 4.675,5.208 2.285,-0.172 4.094,-2.061 4.094,-4.39 0,-2.444 -1.982,-4.425 -4.426,-4.425 z"
    id="path15"
-   style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-   d="M 40.713,39.887 C 39.489,42.119 37.853,44.018 35.916,45.443 C 36.437,47.307 38.129,48.682 40.16,48.682 C 42.603,48.682 44.586,46.702 44.586,44.258 C 44.586,42.003 42.893,40.162 40.713,39.887 z"
+   d="m 40.713,39.887 c -1.224,2.232 -2.86,4.131 -4.797,5.556 0.521,1.864 2.213,3.239 4.244,3.239 2.443,0 4.426,-1.98 4.426,-4.424 0,-2.255 -1.693,-4.096 -3.873,-4.371 z"
    id="path17"
-   style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-   d="M 14.273,39.871 C 12.02,40.077 10.249,41.95 10.249,44.258 C 10.249,46.701 12.229,48.682 14.673,48.682 C 16.737,48.682 18.457,47.262 18.945,45.35 C 17.062,43.934 15.47,42.061 14.273,39.871 z"
+   d="m 14.273,39.871 c -2.253,0.206 -4.024,2.079 -4.024,4.387 0,2.443 1.98,4.424 4.424,4.424 2.064,0 3.784,-1.42 4.272,-3.332 -1.883,-1.416 -3.475,-3.289 -4.672,-5.479 z"
    id="path19"
-   style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-   d="M 19.026,15.437 C 18.683,13.334 16.872,11.726 14.673,11.726 C 12.229,11.726 10.249,13.707 10.249,16.15 C 10.249,18.532 12.135,20.46 14.494,20.556 C 15.68,18.513 17.226,16.772 19.026,15.437 z"
+   d="m 19.026,15.437 c -0.343,-2.103 -2.154,-3.711 -4.353,-3.711 -2.444,0 -4.424,1.981 -4.424,4.424 0,2.382 1.886,4.31 4.245,4.406 1.186,-2.043 2.732,-3.784 4.532,-5.119 z"
    id="path21"
-   style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
    </g><path
-   d="M 21.379465,26.34175 C 22.333465,26.34175 23.243465,26.54725 24.088465,26.90575 C 24.458965,26.36775 24.677465,25.71725 24.677465,25.01425 C 24.677465,23.17075 23.182965,21.67575 21.338965,21.67575 C 19.495465,21.67575 18.000965,23.17075 18.000965,25.01425 C 18.000965,25.72825 18.226965,26.38875 18.608965,26.93125 C 19.470965,26.55675 20.402465,26.34175 21.379465,26.34175 z"
-   id="path23"
-   style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g
-   transform="matrix(0.5,0,0,0.5,7.630965,20.06025)"
-   id="g25"
-   style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+       d="m 12.896306,26.571676 c 0.954,0 1.864,0.2055 2.709,0.564 0.3705,-0.538 0.589,-1.1885 0.589,-1.8915 0,-1.8435 -1.4945,-3.3385 -3.3385,-3.3385 -1.8435,0 -3.3380001,1.495 -3.3380001,3.3385 0,0.714 0.226,1.3745 0.6080001,1.917 0.862,-0.3745 1.7935,-0.5895 2.7705,-0.5895 z"
+       id="path23"
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><g
+       transform="matrix(0.5,0,0,0.5,-0.8521941,20.290176)"
+       id="g25"
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
     <path
-   d="M 43.102,30.421 C 43.102,35.1554 41.4568,39.7008 38.5314,43.0485 C 35.606,46.3963 31.6341,48.279 27.497,48.279 C 23.3599,48.279 19.388,46.3963 16.4626,43.0485 C 13.5372,39.7008 11.892,35.1554 11.892,30.421 C 11.892,20.6244 18.9364,12.563 27.497,12.563 C 36.0576,12.563 43.102,20.6244 43.102,30.421 z"
+   d="m 43.102,30.421 c 0,4.7344 -1.6452,9.2798 -4.5706,12.6275 -2.9254,3.3478 -6.8973,5.2305 -11.0344,5.2305 -4.1371,0 -8.109,-1.8827 -11.0344,-5.2305 -2.9254,-3.3477 -4.5706,-7.8931 -4.5706,-12.6275 0,-9.7966 7.0444,-17.858 15.605,-17.858 8.5606,0 15.605,8.0614 15.605,17.858 z"
    id="path2988"
-   style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
    </g><g
-   transform="matrix(0.5,0,0,0.5,7.630965,20.06025)"
-   id="g28"
-   style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+       transform="matrix(0.5,0,0,0.5,-0.8521941,20.290176)"
+       id="g28"
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
     <path
-   d="M 25.875,33.75 L 24.333,29.125 L 27.497,26.538 L 31.112,29.164 L 29.625,33.833 L 25.875,33.75 z"
+   d="m 25.875,33.75 -1.542,-4.625 3.164,-2.587 3.615,2.626 -1.487,4.669 -3.75,-0.083 z"
    id="path30"
-   style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-   d="M 27.501,41.551 C 23.533,41.391 21.958,39.542 21.958,39.542 L 25.528,35.379 L 29.993,35.547 L 33.125,39.667 C 33.125,39.667 30.235,41.661 27.501,41.551 z"
+   d="m 27.501,41.551 c -3.968,-0.16 -5.543,-2.009 -5.543,-2.009 l 3.57,-4.163 4.465,0.168 3.132,4.12 c 0,0 -2.89,1.994 -5.624,1.884 z"
    id="path32"
-   style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-   d="M 18.453,33.843 C 17.604,30.875 18.625,26.959 18.625,26.959 L 22.625,29.126 L 24.118,33.755 L 20.536,37.988 C 20.536,37.987 19.071,35.998 18.453,33.843 z"
+   d="m 18.453,33.843 c -0.849,-2.968 0.172,-6.884 0.172,-6.884 l 4,2.167 1.493,4.629 -3.582,4.233 c 0,-10e-4 -1.465,-1.99 -2.083,-4.145 z"
    id="path34"
-   style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-   d="M 19.458,25.125 C 19.458,25.125 19.958,23.167 22.497,21.303 C 24.734,19.66 26.962,19.583 26.962,19.583 L 26.925,24.564 L 23.404,27.314 L 19.458,25.125 z"
+   d="m 19.458,25.125 c 0,0 0.5,-1.958 3.039,-3.822 2.237,-1.643 4.465,-1.72 4.465,-1.72 l -0.037,4.981 -3.521,2.75 -3.946,-2.189 z"
    id="path2998"
-   style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-   d="M 32.084,27.834 L 28.625,24.959 L 29,19.75 C 29,19.75 30.834,19.708 32.959,21.417 C 35.187,23.208 36.321,26.4 36.321,26.4 L 32.084,27.834 z"
+   d="M 32.084,27.834 28.625,24.959 29,19.75 c 0,0 1.834,-0.042 3.959,1.667 2.228,1.791 3.362,4.983 3.362,4.983 l -4.237,1.434 z"
    id="path37"
-   style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-   d="M 31.292,34.042 L 32.605,29.578 L 36.792,28.042 C 36.792,28.042 37.469,30.705 36.75,33.709 C 36.21,35.965 34.666,38.07 34.666,38.07 L 31.292,34.042 z"
+   d="m 31.292,34.042 1.313,-4.464 4.187,-1.536 c 0,0 0.677,2.663 -0.042,5.667 -0.54,2.256 -2.084,4.361 -2.084,4.361 l -3.374,-4.028 z"
    id="path3002"
-   style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-   </g>
-<line
-   x1="40.75"
-   x2="52.021004"
-   y1="15.249998"
-   y2="3.9789984"
-   id="line2513"
-   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><polyline
-   points="51.562,15.306 41.17,16.188 42.053,5.794"
-   id="polyline2515"
-   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-   transform="translate(-0.4199989,-0.938)" /><polyline
-   points="43.818,18.027 31.874,18.027 31.874,6.088"
-   id="polyline2519"
-   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-opacity:1"
-   transform="translate(45.97349,37.199819)" /></svg>
\ No newline at end of file
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+   </g></g></svg>
\ No newline at end of file
diff --git a/icons/logo-saveon.svg b/icons/logo-saveon.svg
index 7a3f231..9c9ae52 100644
--- a/icons/logo-saveon.svg
+++ b/icons/logo-saveon.svg
@@ -1,15 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   version="1.0"
-   width="55"
+   version="1.1"
+   width="58.5"
    height="55"
-   viewBox="0 0 55 55"
+   viewBox="0 0 58.5 55"
    id="svg2"
    xml:space="preserve"><defs
-   id="defs41">
+     id="defs33">
+	
+	
+	
+
   
   
 
@@ -18,92 +23,75 @@
    
    
    
-</defs>
-<g
-   transform="translate(-0.5507515,-1.7569535)"
-   id="g3"
-   style="fill:none;stroke:#ffffff;stroke-opacity:1">
-  <line
-   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-   id="line3290"
-   y2="4.9169998"
-   y1="16.188"
-   x2="52.441002"
-   x1="41.169998" />
-  <polyline
-   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-   id="polyline3292"
-   points="51.562,15.306 41.17,16.188 42.053,5.794" />
-</g>
-<polygon
-   points="10.932,6.088 31.874,6.088 43.818,18.027 43.818,48.914 10.932,48.914 10.932,6.088 "
-   transform="translate(-6,2)"
-   id="polygon9"
-   style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3.5;stroke-opacity:1" /><polyline
-   points="43.818,18.027 31.874,18.027 31.874,6.088"
-   id="polyline11"
-   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-opacity:1"
-   transform="translate(-6,2)" /><path
-   d="M 21.379465,44.19975 C 21.102965,44.19975 20.829965,44.18225 20.560965,44.14975 L 21.254965,45.32425 L 21.938965,44.16775 C 21.753465,44.18275 21.568465,44.19975 21.379465,44.19975 z"
-   id="path11"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g
-   transform="matrix(0.5,0,0,0.5,7.630965,20.06025)"
-   id="g13"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+
+		
+	
+		
+	</defs><polygon
+     points="56.75,34.543 50.056,32.715 50.056,2 8.433,2 8.433,32.715 1.75,34.542 29.252,52.581 "
+     id="polygon7"
+     style="fill:#00ff00;fill-opacity:1;stroke:#010101;stroke-width:3.5;stroke-linejoin:round" /><g
+     transform="translate(16.080508,-9.0889831)"
+     id="g3105"><path
+       d="m 12.896306,44.429676 c -0.2765,0 -0.5495,-0.0175 -0.8185,-0.05 l 0.694,1.1745 0.684,-1.1565 c -0.1855,0.015 -0.3705,0.032 -0.5595,0.032 z"
+       id="path11"
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><g
+       transform="matrix(0.5,0,0,0.5,-0.8521941,20.290176)"
+       id="g13"
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
     <path
-   d="M 40.16,11.726 C 37.996,11.726 36.202,13.281 35.817,15.333 C 37.676,16.678 39.274,18.448 40.492,20.541 C 42.777,20.369 44.586,18.48 44.586,16.151 C 44.586,13.707 42.604,11.726 40.16,11.726 z"
+   d="m 40.16,11.726 c -2.164,0 -3.958,1.555 -4.343,3.607 1.859,1.345 3.457,3.115 4.675,5.208 2.285,-0.172 4.094,-2.061 4.094,-4.39 0,-2.444 -1.982,-4.425 -4.426,-4.425 z"
    id="path15"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-   d="M 40.713,39.887 C 39.489,42.119 37.853,44.018 35.916,45.443 C 36.437,47.307 38.129,48.682 40.16,48.682 C 42.603,48.682 44.586,46.702 44.586,44.258 C 44.586,42.003 42.893,40.162 40.713,39.887 z"
+   d="m 40.713,39.887 c -1.224,2.232 -2.86,4.131 -4.797,5.556 0.521,1.864 2.213,3.239 4.244,3.239 2.443,0 4.426,-1.98 4.426,-4.424 0,-2.255 -1.693,-4.096 -3.873,-4.371 z"
    id="path17"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-   d="M 14.273,39.871 C 12.02,40.077 10.249,41.95 10.249,44.258 C 10.249,46.701 12.229,48.682 14.673,48.682 C 16.737,48.682 18.457,47.262 18.945,45.35 C 17.062,43.934 15.47,42.061 14.273,39.871 z"
+   d="m 14.273,39.871 c -2.253,0.206 -4.024,2.079 -4.024,4.387 0,2.443 1.98,4.424 4.424,4.424 2.064,0 3.784,-1.42 4.272,-3.332 -1.883,-1.416 -3.475,-3.289 -4.672,-5.479 z"
    id="path19"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-   d="M 19.026,15.437 C 18.683,13.334 16.872,11.726 14.673,11.726 C 12.229,11.726 10.249,13.707 10.249,16.15 C 10.249,18.532 12.135,20.46 14.494,20.556 C 15.68,18.513 17.226,16.772 19.026,15.437 z"
+   d="m 19.026,15.437 c -0.343,-2.103 -2.154,-3.711 -4.353,-3.711 -2.444,0 -4.424,1.981 -4.424,4.424 0,2.382 1.886,4.31 4.245,4.406 1.186,-2.043 2.732,-3.784 4.532,-5.119 z"
    id="path21"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
    </g><path
-   d="M 21.379465,26.34175 C 22.333465,26.34175 23.243465,26.54725 24.088465,26.90575 C 24.458965,26.36775 24.677465,25.71725 24.677465,25.01425 C 24.677465,23.17075 23.182965,21.67575 21.338965,21.67575 C 19.495465,21.67575 18.000965,23.17075 18.000965,25.01425 C 18.000965,25.72825 18.226965,26.38875 18.608965,26.93125 C 19.470965,26.55675 20.402465,26.34175 21.379465,26.34175 z"
-   id="path23"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g
-   transform="matrix(0.5,0,0,0.5,7.630965,20.06025)"
-   id="g25"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+       d="m 12.896306,26.571676 c 0.954,0 1.864,0.2055 2.709,0.564 0.3705,-0.538 0.589,-1.1885 0.589,-1.8915 0,-1.8435 -1.4945,-3.3385 -3.3385,-3.3385 -1.8435,0 -3.3380001,1.495 -3.3380001,3.3385 0,0.714 0.226,1.3745 0.6080001,1.917 0.862,-0.3745 1.7935,-0.5895 2.7705,-0.5895 z"
+       id="path23"
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><g
+       transform="matrix(0.5,0,0,0.5,-0.8521941,20.290176)"
+       id="g25"
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
     <path
-   d="M 43.102,30.421 C 43.102,35.1554 41.4568,39.7008 38.5314,43.0485 C 35.606,46.3963 31.6341,48.279 27.497,48.279 C 23.3599,48.279 19.388,46.3963 16.4626,43.0485 C 13.5372,39.7008 11.892,35.1554 11.892,30.421 C 11.892,20.6244 18.9364,12.563 27.497,12.563 C 36.0576,12.563 43.102,20.6244 43.102,30.421 z"
+   d="m 43.102,30.421 c 0,4.7344 -1.6452,9.2798 -4.5706,12.6275 -2.9254,3.3478 -6.8973,5.2305 -11.0344,5.2305 -4.1371,0 -8.109,-1.8827 -11.0344,-5.2305 -2.9254,-3.3477 -4.5706,-7.8931 -4.5706,-12.6275 0,-9.7966 7.0444,-17.858 15.605,-17.858 8.5606,0 15.605,8.0614 15.605,17.858 z"
    id="path2988"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
    </g><g
-   transform="matrix(0.5,0,0,0.5,7.630965,20.06025)"
-   id="g28"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+       transform="matrix(0.5,0,0,0.5,-0.8521941,20.290176)"
+       id="g28"
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
     <path
-   d="M 25.875,33.75 L 24.333,29.125 L 27.497,26.538 L 31.112,29.164 L 29.625,33.833 L 25.875,33.75 z"
+   d="m 25.875,33.75 -1.542,-4.625 3.164,-2.587 3.615,2.626 -1.487,4.669 -3.75,-0.083 z"
    id="path30"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-   d="M 27.501,41.551 C 23.533,41.391 21.958,39.542 21.958,39.542 L 25.528,35.379 L 29.993,35.547 L 33.125,39.667 C 33.125,39.667 30.235,41.661 27.501,41.551 z"
+   d="m 27.501,41.551 c -3.968,-0.16 -5.543,-2.009 -5.543,-2.009 l 3.57,-4.163 4.465,0.168 3.132,4.12 c 0,0 -2.89,1.994 -5.624,1.884 z"
    id="path32"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-   d="M 18.453,33.843 C 17.604,30.875 18.625,26.959 18.625,26.959 L 22.625,29.126 L 24.118,33.755 L 20.536,37.988 C 20.536,37.987 19.071,35.998 18.453,33.843 z"
+   d="m 18.453,33.843 c -0.849,-2.968 0.172,-6.884 0.172,-6.884 l 4,2.167 1.493,4.629 -3.582,4.233 c 0,-10e-4 -1.465,-1.99 -2.083,-4.145 z"
    id="path34"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-   d="M 19.458,25.125 C 19.458,25.125 19.958,23.167 22.497,21.303 C 24.734,19.66 26.962,19.583 26.962,19.583 L 26.925,24.564 L 23.404,27.314 L 19.458,25.125 z"
+   d="m 19.458,25.125 c 0,0 0.5,-1.958 3.039,-3.822 2.237,-1.643 4.465,-1.72 4.465,-1.72 l -0.037,4.981 -3.521,2.75 -3.946,-2.189 z"
    id="path2998"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-   d="M 32.084,27.834 L 28.625,24.959 L 29,19.75 C 29,19.75 30.834,19.708 32.959,21.417 C 35.187,23.208 36.321,26.4 36.321,26.4 L 32.084,27.834 z"
+   d="M 32.084,27.834 28.625,24.959 29,19.75 c 0,0 1.834,-0.042 3.959,1.667 2.228,1.791 3.362,4.983 3.362,4.983 l -4.237,1.434 z"
    id="path37"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-   d="M 31.292,34.042 L 32.605,29.578 L 36.792,28.042 C 36.792,28.042 37.469,30.705 36.75,33.709 C 36.21,35.965 34.666,38.07 34.666,38.07 L 31.292,34.042 z"
+   d="m 31.292,34.042 1.313,-4.464 4.187,-1.536 c 0,0 0.677,2.663 -0.042,5.667 -0.54,2.256 -2.084,4.361 -2.084,4.361 l -3.374,-4.028 z"
    id="path3002"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-   </g>
-</svg>
\ No newline at end of file
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+   </g></g></svg>
\ No newline at end of file
diff --git a/icons/numbersoff.svg b/icons/numbersoff.svg
new file mode 100644
index 0000000..cffabf7
--- /dev/null
+++ b/icons/numbersoff.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="55"
+   height="55"
+   id="svg2">
+  <defs
+     id="defs5" />
+  <g
+     transform="translate(6.1026134,-1.6740561)"
+     id="g2392"
+     style="fill:#ffffff;fill-opacity:1">
+    <text
+       x="3.9423084"
+       y="26.866751"
+       id="text2384"
+       xml:space="preserve"
+       style="font-size:12px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
+         x="3.9423084"
+         y="26.866751"
+         id="tspan2386"
+         style="font-size:18px;font-weight:normal;fill:#ffffff;fill-opacity:1;-inkscape-font-specification:AlArabiya">123</tspan></text>
+    <text
+       x="1.8153553"
+       y="44.840736"
+       id="text2388"
+       xml:space="preserve"
+       style="font-size:12px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
+         x="1.8153553"
+         y="44.840736"
+         id="tspan2390"
+         style="font-size:18px;font-weight:normal;fill:#ffffff;fill-opacity:1;-inkscape-font-specification:AlArabiya">+–=</tspan></text>
+  </g>
+</svg>
diff --git a/icons/numberson.svg b/icons/numberson.svg
new file mode 100644
index 0000000..124994e
--- /dev/null
+++ b/icons/numberson.svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="55"
+   height="55"
+   id="svg2">
+  <defs
+     id="defs5" />
+  <rect
+     width="55"
+     height="55"
+     rx="0"
+     x="0"
+     y="0"
+     id="rect2839"
+     style="fill:#ffd200;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+  <g
+     transform="translate(6.1026134,-1.6740561)"
+     id="g2392"
+     style="fill:#a000a0;fill-opacity:1">
+    <text
+       x="4.5171318"
+       y="26.866751"
+       id="text2384"
+       xml:space="preserve"
+       style="font-size:12px;fill:#a000a0;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
+         x="4.5171318"
+         y="26.866751"
+         id="tspan2386"
+         style="font-size:18px;fill:#a000a0;fill-opacity:1">123</tspan></text>
+    <text
+       x="1.8153553"
+       y="44.840736"
+       id="text2388"
+       xml:space="preserve"
+       style="font-size:12px;fill:#a000a0;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
+         x="1.8153553"
+         y="44.840736"
+         id="tspan2390"
+         style="font-size:18px;fill:#a000a0;fill-opacity:1">+–=</tspan></text>
+  </g>
+</svg>
diff --git a/icons/palette.svg b/icons/palette.svg
new file mode 100644
index 0000000..48b4b36
--- /dev/null
+++ b/icons/palette.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="55"
+   height="55"
+   id="svg2">
+  <defs
+     id="defs6" />
+  <path
+     d="m 1.5,25.5 0,-8 a 8,8 0 0 1 8,-8 l 8,0 0,4 20,0 0,-4 8,0 a 8,8 0 0 1 8,8 l 0,8 0,8 a 8,8 0 0 1 -8,8 l -8,0 -2,0 0,4 -16,0 0,-4 -2,0 -8,0 a 8,8 0 0 1 -8,-8 l 0,-8 z"
+     id="path2882"
+     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.5;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+</svg>
diff --git a/icons/paletteoff.svg b/icons/paletteoff.svg
new file mode 100644
index 0000000..1964c0a
--- /dev/null
+++ b/icons/paletteoff.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="45"
+   height="45"
+   id="svg2">
+  <defs
+     id="defs13" />
+  <path
+     d="m 0.5,36.5 c 0.25,-9 0,-27 0,-27 l 44,0 0,27 -44,0 z"
+     id="path3"
+     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1px;stroke-opacity:1" />
+  <path
+     d="m 30.875,22.999999 c 0,4.62493 -3.74962,8.374182 -8.375,8.374182 -4.62538,0 -8.375,-3.749252 -8.375,-8.374182 0,-4.624929 3.74962,-8.374182 8.375,-8.374182 4.62538,0 8.375,3.749253 8.375,8.374182 l 0,0 z"
+     id="path5"
+     style="fill:#404040;fill-opacity:1;stroke:#404040;stroke-width:1px;stroke-opacity:1" />
+  <rect
+     width="10"
+     height="2"
+     x="17.5"
+     y="21.5"
+     id="rect2844"
+     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.5;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+</svg>
diff --git a/icons/paletteon.svg b/icons/paletteon.svg
new file mode 100644
index 0000000..cd9f594
--- /dev/null
+++ b/icons/paletteon.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="45"
+   height="45"
+   id="svg2">
+  <defs
+     id="defs13" />
+  <path
+     d="m 0.5,36.5 c 0.25,-9 0,-27 0,-27 l 44,0 0,27 -44,0 z"
+     id="path3"
+     style="fill:#ffd000;fill-opacity:1;stroke:#a08000;stroke-width:1px;stroke-opacity:1" />
+  <path
+     d="m 30.875,22.999999 c 0,4.62493 -3.74962,8.374182 -8.375,8.374182 -4.62538,0 -8.375,-3.749252 -8.375,-8.374182 0,-4.624929 3.74962,-8.374182 8.375,-8.374182 4.62538,0 8.375,3.749253 8.375,8.374182 l 0,0 z"
+     id="path5"
+     style="fill:#00ff00;fill-opacity:1;stroke:#00ff00;stroke-width:1px;stroke-opacity:1" />
+  <rect
+     width="10"
+     height="2"
+     x="17.5"
+     y="21.5"
+     id="rect2844"
+     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.5;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <rect
+     width="10"
+     height="2"
+     x="-27.5"
+     y="21.5"
+     transform="matrix(0,-1,1,0,0,0)"
+     id="rect2844-4"
+     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.5;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+</svg>
diff --git a/icons/penoff.svg b/icons/penoff.svg
new file mode 100644
index 0000000..109c0d6
--- /dev/null
+++ b/icons/penoff.svg
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="55"
+   height="55"
+   id="svg2">
+  <defs
+     id="defs5" />
+  <path
+     d="M 11.152285,41.709935 c 1.43401,0.788706 5.23977,1.402428 7.528553,1.290609 1.626167,-0.07945 3.914929,-0.479849 5.234137,-1.43401 2.238123,-1.618798 3.032695,-5.829627 5.090736,-7.671954 1.225701,-1.097229 3.231844,-2.444635 4.875634,-2.509518 2.003851,-0.07909 4.468168,1.514349 6.166244,2.581219 1.290216,0.810619 3.800127,3.369923 3.800127,3.369923"
+     id="path2471"
+     style="fill:none;stroke:#ffffff;stroke-width:2.5;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;" />
+  <path
+     d="M 35.566307,13.352385 l 2.437818,-2.366117 1.200984,0.84248 1.416085,1.200984 0.985882,1.272684 0.914181,1.487786 -2.366117,2.509519 -0.896257,-1.505711 -2.186866,-2.366117 -1.50571,-1.075508 z"
+     id="path3255"
+     style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1px;stroke-opacity:1" />
+  <path
+     d="M 32.877538,16.112854 l 2.294417,-2.079315 1.200984,0.84248 1.416085,1.200984 0.985882,1.272684 0.914181,1.487786 -2.079315,1.864214 -0.967957,-1.147208 -2.330267,-2.222716 -1.43401,-1.218909 z"
+     id="path3253"
+     style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-opacity:1" />
+  <path
+     d="M 13.423248,38.807621 l 0.891754,-3.80169 18.820708,-18.21056 -0.469344,-0.680549 2.252852,-2.135517 5.115854,5.115853 -2.229385,2.135517 -0.774419,-0.539747 -19.05538,18.022823 -3.70782,0.657082 -0.84482,-0.563212 z"
+     id="path2822"
+     style="fill:none;stroke:#ffffff;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;" />
+  <path
+     d="M 33.482432,17.358584 l 3.660886,3.473148"
+     id="path3596"
+     style="fill:none;stroke:#ffffff;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;" />
+  <path
+     d="M 10.935723,41.905293 l 2.769132,-2.816066"
+     id="path3598"
+     style="fill:none;stroke:#ffffff;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;" />
+  <path
+     d="M 14.690478,35.287537 c 0,0 1.594197,0.393866 2.158983,0.93869 0.574138,0.553844 1.032558,2.158984 1.032558,2.158984"
+     id="path3600"
+     style="fill:none;stroke:#ffffff;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;" />
+</svg>
diff --git a/icons/penon.svg b/icons/penon.svg
new file mode 100644
index 0000000..c717a9e
--- /dev/null
+++ b/icons/penon.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="55"
+   height="55"
+   id="svg2">
+  <defs
+     id="defs5" />
+  <rect
+     width="55"
+     height="55"
+     rx="0"
+     x="0"
+     y="0"
+     id="rect2839"
+     style="fill:#ffd200;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+  <g
+     transform="translate(5.2499995,-0.75000033)"
+     id="g2824">
+    <g
+       transform="translate(-31.525379,-20.795051)"
+       id="g2431">
+      <path
+         d="M 37.427664,63.254986 c 1.43401,0.788706 5.23977,1.402428 7.528553,1.290609 1.626167,-0.07945 3.914929,-0.479849 5.234137,-1.43401 2.238123,-1.618798 3.032695,-5.829627 5.090736,-7.671954 1.225701,-1.097229 3.231844,-2.444635 4.875634,-2.509518 2.003851,-0.07909 4.468168,1.514349 6.166244,2.581219 1.290216,0.810619 3.800127,3.369923 3.800127,3.369923"
+         id="path2471"
+         style="fill:none;stroke:#0080ff;stroke-width:3;stroke-linecap:round;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="M 39.220176,61.820976 l 1.147208,-4.660533 1.935914,0.358503 1.218909,1.075507 0.286802,2.079315 -4.588833,1.147208 z"
+         id="path3245"
+         style="fill:#e0e0e0;fill-opacity:1;stroke:#e0e0e0;stroke-width:1px;stroke-opacity:1" />
+      <path
+         d="M 37.786166,63.039885 c 1.720812,-1.864213 1.864213,-1.720812 1.864213,-1.720812"
+         id="path3243"
+         style="fill:none;stroke:#0060ff;stroke-width:2;stroke-linecap:round;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="M 40.869288,56.443439 59.224617,38.374911 60.658628,39.73722 42.6618,57.303845 40.869288,56.443439 z"
+         id="path3247"
+         style="fill:#a0a0ff;fill-opacity:1;stroke:#a0a0ff;stroke-width:1px;stroke-opacity:1" />
+      <path
+         d="M 44.095811,58.307652 61.949237,41.09953 63.383248,42.461839 44.454312,60.530368 44.095811,58.307652 z"
+         id="path3249"
+         style="fill:#8080ff;fill-opacity:1;stroke:#8080ff;stroke-width:1px;stroke-opacity:1" />
+      <path
+         d="M 42.231598,57.232144 l 1.649111,1.649111 18.28363,-17.781726 -1.505711,-1.792512 -18.42703,17.925127 z"
+         id="path3251"
+         style="fill:#c4c4ff;fill-opacity:1;stroke:#c4c4ff;stroke-width:1px;stroke-opacity:1" />
+      <path
+         d="M 61.841686,34.897436 l 2.437818,-2.366117 1.200984,0.84248 1.416085,1.200984 0.985882,1.272684 0.914181,1.487786 -2.366117,2.509519 -0.896257,-1.505711 -2.186866,-2.366117 -1.50571,-1.075508 z"
+         id="path3255"
+         style="fill:#e0a040;fill-opacity:1;stroke:#e0a040;stroke-width:1px;stroke-opacity:1" />
+      <path
+         d="M 59.152917,37.657905 l 2.294417,-2.079315 1.200984,0.84248 1.416085,1.200984 0.985882,1.272684 0.914181,1.487786 -2.079315,1.864214 -0.967957,-1.147208 -2.330267,-2.222716 -1.43401,-1.218909 z"
+         id="path3253"
+         style="fill:#e0e0e0;fill-opacity:1;stroke:#c4c4c4;stroke-width:1px;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/icons/pippy-openoff.svg b/icons/pippy-openoff.svg
index 628c207..0a11627 100644
--- a/icons/pippy-openoff.svg
+++ b/icons/pippy-openoff.svg
@@ -1,50 +1,66 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   version="1.0"
-   width="55"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   width="58.5"
    height="55"
-   viewBox="0 0 55 55"
+   viewBox="0 0 58.5 55"
    id="svg2"
    xml:space="preserve"><defs
-   id="defs12" />
-<g
-   transform="matrix(-1,0,0,-1,93.060248,19.348046)"
-   id="g3"
-   style="fill:none;stroke:#ffffff;stroke-opacity:1">
-  <line
-   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-   id="line3290"
-   y2="4.9169998"
-   y1="16.188"
-   x2="52.441002"
-   x1="41.169998" />
-  <polyline
-   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-   id="polyline3292"
-   points="51.562,15.306 41.17,16.188 42.053,5.794" />
-</g>
-<polygon
-   points="10.932,6.088 31.874,6.088 43.818,18.027 43.818,48.914 10.932,48.914 10.932,6.088 "
-   transform="translate(-6,2)"
-   id="polygon9"
-   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-opacity:1" /><polyline
-   points="43.818,18.027 31.874,18.027 31.874,6.088"
-   id="polyline11"
-   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-opacity:1"
-   transform="translate(-6,2)" />
-<path
-   d="M 21.811546,47.176099 C 25.489595,47.176099 30.951388,45.596321 30.951388,40.94995 C 30.951388,35.781439 26.195353,35.303832 24.223039,34.780579 C 22.043113,34.335814 20.591057,33.715148 20.503836,32.857347 C 20.354576,31.386674 21.215122,30.813879 22.927614,30.813879 C 22.927614,30.813879 27.001232,32.853451 30.461841,31.225801 C 31.437249,30.767677 33.184138,28.627351 33.184138,27.151111 C 33.184138,25.674314 27.544831,23.96762 25.833568,23.96762 C 24.121076,23.96762 22.66472,26.109059 22.66472,26.109059 C 19.240965,26.109059 15.816595,29.062653 15.816595,32.016247 C 15.816595,34.969284 19.09232,37.279388 23.007464,37.923434 C 24.827448,38.184504 26.349526,39.159201 26.003711,40.950506 C 25.723005,42.405037 24.164072,43.9041 20.868078,43.9041 C 18.256344,43.9041 12.69873,43.782194 11.811158,41.633518 C 11.240532,40.249682 11.91435,38.736146 12.770596,38.736146 L 12.754011,38.647082 C 11.881795,38.559131 9.3462261,38.736146 9.3462261,41.689183 C 9.3456118,45.475528 14.962806,47.176099 21.811546,47.176099 z"
-   id="path2474"
-   style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
-   d="M 30.461227,31.226358 C 28.850084,31.066599 26.400508,30.113054 25.874721,28.430853"
-   id="path2476"
-   style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><circle
-   cx="35.805"
-   cy="10.96"
-   r="1.676"
-   transform="matrix(0.6142367,0,0,0.5566517,4.3076424,20.174595)"
-   id="circle2478"
-   style="fill:#ffffff;fill-opacity:1;stroke-width:3.42034841;stroke-miterlimit:4;stroke-dasharray:none" /></svg>
\ No newline at end of file
+     id="defs25">
+	
+	
+	
+	
+	
+<linearGradient
+   x1="0.94254935"
+   y1="-31.669659"
+   x2="104.37702"
+   y2="20.434471"
+   id="linearGradient3172"
+   xlink:href="#linearGradient3166"
+   gradientUnits="userSpaceOnUse"
+   gradientTransform="matrix(0.7083638,0,0,1.0012565,0.1338084,32.632067)" /><linearGradient
+   id="linearGradient3166"><stop
+     id="stop3168"
+     style="stop-color:#ffffff;stop-opacity:1"
+     offset="0" /><stop
+     id="stop3170"
+     style="stop-color:#ffff00;stop-opacity:1"
+     offset="1" /></linearGradient><linearGradient
+   x1="0"
+   y1="22"
+   x2="74"
+   y2="22"
+   id="linearGradient3172-9"
+   xlink:href="#linearGradient3166-6"
+   gradientUnits="userSpaceOnUse" /><linearGradient
+   id="linearGradient3166-6"><stop
+     id="stop3168-5"
+     style="stop-color:#ffffff;stop-opacity:1"
+     offset="0" /><stop
+     id="stop3170-6"
+     style="stop-color:#ff0000;stop-opacity:1"
+     offset="1" /></linearGradient>
+		
+	</defs><polygon
+     points="1.75,20.038 8.443,21.866 8.443,52.581 50.067,52.58 50.067,21.866 56.75,20.039 29.248,2 "
+     id="polygon7"
+     style="fill:#666666;fill-opacity:1;stroke:#010101;stroke-width:3.5;stroke-linejoin:round" /><path
+     d="m 29.778093,43.02051 c 3.555069,0 8.83424,-1.56838 8.83424,-6.181226 0,-5.131219 -4.597011,-5.60538 -6.503378,-6.124857 -2.107038,-0.441556 -3.510542,-1.057744 -3.594847,-1.909356 -0.144269,-1.460061 0.687503,-2.028723 2.342736,-2.028723 0,0 3.937412,2.024856 7.282311,0.40895 0.942794,-0.454819 2.631273,-2.579702 2.631273,-4.04529 0,-1.466142 -5.450749,-3.160522 -7.104794,-3.160522 -1.655233,0 -3.062894,2.125988 -3.062894,2.125988 -3.309277,0 -6.619149,2.932283 -6.619149,5.864566 0,2.93173 3.166197,5.225166 6.950433,5.864565 1.759131,0.259187 3.230316,1.226851 2.896064,3.005231 -0.27132,1.444036 -1.778128,2.932283 -4.963917,2.932283 -2.524407,0 -7.896195,-0.121026 -8.75409,-2.254199 -0.551547,-1.373851 0.09974,-2.876467 0.927358,-2.876467 l -0.01603,-0.08842 c -0.843052,-0.08732 -3.293841,0.08842 -3.293841,3.020151 -5.94e-4,3.759026 5.428782,5.447327 12.048526,5.447327 z"
+     id="path2474"
+     style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.95917296;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+     d="m 38.138561,27.185851 c -1.557272,-0.158607 -3.924943,-1.105272 -4.43315,-2.775335"
+     id="path2476"
+     style="fill:none;stroke:#000000;stroke-width:1.95917296;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><circle
+     cx="35.805"
+     cy="10.96"
+     r="1.676"
+     transform="matrix(0.59369893,0,0,0.5526353,12.859454,16.213829)"
+     id="circle2478"
+     style="fill:#000000;fill-opacity:1;stroke-width:3.42034841;stroke-miterlimit:4;stroke-dasharray:none" /></svg>
\ No newline at end of file
diff --git a/icons/pippy-openon.svg b/icons/pippy-openon.svg
index 0209ba6..687120e 100644
--- a/icons/pippy-openon.svg
+++ b/icons/pippy-openon.svg
@@ -1,63 +1,66 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   version="1.0"
-   width="55"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   width="58.5"
    height="55"
-   viewBox="0 0 55 55"
+   viewBox="0 0 58.5 55"
    id="svg2"
    xml:space="preserve"><defs
-   id="defs41">
-  
-  
-
-  
-   
-   
-   
-   
-
+     id="defs25">
+	
+	
 	
 	
 	
-</defs>
-<g
-   transform="matrix(-1,0,0,-1,93.060248,19.348046)"
-   id="g3"
-   style="fill:none;stroke:#ffffff;stroke-opacity:1">
-  <line
-   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-   id="line3290"
-   y2="4.9169998"
-   y1="16.188"
-   x2="52.441002"
-   x1="41.169998" />
-  <polyline
-   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-   id="polyline3292"
-   points="51.562,15.306 41.17,16.188 42.053,5.794" />
-</g>
-<polygon
-   points="10.932,6.088 31.874,6.088 43.818,18.027 43.818,48.914 10.932,48.914 10.932,6.088 "
-   transform="translate(-6,2)"
-   id="polygon9"
-   style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3.5;stroke-opacity:1" /><polyline
-   points="43.818,18.027 31.874,18.027 31.874,6.088"
-   id="polyline11"
-   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-opacity:1"
-   transform="translate(-6,2)" />
-<path
-   d="M 21.811546,47.176099 C 25.489595,47.176099 30.951388,45.596321 30.951388,40.94995 C 30.951388,35.781439 26.195353,35.303832 24.223039,34.780579 C 22.043113,34.335814 20.591057,33.715148 20.503836,32.857347 C 20.354576,31.386674 21.215122,30.813879 22.927614,30.813879 C 22.927614,30.813879 27.001232,32.853451 30.461841,31.225801 C 31.437249,30.767677 33.184138,28.627351 33.184138,27.151111 C 33.184138,25.674314 27.544831,23.96762 25.833568,23.96762 C 24.121076,23.96762 22.66472,26.109059 22.66472,26.109059 C 19.240965,26.109059 15.816595,29.062653 15.816595,32.016247 C 15.816595,34.969284 19.09232,37.279388 23.007464,37.923434 C 24.827448,38.184504 26.349526,39.159201 26.003711,40.950506 C 25.723005,42.405037 24.164072,43.9041 20.868078,43.9041 C 18.256344,43.9041 12.69873,43.782194 11.811158,41.633518 C 11.240532,40.249682 11.91435,38.736146 12.770596,38.736146 L 12.754011,38.647082 C 11.881795,38.559131 9.3462261,38.736146 9.3462261,41.689183 C 9.3456118,45.475528 14.962806,47.176099 21.811546,47.176099 z"
-   id="path2474"
-   style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
-   d="M 30.461227,31.226358 C 28.850084,31.066599 26.400508,30.113054 25.874721,28.430853"
-   id="path2476"
-   style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><circle
-   cx="35.805"
-   cy="10.96"
-   r="1.676"
-   transform="matrix(0.6142367,0,0,0.5566517,4.3076424,20.174595)"
-   id="circle2478"
-   style="fill:#000000;fill-opacity:1;stroke-width:3.42034841;stroke-miterlimit:4;stroke-dasharray:none" /></svg>
\ No newline at end of file
+<linearGradient
+   x1="0.94254935"
+   y1="-31.669659"
+   x2="104.37702"
+   y2="20.434471"
+   id="linearGradient3172"
+   xlink:href="#linearGradient3166"
+   gradientUnits="userSpaceOnUse"
+   gradientTransform="matrix(0.7083638,0,0,1.0012565,0.1338084,32.632067)" /><linearGradient
+   id="linearGradient3166"><stop
+     id="stop3168"
+     style="stop-color:#ffffff;stop-opacity:1"
+     offset="0" /><stop
+     id="stop3170"
+     style="stop-color:#ffff00;stop-opacity:1"
+     offset="1" /></linearGradient><linearGradient
+   x1="0"
+   y1="22"
+   x2="74"
+   y2="22"
+   id="linearGradient3172-9"
+   xlink:href="#linearGradient3166-6"
+   gradientUnits="userSpaceOnUse" /><linearGradient
+   id="linearGradient3166-6"><stop
+     id="stop3168-5"
+     style="stop-color:#ffffff;stop-opacity:1"
+     offset="0" /><stop
+     id="stop3170-6"
+     style="stop-color:#ff0000;stop-opacity:1"
+     offset="1" /></linearGradient>
+		
+	</defs><polygon
+     points="1.75,20.038 8.443,21.866 8.443,52.581 50.067,52.58 50.067,21.866 56.75,20.039 29.248,2 "
+     id="polygon7"
+     style="fill:#00ff00;fill-opacity:1;stroke:#010101;stroke-width:3.5;stroke-linejoin:round" /><path
+     d="m 29.778093,43.02051 c 3.555069,0 8.83424,-1.56838 8.83424,-6.181226 0,-5.131219 -4.597011,-5.60538 -6.503378,-6.124857 -2.107038,-0.441556 -3.510542,-1.057744 -3.594847,-1.909356 -0.144269,-1.460061 0.687503,-2.028723 2.342736,-2.028723 0,0 3.937412,2.024856 7.282311,0.40895 0.942794,-0.454819 2.631273,-2.579702 2.631273,-4.04529 0,-1.466142 -5.450749,-3.160522 -7.104794,-3.160522 -1.655233,0 -3.062894,2.125988 -3.062894,2.125988 -3.309277,0 -6.619149,2.932283 -6.619149,5.864566 0,2.93173 3.166197,5.225166 6.950433,5.864565 1.759131,0.259187 3.230316,1.226851 2.896064,3.005231 -0.27132,1.444036 -1.778128,2.932283 -4.963917,2.932283 -2.524407,0 -7.896195,-0.121026 -8.75409,-2.254199 -0.551547,-1.373851 0.09974,-2.876467 0.927358,-2.876467 l -0.01603,-0.08842 c -0.843052,-0.08732 -3.293841,0.08842 -3.293841,3.020151 -5.94e-4,3.759026 5.428782,5.447327 12.048526,5.447327 z"
+     id="path2474"
+     style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.95917296;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+     d="m 38.138561,27.185851 c -1.557272,-0.158607 -3.924943,-1.105272 -4.43315,-2.775335"
+     id="path2476"
+     style="fill:none;stroke:#000000;stroke-width:1.95917296;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><circle
+     cx="35.805"
+     cy="10.96"
+     r="1.676"
+     transform="matrix(0.59369893,0,0,0.5526353,12.859454,16.213829)"
+     id="circle2478"
+     style="fill:#000000;fill-opacity:1;stroke-width:3.42034841;stroke-miterlimit:4;stroke-dasharray:none" /></svg>
\ No newline at end of file
diff --git a/icons/portfoliooff.svg b/icons/portfoliooff.svg
new file mode 100644
index 0000000..d428a91
--- /dev/null
+++ b/icons/portfoliooff.svg
@@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.0"
+   width="55"
+   height="55"
+   id="svg2">
+  <defs
+     id="defs5">
+    <linearGradient
+       x1="66.800423"
+       y1="23.707363"
+       x2="203.4543"
+       y2="23.237999"
+       id="linearGradient2467"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2497164,0,0,0.2514503,-11.493525,14.124173)" />
+    <linearGradient
+       x1="0"
+       y1="22"
+       x2="74"
+       y2="22"
+       id="linearGradient3172"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3166">
+      <stop
+         id="stop3168"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3170"
+         style="stop-color:#0000ff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="0"
+       y1="22"
+       x2="74"
+       y2="22"
+       id="linearGradient2557"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3333,0,0,0.3333,9.2560985,9.9123239)" />
+    <linearGradient
+       x1="0"
+       y1="22"
+       x2="74"
+       y2="22"
+       id="linearGradient2561"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3333,0,0,0.3333,8.962951,22.783517)" />
+    <linearGradient
+       x1="66.800423"
+       y1="23.707363"
+       x2="203.4543"
+       y2="23.237999"
+       id="linearGradient2567"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2497164,0,0,0.2514503,-11.743525,13.874173)" />
+    <linearGradient
+       id="linearGradient2527">
+      <stop
+         id="stop2529"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2531"
+         style="stop-color:#ffff00;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="0.94254935"
+       y1="-31.669659"
+       x2="104.37702"
+       y2="20.434471"
+       id="linearGradient2533"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7083638,0,0,1.0012565,0.1338084,32.632067)" />
+    <linearGradient
+       id="linearGradient4342">
+      <stop
+         id="stop3259"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4345"
+         style="stop-color:#ff00ff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="0"
+       y1="0"
+       x2="104"
+       y2="21"
+       id="linearGradient4340"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0139238,0,0,1.0946487,31.741439,7.7561892)" />
+    <linearGradient
+       x1="0"
+       y1="19.625"
+       x2="320.75"
+       y2="19.625"
+       id="linearGradient3170"
+       xlink:href="#linearGradient3164"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3164">
+      <stop
+         id="stop3166"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4336"
+         style="stop-color:#ff00ff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="66.800423"
+       y1="23.707363"
+       x2="203.4543"
+       y2="23.237999"
+       id="linearGradient4362"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9988658,0,0,1.0058014,-66.724103,-0.0033087)" />
+    <linearGradient
+       x1="0"
+       y1="22"
+       x2="74"
+       y2="22"
+       id="linearGradient4488"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4482">
+      <stop
+         id="stop4484"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4486"
+         style="stop-color:#ff00ff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="0"
+       y1="22"
+       x2="74"
+       y2="22"
+       id="linearGradient2550"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3333,0,0,0.3333,8.962951,22.783517)" />
+    <linearGradient
+       x1="0"
+       y1="22"
+       x2="74"
+       y2="22"
+       id="linearGradient2548"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3333,0,0,0.3333,9.2560985,9.9123239)" />
+    <linearGradient
+       id="linearGradient2540">
+      <stop
+         id="stop2542"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2544"
+         style="stop-color:#ffff00;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="0"
+       y1="22"
+       x2="74"
+       y2="22"
+       id="linearGradient2538"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="66.800423"
+       y1="23.707363"
+       x2="203.4543"
+       y2="23.237999"
+       id="linearGradient2874"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2497164,0,0,0.2514503,-5.118553,13.374173)" />
+    <linearGradient
+       x1="0.94254935"
+       y1="-31.669659"
+       x2="104.37702"
+       y2="20.434471"
+       id="linearGradient3172-9"
+       xlink:href="#linearGradient3166-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7083638,0,0,1.0012565,0.1338084,32.632067)" />
+    <linearGradient
+       id="linearGradient3166-6">
+      <stop
+         id="stop3168-5"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3170-6"
+         style="stop-color:#ffff00;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <g
+     transform="matrix(0.67,0,0,0.67,9.075,9.075)"
+     id="g2855">
+    <path
+       d="m 46.7405,44.669 c 0,2.511 -1.528,4.331 -4.332,4.331 l -29.457,0 0,-43 29.458,0 c 2.15,0 4.332,2.154 4.332,4.33 l -0.001,34.339 0,0 z"
+       id="path2458"
+       style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+    <line
+       style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       x1="22.2155"
+       x2="22.2155"
+       y1="6.1209998"
+       y2="48.881001"
+       id="line2460" />
+    <path
+       d="m 8.2585,14.464 c 0,0 2.084,0.695 4.17,0.695 2.086,0 4.173,-0.695 4.173,-0.695"
+       id="path2462"
+       style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+    <path
+       d="m 8.2585,28.021 c 0,0 1.912,0.695 4.345,0.695 2.433,0 3.999,-0.695 3.999,-0.695"
+       id="path2464"
+       style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+    <path
+       d="m 8.2585,41.232 c 0,0 1.736,0.695 4.518,0.695 2.781,0 3.825,-0.695 3.825,-0.695"
+       id="path2466"
+       style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/icons/portfolioon.svg b/icons/portfolioon.svg
new file mode 100644
index 0000000..fa4ddf6
--- /dev/null
+++ b/icons/portfolioon.svg
@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.0"
+   width="55"
+   height="55"
+   id="svg2">
+  <defs
+     id="defs5">
+    <linearGradient
+       x1="66.800423"
+       y1="23.707363"
+       x2="203.4543"
+       y2="23.237999"
+       id="linearGradient2467"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2497164,0,0,0.2514503,-11.493525,14.124173)" />
+    <linearGradient
+       x1="0"
+       y1="22"
+       x2="74"
+       y2="22"
+       id="linearGradient3172"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3166">
+      <stop
+         id="stop3168"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3170"
+         style="stop-color:#0000ff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="0"
+       y1="22"
+       x2="74"
+       y2="22"
+       id="linearGradient2557"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3333,0,0,0.3333,9.2560985,9.9123239)" />
+    <linearGradient
+       x1="0"
+       y1="22"
+       x2="74"
+       y2="22"
+       id="linearGradient2561"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3333,0,0,0.3333,8.962951,22.783517)" />
+    <linearGradient
+       x1="66.800423"
+       y1="23.707363"
+       x2="203.4543"
+       y2="23.237999"
+       id="linearGradient2567"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2497164,0,0,0.2514503,-11.743525,13.874173)" />
+    <linearGradient
+       id="linearGradient2527">
+      <stop
+         id="stop2529"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2531"
+         style="stop-color:#ffff00;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="0.94254935"
+       y1="-31.669659"
+       x2="104.37702"
+       y2="20.434471"
+       id="linearGradient2533"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7083638,0,0,1.0012565,0.1338084,32.632067)" />
+    <linearGradient
+       id="linearGradient4342">
+      <stop
+         id="stop3259"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4345"
+         style="stop-color:#ff00ff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="0"
+       y1="0"
+       x2="104"
+       y2="21"
+       id="linearGradient4340"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0139238,0,0,1.0946487,31.741439,7.7561892)" />
+    <linearGradient
+       x1="0"
+       y1="19.625"
+       x2="320.75"
+       y2="19.625"
+       id="linearGradient3170"
+       xlink:href="#linearGradient3164"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3164">
+      <stop
+         id="stop3166"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4336"
+         style="stop-color:#ff00ff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="66.800423"
+       y1="23.707363"
+       x2="203.4543"
+       y2="23.237999"
+       id="linearGradient4362"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9988658,0,0,1.0058014,-66.724103,-0.0033087)" />
+    <linearGradient
+       x1="0"
+       y1="22"
+       x2="74"
+       y2="22"
+       id="linearGradient4488"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4482">
+      <stop
+         id="stop4484"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4486"
+         style="stop-color:#ff00ff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="0"
+       y1="22"
+       x2="74"
+       y2="22"
+       id="linearGradient2550"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3333,0,0,0.3333,8.962951,22.783517)" />
+    <linearGradient
+       x1="0"
+       y1="22"
+       x2="74"
+       y2="22"
+       id="linearGradient2548"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3333,0,0,0.3333,9.2560985,9.9123239)" />
+    <linearGradient
+       id="linearGradient2540">
+      <stop
+         id="stop2542"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2544"
+         style="stop-color:#ffff00;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="0"
+       y1="22"
+       x2="74"
+       y2="22"
+       id="linearGradient2538"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="66.800423"
+       y1="23.707363"
+       x2="203.4543"
+       y2="23.237999"
+       id="linearGradient2874"
+       xlink:href="#linearGradient3166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2497164,0,0,0.2514503,-5.118553,13.374173)" />
+    <linearGradient
+       x1="0.94254935"
+       y1="-31.669659"
+       x2="104.37702"
+       y2="20.434471"
+       id="linearGradient3172-9"
+       xlink:href="#linearGradient3166-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7083638,0,0,1.0012565,0.1338084,32.632067)" />
+    <linearGradient
+       id="linearGradient3166-6">
+      <stop
+         id="stop3168-5"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3170-6"
+         style="stop-color:#ffff00;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <rect
+     width="55"
+     height="55"
+     rx="0"
+     x="0"
+     y="0"
+     id="rect2839"
+     style="fill:#ffd200;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+  <g
+     transform="matrix(0.67,0,0,0.67,9.075,9.075)"
+     id="g2856">
+    <path
+       d="m 46.7405,44.669 c 0,2.511 -1.528,4.331 -4.332,4.331 l -29.457,0 0,-43 29.458,0 c 2.15,0 4.332,2.154 4.332,4.33 l -0.001,34.339 0,0 z"
+       id="path2458"
+       style="fill:#ffffff;stroke:#0000ff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+    <line
+       style="fill:none;stroke:#0000ff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       x1="22.2155"
+       x2="22.2155"
+       y1="6.1209998"
+       y2="48.881001"
+       id="line2460" />
+    <path
+       d="m 8.2585,14.464 c 0,0 2.084,0.695 4.17,0.695 2.086,0 4.173,-0.695 4.173,-0.695"
+       id="path2462"
+       style="fill:none;stroke:#0000ff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+    <path
+       d="m 8.2585,28.021 c 0,0 1.912,0.695 4.345,0.695 2.433,0 3.999,-0.695 3.999,-0.695"
+       id="path2464"
+       style="fill:none;stroke:#0000ff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+    <path
+       d="m 8.2585,41.232 c 0,0 1.736,0.695 4.518,0.695 2.781,0 3.825,-0.695 3.825,-0.695"
+       id="path2466"
+       style="fill:none;stroke:#0000ff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/icons/resize+.svg b/icons/resize+.svg
new file mode 100644
index 0000000..0fae3c3
--- /dev/null
+++ b/icons/resize+.svg
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="55"
+   height="54.695999"
+   viewBox="0 0 55 54.696"
+   id="svg2"
+   xml:space="preserve"><defs
+     id="defs21">
+	
+
+		
+		
+	</defs><g
+     transform="translate(-0.4354,0)"
+     id="g7">
+			<g
+   id="g9">
+				<path
+   d="m 25.263,12.435 h 24.656 v 3.562 H 39.575 V 41.59 H 35.606 V 15.996 H 25.263 v -3.561 z"
+   id="path11"
+   style="fill:#ffffff" />
+			</g>
+		</g><g
+     transform="translate(-8.4356,0)"
+     id="g13">
+			<g
+   id="g15">
+				<path
+   d="m 13.953,24.435 h 16.656 v 3.562 H 24.265 V 41.59 H 20.296 V 27.997 h -6.344 v -3.562 z"
+   id="path17"
+   style="fill:#ffffff" />
+			</g>
+		</g><path
+     d="m 25.5774,23.677763 6,-6.000001 -4,0"
+     id="path3618"
+     style="fill:none;stroke:#ffffff;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></svg>
\ No newline at end of file
diff --git a/icons/resize-.svg b/icons/resize-.svg
new file mode 100644
index 0000000..e3b719e
--- /dev/null
+++ b/icons/resize-.svg
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="55"
+   height="54.695999"
+   viewBox="0 0 55 54.696"
+   id="svg2"
+   xml:space="preserve"><defs
+     id="defs21">
+	
+
+		
+		
+	</defs><g
+     transform="translate(3.5644,0)"
+     id="g2821"><g
+       transform="matrix(-1,0,0,1,51.871,0)"
+       id="g7">
+			<g
+   id="g9">
+				<path
+   d="m 25.263,12.435 h 24.656 v 3.562 H 39.575 V 41.59 H 35.606 V 15.996 H 25.263 v -3.561 z"
+   id="path11"
+   style="fill:#ffffff" />
+			</g>
+		</g><g
+       transform="matrix(-1,0,0,1,59.8712,0)"
+       id="g13">
+			<g
+   id="g15">
+				<path
+   d="m 13.953,24.435 h 16.656 v 3.562 H 24.265 V 41.59 H 20.296 V 27.997 h -6.344 v -3.562 z"
+   id="path17"
+   style="fill:#ffffff" />
+			</g>
+		</g><path
+       d="m 19.8582,17.677762 6,6.000001 -4,0"
+       id="path3618"
+       style="fill:none;stroke:#ffffff;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g></svg>
\ No newline at end of file
diff --git a/icons/run-fastoff.svg b/icons/run-fastoff.svg
index f76570f..401955e 100644
--- a/icons/run-fastoff.svg
+++ b/icons/run-fastoff.svg
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
@@ -9,31 +10,26 @@
    id="svg2">
   <defs
      id="defs5" />
-  <path
-     d="M 27.849263,20.597427 C 27.851349,29.203268 22.048546,36.18101 14.889706,36.18101 C 7.7308648,36.18101 1.9280624,29.203268 1.9301481,20.597427 C 1.9280624,11.991586 7.7308648,5.0138442 14.889706,5.0138442 C 22.048546,5.0138442 27.851349,11.991586 27.849263,20.597427 L 27.849263,20.597427 z"
-     transform="matrix(1.6011349,0,0,1.3319174,-1.3404274,-4.9340719)"
-     id="path2401"
-     style="opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:2.39670968;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   <g
      transform="translate(6.0193572e-8,-1.9999998)"
      id="g3287">
     <path
-       d="M 37.158177,18.217157 C 37.158177,25.346516 32.418457,31.126004 26.571716,31.126004 C 20.724975,31.126004 15.985255,25.346516 15.985255,18.217157 C 15.985255,11.087798 20.724975,5.30831 26.571716,5.30831 C 32.418457,5.30831 37.158177,11.087798 37.158177,18.217157 L 37.158177,18.217157 z"
+       d="m 37.158177,18.217157 c 0,7.129359 -4.73972,12.908847 -10.586461,12.908847 -5.846741,0 -10.586461,-5.779488 -10.586461,-12.908847 0,-7.129359 4.73972,-12.908847 10.586461,-12.908847 5.846741,0 10.586461,5.779488 10.586461,12.908847 l 0,0 z"
        transform="matrix(0.9002849,0,0,0.6378505,-7.1526774,12.961276)"
        id="path3173"
-       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:3.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="fill:#ffffff;fill-opacity:1;stroke:none" />
     <path
-       d="M 37.158177,18.217157 C 37.158177,25.346516 32.418457,31.126004 26.571716,31.126004 C 20.724975,31.126004 15.985255,25.346516 15.985255,18.217157 C 15.985255,11.087798 20.724975,5.30831 26.571716,5.30831 C 32.418457,5.30831 37.158177,11.087798 37.158177,18.217157 L 37.158177,18.217157 z"
+       d="m 37.158177,18.217157 c 0,7.129359 -4.73972,12.908847 -10.586461,12.908847 -5.846741,0 -10.586461,-5.779488 -10.586461,-12.908847 0,-7.129359 4.73972,-12.908847 10.586461,-12.908847 5.846741,0 10.586461,5.779488 10.586461,12.908847 l 0,0 z"
        transform="matrix(0.34904,-0.8298699,0.4328947,0.1820738,8.5363479,48.352162)"
        id="path3177"
-       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:3.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="fill:#ffffff;fill-opacity:1;stroke:none" />
     <path
-       d="M 37.158177,18.217157 C 37.158177,25.346516 32.418457,31.126004 26.571716,31.126004 C 20.724975,31.126004 15.985255,25.346516 15.985255,18.217157 C 15.985255,11.087798 20.724975,5.30831 26.571716,5.30831 C 32.418457,5.30831 37.158177,11.087798 37.158177,18.217157 L 37.158177,18.217157 z"
+       d="m 37.158177,18.217157 c 0,7.129359 -4.73972,12.908847 -10.586461,12.908847 -5.846741,0 -10.586461,-5.779488 -10.586461,-12.908847 0,-7.129359 4.73972,-12.908847 10.586461,-12.908847 5.846741,0 10.586461,5.779488 10.586461,12.908847 l 0,0 z"
        transform="matrix(0.5612942,0.3544048,-0.1085241,0.1718767,9.8942224,-2.0522731)"
        id="path3179"
-       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:3.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="fill:#ffffff;fill-opacity:1;stroke:none" />
     <path
-       d="M 9.2958401,27.300367 C 9.2958401,27.300367 9.9396698,23.306166 10.935872,22.061849 C 11.769129,21.021055 13.452567,20.204259 14.698298,20.030587 C 15.695098,19.89162 17.0817,20.276787 17.978361,20.778947 C 19.020906,21.362808 20.249615,22.570421 20.872534,23.665477 C 21.854124,25.391058 22.129508,28.217508 22.609038,30.186897 C 22.989402,31.749024 22.893077,34.129027 23.766707,35.425415 C 24.488451,36.496419 26.05388,37.425825 27.239715,37.670497 C 29.026585,38.03918 31.406612,36.482252 33.221007,36.601409 C 34.062327,36.656661 35.491157,36.654128 35.922236,37.456679 C 36.195195,37.964849 35.905348,38.953801 35.536346,39.381028 C 34.148002,40.988448 31.052212,40.932891 29.072692,41.305385 C 27.527672,41.596112 25.302132,42.420918 23.863179,41.73302 C 21.671793,40.685409 20.751319,36.484464 18.846612,34.890872 C 18.494794,34.59652 17.932313,34.319138 17.495998,34.249421 C 16.284393,34.055824 14.659189,34.94909 13.444155,34.783964 C 12.553171,34.662876 11.3895,34.166119 10.646456,33.607971 C 9.4764934,32.729136 8.0161145,31.200596 7.4628632,29.759263 C 6.9180297,28.339853 7.0795774,26.166629 7.1734442,24.627654 C 7.2232038,23.811822 7.3595912,22.703851 7.6558077,21.954941 C 8.129897,20.756324 9.037934,19.228958 9.9711481,18.42696 C 11.274962,17.306468 13.444036,16.38069 15.084187,16.181881 C 16.715989,15.984082 18.912219,16.629234 20.486644,17.144057 C 22.002981,17.639887 23.732735,19.380539 25.310266,19.496045 C 26.242474,19.564301 27.718204,19.343106 28.300912,18.533868 C 28.608322,18.106952 28.64407,17.189262 28.397385,16.716423 C 27.846731,15.660948 26.172441,15.244277 25.117321,14.898978 C 24.111931,14.569954 22.665771,14.732615 21.644314,14.471344 C 20.805858,14.256882 19.710906,13.832753 18.943085,13.402258 C 17.696795,12.703503 15.983926,11.69961 15.084187,10.515729 C 14.266411,9.4396944 12.76679,7.4902805 13.347682,6.2393884 C 13.41521,6.0939751 13.684267,6.1579103 13.830045,6.1324796 C 14.578309,6.0019484 15.977747,6.549964 16.338329,5.8117543 C 16.677203,5.1179904 14.855157,4.0951091 15.277132,3.4597663 C 16.128895,2.1773214 18.606474,3.9460325 20.004282,4.3150345 C 21.126208,4.6112076 22.630202,5.0455391 23.670235,5.5979377 C 25.364051,6.4975826 27.497006,8.0378634 28.879747,9.4466434 C 30.077615,10.667069 30.867467,13.211005 32.256283,14.150619 C 32.886063,14.576701 33.98137,14.386024 34.668094,14.685162 C 35.079247,14.864259 35.552151,15.273077 35.922236,15.540429 C 36.776337,16.157439 38.022189,16.854785 38.719937,17.678599 C 39.297398,18.360395 38.719937,17.785508 40.167023,20.351313 C 41.61411,22.917117 41.668302,20.677033 42,22.596392 C 42,22.596392 41.67672,24.108461 41.324693,24.627654 C 40.914383,25.232806 40.129195,25.852525 39.491716,26.124373 C 39.220261,26.240133 38.809226,26.309203 38.526992,26.231281 C 38.121969,26.119459 37.773325,25.492283 37.369323,25.376014 C 36.666773,25.173825 35.682398,25.631351 34.957512,25.589831 C 34.163857,25.544373 33.029679,25.516672 32.352755,25.055288 C 31.701921,24.611687 31.161002,23.561857 30.809196,22.810209 C 30.543686,22.242934 30.800291,20.681593 30.230362,20.778947 C 30.201757,20.783833 30.230362,20.885856 30.230362,20.885856 M 32.835118,25.269105 C 32.835118,25.269105 32.161048,28.275715 31.870393,29.563774 C 31.611022,30.713194 31.489203,32.339425 31.002141,33.394153 C 30.347142,34.812547 27.915022,37.456679 27.915022,37.456679 M 27.336188,30.079989 C 27.336188,30.079989 26.573965,32.103279 26.082046,32.85961 C 25.55554,33.66912 24.304241,34.289692 23.959652,35.211598 C 23.948576,35.241229 23.959652,35.318506 23.959652,35.318506 M 20.100754,37.029044 C 20.100754,37.029044 17.602411,37.119914 16.531274,37.135949 C 15.836737,37.146354 14.683229,36.566444 14.215934,37.135949 C 13.8052,37.636522 14.086796,38.806265 14.408882,39.381028 C 14.785983,40.053964 15.750748,40.540994 16.434804,40.770837 C 17.238483,41.040868 18.394912,40.945344 19.232502,40.87775 C 20.200674,40.799617 22.416092,40.236298 22.416092,40.236298 M 7.3663896,23.237843 C 7.3663896,23.237843 5.232627,20.433105 4.0863258,20.778947 C 3.4368004,20.97491 3.2582141,22.29356 3.1216024,23.024026 C 2.9570428,23.903932 2.9326465,25.17637 3.2180769,26.017465 C 3.5728864,27.063003 4.5024833,28.2832 5.3404682,28.903995 C 5.8428689,29.276181 6.6720026,29.448198 7.2699187,29.545446 C 7.2985527,29.550103 7.3663896,29.545446 7.3663896,29.545446 M 29.651526,14.04371 C 29.651526,14.04371 26.593178,9.9048794 24.924376,8.5913764 C 23.678488,7.6107444 21.770009,6.6768097 20.293698,6.2393884 C 19.086245,5.8816272 16.145385,5.8117543 16.145385,5.8117543 M 35.343402,20.030587 C 35.620274,20.314716 36.422904,20.294375 36.597543,19.923679 C 36.861718,19.362929 36.073833,18.50785 35.632819,18.106233 C 35.159011,17.674755 34.170679,16.917779 33.70337,17.357874 C 33.322664,17.716409 33.505003,19.055561 33.992786,19.175319 C 34.337702,19.260001 34.319902,18.172433 34.668094,18.106233 C 34.913475,18.059581 35.229479,18.395457 35.343402,18.640776 C 35.515563,19.011509 35.067344,19.747295 35.343402,20.030587 z M 35.246929,19.923679 C 35.246929,19.923679 35.246929,19.923679 35.246929,19.923679 z"
+       d="m 9.2958401,27.300367 c 0,0 0.6438297,-3.994201 1.6400319,-5.238518 0.833257,-1.040794 2.516695,-1.85759 3.762426,-2.031262 0.9968,-0.138967 2.383402,0.2462 3.280063,0.74836 1.042545,0.583861 2.271254,1.791474 2.894173,2.88653 0.98159,1.725581 1.256974,4.552031 1.736504,6.52142 0.380364,1.562127 0.284039,3.94213 1.157669,5.238518 0.721744,1.071004 2.287173,2.00041 3.473008,2.245082 1.78687,0.368683 4.166897,-1.188245 5.981292,-1.069088 0.84132,0.05525 2.27015,0.05272 2.701229,0.85527 0.272959,0.50817 -0.01689,1.497122 -0.38589,1.924349 -1.388344,1.60742 -4.484134,1.551863 -6.463654,1.924357 -1.54502,0.290727 -3.77056,1.115533 -5.209513,0.427635 -2.191386,-1.047611 -3.11186,-5.248556 -5.016567,-6.842148 C 18.494794,34.59652 17.932313,34.319138 17.495998,34.249421 16.284393,34.055824 14.659189,34.94909 13.444155,34.783964 12.553171,34.662876 11.3895,34.166119 10.646456,33.607971 9.4764934,32.729136 8.0161145,31.200596 7.4628632,29.759263 6.9180297,28.339853 7.0795774,26.166629 7.1734442,24.627654 c 0.04976,-0.815832 0.186147,-1.923803 0.4823635,-2.672713 0.4740893,-1.198617 1.3821263,-2.725983 2.3153404,-3.527981 1.3038139,-1.120492 3.4728879,-2.04627 5.1130389,-2.245079 1.631802,-0.197799 3.828032,0.447353 5.402457,0.962176 1.516337,0.49583 3.246091,2.236482 4.823622,2.351988 0.932208,0.06826 2.407938,-0.152939 2.990646,-0.962177 0.30741,-0.426916 0.343158,-1.344606 0.09647,-1.817445 -0.550654,-1.055475 -2.224944,-1.472146 -3.280064,-1.817445 -1.00539,-0.329024 -2.45155,-0.166363 -3.473007,-0.427634 -0.838456,-0.214462 -1.933408,-0.638591 -2.701229,-1.069086 -1.24629,-0.698755 -2.959159,-1.702648 -3.858898,-2.886529 -0.817776,-1.0760346 -2.317397,-3.0254485 -1.736505,-4.2763406 0.06753,-0.1454133 0.336585,-0.081478 0.482363,-0.1069088 0.748264,-0.1305312 2.147702,0.4174844 2.508284,-0.3207253 0.338874,-0.6937639 -1.483172,-1.7166452 -1.061197,-2.351988 0.851763,-1.2824449 3.329342,0.4862662 4.72715,0.8552682 1.121926,0.2961731 2.62592,0.7305046 3.665953,1.2829032 1.693816,0.8996449 3.826771,2.4399257 5.209512,3.8487057 1.197868,1.2204256 1.98772,3.7643616 3.376536,4.7039756 0.62978,0.426082 1.725087,0.235405 2.411811,0.534543 0.411153,0.179097 0.884057,0.587915 1.254142,0.855267 0.854101,0.61701 2.099953,1.314356 2.797701,2.13817 0.577461,0.681796 0,0.106909 1.447086,2.672714 1.447087,2.565804 1.501279,0.32572 1.832977,2.245079 0,0 -0.32328,1.512069 -0.675307,2.031262 -0.41031,0.605152 -1.195498,1.224871 -1.832977,1.496719 -0.271455,0.11576 -0.68249,0.18483 -0.964724,0.106908 -0.405023,-0.111822 -0.753667,-0.738998 -1.157669,-0.855267 -0.70255,-0.202189 -1.686925,0.255337 -2.411811,0.213817 -0.793655,-0.04546 -1.927833,-0.07316 -2.604757,-0.534543 -0.650834,-0.443601 -1.191753,-1.493431 -1.543559,-2.245079 -0.26551,-0.567275 -0.0089,-2.128616 -0.578834,-2.031262 -0.0286,0.0049 0,0.106909 0,0.106909 m 2.604756,4.383249 c 0,0 -0.67407,3.00661 -0.964725,4.294669 -0.259371,1.14942 -0.38119,2.775651 -0.868252,3.830379 -0.654999,1.418394 -3.087119,4.062526 -3.087119,4.062526 m -0.578834,-7.37669 c 0,0 -0.762223,2.02329 -1.254142,2.779621 -0.526506,0.80951 -1.777805,1.430082 -2.122394,2.351988 -0.01108,0.02963 0,0.106908 0,0.106908 m -3.858898,1.710538 c 0,0 -2.498343,0.09087 -3.56948,0.106905 -0.694537,0.01041 -1.848045,-0.569505 -2.31534,0 -0.410734,0.500573 -0.129138,1.670316 0.192948,2.245079 0.377101,0.672936 1.341866,1.159966 2.025922,1.389809 0.803679,0.270031 1.960108,0.174507 2.797698,0.106913 0.968172,-0.07813 3.18359,-0.641452 3.18359,-0.641452 M 7.3663896,23.237843 c 0,0 -2.1337626,-2.804738 -3.2800638,-2.458896 -0.6495254,0.195963 -0.8281117,1.514613 -0.9647234,2.245079 -0.1645596,0.879906 -0.1889559,2.152344 0.096474,2.993439 0.3548095,1.045538 1.2844064,2.265735 2.1223913,2.88653 0.5024007,0.372186 1.3315344,0.544203 1.9294505,0.641451 0.028634,0.0047 0.096471,0 0.096471,0 M 29.651526,14.04371 c 0,0 -3.058348,-4.1388306 -4.72715,-5.4523336 C 23.678488,7.6107444 21.770009,6.6768097 20.293698,6.2393884 19.086245,5.8816272 16.145385,5.8117543 16.145385,5.8117543 M 35.343402,20.030587 c 0.276872,0.284129 1.079502,0.263788 1.254141,-0.106908 0.264175,-0.56075 -0.52371,-1.415829 -0.964724,-1.817446 -0.473808,-0.431478 -1.46214,-1.188454 -1.929449,-0.748359 -0.380706,0.358535 -0.198367,1.697687 0.289416,1.817445 0.344916,0.08468 0.327116,-1.002886 0.675308,-1.069086 0.245381,-0.04665 0.561385,0.289224 0.675308,0.534543 0.172161,0.370733 -0.276058,1.106519 0,1.389811 z m -0.09647,-0.106908 c 0,0 0,0 0,0 z"
        id="path2384"
        style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
   </g>
diff --git a/icons/run-slowoff.svg b/icons/run-slowoff.svg
index f120056..988759b 100644
--- a/icons/run-slowoff.svg
+++ b/icons/run-slowoff.svg
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
@@ -12,26 +13,54 @@
 <defs
    id="defs12">
 	
-</defs><path
-   d="M 36.852226,15.69838 C 36.852226,21.662832 31.693078,26.497975 25.328947,26.497975 C 18.964816,26.497975 13.805668,21.662832 13.805668,15.69838 C 13.805668,9.7339283 18.964816,4.8987848 25.328947,4.8987848 C 31.693078,4.8987848 36.852226,9.7339283 36.852226,15.69838 L 36.852226,15.69838 z"
-   transform="matrix(2.1478261,0,0,2.2917526,-26.902174,-8.4768043)"
-   id="path2387"
-   style="opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:1.92812335;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
-   d="M 11.990413,18.017646 C 12.802994,19.393237 13.858719,20.841774 13.990413,21.517646 C 14.122107,22.193518 13.329772,22.096724 12.490413,23.517646 C 10.794222,26.389069 10.794222,28.646223 12.490413,31.517646 C 13.329772,32.938568 14.122107,32.841774 13.990413,33.517646 C 13.858718,34.193518 12.802994,35.642056 11.990413,37.017646 C 11.046828,38.615007 10.990413,43.023282 10.990413,44.017646 C 10.990413,45.380621 12.807811,43.627769 14.990413,41.017646 L 17.990413,37.017646 L 19.990413,39.017646 C 23.591808,41.069647 25.719736,41.577324 28.990413,40.017646 L 31.490413,38.017646 L 35.490413,43.517646 C 37.137547,45.570847 39.948387,44.852636 40.490413,44.517646 C 40.764949,44.347974 40.805225,42.944288 40.490413,42.017646 C 40.1756,41.091004 39.505699,40.641406 38.740413,39.842619 C 36.142025,37.130486 35.350389,38.404433 36.490413,34.599372 C 37.80724,30.204194 38.882093,29.476417 41.926378,32.231458 C 43.631038,33.774153 45.067291,33.528342 46.931589,31.841175 C 49.474312,29.540042 49.591959,25.848191 47.049236,23.547058 C 45.184938,21.859891 43.513391,21.261139 41.808731,22.803834 C 38.764446,25.558875 37.80724,24.595804 36.490413,20.200626 C 35.35435,16.408784 36.215144,17.428871 38.740413,14.793058 C 39.477179,14.024039 40.18719,13.844329 40.490413,13.017646 C 40.793637,12.190963 40.690074,10.717307 40.490413,10.517646 C 40.091093,10.118326 37.237542,9.4366173 35.490413,11.517646 L 31.490413,17.017646 L 28.990413,15.017646 C 25.70771,13.452234 23.5949,13.963884 19.990413,16.017646 L 17.990413,18.017646 L 14.990413,14.017646 C 12.807811,11.407523 10.990413,9.6546713 10.990413,11.017646 C 10.990413,12.01201 11.046828,16.420285 11.990413,18.017646 z"
-   id="path2582"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.83333337;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
-   d="M 33.066802,26.052631 C 33.066802,29.803472 29.079055,32.844129 24.15992,32.844129 C 19.240784,32.844129 15.253037,29.803472 15.253037,26.052631 C 15.253037,22.30179 19.240784,19.261133 24.15992,19.261133 C 29.079055,19.261133 33.066802,22.30179 33.066802,26.052631 L 33.066802,26.052631 z"
-   transform="matrix(1.1875,0,0,1.4262294,-2.8599446,-9.6570288)"
-   id="path2384"
-   style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.40873694;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
+</defs><g
+   transform="matrix(0,1.2222222,-1.2222222,0,62.905112,-6.1111105)"
+   id="g2937"><path
+     d="m 27.567493,45.252146 c -0.46948,0 -0.933016,-0.02903 -1.389761,-0.08296 l 1.178368,1.948634 1.161389,-1.918769 c -0.314968,0.02489 -0.629086,0.05309 -0.949996,0.05309 z"
+     id="path3003"
+     style="fill:none;stroke:#ffffff;stroke-width:1.20000005;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+     d="m 38.317981,14.929279 c -1.837168,0 -3.360217,1.289964 -3.68707,2.992219 1.578232,1.115757 2.934884,2.584076 3.968928,4.320343 1.939893,-0.142684 3.475677,-1.709721 3.475677,-3.641764 0,-2.027442 -1.682656,-3.670798 -3.757535,-3.670798 z"
+     id="path3007"
+     style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:2.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+     d="m 38.787461,38.290488 c -1.039138,1.851575 -2.42805,3.426908 -4.072502,4.609029 0.442312,1.546298 1.878767,2.686942 3.603022,2.686942 2.07403,0 3.757535,-1.642527 3.757535,-3.669969 0,-1.870656 -1.437304,-3.397874 -3.288055,-3.626002 z"
+     id="path3009"
+     style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:2.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+     d="m 16.340734,38.277215 c -1.912727,0.170889 -3.41625,1.724653 -3.41625,3.639275 0,2.026612 1.680958,3.669969 3.755837,3.669969 1.752271,0 3.212497,-1.177974 3.626793,-2.764091 -1.598607,-1.174655 -2.950165,-2.728419 -3.96638,-4.545153 z"
+     id="path3011"
+     style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:2.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+     d="m 20.375881,18.007772 c -0.291196,-1.744563 -1.828678,-3.078493 -3.69556,-3.078493 -2.074879,0 -3.755837,1.643356 -3.755837,3.669968 0,1.97601 1.601155,3.575399 3.603872,3.655037 1.006876,-1.694789 2.319381,-3.139051 3.847525,-4.246512 z"
+     id="path3013"
+     style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:2.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+     d="m 27.567493,15.62362 c 1.619832,0 3.164955,0.340948 4.599711,0.935742 0.629086,-0.892605 1.000085,-1.971862 1.000085,-3.138221 0,-3.058584 -2.537567,-5.5389654 -5.668563,-5.5389654 -3.130146,0 -5.667713,2.4803814 -5.667713,5.5389654 0,1.18461 0.383734,2.280457 1.032345,3.180529 1.463622,-0.62134 3.04525,-0.97805 4.704135,-0.97805 z"
+     id="path3015"
+     style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:2.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><g
+     transform="matrix(0.8489685,0,0,0.82955893,4.2234061,5.2018707)"
+     id="g3017"
+     style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"><path
+       d="m 43.102,30.421 c 0,4.7344 -1.6452,9.2798 -4.5706,12.6275 -2.9254,3.3478 -6.8973,5.2305 -11.0344,5.2305 -4.1371,0 -8.109,-1.8827 -11.0344,-5.2305 -2.9254,-3.3477 -4.5706,-7.8931 -4.5706,-12.6275 0,-9.7966 7.0444,-17.858 15.605,-17.858 8.5606,0 15.605,8.0614 15.605,17.858 z"
+       id="path3019"
+       style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g><g
+     transform="matrix(0.8489685,0,0,0.82955893,4.2234061,5.2018707)"
+     id="g3021"
+     style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"><path
+       d="m 25.875,33.75 -1.542,-4.625 3.164,-2.587 3.615,2.626 -1.487,4.669 z"
+       id="path3023"
+       style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+       d="m 27.501,41.551 c -3.968,-0.16 -5.543,-2.009 -5.543,-2.009 l 3.57,-4.163 4.465,0.168 3.132,4.12 c 0,0 -2.89,1.994 -5.624,1.884 z"
+       id="path3025"
+       style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+       d="m 18.453,33.843 c -0.849,-2.968 0.172,-6.884 0.172,-6.884 l 4,2.167 1.493,4.629 -3.582,4.233 c 0,-10e-4 -1.465,-1.99 -2.083,-4.145 z"
+       id="path3027"
+       style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+       d="m 19.458,25.125 c 0,0 0.5,-1.958 3.039,-3.822 2.237,-1.643 4.465,-1.72 4.465,-1.72 l -0.037,4.981 -3.521,2.75 -3.946,-2.189 z"
+       id="path3029"
+       style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+       d="M 32.084,27.834 28.625,24.959 29,19.75 c 0,0 1.834,-0.042 3.959,1.667 2.228,1.791 3.362,4.983 3.362,4.983 l -4.237,1.434 z"
+       id="path3031"
+       style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+       d="m 31.292,34.042 1.313,-4.464 4.187,-1.536 c 0,0 0.677,2.663 -0.042,5.667 -0.54,2.256 -2.084,4.361 -2.084,4.361 l -3.374,-4.028 z"
+       id="path3033"
+       style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g></g><path
    d=""
    id="path2385"
-   style="opacity:1;fill:#a0ffa0;fill-opacity:1;stroke:#00c000;stroke-width:1.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
-   d="M 47.763159,26.163967 A 2.2823887,1.6700405 0 1 1 43.198381,26.163967 A 2.2823887,1.6700405 0 1 1 47.763159,26.163967 z"
-   transform="translate(-0.2226721,-1.3360324)"
-   id="path2388"
-   style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
-   d="M 47.763159,26.163967 A 2.2823887,1.6700405 0 1 1 43.198381,26.163967 A 2.2823887,1.6700405 0 1 1 47.763159,26.163967 z"
-   transform="translate(-0.2226721,3.8967616)"
-   id="path3162"
-   style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /></svg>
\ No newline at end of file
+   style="fill:#a0ffa0;fill-opacity:1;stroke:#00c000;stroke-width:1.5;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></svg>
\ No newline at end of file
diff --git a/icons/run-slowon.svg b/icons/run-slowon.svg
index d8f9162..1a0883b 100644
--- a/icons/run-slowon.svg
+++ b/icons/run-slowon.svg
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
@@ -12,12 +13,57 @@
      id="defs12">
 	
 </defs><path
-     d="M 36.852226,15.69838 C 36.852226,21.662832 31.693078,26.497975 25.328947,26.497975 C 18.964816,26.497975 13.805668,21.662832 13.805668,15.69838 C 13.805668,9.7339283 18.964816,4.8987848 25.328947,4.8987848 C 31.693078,4.8987848 36.852226,9.7339283 36.852226,15.69838 L 36.852226,15.69838 z"
+     d="m 36.852226,15.69838 c 0,5.964452 -5.159148,10.799595 -11.523279,10.799595 -6.364131,0 -11.523279,-4.835143 -11.523279,-10.799595 0,-5.9644517 5.159148,-10.7995952 11.523279,-10.7995952 6.364131,0 11.523279,4.8351435 11.523279,10.7995952 l 0,0 z"
      transform="matrix(2.1478261,0,0,2.2917526,-26.902174,-8.4768043)"
      id="path2387"
-     style="opacity:1;fill:#00d000;fill-opacity:1;stroke:#00d000;stroke-width:1.92812335;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.94117647" /><path
-     d="M 11.990413,18.017646 C 12.802994,19.393237 13.858719,20.841774 13.990413,21.517646 C 14.122107,22.193518 13.329772,22.096724 12.490413,23.517646 C 10.794222,26.389069 10.794222,28.646223 12.490413,31.517646 C 13.329772,32.938568 14.122107,32.841774 13.990413,33.517646 C 13.858718,34.193518 12.802994,35.642056 11.990413,37.017646 C 11.046828,38.615007 10.990413,43.023282 10.990413,44.017646 C 10.990413,45.380621 12.807811,43.627769 14.990413,41.017646 L 17.990413,37.017646 L 19.990413,39.017646 C 23.591808,41.069647 25.719736,41.577324 28.990413,40.017646 L 31.490413,38.017646 L 35.490413,43.517646 C 37.137547,45.570847 39.948387,44.852636 40.490413,44.517646 C 40.764949,44.347974 40.805225,42.944288 40.490413,42.017646 C 40.1756,41.091004 39.505699,40.641406 38.740413,39.842619 C 36.142025,37.130486 35.350389,38.404433 36.490413,34.599372 C 37.80724,30.204194 38.882093,29.476417 41.926378,32.231458 C 43.631038,33.774153 45.067291,33.528342 46.931589,31.841175 C 49.474312,29.540042 49.591959,25.848191 47.049236,23.547058 C 45.184938,21.859891 43.513391,21.261139 41.808731,22.803834 C 38.764446,25.558875 37.80724,24.595804 36.490413,20.200626 C 35.35435,16.408784 36.215144,17.428871 38.740413,14.793058 C 39.477179,14.024039 40.18719,13.844329 40.490413,13.017646 C 40.793637,12.190963 40.690074,10.717307 40.490413,10.517646 C 40.091093,10.118326 37.237542,9.4366173 35.490413,11.517646 L 31.490413,17.017646 L 28.990413,15.017646 C 25.70771,13.452234 23.5949,13.963884 19.990413,16.017646 L 17.990413,18.017646 L 14.990413,14.017646 C 12.807811,11.407523 10.990413,9.6546713 10.990413,11.017646 C 10.990413,12.01201 11.046828,16.420285 11.990413,18.017646 z"
-     id="path2582"
-     style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.83333337;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
+     style="fill:#00d000;fill-opacity:1;stroke:#00d000;stroke-width:1.92812335;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:0.94117647;stroke-dasharray:none" /><path
+     d=""
      id="path2385"
-     style="opacity:1;fill:#00d000;fill-opacity:1;stroke:#00d000;stroke-width:1.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /></svg>
\ No newline at end of file
+     style="fill:#00d000;fill-opacity:1;stroke:#00d000;stroke-width:1.5;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><g
+     transform="matrix(0,1.2222222,-1.2222222,0,62.905112,-6.1105186)"
+     id="g2937"><path
+       d="m 27.567493,45.252146 c -0.46948,0 -0.933016,-0.02903 -1.389761,-0.08296 l 1.178368,1.948634 1.161389,-1.918769 c -0.314968,0.02489 -0.629086,0.05309 -0.949996,0.05309 z"
+       id="path3003"
+       style="fill:none;stroke:#ffffff;stroke-width:1.20000005;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+       d="m 38.317981,14.929279 c -1.837168,0 -3.360217,1.289964 -3.68707,2.992219 1.578232,1.115757 2.934884,2.584076 3.968928,4.320343 1.939893,-0.142684 3.475677,-1.709721 3.475677,-3.641764 0,-2.027442 -1.682656,-3.670798 -3.757535,-3.670798 z"
+       id="path3007"
+       style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:2.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+       d="m 38.787461,38.290488 c -1.039138,1.851575 -2.42805,3.426908 -4.072502,4.609029 0.442312,1.546298 1.878767,2.686942 3.603022,2.686942 2.07403,0 3.757535,-1.642527 3.757535,-3.669969 0,-1.870656 -1.437304,-3.397874 -3.288055,-3.626002 z"
+       id="path3009"
+       style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:2.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+       d="m 16.340734,38.277215 c -1.912727,0.170889 -3.41625,1.724653 -3.41625,3.639275 0,2.026612 1.680958,3.669969 3.755837,3.669969 1.752271,0 3.212497,-1.177974 3.626793,-2.764091 -1.598607,-1.174655 -2.950165,-2.728419 -3.96638,-4.545153 z"
+       id="path3011"
+       style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:2.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+       d="m 20.375881,18.007772 c -0.291196,-1.744563 -1.828678,-3.078493 -3.69556,-3.078493 -2.074879,0 -3.755837,1.643356 -3.755837,3.669968 0,1.97601 1.601155,3.575399 3.603872,3.655037 1.006876,-1.694789 2.319381,-3.139051 3.847525,-4.246512 z"
+       id="path3013"
+       style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:2.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+       d="m 27.567493,15.62362 c 1.619832,0 3.164955,0.340948 4.599711,0.935742 0.629086,-0.892605 1.000085,-1.971862 1.000085,-3.138221 0,-3.058584 -2.537567,-5.5389654 -5.668563,-5.5389654 -3.130146,0 -5.667713,2.4803814 -5.667713,5.5389654 0,1.18461 0.383734,2.280457 1.032345,3.180529 1.463622,-0.62134 3.04525,-0.97805 4.704135,-0.97805 z"
+       id="path3015"
+       style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:2.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><g
+       transform="matrix(0.8489685,0,0,0.82955893,4.2234061,5.2018707)"
+       id="g3017"
+       style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"><path
+         d="m 43.102,30.421 c 0,4.7344 -1.6452,9.2798 -4.5706,12.6275 -2.9254,3.3478 -6.8973,5.2305 -11.0344,5.2305 -4.1371,0 -8.109,-1.8827 -11.0344,-5.2305 -2.9254,-3.3477 -4.5706,-7.8931 -4.5706,-12.6275 0,-9.7966 7.0444,-17.858 15.605,-17.858 8.5606,0 15.605,8.0614 15.605,17.858 z"
+         id="path3019"
+         style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g><g
+       transform="matrix(0.8489685,0,0,0.82955893,4.2234061,5.2018707)"
+       id="g3021"
+       style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"><path
+         d="m 25.875,33.75 -1.542,-4.625 3.164,-2.587 3.615,2.626 -1.487,4.669 z"
+         id="path3023"
+         style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+         d="m 27.501,41.551 c -3.968,-0.16 -5.543,-2.009 -5.543,-2.009 l 3.57,-4.163 4.465,0.168 3.132,4.12 c 0,0 -2.89,1.994 -5.624,1.884 z"
+         id="path3025"
+         style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+         d="m 18.453,33.843 c -0.849,-2.968 0.172,-6.884 0.172,-6.884 l 4,2.167 1.493,4.629 -3.582,4.233 c 0,-10e-4 -1.465,-1.99 -2.083,-4.145 z"
+         id="path3027"
+         style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+         d="m 19.458,25.125 c 0,0 0.5,-1.958 3.039,-3.822 2.237,-1.643 4.465,-1.72 4.465,-1.72 l -0.037,4.981 -3.521,2.75 -3.946,-2.189 z"
+         id="path3029"
+         style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+         d="M 32.084,27.834 28.625,24.959 29,19.75 c 0,0 1.834,-0.042 3.959,1.667 2.228,1.791 3.362,4.983 3.362,4.983 l -4.237,1.434 z"
+         id="path3031"
+         style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+         d="m 31.292,34.042 1.313,-4.464 4.187,-1.536 c 0,0 0.677,2.663 -0.042,5.667 -0.54,2.256 -2.084,4.361 -2.084,4.361 l -3.374,-4.028 z"
+         id="path3033"
+         style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g></g></svg>
\ No newline at end of file
diff --git a/icons/stopitoff.svg b/icons/stopitoff.svg
index 78117ec..de041ea 100644
--- a/icons/stopitoff.svg
+++ b/icons/stopitoff.svg
@@ -1,96 +1,22 @@
 <?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"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
+   version="1.0"
    width="44"
    height="44"
-   version="1.0"
-   sodipodi:docname="stopitoff.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <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" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+   id="svg2">
   <defs
-     id="defs5">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective9" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-height="1000"
-     inkscape:window-width="1679"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     showgrid="false"
-     inkscape:zoom="10"
-     inkscape:cx="24.924162"
-     inkscape:cy="3.0823126"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:current-layer="svg2" />
-  <path
-     sodipodi:type="star"
-     style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:1.50000000000000000;stroke-opacity:1"
-     id="path2386"
-     sodipodi:sides="8"
-     sodipodi:cx="6.154902"
-     sodipodi:cy="3.6254902"
-     sodipodi:r1="22.234058"
-     sodipodi:r2="20.541592"
-     sodipodi:arg1="0.36853512"
-     sodipodi:arg2="0.7612342"
-     inkscape:flatsided="true"
-     inkscape:rounded="0"
-     inkscape:randomized="0"
-     d="M 26.896078,11.635294 L 15.157342,23.955503 L -1.8549019,24.366666 L -14.175111,12.62793 L -14.586274,-4.3843137 L -2.8475378,-16.704523 L 14.164706,-17.115686 L 26.484915,-5.3769496 L 26.896078,11.635294 z"
-     transform="matrix(1.0676988,3.2621148e-2,-3.2621148e-2,1.0676988,15.546686,17.928289)" />
+     id="defs5" />
   <path
-     sodipodi:type="star"
-     style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.31833665000000000;stroke-opacity:1"
+     d="M 26.896078,11.635294 L 15.157342,23.955503 -1.8549019,24.366666 -14.175111,12.62793 -14.586274,-4.3843137 -2.8475378,-16.704523 14.164706,-17.115686 26.484915,-5.3769496 26.896078,11.635294 z"
+     transform="matrix(0.8982409,0.027775,-0.02744374,0.9090831,16.347508,18.533176)"
      id="path3158"
-     sodipodi:sides="8"
-     sodipodi:cx="6.154902"
-     sodipodi:cy="3.6254902"
-     sodipodi:r1="22.234058"
-     sodipodi:r2="20.541592"
-     sodipodi:arg1="0.36853512"
-     sodipodi:arg2="0.7612342"
-     inkscape:flatsided="true"
-     inkscape:rounded="0"
-     inkscape:randomized="0"
-     d="M 26.896078,11.635294 L 15.157342,23.955503 L -1.8549019,24.366666 L -14.175111,12.62793 L -14.586274,-4.3843137 L -2.8475378,-16.704523 L 14.164706,-17.115686 L 26.484915,-5.3769496 L 26.896078,11.635294 z"
-     transform="matrix(0.8982409,2.7775002e-2,-2.7443742e-2,0.9090831,16.347508,18.533176)" />
+     style="fill:none;stroke:#ffffff;stroke-width:3.31833673;stroke-opacity:1" />
   <path
-     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.5;stroke-opacity:1"
-     d="M 16.987782,36.466398 L 16.987782,31.060516 C 16.987782,31.060516 15.454015,30.38416 14.964253,29.880123 C 14.30166,29.198216 13.446606,27.097771 13.446606,27.097771 L 13.428206,15.466398 C 13.428206,15.466398 14.116058,14.43353 14.599464,14.48868 C 15.098301,14.545591 15.575838,15.466398 15.575838,15.466398 L 15.575838,21.466398 C 15.575838,21.466398 16.264462,22.047049 16.481899,22.038947 C 16.679317,22.031591 17.13801,21.466398 17.13801,21.466398 L 17.222322,11.716398 C 17.222322,11.716398 17.80243,10.809048 18.252488,10.825222 C 18.62827,10.838727 19.17994,11.716398 19.17994,11.716398 L 19.348567,18.466398 C 19.348567,18.466398 19.754261,19.166353 20.023077,19.17228 C 20.184998,19.17585 20.7451,18.466398 20.7451,18.466398 L 20.613273,8.4663984 C 20.613273,8.4663984 21.4426,7.4683451 21.793664,7.536987 C 22.138531,7.604417 22.80543,8.4663984 22.80543,8.4663984 L 22.889742,18.716398 C 22.889742,18.716398 23.339523,19.198362 23.564253,19.17228 C 23.760489,19.149505 24.325837,18.716398 24.325837,18.716398 L 24.325837,11.466398 C 24.325837,11.466398 24.989235,10.533447 25.437283,10.487967 C 25.887444,10.442273 26.575837,11.579069 26.575837,11.579069 L 26.575837,24.596716 L 28.454448,24.905614 C 28.454448,24.905614 29.743051,22.436507 30.646605,21.701692 C 31.411938,21.079285 32.676626,20.470888 33.644343,20.662327 C 34.030345,20.738688 34.571793,21.514664 34.571793,21.514664 C 34.571793,21.514664 32.320674,23.896383 31.630012,25.167755 C 31.114202,26.11726 30.873374,27.938957 30.177523,28.765645 C 29.629973,29.416148 28.579515,29.845615 27.845095,30.274092 C 27.061923,30.731012 25.45671,31.453727 25.45671,31.453727 L 25.419154,36.466398 L 16.987782,36.466398 z"
+     d="m 16.987782,36.466398 0,-5.405882 c 0,0 -1.533767,-0.676356 -2.023529,-1.180393 -0.662593,-0.681907 -1.517647,-2.782352 -1.517647,-2.782352 l -0.0184,-11.631373 c 0,0 0.687852,-1.032868 1.171258,-0.977718 0.498837,0.05691 0.976374,0.977718 0.976374,0.977718 l 0,6 c 0,0 0.688624,0.580651 0.906061,0.572549 0.197418,-0.0074 0.656111,-0.572549 0.656111,-0.572549 l 0.08431,-9.75 c 0,0 0.580108,-0.90735 1.030166,-0.891176 0.375782,0.01351 0.927452,0.891176 0.927452,0.891176 l 0.168627,6.75 c 0,0 0.405694,0.699955 0.67451,0.705882 0.161921,0.0036 0.722023,-0.705882 0.722023,-0.705882 L 20.613273,8.4663984 c 0,0 0.829327,-0.9980533 1.180391,-0.9294114 0.344867,0.06743 1.011766,0.9294114 1.011766,0.9294114 l 0.08431,10.2499996 c 0,0 0.449781,0.481964 0.674511,0.455882 0.196236,-0.02277 0.761584,-0.455882 0.761584,-0.455882 l 0,-7.25 c 0,0 0.663398,-0.932951 1.111446,-0.978431 0.450161,-0.04569 1.138554,1.091102 1.138554,1.091102 l 0,13.017647 1.878611,0.308898 c 0,0 1.288603,-2.469107 2.192157,-3.203922 0.765333,-0.622407 2.030021,-1.230804 2.997738,-1.039365 0.386002,0.07636 0.92745,0.852337 0.92745,0.852337 0,0 -2.251119,2.381719 -2.941781,3.653091 -0.51581,0.949505 -0.756638,2.771202 -1.452489,3.59789 -0.54755,0.650503 -1.598008,1.07997 -2.332428,1.508447 -0.783172,0.45692 -2.388385,1.179635 -2.388385,1.179635 l -0.03756,5.012671 -8.431372,0 z"
      id="path3162"
-     sodipodi:nodetypes="ccsccsccsccsccsccsccsccscccsscsssccc" />
+     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.5;stroke-opacity:1" />
 </svg>
diff --git a/icons/trashoff.svg b/icons/trashoff.svg
new file mode 100644
index 0000000..8ebfb39
--- /dev/null
+++ b/icons/trashoff.svg
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="55"
+   height="55"
+   id="svg2">
+  <defs
+     id="defs5" />
+  <path
+     d="m 38.999052,40.01547 a 11.011069,3.4902595 0 1 1 -22.022137,0 11.011069,3.4902595 0 1 1 22.022137,0 z"
+     id="path2822"
+     style="fill:none;stroke:#ffffff;stroke-width:2.29999995;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     d="m 13.75483,14.61245 c 3.56733,24.489728 3.430201,24.354426 3.430201,24.354426 l 0,0"
+     id="path2820"
+     style="fill:none;stroke:#ffffff;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     d="m 41.24517,14.793462 c -2.625017,24.01617 -2.55771,24.314197 -2.55771,24.314197"
+     id="path2820-4"
+     style="fill:none;stroke:#ffffff;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     d="m 15.951887,16.457318 c 3.836562,25.030939 3.656235,25.621512 3.656235,25.621512"
+     id="path3620"
+     style="fill:none;stroke:#ffffff;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     d="m 39.328864,16.340019 c -2.902587,25.706467 -2.96102,25.806464 -2.96102,25.806464"
+     id="path3622"
+     style="fill:none;stroke:#ffffff;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     d="m 20.66094,17.470259 c 2.288476,25.03094 2.24528,25.62334 2.24528,25.62334"
+     id="path3624"
+     style="fill:none;stroke:#ffffff;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     d="M 34.281292,17.792054 C 31.790893,43.567158 32.084236,43.133828 32.084236,43.133828"
+     id="path3626"
+     style="fill:none;stroke:#ffffff;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     d="m 26.831688,18.009641 c 0.06731,24.963289 0.180327,25.396617 0.180327,25.396617"
+     id="path3628"
+     style="fill:none;stroke:#ffffff;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     d="m 41.281336,14.477147 a 13.76451,3.1119547 0 0 1 -27.529019,0 13.76451,3.1119547 0 1 1 27.529019,0 z"
+     id="path2818"
+     style="fill:none;stroke:#ffffff;stroke-width:2.29999995;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+</svg>
diff --git a/icons/trashon.svg b/icons/trashon.svg
new file mode 100644
index 0000000..01e9cd2
--- /dev/null
+++ b/icons/trashon.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="55"
+   height="55"
+   id="svg2">
+  <defs
+     id="defs5" />
+  <rect
+     width="55"
+     height="55"
+     rx="0"
+     x="0"
+     y="0"
+     id="rect2839"
+     style="fill:#ffd200;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+  <path
+     d="m 38.982225,40.079903 a 11.011069,3.4902595 0 1 1 -22.022137,0 11.011069,3.4902595 0 1 1 22.022137,0 z"
+     id="path2822-6"
+     style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:2.29999995;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     d="m 13.738004,14.676883 c 3.567329,24.489728 3.4302,24.354426 3.4302,24.354426 l 0,0"
+     id="path2820-5"
+     style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     d="m 41.228343,14.857895 c -2.625016,24.01617 -2.55771,24.314197 -2.55771,24.314197"
+     id="path2820-4-6"
+     style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     d="m 15.93506,16.521751 c 3.836562,25.030939 3.656235,25.621512 3.656235,25.621512"
+     id="path3620-9"
+     style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     d="m 39.312038,16.404452 c -2.902587,25.706467 -2.96102,25.806464 -2.96102,25.806464"
+     id="path3622-3"
+     style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     d="m 20.644113,17.534692 c 2.288476,25.03094 2.24528,25.62334 2.24528,25.62334"
+     id="path3624-7"
+     style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     d="M 34.264465,17.856487 C 31.774066,43.631591 32.067409,43.198261 32.067409,43.198261"
+     id="path3626-4"
+     style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     d="m 26.814861,18.074074 c 0.06731,24.963289 0.180327,25.396617 0.180327,25.396617"
+     id="path3628-5"
+     style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     d="m 41.26451,14.54158 a 13.76451,3.1119547 0 0 1 -27.529019,0 13.76451,3.1119547 0 1 1 27.529019,0 z"
+     id="path2818-2"
+     style="fill:none;stroke:#000000;stroke-width:2.29999995;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+</svg>
diff --git a/icons/turtleoff.svg b/icons/turtleoff.svg
new file mode 100644
index 0000000..34af2f3
--- /dev/null
+++ b/icons/turtleoff.svg
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="55"
+   height="55"
+   id="svg2">
+  <defs
+     id="defs5" />
+  <path
+     d="m 27.567493,45.252146 c -0.46948,0 -0.933016,-0.02903 -1.389761,-0.08296 l 1.178368,1.948634 1.161389,-1.918769 c -0.314968,0.02489 -0.629086,0.05309 -0.949996,0.05309 z"
+     id="path3003"
+     style="fill:none;stroke:#ffffff;stroke-width:1.20000005;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     d="m 38.317981,14.929279 c -1.837168,0 -3.360217,1.289964 -3.68707,2.992219 1.578232,1.115757 2.934884,2.584076 3.968928,4.320343 1.939893,-0.142684 3.475677,-1.709721 3.475677,-3.641764 0,-2.027442 -1.682656,-3.670798 -3.757535,-3.670798 z"
+     id="path3007"
+     style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:2.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     d="m 38.787461,38.290488 c -1.039138,1.851575 -2.42805,3.426908 -4.072502,4.609029 0.442312,1.546298 1.878767,2.686942 3.603022,2.686942 2.07403,0 3.757535,-1.642527 3.757535,-3.669969 0,-1.870656 -1.437304,-3.397874 -3.288055,-3.626002 z"
+     id="path3009"
+     style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:2.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     d="m 16.340734,38.277215 c -1.912727,0.170889 -3.41625,1.724653 -3.41625,3.639275 0,2.026612 1.680958,3.669969 3.755837,3.669969 1.752271,0 3.212497,-1.177974 3.626793,-2.764091 -1.598607,-1.174655 -2.950165,-2.728419 -3.96638,-4.545153 z"
+     id="path3011"
+     style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:2.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     d="m 20.375881,18.007772 c -0.291196,-1.744563 -1.828678,-3.078493 -3.69556,-3.078493 -2.074879,0 -3.755837,1.643356 -3.755837,3.669968 0,1.97601 1.601155,3.575399 3.603872,3.655037 1.006876,-1.694789 2.319381,-3.139051 3.847525,-4.246512 z"
+     id="path3013"
+     style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:2.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     d="m 27.567493,15.62362 c 1.619832,0 3.164955,0.340948 4.599711,0.935742 0.629086,-0.892605 1.000085,-1.971862 1.000085,-3.138221 0,-3.058584 -2.537567,-5.5389654 -5.668563,-5.5389654 -3.130146,0 -5.667713,2.4803814 -5.667713,5.5389654 0,1.18461 0.383734,2.280457 1.032345,3.180529 1.463622,-0.62134 3.04525,-0.97805 4.704135,-0.97805 z"
+     id="path3015"
+     style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:2.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <g
+     transform="matrix(0.8489685,0,0,0.82955893,4.2234061,5.2018707)"
+     id="g3017"
+     style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
+    <path
+       d="m 43.102,30.421 c 0,4.7344 -1.6452,9.2798 -4.5706,12.6275 -2.9254,3.3478 -6.8973,5.2305 -11.0344,5.2305 -4.1371,0 -8.109,-1.8827 -11.0344,-5.2305 -2.9254,-3.3477 -4.5706,-7.8931 -4.5706,-12.6275 0,-9.7966 7.0444,-17.858 15.605,-17.858 8.5606,0 15.605,8.0614 15.605,17.858 z"
+       id="path3019"
+       style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  </g>
+  <g
+     transform="matrix(0.8489685,0,0,0.82955893,4.2234061,5.2018707)"
+     id="g3021"
+     style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
+    <path
+       d="m 25.875,33.75 -1.542,-4.625 3.164,-2.587 3.615,2.626 -1.487,4.669 z"
+       id="path3023"
+       style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 27.501,41.551 c -3.968,-0.16 -5.543,-2.009 -5.543,-2.009 l 3.57,-4.163 4.465,0.168 3.132,4.12 c 0,0 -2.89,1.994 -5.624,1.884 z"
+       id="path3025"
+       style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 18.453,33.843 c -0.849,-2.968 0.172,-6.884 0.172,-6.884 l 4,2.167 1.493,4.629 -3.582,4.233 c 0,-10e-4 -1.465,-1.99 -2.083,-4.145 z"
+       id="path3027"
+       style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 19.458,25.125 c 0,0 0.5,-1.958 3.039,-3.822 2.237,-1.643 4.465,-1.72 4.465,-1.72 l -0.037,4.981 -3.521,2.75 -3.946,-2.189 z"
+       id="path3029"
+       style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="M 32.084,27.834 28.625,24.959 29,19.75 c 0,0 1.834,-0.042 3.959,1.667 2.228,1.791 3.362,4.983 3.362,4.983 l -4.237,1.434 z"
+       id="path3031"
+       style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 31.292,34.042 1.313,-4.464 4.187,-1.536 c 0,0 0.677,2.663 -0.042,5.667 -0.54,2.256 -2.084,4.361 -2.084,4.361 l -3.374,-4.028 z"
+       id="path3033"
+       style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  </g>
+</svg>
diff --git a/icons/turtleon.svg b/icons/turtleon.svg
new file mode 100644
index 0000000..bd19cff
--- /dev/null
+++ b/icons/turtleon.svg
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="55"
+   height="55"
+   id="svg2">
+  <defs
+     id="defs5" />
+  <rect
+     width="55"
+     height="55"
+     rx="0"
+     x="0"
+     y="0"
+     id="rect2839"
+     style="fill:#ffd200;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+  <g
+     transform="matrix(0.8489685,0,0,0.82955893,4.1533662,4.6871294)"
+     id="g2831"
+     style="stroke-width:1.42992032;stroke-miterlimit:4;stroke-dasharray:none">
+    <path
+       d="m 27.5795,48.8995 c -0.553,0 -1.099,-0.035 -1.637,-0.1 l 1.388,2.349 1.368,-2.313 c -0.371,0.03 -0.741,0.064 -1.119,0.064 z"
+       id="path3003"
+       style="fill:none;stroke:#00ff00;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <g
+       transform="translate(0.0825,0.6205)"
+       id="g3005"
+       style="fill:#00d000;fill-opacity:1;stroke:#00ff00;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
+      <path
+         d="m 40.16,11.726 c -2.164,0 -3.958,1.555 -4.343,3.607 1.859,1.345 3.457,3.115 4.675,5.208 2.285,-0.172 4.094,-2.061 4.094,-4.39 0,-2.444 -1.982,-4.425 -4.426,-4.425 z"
+         id="path3007"
+         style="fill:#00d000;fill-opacity:1;stroke:#00ff00;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 40.713,39.887 c -1.224,2.232 -2.86,4.131 -4.797,5.556 0.521,1.864 2.213,3.239 4.244,3.239 2.443,0 4.426,-1.98 4.426,-4.424 0,-2.255 -1.693,-4.096 -3.873,-4.371 z"
+         id="path3009"
+         style="fill:#00d000;fill-opacity:1;stroke:#00ff00;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 14.273,39.871 c -2.253,0.206 -4.024,2.079 -4.024,4.387 0,2.443 1.98,4.424 4.424,4.424 2.064,0 3.784,-1.42 4.272,-3.332 -1.883,-1.416 -3.475,-3.289 -4.672,-5.479 z"
+         id="path3011"
+         style="fill:#00d000;fill-opacity:1;stroke:#00ff00;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 19.026,15.437 c -0.343,-2.103 -2.154,-3.711 -4.353,-3.711 -2.444,0 -4.424,1.981 -4.424,4.424 0,2.382 1.886,4.31 4.245,4.406 1.186,-2.043 2.732,-3.784 4.532,-5.119 z"
+         id="path3013"
+         style="fill:#00d000;fill-opacity:1;stroke:#00ff00;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <path
+       d="m 27.5795,13.1835 c 1.908,0 3.728,0.411 5.418,1.128 0.741,-1.076 1.178,-2.377 1.178,-3.783 0,-3.687 -2.989,-6.677 -6.677,-6.677 -3.687,0 -6.676,2.99 -6.676,6.677 0,1.428 0.452,2.749 1.216,3.834 1.724,-0.749 3.587,-1.179 5.541,-1.179 z"
+       id="path3015"
+       style="fill:#00d000;fill-opacity:1;stroke:#00ff00;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <g
+       transform="translate(0.0825,0.6205)"
+       id="g3017"
+       style="fill:#00d000;fill-opacity:1;stroke:#00ff00;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
+      <path
+         d="m 43.102,30.421 c 0,4.7344 -1.6452,9.2798 -4.5706,12.6275 -2.9254,3.3478 -6.8973,5.2305 -11.0344,5.2305 -4.1371,0 -8.109,-1.8827 -11.0344,-5.2305 -2.9254,-3.3477 -4.5706,-7.8931 -4.5706,-12.6275 0,-9.7966 7.0444,-17.858 15.605,-17.858 8.5606,0 15.605,8.0614 15.605,17.858 z"
+         id="path3019"
+         style="fill:#00d000;fill-opacity:1;stroke:#00ff00;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <g
+       transform="translate(0.0825,0.6205)"
+       id="g3021"
+       style="fill:none;stroke:#00ff00;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
+      <path
+         d="m 25.875,33.75 -1.542,-4.625 3.164,-2.587 3.615,2.626 -1.487,4.669 z"
+         id="path3023"
+         style="fill:none;stroke:#00ff00;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 27.501,41.551 c -3.968,-0.16 -5.543,-2.009 -5.543,-2.009 l 3.57,-4.163 4.465,0.168 3.132,4.12 c 0,0 -2.89,1.994 -5.624,1.884 z"
+         id="path3025"
+         style="fill:none;stroke:#00ff00;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 18.453,33.843 c -0.849,-2.968 0.172,-6.884 0.172,-6.884 l 4,2.167 1.493,4.629 -3.582,4.233 c 0,-10e-4 -1.465,-1.99 -2.083,-4.145 z"
+         id="path3027"
+         style="fill:none;stroke:#00ff00;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 19.458,25.125 c 0,0 0.5,-1.958 3.039,-3.822 2.237,-1.643 4.465,-1.72 4.465,-1.72 l -0.037,4.981 -3.521,2.75 -3.946,-2.189 z"
+         id="path3029"
+         style="fill:none;stroke:#00ff00;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="M 32.084,27.834 28.625,24.959 29,19.75 c 0,0 1.834,-0.042 3.959,1.667 2.228,1.791 3.362,4.983 3.362,4.983 l -4.237,1.434 z"
+         id="path3031"
+         style="fill:none;stroke:#00ff00;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 31.292,34.042 1.313,-4.464 4.187,-1.536 c 0,0 0.677,2.663 -0.042,5.667 -0.54,2.256 -2.084,4.361 -2.084,4.361 l -3.374,-4.028 z"
+         id="path3033"
+         style="fill:none;stroke:#00ff00;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+  </g>
+</svg>
--
cgit v0.9.1