diff --git a/icons/category_dataset.png b/icons/category_dataset.png
index bddfc9b..e1f1d0e 100644
Binary files a/icons/category_dataset.png and b/icons/category_dataset.png differ
diff --git a/icons/category_dataset.svg b/icons/category_dataset.svg
index 9f58c9a..67e5f50 100644
--- a/icons/category_dataset.svg
+++ b/icons/category_dataset.svg
@@ -11,35 +11,16 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16px"
    height="16px"
-   id="svg1617"
+   id="svg8468"
    sodipodi:version="0.32"
    inkscape:version="0.43"
    sodipodi:docbase="/home/flatberg/fluent/icons"
    sodipodi:docname="category_dataset.svg"
-   inkscape:export-filename="/home/flatberg/fluent/icons/dataset.png"
+   inkscape:export-filename="/home/flatberg/fluent/icons/category_dataset.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs
-     id="defs1619">
-    <linearGradient
-       id="linearGradient9542">
-      <stop
-         style="stop-color:#978e8e;stop-opacity:1;"
-         offset="0"
-         id="stop9544" />
-      <stop
-         id="stop13091"
-         offset="0.2857143"
-         style="stop-color:#837d9e;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#b075a6;stop-opacity:0.24705882;"
-         offset="1"
-         id="stop13093" />
-      <stop
-         style="stop-color:#6f6daf;stop-opacity:0;"
-         offset="1"
-         id="stop9546" />
-    </linearGradient>
+     id="defs8470">
     <linearGradient
        inkscape:collect="always"
        id="linearGradient8653">
@@ -53,40 +34,52 @@
          id="stop8657" />
     </linearGradient>
     <linearGradient
-       id="linearGradient2500">
+       inkscape:collect="always"
+       xlink:href="#linearGradient8653"
+       id="linearGradient1362"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.048746,-7.497414e-10,1.276627e-10,0.992725,0.504498,4.555838)"
+       x1="-14.992936"
+       y1="3.2324076"
+       x2="-0.50547981"
+       y2="3.2324076" />
+    <linearGradient
+       id="linearGradient9542">
       <stop
-         style="stop-color:#a8a8a8;stop-opacity:1;"
+         style="stop-color:#a0a0a0;stop-opacity:0.85123968;"
          offset="0"
-         id="stop2502" />
+         id="stop9544" />
       <stop
-         id="stop3387"
-         offset="0.75510204"
-         style="stop-color:#e5e5e5;stop-opacity:0.96907216;" />
+         id="stop7591"
+         offset="0.14835165"
+         style="stop-color:#918e9f;stop-opacity:0.6745098;" />
       <stop
-         style="stop-color:#ebebeb;stop-opacity:0;"
+         id="stop13091"
+         offset="0.2857143"
+         style="stop-color:#837d9e;stop-opacity:0.49803922;" />
+      <stop
+         style="stop-color:#7975a6;stop-opacity:0.24705882;"
+         offset="0.56043959"
+         id="stop13093" />
+      <stop
+         id="stop7593"
          offset="1"
-         id="stop2504" />
+         style="stop-color:#7471aa;stop-opacity:0.12156863;" />
+      <stop
+         style="stop-color:#6f6daf;stop-opacity:0;"
+         offset="1"
+         id="stop9546" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8653"
-       id="linearGradient8659"
-       x1="-14.992936"
-       y1="3.2324076"
-       x2="-0.50547981"
-       y2="3.2324076"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.786559,-6.091642e-10,9.574695e-11,0.806589,-3.626117,6.632697)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient9542"
-       id="linearGradient9548"
+       id="linearGradient1360"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.048746,-7.497414e-10,1.276627e-10,0.992725,0.504498,4.555838)"
        x1="-14.992936"
        y1="3.2324076"
        x2="-0.50547981"
-       y2="3.2324076"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.786559,-6.091642e-10,9.574695e-11,0.806589,-3.626117,6.632697)" />
+       y2="3.2324076" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -97,17 +90,17 @@
      inkscape:pageshadow="2"
      inkscape:zoom="22.197802"
      inkscape:cx="8"
-     inkscape:cy="8"
+     inkscape:cy="7.1848042"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
      inkscape:window-width="749"
      inkscape:window-height="540"
-     inkscape:window-x="136"
-     inkscape:window-y="107" />
+     inkscape:window-x="0"
+     inkscape:window-y="0" />
   <metadata
-     id="metadata1622">
+     id="metadata8473">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -122,105 +115,90 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <rect
-       style="opacity:1;fill:url(#linearGradient9548);fill-opacity:1;stroke:url(#linearGradient8659);stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1625"
-       width="11.395269"
-       height="12.492741"
-       x="-15.41898"
-       y="2.9935551"
-       transform="matrix(-1.602589e-3,-0.999999,0.999999,-1.530673e-3,0,0)" />
-    <rect
-       style="opacity:0.86243388;fill:#929797;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3393"
-       width="0.50445545"
-       height="11.522277"
-       x="15.495544"
-       y="4.4777226" />
-    <rect
-       style="opacity:0.86243388;fill:#929797;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:#878e8e;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect9550"
-       width="0.59595656"
-       height="11.990877"
-       x="-16.000607"
-       y="3.4989688"
-       transform="matrix(-3.561914e-4,-1,1,-1.724514e-4,0,0)" />
+       width="0.82326102"
+       height="14.495289"
+       x="-16.045271"
+       y="1.0721804"
+       transform="matrix(-3.116999e-4,-1,1,-1.970668e-4,0,0)" />
     <rect
-       style="fill:#e7577b;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;opacity:0.49746193"
+       style="opacity:0.95890407;fill:url(#linearGradient1360);fill-opacity:1;stroke:url(#linearGradient1362);stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect1625"
+       width="15.193709"
+       height="15.375698"
+       x="-15.219335"
+       y="0.076888956"
+       transform="matrix(-1.479312e-3,-0.999999,0.999999,-1.658227e-3,0,0)" />
+    <rect
+       style="opacity:1;fill:#878e8e;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3393"
+       width="0.62086815"
+       height="15.000007"
+       x="15.456053"
+       y="1" />
+    <rect
+       style="opacity:1;fill:#fa96c7;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect11308"
-       width="3"
-       height="3"
-       x="4"
-       y="5" />
+       width="3.692307"
+       height="4.0000019"
+       x="1.307693"
+       y="1.333333" />
     <rect
-       style="fill:#e7577b;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="fill:#e68ab8;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect12183"
-       width="3"
-       height="3"
-       x="4"
-       y="8.5" />
+       width="3.692307"
+       height="4.0000019"
+       x="1.307693"
+       y="6.0000024" />
     <rect
-       style="fill:#e7577b;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="fill:#cc7aa3;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect12185"
-       width="3"
-       height="3"
-       x="4"
-       y="12" />
+       width="3.692307"
+       height="4.0000019"
+       x="1.307693"
+       y="10.666672" />
     <rect
-       style="opacity:0.49746195;fill:#d9728e;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:#fa96d5;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect13079"
-       width="3"
-       height="3"
-       x="7.5945544"
-       y="5" />
+       width="3.692307"
+       height="4.0000019"
+       x="5.8669081"
+       y="1.333333" />
     <rect
-       style="fill:#d9728e;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="fill:#e68ac4;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect13081"
-       width="3"
-       height="3"
-       x="7.5945544"
-       y="8.5" />
+       width="3.692307"
+       height="4.0000019"
+       x="5.8669081"
+       y="6.0000024" />
     <rect
-       style="fill:#d9728e;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="fill:#cc7aae;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect13083"
-       width="3"
-       height="3"
-       x="7.5945544"
-       y="12.000001" />
+       width="3.692307"
+       height="4.0000019"
+       x="5.8669081"
+       y="10.666674" />
     <rect
-       style="opacity:0.49746195;fill:#f4909c;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:#fa96e1;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect13085"
-       width="3"
-       height="3"
-       x="11.564356"
-       y="4.999999" />
+       width="3.692307"
+       height="4.0000019"
+       x="10.617668"
+       y="1.3333318" />
     <rect
-       style="fill:#f4909c;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="fill:#e68acf;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect13087"
-       width="3"
-       height="3"
-       x="11.564356"
-       y="8.499999" />
+       width="3.692307"
+       height="4.0000019"
+       x="10.617668"
+       y="6.0000014" />
     <rect
-       style="fill:#f4909c;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="fill:#cc7ab8;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect13089"
-       width="3"
-       height="3"
-       x="11.564356"
-       y="12" />
-    <rect
-       style="opacity:0.86243388;fill:#929797;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect13095"
-       width="1"
-       height="1.9999686"
-       x="-10.45223"
-       y="0.99966687"
-       transform="matrix(-3.540536e-5,-1,0.999998,-1.734922e-3,0,0)" />
-    <rect
-       style="opacity:0.86243388;fill:#929797;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect13097"
-       width="1"
-       height="16"
-       x="0"
-       y="0" />
+       width="3.692307"
+       height="4.0000019"
+       x="10.617668"
+       y="10.666672" />
   </g>
 </svg>
diff --git a/icons/cursor.png b/icons/cursor.png
index 9f1987d..25cbbdd 100644
Binary files a/icons/cursor.png and b/icons/cursor.png differ
diff --git a/icons/dataset.png b/icons/dataset.png
index d974e17..c289e23 100644
Binary files a/icons/dataset.png and b/icons/dataset.png differ
diff --git a/icons/dataset.svg b/icons/dataset.svg
index 1aef6f0..c9dbd1a 100644
--- a/icons/dataset.svg
+++ b/icons/dataset.svg
@@ -15,23 +15,34 @@
    sodipodi:version="0.32"
    inkscape:version="0.43"
    sodipodi:docbase="/home/flatberg/fluent/icons"
-   sodipodi:docname="dataset.svg">
+   sodipodi:docname="dataset.svg"
+   inkscape:export-filename="/home/flatberg/fluent/icons/dataset.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
   <defs
      id="defs1619">
     <linearGradient
        id="linearGradient9542">
       <stop
-         style="stop-color:#978e8e;stop-opacity:1;"
+         style="stop-color:#a0a0a0;stop-opacity:0.85123968;"
          offset="0"
          id="stop9544" />
+      <stop
+         id="stop7591"
+         offset="0.14835165"
+         style="stop-color:#918e9f;stop-opacity:0.6745098;" />
       <stop
          id="stop13091"
          offset="0.2857143"
          style="stop-color:#837d9e;stop-opacity:0.49803922;" />
       <stop
          style="stop-color:#7975a6;stop-opacity:0.24705882;"
-         offset="1"
+         offset="0.56043959"
          id="stop13093" />
+      <stop
+         id="stop7593"
+         offset="1"
+         style="stop-color:#7471aa;stop-opacity:0.12156863;" />
       <stop
          style="stop-color:#6f6daf;stop-opacity:0;"
          offset="1"
@@ -52,13 +63,17 @@
     <linearGradient
        id="linearGradient2500">
       <stop
-         style="stop-color:#a8a8a8;stop-opacity:1;"
+         style="stop-color:#cacaca;stop-opacity:1;"
          offset="0"
          id="stop2502" />
       <stop
          id="stop3387"
          offset="0.75510204"
          style="stop-color:#e5e5e5;stop-opacity:0.96907216;" />
+      <stop
+         style="stop-color:#e8e8e8;stop-opacity:0.48627451;"
+         offset="0.75510204"
+         id="stop7589" />
       <stop
          style="stop-color:#ebebeb;stop-opacity:0;"
          offset="1"
@@ -66,24 +81,24 @@
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient8653"
-       id="linearGradient8659"
+       xlink:href="#linearGradient9542"
+       id="linearGradient1360"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.048746,-7.497408e-10,1.276627e-10,0.992725,0.504626,4.478908)"
        x1="-14.992936"
        y1="3.2324076"
        x2="-0.50547981"
-       y2="3.2324076"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.786559,-6.091642e-10,9.574695e-11,0.806589,-3.626117,6.632697)" />
+       y2="3.2324076" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient9542"
-       id="linearGradient9548"
+       xlink:href="#linearGradient8653"
+       id="linearGradient1362"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.048746,-7.497408e-10,1.276627e-10,0.992725,0.504626,4.478908)"
        x1="-14.992936"
        y1="3.2324076"
        x2="-0.50547981"
-       y2="3.2324076"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.786559,-6.091642e-10,9.574695e-11,0.806589,-3.626117,6.632697)" />
+       y2="3.2324076" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -101,8 +116,8 @@
      inkscape:document-units="px"
      inkscape:window-width="749"
      inkscape:window-height="540"
-     inkscape:window-x="136"
-     inkscape:window-y="107" />
+     inkscape:window-x="236"
+     inkscape:window-y="35" />
   <metadata
      id="metadata1622">
     <rdf:RDF>
@@ -119,105 +134,90 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <rect
-       style="opacity:1;fill:url(#linearGradient9548);fill-opacity:1;stroke:url(#linearGradient8659);stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1625"
-       width="11.395269"
-       height="12.492741"
-       x="-15.41898"
-       y="2.9935551"
-       transform="matrix(-1.602589e-3,-0.999999,0.999999,-1.530673e-3,0,0)" />
-    <rect
-       style="opacity:0.86243388;fill:#929797;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3393"
-       width="0.50445545"
-       height="11.522277"
-       x="15.495544"
-       y="4.4777226" />
-    <rect
-       style="opacity:0.86243388;fill:#929797;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:#878e8e;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect9550"
-       width="0.59595656"
-       height="11.990877"
-       x="-16.000607"
-       y="3.4989688"
-       transform="matrix(-3.561914e-4,-1,1,-1.724514e-4,0,0)" />
+       width="0.8232609"
+       height="14.495289"
+       x="-16.045254"
+       y="0.99525535"
+       transform="matrix(-3.116999e-4,-1,1,-1.970668e-4,0,0)" />
     <rect
-       style="fill:#5797e7;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;opacity:0.49746193"
+       style="fill:url(#linearGradient1360);fill-opacity:1.0;stroke:url(#linearGradient1362);stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;opacity:0.95890411"
+       id="rect1625"
+       width="15.193706"
+       height="15.375687"
+       x="-15.219205"
+       y="-3.7501515e-05"
+       transform="matrix(-1.479312e-3,-0.999999,0.999999,-1.658229e-3,0,0)" />
+    <rect
+       style="opacity:1;fill:#878e8e;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3393"
+       width="0.62086815"
+       height="15.000007"
+       x="15.379128"
+       y="1" />
+    <rect
+       style="opacity:1;fill:#96c8fa;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect11308"
-       width="3"
-       height="3"
-       x="4"
-       y="5" />
+       width="3.692307"
+       height="4.0000019"
+       x="1.230768"
+       y="1.333333" />
     <rect
-       style="fill:#5797e7;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="fill:#8ab8e6;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect12183"
-       width="3"
-       height="3"
-       x="4"
-       y="8.5" />
+       width="3.692307"
+       height="4.0000019"
+       x="1.230768"
+       y="6.0000019" />
     <rect
-       style="fill:#5797e7;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="fill:#7ba4cc;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect12185"
-       width="3"
-       height="3"
-       x="4"
-       y="12" />
+       width="3.692307"
+       height="4.0000019"
+       x="1.230768"
+       y="10.666671" />
     <rect
-       style="opacity:0.49746195;fill:#57ade7;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:#96d5fa;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect13079"
-       width="3"
-       height="3"
-       x="7.5945544"
-       y="5" />
+       width="3.692307"
+       height="4.0000019"
+       x="5.7899828"
+       y="1.333333" />
     <rect
-       style="fill:#57ade7;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="fill:#8ac4e6;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect13081"
-       width="3"
-       height="3"
-       x="7.5945544"
-       y="8.5" />
+       width="3.692307"
+       height="4.0000019"
+       x="5.7899828"
+       y="6.0000019" />
     <rect
-       style="fill:#57ade7;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="fill:#7baecc;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect13083"
-       width="3"
-       height="3"
-       x="7.5945544"
-       y="12.000001" />
+       width="3.692307"
+       height="4.0000019"
+       x="5.7899828"
+       y="10.666673" />
     <rect
-       style="opacity:0.49746195;fill:#57c2e7;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:#96e1fa;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect13085"
-       width="3"
-       height="3"
-       x="11.564356"
-       y="4.999999" />
+       width="3.692307"
+       height="4.0000019"
+       x="10.540743"
+       y="1.3333317" />
     <rect
-       style="fill:#57c2e7;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="fill:#8acfe6;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect13087"
-       width="3"
-       height="3"
-       x="11.564356"
-       y="8.499999" />
+       width="3.692307"
+       height="4.0000019"
+       x="10.540743"
+       y="6.000001" />
     <rect
-       style="fill:#57c2e7;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="fill:#7bb8cc;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect13089"
-       width="3"
-       height="3"
-       x="11.564356"
-       y="12" />
-    <rect
-       style="opacity:0.86243388;fill:#929797;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect13095"
-       width="1"
-       height="1.9999686"
-       x="-10.45223"
-       y="0.99966687"
-       transform="matrix(-3.540536e-5,-1,0.999998,-1.734922e-3,0,0)" />
-    <rect
-       style="opacity:0.86243388;fill:#929797;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect13097"
-       width="1"
-       height="16"
-       x="0"
-       y="0" />
+       width="3.692307"
+       height="4.0000019"
+       x="10.540743"
+       y="10.666671" />
   </g>
 </svg>
diff --git a/icons/graph_dataset.png b/icons/graph_dataset.png
index 5ce8239..2709275 100644
Binary files a/icons/graph_dataset.png and b/icons/graph_dataset.png differ
diff --git a/icons/graph_dataset.svg b/icons/graph_dataset.svg
index 8ebb3f8..ad9268c 100644
--- a/icons/graph_dataset.svg
+++ b/icons/graph_dataset.svg
@@ -11,7 +11,7 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16px"
    height="16px"
-   id="svg1617"
+   id="svg8468"
    sodipodi:version="0.32"
    inkscape:version="0.43"
    sodipodi:docbase="/home/flatberg/fluent/icons"
@@ -20,52 +20,40 @@
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs
-     id="defs1619">
+     id="defs8470">
     <marker
-       inkscape:stockid="Dot_s"
+       inkscape:stockid="TriangleOutS"
        orient="auto"
        refY="0.0"
        refX="0.0"
-       id="Dot_s"
+       id="TriangleOutS"
        style="overflow:visible">
       <path
-         id="path23705"
-         d="M -2.5,-1.0 C -2.5,1.7600000 -4.7400000,4.0 -7.5,4.0 C -10.260000,4.0 -12.5,1.7600000 -12.5,-1.0 C -12.5,-3.7600000 -10.260000,-6.0 -7.5,-6.0 C -4.7400000,-6.0 -2.5,-3.7600000 -2.5,-1.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;marker-end:none"
-         transform="scale(0.2) translate(7.125493, 1)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Lstart"
-       style="overflow:visible">
-      <path
-         id="path23776"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         id="path10489"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
          style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.8)" />
+         transform="scale(0.2)" />
+    </marker>
+    <marker
+       inkscape:stockid="DistanceIn"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="DistanceIn"
+       style="overflow:visible">
+      <g
+         id="g10541"
+         transform="scale(0.6,0.6) translate(8,0)">
+        <path
+           id="path10543"
+           d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+           style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" />
+        <path
+           id="path10545"
+           d="M -14.759949,-7 L -14.759949,65"
+           style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.2pt;marker-start:none" />
+      </g>
     </marker>
-    <linearGradient
-       id="linearGradient9542">
-      <stop
-         style="stop-color:#978e8e;stop-opacity:1;"
-         offset="0"
-         id="stop9544" />
-      <stop
-         id="stop13091"
-         offset="0.2857143"
-         style="stop-color:#837d9e;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#b075a6;stop-opacity:0.24705882;"
-         offset="1"
-         id="stop13093" />
-      <stop
-         style="stop-color:#6f6daf;stop-opacity:0;"
-         offset="1"
-         id="stop9546" />
-    </linearGradient>
     <linearGradient
        inkscape:collect="always"
        id="linearGradient8653">
@@ -79,40 +67,52 @@
          id="stop8657" />
     </linearGradient>
     <linearGradient
-       id="linearGradient2500">
+       inkscape:collect="always"
+       xlink:href="#linearGradient8653"
+       id="linearGradient1362"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.048746,-7.497414e-10,1.276627e-10,0.992725,0.504498,4.555838)"
+       x1="-14.992936"
+       y1="3.2324076"
+       x2="-0.50547981"
+       y2="3.2324076" />
+    <linearGradient
+       id="linearGradient9542">
       <stop
-         style="stop-color:#a8a8a8;stop-opacity:1;"
+         style="stop-color:#a0a0a0;stop-opacity:0.85123968;"
          offset="0"
-         id="stop2502" />
+         id="stop9544" />
       <stop
-         id="stop3387"
-         offset="0.75510204"
-         style="stop-color:#e5e5e5;stop-opacity:0.96907216;" />
+         id="stop7591"
+         offset="0.14835165"
+         style="stop-color:#918e9f;stop-opacity:0.6745098;" />
       <stop
-         style="stop-color:#ebebeb;stop-opacity:0;"
+         id="stop13091"
+         offset="0.2857143"
+         style="stop-color:#837d9e;stop-opacity:0.49803922;" />
+      <stop
+         style="stop-color:#7975a6;stop-opacity:0.24705882;"
+         offset="0.56043959"
+         id="stop13093" />
+      <stop
+         id="stop7593"
          offset="1"
-         id="stop2504" />
+         style="stop-color:#7471aa;stop-opacity:0.12156863;" />
+      <stop
+         style="stop-color:#6f6daf;stop-opacity:0;"
+         offset="1"
+         id="stop9546" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8653"
-       id="linearGradient8659"
-       x1="-14.992936"
-       y1="3.2324076"
-       x2="-0.50547981"
-       y2="3.2324076"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.786559,-6.091644e-10,9.574701e-11,0.806589,-3.750022,6.643764)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient9542"
-       id="linearGradient9548"
+       id="linearGradient1360"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.048746,-7.497414e-10,1.276627e-10,0.992725,0.504498,4.555838)"
        x1="-14.992936"
        y1="3.2324076"
        x2="-0.50547981"
-       y2="3.2324076"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.786559,-6.091644e-10,9.574701e-11,0.806589,-3.750022,6.643764)" />
+       y2="3.2324076" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -121,19 +121,19 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="44.395604"
-     inkscape:cx="7.3431998"
-     inkscape:cy="7.7311881"
+     inkscape:zoom="31.392433"
+     inkscape:cx="8"
+     inkscape:cy="8.3153731"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="1280"
-     inkscape:window-height="955"
+     inkscape:window-width="992"
+     inkscape:window-height="672"
      inkscape:window-x="0"
      inkscape:window-y="0" />
   <metadata
-     id="metadata1622">
+     id="metadata8473">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -148,127 +148,112 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <rect
-       style="opacity:1;fill:url(#linearGradient9548);fill-opacity:1;stroke:url(#linearGradient8659);stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1625"
-       width="11.395275"
-       height="12.492744"
-       x="-15.542892"
-       y="3.0046201"
-       transform="matrix(-1.602589e-3,-0.999999,0.999999,-1.530673e-3,0,0)" />
-    <rect
-       style="opacity:0.86243388;fill:#929797;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3393"
-       width="0.50445545"
-       height="11.522277"
-       x="15.495544"
-       y="4.4777226" />
-    <rect
-       style="opacity:0.86243388;fill:#929797;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:#878e8e;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect9550"
-       width="0.59595656"
-       height="11.990877"
-       x="-16.000607"
-       y="3.4989688"
-       transform="matrix(-3.561914e-4,-1,1,-1.724514e-4,0,0)" />
+       width="0.82326102"
+       height="14.495289"
+       x="-16.045271"
+       y="1.0721804"
+       transform="matrix(-3.116999e-4,-1,1,-1.970668e-4,0,0)" />
     <rect
-       style="opacity:0.86243388;fill:#929797;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect13095"
-       width="1"
-       height="1.9999686"
-       x="-10.45223"
-       y="0.99966687"
-       transform="matrix(-3.540536e-5,-1,0.999998,-1.734922e-3,0,0)" />
+       style="opacity:0.95890407;fill:url(#linearGradient1360);fill-opacity:1;stroke:url(#linearGradient1362);stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect1625"
+       width="15.193709"
+       height="15.375698"
+       x="-15.219335"
+       y="0.076888956"
+       transform="matrix(-1.479312e-3,-0.999999,0.999999,-1.658227e-3,0,0)" />
     <rect
-       style="opacity:0.86243388;fill:#929797;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect13097"
-       width="1"
-       height="16"
-       x="0"
-       y="0" />
+       style="opacity:1;fill:#878e8e;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3393"
+       width="0.62086815"
+       height="15.000007"
+       x="15.456053"
+       y="1" />
     <path
        sodipodi:type="arc"
-       style="opacity:0.89847711;fill:#eb9213;fill-opacity:1;stroke:#000000;stroke-width:0.11331103;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:#fce100;fill-opacity:1;stroke:#000000;stroke-width:0.11344237;stroke-linecap:square;stroke-linejoin:round;marker-start:none;stroke-miterlimit:0.60000002;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="path17466"
        sodipodi:cx="4.8202972"
        sodipodi:cy="5.9539604"
        sodipodi:rx="1.3514851"
        sodipodi:ry="1.5767326"
-       d="M 6.1717824,5.9539604 A 1.3514851,1.5767326 0 1 1 6.1507906,5.6771397"
+       d="M 6.1717824,5.9539604 A 1.3514851,1.5767326 0 1 1 6.1676788,5.8311826"
        sodipodi:start="0"
-       sodipodi:end="6.1067046"
-       sodipodi:open="true"
-       transform="matrix(0.936447,0,0,0.831711,0.751641,1.359412)" />
+       sodipodi:end="6.2052379"
+       transform="matrix(1.253157,0,0,1.113406,-3.467103,-3.568938)"
+       sodipodi:open="true" />
     <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#eb9213;fill-opacity:1;stroke:#000000;stroke-width:0.11331103;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stroke-linecap:round;marker-start:none"
-       id="path18341"
-       sodipodi:cx="4.8202972"
-       sodipodi:cy="5.9539604"
-       sodipodi:rx="1.3514851"
-       sodipodi:ry="1.5767326"
-       d="M 6.1717824,5.9539604 A 1.3514851,1.5767326 0 1 1 6.1507906,5.6771397"
-       sodipodi:start="0"
-       sodipodi:end="6.1067046"
-       sodipodi:open="true"
-       transform="matrix(0.936447,0,0,0.831711,5.220453,1.73664)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.89847711;fill:#eb9213;fill-opacity:1;stroke:#000000;stroke-width:0.11331103;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path18343"
-       sodipodi:cx="4.8202972"
-       sodipodi:cy="5.9539604"
-       sodipodi:rx="1.3514851"
-       sodipodi:ry="1.5767326"
-       d="M 6.1717824,5.9539604 A 1.3514851,1.5767326 0 1 1 6.1507906,5.6771397"
-       sodipodi:start="0"
-       sodipodi:end="6.1067046"
-       sodipodi:open="true"
-       transform="matrix(0.936447,0,0,0.831711,1.369384,5.359412)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.89847711;fill:#eb9213;fill-opacity:1;stroke:#000000;stroke-width:0.11331103;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path18345"
-       sodipodi:cx="4.8202972"
-       sodipodi:cy="5.9539604"
-       sodipodi:rx="1.3514851"
-       sodipodi:ry="1.5767326"
-       d="M 6.1717824,5.9539604 A 1.3514851,1.5767326 0 1 1 6.1507906,5.6771397"
-       sodipodi:start="0"
-       sodipodi:end="6.1067046"
-       sodipodi:open="true"
-       transform="matrix(0.936447,0,0,0.831711,8.751641,8.73664)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.89847711;fill:#eb9213;fill-opacity:1;stroke:#000000;stroke-width:0.11331103;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path18347"
-       sodipodi:cx="4.8202972"
-       sodipodi:cy="5.9539604"
-       sodipodi:rx="1.3514851"
-       sodipodi:ry="1.5767326"
-       d="M 6.1717824,5.9539604 A 1.3514851,1.5767326 0 1 1 6.1507906,5.6771397"
-       sodipodi:start="0"
-       sodipodi:end="6.1067046"
-       sodipodi:open="true"
-       transform="matrix(0.936447,0,0,0.831711,5.751641,5.73664)" />
-    <path
-       style="opacity:1;color:#000000;fill:#3a383b;fill-opacity:0.82485878;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 6.5302362,6.411702 C 8.4733797,6.5391212 8.4733797,6.5391212 8.4733797,6.5391212"
+       style="opacity:1;color:#000000;fill:#3a383b;fill-opacity:0.82485878;fill-rule:evenodd;stroke:#000000;stroke-width:0.26768968;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 4.2658336,3.1945274 C 6.8661552,3.3651026 6.8661552,3.3651026 6.8661552,3.3651026"
        id="path19226" />
     <path
-       style="opacity:1;color:#000000;fill:#3a383b;fill-opacity:0.82485878;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 7.1195502,10.520973 C 9.0626937,10.648392 9.0626937,10.648392 9.0626937,10.648392"
+       style="opacity:1;color:#000000;fill:#3a383b;fill-opacity:0.82485878;fill-rule:evenodd;stroke:#000000;stroke-width:0.26768968;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 5.0544557,8.6955802 C 7.6547772,8.8661552 7.6547772,8.8661552 7.6547772,8.8661552"
        id="path20976" />
     <path
-       style="opacity:1;color:#000000;fill:#3a383b;fill-opacity:0.82485878;fill-rule:evenodd;stroke:#000000;stroke-width:0.17171589;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 11.154855,11.623699 C 12.364938,12.802918 12.364938,12.802918 12.364938,12.802918"
+       style="opacity:1;color:#000000;fill:#3a383b;fill-opacity:0.82485878;fill-rule:evenodd;stroke:#000000;stroke-width:0.22983284;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 10.454515,10.171792 C 12.073852,11.750404 12.073852,11.750404 12.073852,11.750404"
        id="path20978" />
     <path
-       style="opacity:1;color:#000000;fill:#3a383b;fill-opacity:0.82485878;fill-rule:evenodd;stroke:#000000;stroke-width:0.15874009;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 9.9153246,7.9660097 C 10.052976,9.4051342 10.052976,9.4051342 10.052976,9.4051342"
+       style="opacity:1;color:#000000;fill:#3a383b;fill-opacity:0.82485878;fill-rule:evenodd;stroke:#000000;stroke-width:0.21246541;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 8.7957709,5.2752684 C 8.9799765,7.2018145 8.9799765,7.2018145 8.9799765,7.2018145"
        id="path20980" />
     <path
-       style="opacity:1;color:#000000;fill:#3a383b;fill-opacity:0.82485878;fill-rule:evenodd;stroke:#000000;stroke-width:0.15874009;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 5.3866948,7.6172167 C 5.6087428,9.0457551 5.6087428,9.0457551 5.6087428,9.0457551"
+       style="opacity:1;color:#000000;fill:#3a383b;fill-opacity:0.82485878;fill-rule:evenodd;stroke:#000000;stroke-width:0.21246541;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 2.7355425,4.8083416 C 3.0326879,6.7207162 3.0326879,6.7207162 3.0326879,6.7207162"
        id="path20982" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#fce100;fill-opacity:1;stroke:#000000;stroke-width:0.11344237;stroke-linecap:round;stroke-linejoin:round;marker-start:none;stroke-miterlimit:0.60000002;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path11491"
+       sodipodi:cx="4.8202972"
+       sodipodi:cy="5.9539604"
+       sodipodi:rx="1.3514851"
+       sodipodi:ry="1.5767326"
+       d="M 6.1717824,5.9539604 A 1.3514851,1.5767326 0 1 1 6.1712767,5.9108317"
+       sodipodi:start="0"
+       sodipodi:end="6.2558287"
+       transform="matrix(1.253157,0,0,1.113406,2.563866,-3.062839)"
+       sodipodi:open="true" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#fce100;fill-opacity:1;stroke:#000000;stroke-width:0.11344237;stroke-linecap:square;stroke-linejoin:round;marker-start:none;stroke-miterlimit:0.60000002;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path11493"
+       sodipodi:cx="4.8202972"
+       sodipodi:cy="5.9539604"
+       sodipodi:rx="1.3514851"
+       sodipodi:ry="1.5767326"
+       d="M 6.1717824,5.9539604 A 1.3514851,1.5767326 0 1 1 6.1687496,5.8483902"
+       sodipodi:start="0"
+       sodipodi:end="6.2161801"
+       sodipodi:open="true"
+       transform="matrix(1.253157,0,0,1.113406,-2.616827,1.847557)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#fce100;fill-opacity:1;stroke:#000000;stroke-width:0.11344237;stroke-linecap:square;stroke-linejoin:round;marker-start:none;stroke-miterlimit:0.60000002;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path11495"
+       sodipodi:cx="4.8202972"
+       sodipodi:cy="5.9539604"
+       sodipodi:rx="1.3514851"
+       sodipodi:ry="1.5767326"
+       d="M 6.1717824,5.9539604 A 1.3514851,1.5767326 0 1 1 6.1677975,5.8329691"
+       sodipodi:start="0"
+       sodipodi:end="6.2063743"
+       sodipodi:open="true"
+       transform="matrix(1.253157,0,0,1.113406,3.14951,2.388151)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#fce100;fill-opacity:1;stroke:#000000;stroke-width:0.11344237;stroke-linecap:square;stroke-linejoin:round;marker-start:none;stroke-miterlimit:0.60000002;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path11497"
+       sodipodi:cx="4.8202972"
+       sodipodi:cy="5.9539604"
+       sodipodi:rx="1.3514851"
+       sodipodi:ry="1.5767326"
+       d="M 6.1717824,5.9539604 A 1.3514851,1.5767326 0 1 1 6.1678722,5.8341073"
+       sodipodi:start="0"
+       sodipodi:end="6.2070983"
+       sodipodi:open="true"
+       transform="matrix(1.253157,0,0,1.113406,7.198788,6.458182)" />
   </g>
 </svg>
diff --git a/icons/line_plot.png b/icons/line_plot.png
index 70de6a7..9562680 100644
Binary files a/icons/line_plot.png and b/icons/line_plot.png differ
diff --git a/icons/line_plot.svg b/icons/line_plot.svg
index bf84748..fe93674 100644
--- a/icons/line_plot.svg
+++ b/icons/line_plot.svg
@@ -11,13 +11,16 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16px"
    height="16px"
-   id="svg1617"
+   id="svg8468"
    sodipodi:version="0.32"
    inkscape:version="0.43"
    sodipodi:docbase="/home/flatberg/fluent/icons"
-   sodipodi:docname="line_plot.svg">
+   sodipodi:docname="line_plot.svg"
+   inkscape:export-filename="/home/flatberg/fluent/icons/line_plot.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
   <defs
-     id="defs1619">
+     id="defs8470">
     <marker
        inkscape:stockid="SquareS"
        orient="auto"
@@ -32,41 +35,42 @@
          transform="scale(0.2)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Send"
+       inkscape:stockid="TriangleOutS"
        orient="auto"
        refY="0.0"
        refX="0.0"
-       id="Arrow1Send"
-       style="overflow:visible;">
+       id="TriangleOutS"
+       style="overflow:visible">
       <path
-         id="path3456"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
-         transform="scale(0.2) rotate(180)" />
+         id="path10489"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
+         transform="scale(0.2)" />
+    </marker>
+    <marker
+       inkscape:stockid="DistanceIn"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="DistanceIn"
+       style="overflow:visible">
+      <g
+         id="g10541"
+         transform="scale(0.6,0.6) translate(8,0)">
+        <path
+           id="path10543"
+           d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+           style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" />
+        <path
+           id="path10545"
+           d="M -14.759949,-7 L -14.759949,65"
+           style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.2pt;marker-start:none" />
+      </g>
     </marker>
-    <linearGradient
-       id="linearGradient9542">
-      <stop
-         style="stop-color:#1d8b3d;stop-opacity:1;"
-         offset="0"
-         id="stop9544" />
-      <stop
-         id="stop13091"
-         offset="0.2857143"
-         style="stop-color:#837d9e;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#7975a6;stop-opacity:0.24705882;"
-         offset="1"
-         id="stop13093" />
-      <stop
-         style="stop-color:#6f6daf;stop-opacity:0;"
-         offset="1"
-         id="stop9546" />
-    </linearGradient>
     <linearGradient
        id="linearGradient8653">
       <stop
-         style="stop-color:#23fd00;stop-opacity:1;"
+         style="stop-color:#3def19;stop-opacity:0.97540987;"
          offset="0"
          id="stop8655" />
       <stop
@@ -75,40 +79,52 @@
          id="stop8657" />
     </linearGradient>
     <linearGradient
-       id="linearGradient2500">
+       inkscape:collect="always"
+       xlink:href="#linearGradient8653"
+       id="linearGradient1362"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.048746,-7.497417e-10,1.276627e-10,0.992725,0.504627,4.478913)"
+       x1="-13.565333"
+       y1="3.2233276"
+       x2="0.73984236"
+       y2="3.2456837" />
+    <linearGradient
+       id="linearGradient9542">
       <stop
-         style="stop-color:#a8a8a8;stop-opacity:1;"
+         style="stop-color:#13e414;stop-opacity:0.92622954;"
          offset="0"
-         id="stop2502" />
+         id="stop9544" />
       <stop
-         id="stop3387"
-         offset="0.75510204"
-         style="stop-color:#e5e5e5;stop-opacity:0.96907216;" />
+         id="stop7591"
+         offset="0.14835165"
+         style="stop-color:#918e9f;stop-opacity:0.6745098;" />
       <stop
-         style="stop-color:#ebebeb;stop-opacity:0;"
+         id="stop13091"
+         offset="0.2857143"
+         style="stop-color:#837d9e;stop-opacity:0.49803922;" />
+      <stop
+         style="stop-color:#7975a6;stop-opacity:0.24705882;"
+         offset="0.56043959"
+         id="stop13093" />
+      <stop
+         id="stop7593"
          offset="1"
-         id="stop2504" />
+         style="stop-color:#7471aa;stop-opacity:0.12156863;" />
+      <stop
+         style="stop-color:#6f6daf;stop-opacity:0;"
+         offset="1"
+         id="stop9546" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient8653"
-       id="linearGradient8659"
-       x1="-14.992936"
-       y1="3.2324076"
-       x2="-0.50547981"
-       y2="3.2324076"
+       id="linearGradient1360"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.786559,-6.091642e-10,9.574695e-11,0.806589,-3.626117,6.632697)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8653"
-       id="linearGradient9548"
-       x1="-14.992936"
-       y1="3.2324076"
-       x2="-0.50547981"
-       y2="3.2324076"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.786559,-6.091642e-10,9.574695e-11,0.806589,-3.626117,6.632697)" />
+       gradientTransform="matrix(1.048746,-7.497417e-10,1.276627e-10,0.992725,0.504627,4.478913)"
+       x1="-13.565333"
+       y1="3.2233276"
+       x2="0.73984236"
+       y2="3.2456837" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -117,19 +133,19 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="22.197802"
-     inkscape:cx="8.4320071"
-     inkscape:cy="4.4085456"
+     inkscape:zoom="31.392433"
+     inkscape:cx="8"
+     inkscape:cy="8.1498335"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="914"
-     inkscape:window-height="712"
-     inkscape:window-x="237"
-     inkscape:window-y="43" />
+     inkscape:window-width="1024"
+     inkscape:window-height="699"
+     inkscape:window-x="0"
+     inkscape:window-y="0" />
   <metadata
-     id="metadata1622">
+     id="metadata8473">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -144,54 +160,39 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <rect
-       style="opacity:1;fill:url(#linearGradient9548);fill-opacity:1.0;stroke:url(#linearGradient8659);stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1625"
-       width="11.395269"
-       height="12.492741"
-       x="-15.41898"
-       y="2.9935551"
-       transform="matrix(-1.602589e-3,-0.999999,0.999999,-1.530673e-3,0,0)" />
-    <rect
-       style="opacity:0.86243388;fill:#929797;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3393"
-       width="0.50445545"
-       height="11.522277"
-       x="15.495544"
-       y="4.4777226" />
-    <rect
-       style="opacity:0.86243388;fill:#929797;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:#878e8e;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect9550"
-       width="0.59595656"
-       height="11.990877"
-       x="-16.000607"
-       y="3.4989688"
-       transform="matrix(-3.561914e-4,-1,1,-1.724514e-4,0,0)" />
+       width="0.82326102"
+       height="14.495289"
+       x="-16.045271"
+       y="1.0721804"
+       transform="matrix(-3.116999e-4,-1,1,-1.970668e-4,0,0)" />
     <rect
-       style="opacity:0.86243388;fill:#929797;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect13095"
-       width="1"
-       height="1.9999686"
-       x="-10.45223"
-       y="0.99966687"
-       transform="matrix(-3.540536e-5,-1,0.999998,-1.734922e-3,0,0)" />
+       style="opacity:0.95890407;fill:url(#linearGradient1360);fill-opacity:1.0;stroke:url(#linearGradient1362);stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect1625"
+       width="15.193711"
+       height="15.375704"
+       x="-15.219207"
+       y="-3.7717124e-05"
+       transform="matrix(-1.479312e-3,-0.999999,0.999999,-1.658226e-3,0,0)" />
     <rect
-       style="opacity:0.86243388;fill:#929797;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect13097"
-       width="1"
-       height="16"
-       x="0"
-       y="0" />
+       style="opacity:1;fill:#878e8e;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3393"
+       width="0.62086815"
+       height="15.000007"
+       x="15.456053"
+       y="1" />
     <path
-       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:0.30343372;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:url(#SquareS);marker-mid:url(#SquareS);marker-end:url(#SquareS);stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 3.8080234,4.8809418 C 3.8080234,14.496824 3.8002372,14.496824 3.8002372,14.496824 L 3.8002372,14.496824"
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:0.33539712;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:url(#SquareS);marker-mid:url(#SquareS);marker-end:url(#SquareS);stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 1.6021029,2.0851203 C 1.6021029,13.166175 1.5938478,13.166175 1.5938478,13.166175 L 1.5938478,13.166175"
        id="path2423" />
     <path
-       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:0.35327095;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:url(#SquareS);marker-mid:url(#SquareS);marker-end:url(#SquareS);stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 15.345903,9.6197631 C 3.8038219,9.5920041 3.8038979,9.5832116 3.8038979,9.5832116 L 3.8038979,9.5832116"
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:0.39048415;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:url(#SquareS);marker-mid:url(#SquareS);marker-end:url(#SquareS);stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 13.834879,7.5459964 C 1.5976484,7.5140078 1.5977289,7.5038756 1.5977289,7.5038756 L 1.5977289,7.5038756"
        id="path3480" />
     <path
-       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#c72124;stroke-width:0.60000002;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 4.3,10.7 C 4.3,10.7 4.3009598,7.1690281 5.8146309,6.1007426 C 7.0219601,5.2486603 8.1832644,8.8588352 8.5982942,9.6868812 C 9.2420898,10.971349 9.6086599,13.094711 10.882205,13.263119 C 12.289868,13.449262 12.836966,11.8966 13.197551,11.060396 C 13.862121,9.519248 14.454234,7.1641089 14.454234,7.1641089 C 14.454234,7.1641089 14.90473,5.7056312 14.679482,5.6774752"
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#fa0707;stroke-width:0.563;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 2.12371,8.7908287 C 2.12371,8.7908287 2.1247276,4.7218426 3.7295633,3.4907823 C 5.0096068,2.5088681 6.2408535,6.6691258 6.6808795,7.6233413 C 7.3634493,9.1035237 7.752097,11.550423 9.1023444,11.744491 C 10.594787,11.958997 11.174836,10.169755 11.557138,9.2061391 C 12.261733,7.4301658 12.889508,4.7161739 12.889508,4.7161739 C 12.889508,4.7161739 13.367136,3.0354678 13.128322,3.0030216"
        id="path3482"
        sodipodi:nodetypes="csssscs"
        inkscape:export-filename="/home/flatberg/fluent/icons/line_plot.png"
diff --git a/icons/select.png b/icons/select.png
index 3f2d88b..fc1d68b 100644
Binary files a/icons/select.png and b/icons/select.png differ
diff --git a/icons/zoom_to_rect.png b/icons/zoom_to_rect.png
index 26ad414..12c2afd 100644
Binary files a/icons/zoom_to_rect.png and b/icons/zoom_to_rect.png differ