diff --git a/Resources/UI/circle_menu.png b/Resources/UI/circle_menu.png
new file mode 100644
index 0000000..0ff2962
Binary files /dev/null and b/Resources/UI/circle_menu.png differ
diff --git a/Resources/UI/circle_menu2.png b/Resources/UI/circle_menu2.png
new file mode 100644
index 0000000..2338c18
Binary files /dev/null and b/Resources/UI/circle_menu2.png differ
diff --git a/Resources/UI/icons.svg b/Resources/UI/icons.svg
index bfe370d..fc6bf20 100644
--- a/Resources/UI/icons.svg
+++ b/Resources/UI/icons.svg
@@ -7,19 +7,19 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="36.465881"
-   height="56.465881"
-   viewBox="0 0 36.465881 56.465881"
-   fill="none"
-   stroke="currentColor"
-   stroke-width="2"
-   stroke-linecap="round"
-   stroke-linejoin="round"
-   class="feather feather-save"
-   version="1.1"
-   id="svg8"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
    sodipodi:docname="icons.svg"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+   id="svg8"
+   version="1.1"
+   class="feather feather-save"
+   stroke-linejoin="round"
+   stroke-linecap="round"
+   stroke-width="2"
+   stroke="currentColor"
+   fill="none"
+   viewBox="0 0 169.84447 96.385719"
+   height="96.385719"
+   width="169.84447">
   <metadata
      id="metadata14">
     <rdf:RDF>
@@ -35,476 +35,569 @@
   <defs
      id="defs12" />
   <sodipodi:namedview
-     fit-margin-bottom="0"
-     fit-margin-right="0"
-     fit-margin-left="0"
-     fit-margin-top="0"
-     inkscape:document-rotation="0"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     id="namedview10"
-     showgrid="false"
-     inkscape:zoom="6.2608413"
-     inkscape:cx="90.016116"
-     inkscape:cy="49.411899"
-     inkscape:window-x="1072"
-     inkscape:window-y="845"
+     inkscape:current-layer="svg8"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg8" />
+     inkscape:window-y="845"
+     inkscape:window-x="1072"
+     inkscape:cy="82.547694"
+     inkscape:cx="114.18197"
+     inkscape:zoom="6.2608413"
+     showgrid="false"
+     id="namedview10"
+     inkscape:window-height="1017"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     inkscape:document-rotation="0"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
   <g
-     id="g842"
-     transform="matrix(0.80171614,0,0,0.7982539,18.396568,-1.5965078)"
+     inkscape:export-ydpi="96"
      inkscape:export-xdpi="96"
-     inkscape:export-ydpi="96">
+     transform="matrix(0.80171614,0,0,0.7982539,18.396568,-1.5965078)"
+     id="g842">
     <path
-       id="path2"
+       d="M 19,21 H 5 A 2,2 0 0 1 3,19 V 5 A 2,2 0 0 1 5,3 h 11 l 5,5 v 11 a 2,2 0 0 1 -2,2 z"
+       id="path2" />
+    <polyline
+       points="17 21 17 13 7 13 7 21"
+       id="polyline4" />
+    <polyline
+       points="7 3 7 8 15 8"
+       id="polyline6" />
+  </g>
+  <g
+     inkscape:export-ydpi="96"
+     inkscape:export-xdpi="96"
+     transform="matrix(0.65647058,0,0,0.65647058,4e-8,20)"
+     id="g894"
+     style="fill:none;stroke:#d4d4d4;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1">
+    <circle
+       style="stroke:#d4d4d4;stroke-opacity:1"
+       cx="12"
+       cy="12"
+       r="3"
+       id="circle880" />
+    <path
+       style="stroke:#d4d4d4;stroke-opacity:1"
+       d="m 19.4,15 a 1.65,1.65 0 0 0 0.33,1.82 l 0.06,0.06 a 2,2 0 0 1 0,2.83 2,2 0 0 1 -2.83,0 L 16.9,19.65 a 1.65,1.65 0 0 0 -1.82,-0.33 1.65,1.65 0 0 0 -1,1.51 V 21 a 2,2 0 0 1 -2,2 2,2 0 0 1 -2,-2 V 20.91 A 1.65,1.65 0 0 0 9,19.4 1.65,1.65 0 0 0 7.18,19.73 l -0.06,0.06 a 2,2 0 0 1 -2.83,0 2,2 0 0 1 0,-2.83 L 4.35,16.9 a 1.65,1.65 0 0 0 0.33,-1.82 1.65,1.65 0 0 0 -1.51,-1 H 3 a 2,2 0 0 1 -2,-2 2,2 0 0 1 2,-2 H 3.09 A 1.65,1.65 0 0 0 4.6,9 1.65,1.65 0 0 0 4.27,7.18 L 4.21,7.12 a 2,2 0 0 1 0,-2.83 2,2 0 0 1 2.83,0 L 7.1,4.35 A 1.65,1.65 0 0 0 8.92,4.68 H 9 A 1.65,1.65 0 0 0 10,3.17 V 3 a 2,2 0 0 1 2,-2 2,2 0 0 1 2,2 v 0.09 a 1.65,1.65 0 0 0 1,1.51 1.65,1.65 0 0 0 1.82,-0.33 l 0.06,-0.06 a 2,2 0 0 1 2.83,0 2,2 0 0 1 0,2.83 L 19.65,7.1 A 1.65,1.65 0 0 0 19.32,8.92 V 9 a 1.65,1.65 0 0 0 1.51,1 H 21 a 2,2 0 0 1 2,2 2,2 0 0 1 -2,2 h -0.09 a 1.65,1.65 0 0 0 -1.51,1 z"
+       id="path882" />
+  </g>
+  <g
+     inkscape:export-ydpi="96"
+     inkscape:export-xdpi="96"
+     style="stroke:#d4d4d4;stroke-opacity:1"
+     id="g842-8"
+     transform="matrix(0.80171614,0,0,0.7982539,-1.6034323,-1.5965078)">
+    <path
+       style="stroke:#d4d4d4;stroke-opacity:1"
+       id="path2-6"
        d="M 19,21 H 5 A 2,2 0 0 1 3,19 V 5 A 2,2 0 0 1 5,3 h 11 l 5,5 v 11 a 2,2 0 0 1 -2,2 z" />
     <polyline
-       id="polyline4"
+       style="stroke:#d4d4d4;stroke-opacity:1"
+       id="polyline4-7"
        points="17 21 17 13 7 13 7 21" />
     <polyline
-       id="polyline6"
+       style="stroke:#d4d4d4;stroke-opacity:1"
+       id="polyline6-7"
        points="7 3 7 8 15 8" />
   </g>
   <g
-     style="fill:none;stroke:#d4d4d4;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-     id="g894"
-     transform="matrix(0.65647058,0,0,0.65647058,2e-8,20)"
+     inkscape:export-ydpi="96"
      inkscape:export-xdpi="96"
-     inkscape:export-ydpi="96">
-    <circle
-       id="circle880"
-       r="3"
-       cy="12"
-       cx="12"
-       style="stroke:#d4d4d4;stroke-opacity:1" />
-    <path
-       id="path882"
-       d="m 19.4,15 a 1.65,1.65 0 0 0 0.33,1.82 l 0.06,0.06 a 2,2 0 0 1 0,2.83 2,2 0 0 1 -2.83,0 L 16.9,19.65 a 1.65,1.65 0 0 0 -1.82,-0.33 1.65,1.65 0 0 0 -1,1.51 V 21 a 2,2 0 0 1 -2,2 2,2 0 0 1 -2,-2 V 20.91 A 1.65,1.65 0 0 0 9,19.4 1.65,1.65 0 0 0 7.18,19.73 l -0.06,0.06 a 2,2 0 0 1 -2.83,0 2,2 0 0 1 0,-2.83 L 4.35,16.9 a 1.65,1.65 0 0 0 0.33,-1.82 1.65,1.65 0 0 0 -1.51,-1 H 3 a 2,2 0 0 1 -2,-2 2,2 0 0 1 2,-2 H 3.09 A 1.65,1.65 0 0 0 4.6,9 1.65,1.65 0 0 0 4.27,7.18 L 4.21,7.12 a 2,2 0 0 1 0,-2.83 2,2 0 0 1 2.83,0 L 7.1,4.35 A 1.65,1.65 0 0 0 8.92,4.68 H 9 A 1.65,1.65 0 0 0 10,3.17 V 3 a 2,2 0 0 1 2,-2 2,2 0 0 1 2,2 v 0.09 a 1.65,1.65 0 0 0 1,1.51 1.65,1.65 0 0 0 1.82,-0.33 l 0.06,-0.06 a 2,2 0 0 1 2.83,0 2,2 0 0 1 0,2.83 L 19.65,7.1 A 1.65,1.65 0 0 0 19.32,8.92 V 9 a 1.65,1.65 0 0 0 1.51,1 H 21 a 2,2 0 0 1 2,2 2,2 0 0 1 -2,2 h -0.09 a 1.65,1.65 0 0 0 -1.51,1 z"
-       style="stroke:#d4d4d4;stroke-opacity:1" />
-  </g>
-  <g
-     transform="matrix(0.80171614,0,0,0.7982539,-1.6034323,-1.5965078)"
-     id="g842-8"
-     style="stroke:#d4d4d4;stroke-opacity:1"
-     inkscape:export-xdpi="96"
-     inkscape:export-ydpi="96">
-    <path
-       d="M 19,21 H 5 A 2,2 0 0 1 3,19 V 5 A 2,2 0 0 1 5,3 h 11 l 5,5 v 11 a 2,2 0 0 1 -2,2 z"
-       id="path2-6"
-       style="stroke:#d4d4d4;stroke-opacity:1" />
-    <polyline
-       points="17 21 17 13 7 13 7 21"
-       id="polyline4-7"
-       style="stroke:#d4d4d4;stroke-opacity:1" />
-    <polyline
-       points="7 3 7 8 15 8"
-       id="polyline6-7"
-       style="stroke:#d4d4d4;stroke-opacity:1" />
-  </g>
-  <g
-     transform="matrix(0.65647058,0,0,0.65647058,20,20)"
+     style="fill:none;stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
      id="g894-2"
-     style="fill:none;stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
-     inkscape:export-xdpi="96"
-     inkscape:export-ydpi="96">
+     transform="matrix(0.65647058,0,0,0.65647058,20,20)">
     <circle
-       cx="12"
-       cy="12"
+       id="circle880-3"
        r="3"
-       id="circle880-3" />
+       cy="12"
+       cx="12" />
     <path
-       d="m 19.4,15 a 1.65,1.65 0 0 0 0.33,1.82 l 0.06,0.06 a 2,2 0 0 1 0,2.83 2,2 0 0 1 -2.83,0 L 16.9,19.65 a 1.65,1.65 0 0 0 -1.82,-0.33 1.65,1.65 0 0 0 -1,1.51 V 21 a 2,2 0 0 1 -2,2 2,2 0 0 1 -2,-2 V 20.91 A 1.65,1.65 0 0 0 9,19.4 1.65,1.65 0 0 0 7.18,19.73 l -0.06,0.06 a 2,2 0 0 1 -2.83,0 2,2 0 0 1 0,-2.83 L 4.35,16.9 a 1.65,1.65 0 0 0 0.33,-1.82 1.65,1.65 0 0 0 -1.51,-1 H 3 a 2,2 0 0 1 -2,-2 2,2 0 0 1 2,-2 H 3.09 A 1.65,1.65 0 0 0 4.6,9 1.65,1.65 0 0 0 4.27,7.18 L 4.21,7.12 a 2,2 0 0 1 0,-2.83 2,2 0 0 1 2.83,0 L 7.1,4.35 A 1.65,1.65 0 0 0 8.92,4.68 H 9 A 1.65,1.65 0 0 0 10,3.17 V 3 a 2,2 0 0 1 2,-2 2,2 0 0 1 2,2 v 0.09 a 1.65,1.65 0 0 0 1,1.51 1.65,1.65 0 0 0 1.82,-0.33 l 0.06,-0.06 a 2,2 0 0 1 2.83,0 2,2 0 0 1 0,2.83 L 19.65,7.1 A 1.65,1.65 0 0 0 19.32,8.92 V 9 a 1.65,1.65 0 0 0 1.51,1 H 21 a 2,2 0 0 1 2,2 2,2 0 0 1 -2,2 h -0.09 a 1.65,1.65 0 0 0 -1.51,1 z"
-       id="path882-5" />
+       id="path882-5"
+       d="m 19.4,15 a 1.65,1.65 0 0 0 0.33,1.82 l 0.06,0.06 a 2,2 0 0 1 0,2.83 2,2 0 0 1 -2.83,0 L 16.9,19.65 a 1.65,1.65 0 0 0 -1.82,-0.33 1.65,1.65 0 0 0 -1,1.51 V 21 a 2,2 0 0 1 -2,2 2,2 0 0 1 -2,-2 V 20.91 A 1.65,1.65 0 0 0 9,19.4 1.65,1.65 0 0 0 7.18,19.73 l -0.06,0.06 a 2,2 0 0 1 -2.83,0 2,2 0 0 1 0,-2.83 L 4.35,16.9 a 1.65,1.65 0 0 0 0.33,-1.82 1.65,1.65 0 0 0 -1.51,-1 H 3 a 2,2 0 0 1 -2,-2 2,2 0 0 1 2,-2 H 3.09 A 1.65,1.65 0 0 0 4.6,9 1.65,1.65 0 0 0 4.27,7.18 L 4.21,7.12 a 2,2 0 0 1 0,-2.83 2,2 0 0 1 2.83,0 L 7.1,4.35 A 1.65,1.65 0 0 0 8.92,4.68 H 9 A 1.65,1.65 0 0 0 10,3.17 V 3 a 2,2 0 0 1 2,-2 2,2 0 0 1 2,2 v 0.09 a 1.65,1.65 0 0 0 1,1.51 1.65,1.65 0 0 0 1.82,-0.33 l 0.06,-0.06 a 2,2 0 0 1 2.83,0 2,2 0 0 1 0,2.83 L 19.65,7.1 A 1.65,1.65 0 0 0 19.32,8.92 V 9 a 1.65,1.65 0 0 0 1.51,1 H 21 a 2,2 0 0 1 2,2 2,2 0 0 1 -2,2 h -0.09 a 1.65,1.65 0 0 0 -1.51,1 z" />
   </g>
   <g
-     style="fill:none;stroke:#d4d4d4;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     inkscape:export-ydpi="96"
+     inkscape:export-xdpi="96"
+     transform="matrix(0.7484492,0,0,0.7484492,-0.74844916,39.251551)"
      id="g958"
-     transform="matrix(0.7484492,0,0,0.7484492,-0.74844918,39.251551)"
-     inkscape:export-xdpi="96"
-     inkscape:export-ydpi="96">
+     style="fill:none;stroke:#d4d4d4;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1">
     <circle
-       id="circle941"
-       r="10"
-       cy="12"
+       style="stroke:#d4d4d4;stroke-opacity:1"
        cx="12"
-       style="stroke:#d4d4d4;stroke-opacity:1" />
+       cy="12"
+       r="10"
+       id="circle941" />
     <path
-       id="path943"
+       style="stroke:#d4d4d4;stroke-opacity:1"
        d="m 9.09,9 a 3,3 0 0 1 5.83,1 c 0,2 -3,3 -3,3"
-       style="stroke:#d4d4d4;stroke-opacity:1" />
+       id="path943" />
     <line
-       id="line945"
-       y2="17"
-       x2="12.01"
-       y1="17"
+       style="stroke:#d4d4d4;stroke-opacity:1"
        x1="12"
-       style="stroke:#d4d4d4;stroke-opacity:1" />
+       y1="17"
+       x2="12.01"
+       y2="17"
+       id="line945" />
   </g>
   <g
-     transform="matrix(0.7484492,0,0,0.7484492,19.251551,39.251551)"
+     inkscape:export-ydpi="96"
+     inkscape:export-xdpi="96"
+     style="fill:none;stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
      id="g958-4"
+     transform="matrix(0.7484492,0,0,0.7484492,19.251551,39.251551)">
+    <circle
+       id="circle941-9"
+       r="10"
+       cy="12"
+       cx="12" />
+    <path
+       id="path943-1"
+       d="m 9.09,9 a 3,3 0 0 1 5.83,1 c 0,2 -3,3 -3,3" />
+    <line
+       id="line945-3"
+       y2="17"
+       x2="12.01"
+       y1="17"
+       x1="12" />
+  </g>
+  <g
+     style="fill:none;stroke:#d4d4d4;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     id="g1510"
+     transform="translate(36,-4)">
+    <line
+       id="line1496"
+       y2="19"
+       x2="12"
+       y1="5"
+       x1="12"
+       style="stroke:#d4d4d4;stroke-opacity:1" />
+    <line
+       id="line1498"
+       y2="12"
+       x2="19"
+       y1="12"
+       x1="5"
+       style="stroke:#d4d4d4;stroke-opacity:1" />
+  </g>
+  <g
+     transform="translate(56,-4)"
+     id="g1510-0"
+     style="fill:none;stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round">
+    <line
+       x1="12"
+       y1="5"
+       x2="12"
+       y2="19"
+       id="line1496-5" />
+    <line
+       x1="5"
+       y1="12"
+       x2="19"
+       y2="12"
+       id="line1498-1" />
+  </g>
+  <g
+     style="fill:none;stroke:#d4d4d4;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     id="g1560"
+     transform="matrix(0.81929378,0,0,0.81929378,38.361382,18.491799)"
+     inkscape:export-xdpi="96"
+     inkscape:export-ydpi="96">
+    <path
+       id="path1546"
+       d="m 12,20 h 9"
+       style="stroke:#d4d4d4;stroke-opacity:1" />
+    <path
+       id="path1548"
+       d="m 16.5,3.5 a 2.1213203,2.1213203 0 0 1 3,3 L 7,19 3,20 4,16 Z"
+       style="stroke:#d4d4d4;stroke-opacity:1" />
+  </g>
+  <g
+     transform="matrix(0.81929378,0,0,0.81929378,58.361382,18.491799)"
+     id="g1560-8"
      style="fill:none;stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
      inkscape:export-xdpi="96"
      inkscape:export-ydpi="96">
-    <circle
-       cx="12"
-       cy="12"
-       r="10"
-       id="circle941-9" />
     <path
-       d="m 9.09,9 a 3,3 0 0 1 5.83,1 c 0,2 -3,3 -3,3"
-       id="path943-1" />
-    <line
-       x1="12"
-       y1="17"
-       x2="12.01"
-       y2="17"
-       id="line945-3" />
-  </g>
-  <g
-     transform="translate(36,-4)"
-     id="g1510"
-     style="fill:none;stroke:#d4d4d4;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1">
-    <line
-       style="stroke:#d4d4d4;stroke-opacity:1"
-       x1="12"
-       y1="5"
-       x2="12"
-       y2="19"
-       id="line1496" />
-    <line
-       style="stroke:#d4d4d4;stroke-opacity:1"
-       x1="5"
-       y1="12"
-       x2="19"
-       y2="12"
-       id="line1498" />
-  </g>
-  <g
-     style="fill:none;stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
-     id="g1510-0"
-     transform="translate(56,-4)">
-    <line
-       id="line1496-5"
-       y2="19"
-       x2="12"
-       y1="5"
-       x1="12" />
-    <line
-       id="line1498-1"
-       y2="12"
-       x2="19"
-       y1="12"
-       x1="5" />
-  </g>
-  <g
-     inkscape:export-ydpi="96"
-     inkscape:export-xdpi="96"
-     transform="matrix(0.81929378,0,0,0.81929378,38.361382,18.491799)"
-     id="g1560"
-     style="fill:none;stroke:#d4d4d4;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1">
-    <path
-       style="stroke:#d4d4d4;stroke-opacity:1"
        d="m 12,20 h 9"
-       id="path1546" />
+       id="path1546-2" />
     <path
-       style="stroke:#d4d4d4;stroke-opacity:1"
        d="m 16.5,3.5 a 2.1213203,2.1213203 0 0 1 3,3 L 7,19 3,20 4,16 Z"
-       id="path1548" />
-  </g>
-  <g
-     inkscape:export-ydpi="96"
-     inkscape:export-xdpi="96"
-     style="fill:none;stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
-     id="g1560-8"
-     transform="matrix(0.81929378,0,0,0.81929378,58.361382,18.491799)">
-    <path
-       id="path1546-2"
-       d="m 12,20 h 9" />
-    <path
-       id="path1548-4"
-       d="m 16.5,3.5 a 2.1213203,2.1213203 0 0 1 3,3 L 7,19 3,20 4,16 Z" />
+       id="path1548-4" />
   </g>
   <line
-     style="fill:none;stroke:#d4d4d4;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-     x1="41"
-     y1="48"
+     id="line1498-7"
+     y2="48"
      x2="55"
-     y2="48"
-     id="line1498-7" />
-  <line
-     id="line1498-1-9"
-     y2="48"
-     x2="75"
      y1="48"
+     x1="41"
+     style="fill:none;stroke:#d4d4d4;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+  <line
+     style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
      x1="61"
-     style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round" />
+     y1="48"
+     x2="75"
+     y2="48"
+     id="line1498-1-9" />
   <g
-     inkscape:export-ydpi="96"
-     inkscape:export-xdpi="96"
-     transform="matrix(0.88705882,0,0,0.88705882,36.451765,57.338728)"
+     style="fill:none;stroke:#d4d4d4;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
      id="g1631"
-     style="fill:none;stroke:#d4d4d4;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1">
+     transform="matrix(0.88705882,0,0,0.88705882,36.451765,57.338728)"
+     inkscape:export-xdpi="96"
+     inkscape:export-ydpi="96">
     <polygon
-       style="stroke:#d4d4d4;stroke-opacity:1"
-       points="19,20 9,12 19,4 "
-       id="polygon1617" />
+       id="polygon1617"
+       points="19,4 19,20 9,12 "
+       style="stroke:#d4d4d4;stroke-opacity:1" />
+    <line
+       id="line1619"
+       y2="5"
+       x2="5"
+       y1="19"
+       x1="5"
+       style="stroke:#d4d4d4;stroke-opacity:1" />
+  </g>
+  <g
+     transform="matrix(0.88705882,0,0,0.88705882,56.451765,57.338728)"
+     id="g1631-1"
+     style="fill:none;stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
+     inkscape:export-xdpi="96"
+     inkscape:export-ydpi="96">
+    <polygon
+       points="9,12 19,4 19,20 "
+       id="polygon1617-1" />
     <line
-       style="stroke:#d4d4d4;stroke-opacity:1"
        x1="5"
        y1="19"
        x2="5"
        y2="5"
-       id="line1619" />
+       id="line1619-8" />
   </g>
   <g
-     inkscape:export-ydpi="96"
-     inkscape:export-xdpi="96"
-     style="fill:none;stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
-     id="g1631-1"
-     transform="matrix(0.88705882,0,0,0.88705882,56.451765,57.338728)">
-    <polygon
-       id="polygon1617-1"
-       points="19,4 19,20 9,12 " />
-    <line
-       id="line1619-8"
-       y2="5"
-       x2="5"
-       y1="19"
-       x1="5" />
-  </g>
-  <g
-     transform="matrix(0.712,0,0,0.712,-0.12988243,63.506823)"
+     style="fill:none;stroke:#d4d4d4;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
      id="g1706"
-     style="fill:none;stroke:#d4d4d4;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1">
+     transform="matrix(0.712,0,0,0.712,-0.12988241,63.506823)">
     <polyline
-       style="stroke:#d4d4d4;stroke-opacity:1"
+       id="polyline1686"
        points="3 6 5 6 21 6"
-       id="polyline1686" />
+       style="stroke:#d4d4d4;stroke-opacity:1" />
     <path
-       style="stroke:#d4d4d4;stroke-opacity:1"
+       id="path1688"
        d="m 19,6 v 14 a 2,2 0 0 1 -2,2 H 7 A 2,2 0 0 1 5,20 V 6 M 8,6 V 4 a 2,2 0 0 1 2,-2 h 4 a 2,2 0 0 1 2,2 v 2"
-       id="path1688" />
+       style="stroke:#d4d4d4;stroke-opacity:1" />
+    <line
+       id="line1690"
+       y2="17"
+       x2="10"
+       y1="11"
+       x1="10"
+       style="stroke:#d4d4d4;stroke-opacity:1" />
+    <line
+       id="line1692"
+       y2="17"
+       x2="14"
+       y1="11"
+       x1="14"
+       style="stroke:#d4d4d4;stroke-opacity:1" />
+  </g>
+  <g
+     transform="matrix(0.712,0,0,0.712,19.691294,63.39953)"
+     id="g1706-5"
+     style="fill:none;stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round">
+    <polyline
+       points="3 6 5 6 21 6"
+       id="polyline1686-0" />
+    <path
+       d="m 19,6 v 14 a 2,2 0 0 1 -2,2 H 7 A 2,2 0 0 1 5,20 V 6 M 8,6 V 4 a 2,2 0 0 1 2,-2 h 4 a 2,2 0 0 1 2,2 v 2"
+       id="path1688-2" />
     <line
-       style="stroke:#d4d4d4;stroke-opacity:1"
        x1="10"
        y1="11"
        x2="10"
        y2="17"
-       id="line1690" />
+       id="line1690-1" />
     <line
-       style="stroke:#d4d4d4;stroke-opacity:1"
        x1="14"
        y1="11"
        x2="14"
        y2="17"
-       id="line1692" />
+       id="line1692-7" />
   </g>
   <g
-     style="fill:none;stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
-     id="g1706-5"
-     transform="matrix(0.712,0,0,0.712,19.691294,63.39953)">
-    <polyline
-       id="polyline1686-0"
-       points="3 6 5 6 21 6" />
-    <path
-       id="path1688-2"
-       d="m 19,6 v 14 a 2,2 0 0 1 -2,2 H 7 A 2,2 0 0 1 5,20 V 6 M 8,6 V 4 a 2,2 0 0 1 2,-2 h 4 a 2,2 0 0 1 2,2 v 2" />
-    <line
-       id="line1690-1"
-       y2="17"
-       x2="10"
-       y1="11"
-       x1="10" />
-    <line
-       id="line1692-7"
-       y2="17"
-       x2="14"
-       y1="11"
-       x1="14" />
-  </g>
-  <g
-     inkscape:export-ydpi="96"
-     inkscape:export-xdpi="96"
-     transform="matrix(0.88297886,0,0,0.81929262,37.468085,78.361347)"
+     style="fill:none;stroke:#d4d4d4;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
      id="g1746"
-     style="fill:none;stroke:#d4d4d4;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1">
+     transform="matrix(0.88297886,0,0,0.81929262,37.468085,78.361347)"
+     inkscape:export-xdpi="96"
+     inkscape:export-ydpi="96">
     <polygon
-       style="stroke:#d4d4d4;stroke-opacity:1"
-       points="5,3 19,12 5,21 "
-       id="polygon1735" />
+       id="polygon1735"
+       points="5,21 5,3 19,12 "
+       style="stroke:#d4d4d4;stroke-opacity:1" />
   </g>
   <g
-     inkscape:export-ydpi="96"
-     inkscape:export-xdpi="96"
-     style="fill:none;stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
+     transform="matrix(0.88297886,0,0,0.81929262,57.468085,78.361347)"
      id="g1746-7"
-     transform="matrix(0.88297886,0,0,0.81929262,57.468085,78.361347)">
+     style="fill:none;stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
+     inkscape:export-xdpi="96"
+     inkscape:export-ydpi="96">
     <polygon
-       id="polygon1735-2"
-       points="5,21 5,3 19,12 " />
+       points="19,12 5,21 5,3 "
+       id="polygon1735-2" />
   </g>
   <g
-     inkscape:export-ydpi="96"
-     inkscape:export-xdpi="96"
-     transform="matrix(0.80034632,0,0,0.80034632,78.399307,-1.6006926)"
+     style="fill:none;stroke:#d4d4d4;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
      id="g1783"
-     style="fill:none;stroke:#d4d4d4;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1">
+     transform="matrix(0.80034632,0,0,0.80034632,78.399307,-1.6006926)"
+     inkscape:export-xdpi="96"
+     inkscape:export-ydpi="96">
+    <rect
+       id="rect1766"
+       ry="2"
+       rx="2"
+       height="18"
+       width="18"
+       y="3"
+       x="3"
+       style="stroke:#d4d4d4;stroke-opacity:1" />
+    <line
+       id="line1768"
+       y2="16"
+       x2="12"
+       y1="8"
+       x1="12"
+       style="stroke:#d4d4d4;stroke-opacity:1" />
+    <line
+       id="line1770"
+       y2="12"
+       x2="16"
+       y1="12"
+       x1="8"
+       style="stroke:#d4d4d4;stroke-opacity:1" />
+  </g>
+  <g
+     transform="matrix(0.80034632,0,0,0.80034632,98.399307,-1.6006926)"
+     id="g1783-8"
+     style="fill:none;stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
+     inkscape:export-xdpi="96"
+     inkscape:export-ydpi="96">
     <rect
-       style="stroke:#d4d4d4;stroke-opacity:1"
        x="3"
        y="3"
        width="18"
        height="18"
        rx="2"
        ry="2"
-       id="rect1766" />
+       id="rect1766-0" />
     <line
-       style="stroke:#d4d4d4;stroke-opacity:1"
        x1="12"
        y1="8"
        x2="12"
        y2="16"
-       id="line1768" />
+       id="line1768-6" />
     <line
-       style="stroke:#d4d4d4;stroke-opacity:1"
        x1="8"
        y1="12"
        x2="16"
        y2="12"
-       id="line1770" />
+       id="line1770-7" />
   </g>
   <g
-     inkscape:export-ydpi="96"
+     style="fill:none;stroke:#d4d4d4;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     id="g1823"
+     transform="matrix(0.80034632,0,0,0.80034632,78.399307,18.399307)"
      inkscape:export-xdpi="96"
-     style="fill:none;stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
-     id="g1783-8"
-     transform="matrix(0.80034632,0,0,0.80034632,98.399307,-1.6006926)">
+     inkscape:export-ydpi="96">
     <rect
-       id="rect1766-0"
+       id="rect1809"
        ry="2"
        rx="2"
        height="18"
        width="18"
        y="3"
-       x="3" />
+       x="3"
+       style="stroke:#d4d4d4;stroke-opacity:1" />
     <line
-       id="line1768-6"
-       y2="16"
-       x2="12"
-       y1="8"
-       x1="12" />
-    <line
-       id="line1770-7"
+       id="line1811"
        y2="12"
        x2="16"
        y1="12"
-       x1="8" />
+       x1="8"
+       style="stroke:#d4d4d4;stroke-opacity:1" />
   </g>
   <g
-     inkscape:export-ydpi="96"
+     transform="matrix(0.80034632,0,0,0.80034632,98.399307,18.399307)"
+     id="g1823-1"
+     style="fill:none;stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
      inkscape:export-xdpi="96"
-     transform="matrix(0.80034632,0,0,0.80034632,78.399307,18.399307)"
-     id="g1823"
-     style="fill:none;stroke:#d4d4d4;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1">
+     inkscape:export-ydpi="96">
     <rect
-       style="stroke:#d4d4d4;stroke-opacity:1"
        x="3"
        y="3"
        width="18"
        height="18"
        rx="2"
        ry="2"
-       id="rect1809" />
+       id="rect1809-3" />
     <line
-       style="stroke:#d4d4d4;stroke-opacity:1"
        x1="8"
        y1="12"
        x2="16"
        y2="12"
-       id="line1811" />
+       id="line1811-8" />
   </g>
   <g
-     inkscape:export-ydpi="96"
-     inkscape:export-xdpi="96"
-     style="fill:none;stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
-     id="g1823-1"
-     transform="matrix(0.80034632,0,0,0.80034632,98.399307,18.399307)">
-    <rect
-       id="rect1809-3"
-       ry="2"
-       rx="2"
-       height="18"
-       width="18"
-       y="3"
-       x="3" />
-    <line
-       id="line1811-8"
-       y2="12"
-       x2="16"
-       y1="12"
-       x1="8" />
-  </g>
-  <g
-     inkscape:export-ydpi="96"
-     inkscape:export-xdpi="96"
-     transform="matrix(0.81745949,0,0,0.81745949,81.164106,40.822659)"
+     style="fill:none;stroke:#d4d4d4;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
      id="g1863"
-     style="fill:none;stroke:#d4d4d4;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1">
+     transform="matrix(0.81745949,0,0,0.81745949,81.164106,40.822659)"
+     inkscape:export-xdpi="96"
+     inkscape:export-ydpi="96">
+    <line
+       id="line1846"
+       y2="12"
+       x2="21"
+       y1="12"
+       x1="3"
+       style="stroke:#d4d4d4;stroke-opacity:1" />
+    <line
+       id="line1848"
+       y2="6"
+       x2="21"
+       y1="6"
+       x1="3"
+       style="stroke:#d4d4d4;stroke-opacity:1" />
+    <line
+       id="line1850"
+       y2="18"
+       x2="21"
+       y1="18"
+       x1="3"
+       style="stroke:#d4d4d4;stroke-opacity:1" />
+  </g>
+  <g
+     transform="matrix(0.81745949,0,0,0.81745949,101.35765,40.982382)"
+     id="g1863-1"
+     style="fill:none;stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
+     inkscape:export-xdpi="96"
+     inkscape:export-ydpi="96">
     <line
-       style="stroke:#d4d4d4;stroke-opacity:1"
        x1="3"
        y1="12"
        x2="21"
        y2="12"
-       id="line1846" />
+       id="line1846-4" />
     <line
-       style="stroke:#d4d4d4;stroke-opacity:1"
        x1="3"
        y1="6"
        x2="21"
        y2="6"
-       id="line1848" />
+       id="line1848-6" />
     <line
-       style="stroke:#d4d4d4;stroke-opacity:1"
        x1="3"
        y1="18"
        x2="21"
        y2="18"
-       id="line1850" />
+       id="line1850-4" />
+  </g>
+  <g
+     transform="matrix(0.74589532,0,0,0.74589532,96.546258,74.664217)"
+     id="g929"
+     style="fill:none;stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round">
+    <circle
+       cx="12"
+       cy="12"
+       r="10"
+       id="circle915" />
+    <rect
+       x="9"
+       y="9"
+       width="6"
+       height="6"
+       id="rect917" />
   </g>
   <g
      inkscape:export-ydpi="96"
      inkscape:export-xdpi="96"
-     style="fill:none;stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
-     id="g1863-1"
-     transform="matrix(0.81745949,0,0,0.81745949,101.35765,40.982382)">
-    <line
-       id="line1846-4"
-       y2="12"
-       x2="21"
-       y1="12"
-       x1="3" />
-    <line
-       id="line1848-6"
-       y2="6"
-       x2="21"
-       y1="6"
-       x1="3" />
-    <line
-       id="line1850-4"
-       y2="18"
-       x2="21"
-       y1="18"
-       x1="3" />
+     style="stroke:#d4d4d4;stroke-opacity:1"
+     id="g983">
+    <circle
+       style="fill:none;stroke:#d4d4d4;stroke-width:1.49179;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       id="circle915-1"
+       r="7.4589534"
+       cy="71.717644"
+       cx="139.14354" />
+    <g
+       transform="matrix(0.3092242,0,0,0.3092242,135.44162,67.965769)"
+       id="g1863-1-2"
+       style="fill:none;stroke:#d4d4d4;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <line
+         style="stroke:#d4d4d4;stroke-opacity:1"
+         x1="3"
+         y1="12"
+         x2="21"
+         y2="12"
+         id="line1846-4-8" />
+      <line
+         style="stroke:#d4d4d4;stroke-opacity:1"
+         x1="3"
+         y1="6"
+         x2="21"
+         y2="6"
+         id="line1848-6-9" />
+      <line
+         style="stroke:#d4d4d4;stroke-opacity:1"
+         x1="3"
+         y1="18"
+         x2="21"
+         y2="18"
+         id="line1850-4-1" />
+    </g>
+  </g>
+  <g
+     inkscape:export-ydpi="96"
+     inkscape:export-xdpi="96"
+     transform="translate(22.49608,0.1576808)"
+     id="g983-2">
+    <circle
+       cx="139.14354"
+       cy="71.717644"
+       r="7.4589534"
+       id="circle915-1-5"
+       style="fill:none;stroke:#000000;stroke-width:1.49179;stroke-linecap:round;stroke-linejoin:round" />
+    <g
+       inkscape:export-ydpi="96"
+       inkscape:export-xdpi="96"
+       style="fill:none;stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
+       id="g1863-1-2-2"
+       transform="matrix(0.3092242,0,0,0.3092242,135.44162,67.965769)">
+      <line
+         id="line1846-4-8-9"
+         y2="12"
+         x2="21"
+         y1="12"
+         x1="3" />
+      <line
+         id="line1848-6-9-2"
+         y2="6"
+         x2="21"
+         y1="6"
+         x1="3" />
+      <line
+         id="line1850-4-1-6"
+         y2="18"
+         x2="21"
+         y1="18"
+         x1="3" />
+    </g>
   </g>
 </svg>
diff --git a/Resources/UI/square_minus.png b/Resources/UI/square_minus.png
deleted file mode 100644
index e4de014..0000000
Binary files a/Resources/UI/square_minus.png and /dev/null differ
diff --git a/Resources/UI/square_minus2.png b/Resources/UI/square_minus2.png
deleted file mode 100644
index cdd6639..0000000
Binary files a/Resources/UI/square_minus2.png and /dev/null differ
diff --git a/Resources/UI/square_plus.png b/Resources/UI/square_plus.png
deleted file mode 100644
index 440e565..0000000
Binary files a/Resources/UI/square_plus.png and /dev/null differ
diff --git a/Resources/UI/square_plus2.png b/Resources/UI/square_plus2.png
deleted file mode 100644
index 5c8b8ca..0000000
Binary files a/Resources/UI/square_plus2.png and /dev/null differ
diff --git a/Resources/UI/triangle_down.png b/Resources/UI/triangle_down.png
deleted file mode 100644
index af04833..0000000
Binary files a/Resources/UI/triangle_down.png and /dev/null differ
diff --git a/Resources/UI/triangle_down2.png b/Resources/UI/triangle_down2.png
deleted file mode 100644
index 5ef234f..0000000
Binary files a/Resources/UI/triangle_down2.png and /dev/null differ
diff --git a/Resources/UI/triangle_down_stop.png b/Resources/UI/triangle_down_stop.png
deleted file mode 100644
index 8e92aad..0000000
Binary files a/Resources/UI/triangle_down_stop.png and /dev/null differ
diff --git a/Resources/UI/triangle_down_stop2.png b/Resources/UI/triangle_down_stop2.png
deleted file mode 100644
index b31ee36..0000000
Binary files a/Resources/UI/triangle_down_stop2.png and /dev/null differ
diff --git a/Resources/UI/triangle_up.png b/Resources/UI/triangle_up.png
deleted file mode 100644
index b7f6307..0000000
Binary files a/Resources/UI/triangle_up.png and /dev/null differ
diff --git a/Resources/UI/triangle_up2.png b/Resources/UI/triangle_up2.png
deleted file mode 100644
index 431a6b6..0000000
Binary files a/Resources/UI/triangle_up2.png and /dev/null differ
diff --git a/Resources/UI/triangle_up_stop.png b/Resources/UI/triangle_up_stop.png
deleted file mode 100644
index 9556375..0000000
Binary files a/Resources/UI/triangle_up_stop.png and /dev/null differ
diff --git a/Resources/UI/triangle_up_stop2.png b/Resources/UI/triangle_up_stop2.png
deleted file mode 100644
index 74de75a..0000000
Binary files a/Resources/UI/triangle_up_stop2.png and /dev/null differ
diff --git a/RyzStudio/Windows/ThemedForms/TListBox.cs b/RyzStudio/Windows/ThemedForms/TListBox.cs
index 8c3008e..ab3fa86 100644
--- a/RyzStudio/Windows/ThemedForms/TListBox.cs
+++ b/RyzStudio/Windows/ThemedForms/TListBox.cs
@@ -86,6 +86,21 @@ namespace RyzStudio.Windows.ThemedForms
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
+        private void tImageBox1_MouseClick(object sender, MouseEventArgs e)
+        {
+            if (e.Button != MouseButtons.Left)
+            {
+                return;
+            }
+
+            editToolStripMenuItem_Click(sender, e);
+        }
+
+        /// <summary>
+        /// Menu
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void imageBox5_MouseClick(object sender, MouseEventArgs e)
         {
             if (e.Button != MouseButtons.Left)
diff --git a/RyzStudio/Windows/ThemedForms/TListBox.designer.cs b/RyzStudio/Windows/ThemedForms/TListBox.designer.cs
index 2c3e3f4..e45fa50 100644
--- a/RyzStudio/Windows/ThemedForms/TListBox.designer.cs
+++ b/RyzStudio/Windows/ThemedForms/TListBox.designer.cs
@@ -39,22 +39,24 @@ namespace RyzStudio.Windows.ThemedForms
             this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
             this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.addItemToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
             this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
             this.removeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
             this.moveToTopToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.moveUpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.moveDownToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.moveToBottomToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
-            this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
-            this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+            this.tImageBox1 = new RyzStudio.Windows.Forms.TImageBox();
             ((System.ComponentModel.ISupportInitialize)(this.imageBox5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.imageBox4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.imageBox3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.imageBox1)).BeginInit();
             this.contextMenuStrip1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.tImageBox1)).BeginInit();
             this.SuspendLayout();
             // 
             // listBox1
@@ -81,22 +83,22 @@ namespace RyzStudio.Windows.ThemedForms
             this.imageBox5.BackColorSelected = System.Drawing.Color.Transparent;
             this.imageBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.imageBox5.ErrorImage = null;
-            this.imageBox5.HoverImage = global::FizzyLauncher.UIResource.menu2;
-            this.imageBox5.Image = global::FizzyLauncher.UIResource.menu;
-            this.imageBox5.ImageHover = global::FizzyLauncher.UIResource.menu2;
-            this.imageBox5.ImageNormal = global::FizzyLauncher.UIResource.menu;
+            this.imageBox5.HoverImage = global::FizzyLauncher.UIResource.circle_menu2;
+            this.imageBox5.Image = global::FizzyLauncher.UIResource.circle_menu;
+            this.imageBox5.ImageHover = global::FizzyLauncher.UIResource.circle_menu2;
+            this.imageBox5.ImageNormal = global::FizzyLauncher.UIResource.circle_menu;
             this.imageBox5.ImageSelected = null;
             this.imageBox5.InitialImage = null;
             this.imageBox5.IsSelected = false;
-            this.imageBox5.Location = new System.Drawing.Point(106, 24);
+            this.imageBox5.Location = new System.Drawing.Point(106, 48);
             this.imageBox5.Name = "imageBox5";
-            this.imageBox5.NormalImage = global::FizzyLauncher.UIResource.menu;
+            this.imageBox5.NormalImage = global::FizzyLauncher.UIResource.circle_menu;
             this.imageBox5.SelectedImage = null;
             this.imageBox5.Size = new System.Drawing.Size(18, 18);
             this.imageBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
             this.imageBox5.TabIndex = 6;
             this.imageBox5.TabStop = false;
-            this.toolTip1.SetToolTip(this.imageBox5, "Edit Item");
+            this.toolTip1.SetToolTip(this.imageBox5, "Menu");
             this.imageBox5.MouseClick += new System.Windows.Forms.MouseEventHandler(this.imageBox5_MouseClick);
             this.imageBox5.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.imageBox5_MouseClick);
             // 
@@ -109,16 +111,16 @@ namespace RyzStudio.Windows.ThemedForms
             this.imageBox4.BackColorSelected = System.Drawing.Color.Transparent;
             this.imageBox4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.imageBox4.ErrorImage = null;
-            this.imageBox4.HoverImage = global::FizzyLauncher.UIResource.triangle_down2;
-            this.imageBox4.Image = global::FizzyLauncher.UIResource.triangle_down;
-            this.imageBox4.ImageHover = global::FizzyLauncher.UIResource.triangle_down2;
-            this.imageBox4.ImageNormal = global::FizzyLauncher.UIResource.triangle_down;
+            this.imageBox4.HoverImage = global::FizzyLauncher.UIResource.arrow_down2;
+            this.imageBox4.Image = global::FizzyLauncher.UIResource.arrow_down;
+            this.imageBox4.ImageHover = global::FizzyLauncher.UIResource.arrow_down2;
+            this.imageBox4.ImageNormal = global::FizzyLauncher.UIResource.arrow_down;
             this.imageBox4.ImageSelected = null;
             this.imageBox4.InitialImage = null;
             this.imageBox4.IsSelected = false;
-            this.imageBox4.Location = new System.Drawing.Point(106, 68);
+            this.imageBox4.Location = new System.Drawing.Point(106, 92);
             this.imageBox4.Name = "imageBox4";
-            this.imageBox4.NormalImage = global::FizzyLauncher.UIResource.triangle_down;
+            this.imageBox4.NormalImage = global::FizzyLauncher.UIResource.arrow_down;
             this.imageBox4.SelectedImage = null;
             this.imageBox4.Size = new System.Drawing.Size(18, 18);
             this.imageBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
@@ -137,16 +139,16 @@ namespace RyzStudio.Windows.ThemedForms
             this.imageBox3.BackColorSelected = System.Drawing.Color.Transparent;
             this.imageBox3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.imageBox3.ErrorImage = null;
-            this.imageBox3.HoverImage = global::FizzyLauncher.UIResource.triangle_up2;
-            this.imageBox3.Image = global::FizzyLauncher.UIResource.triangle_up;
-            this.imageBox3.ImageHover = global::FizzyLauncher.UIResource.triangle_up2;
-            this.imageBox3.ImageNormal = global::FizzyLauncher.UIResource.triangle_up;
+            this.imageBox3.HoverImage = global::FizzyLauncher.UIResource.arrow_up2;
+            this.imageBox3.Image = global::FizzyLauncher.UIResource.arrow_up;
+            this.imageBox3.ImageHover = global::FizzyLauncher.UIResource.arrow_up2;
+            this.imageBox3.ImageNormal = global::FizzyLauncher.UIResource.arrow_up;
             this.imageBox3.ImageSelected = null;
             this.imageBox3.InitialImage = null;
             this.imageBox3.IsSelected = false;
-            this.imageBox3.Location = new System.Drawing.Point(106, 48);
+            this.imageBox3.Location = new System.Drawing.Point(106, 72);
             this.imageBox3.Name = "imageBox3";
-            this.imageBox3.NormalImage = global::FizzyLauncher.UIResource.triangle_up;
+            this.imageBox3.NormalImage = global::FizzyLauncher.UIResource.arrow_up;
             this.imageBox3.SelectedImage = null;
             this.imageBox3.Size = new System.Drawing.Size(18, 18);
             this.imageBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
@@ -165,22 +167,22 @@ namespace RyzStudio.Windows.ThemedForms
             this.imageBox1.BackColorSelected = System.Drawing.Color.Transparent;
             this.imageBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.imageBox1.ErrorImage = null;
-            this.imageBox1.HoverImage = global::FizzyLauncher.UIResource.square_plus2;
-            this.imageBox1.Image = global::FizzyLauncher.UIResource.square_plus;
-            this.imageBox1.ImageHover = global::FizzyLauncher.UIResource.square_plus2;
-            this.imageBox1.ImageNormal = global::FizzyLauncher.UIResource.square_plus;
+            this.imageBox1.HoverImage = global::FizzyLauncher.UIResource.plus2;
+            this.imageBox1.Image = global::FizzyLauncher.UIResource.plus;
+            this.imageBox1.ImageHover = global::FizzyLauncher.UIResource.plus2;
+            this.imageBox1.ImageNormal = global::FizzyLauncher.UIResource.plus;
             this.imageBox1.ImageSelected = null;
             this.imageBox1.InitialImage = null;
             this.imageBox1.IsSelected = false;
             this.imageBox1.Location = new System.Drawing.Point(106, 4);
             this.imageBox1.Name = "imageBox1";
-            this.imageBox1.NormalImage = global::FizzyLauncher.UIResource.square_plus;
+            this.imageBox1.NormalImage = global::FizzyLauncher.UIResource.plus;
             this.imageBox1.SelectedImage = null;
             this.imageBox1.Size = new System.Drawing.Size(18, 18);
             this.imageBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
             this.imageBox1.TabIndex = 2;
             this.imageBox1.TabStop = false;
-            this.toolTip1.SetToolTip(this.imageBox1, "Add Item");
+            this.toolTip1.SetToolTip(this.imageBox1, "Add");
             this.imageBox1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.imageBox1_MouseClick);
             this.imageBox1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.imageBox1_MouseClick);
             // 
@@ -200,89 +202,118 @@ namespace RyzStudio.Windows.ThemedForms
             this.moveDownToolStripMenuItem,
             this.moveToBottomToolStripMenuItem});
             this.contextMenuStrip1.Name = "contextMenuStrip1";
-            this.contextMenuStrip1.Size = new System.Drawing.Size(181, 242);
+            this.contextMenuStrip1.Size = new System.Drawing.Size(163, 220);
             // 
             // addItemToolStripMenuItem
             // 
             this.addItemToolStripMenuItem.Name = "addItemToolStripMenuItem";
-            this.addItemToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.addItemToolStripMenuItem.Size = new System.Drawing.Size(162, 22);
             this.addItemToolStripMenuItem.Text = "&Add";
             this.addItemToolStripMenuItem.Click += new System.EventHandler(this.addItemToolStripMenuItem_Click);
             // 
-            // editToolStripMenuItem
-            // 
-            this.editToolStripMenuItem.Name = "editToolStripMenuItem";
-            this.editToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
-            this.editToolStripMenuItem.Text = "&Edit";
-            this.editToolStripMenuItem.Click += new System.EventHandler(this.editToolStripMenuItem_Click);
-            // 
-            // removeToolStripMenuItem
-            // 
-            this.removeToolStripMenuItem.Name = "removeToolStripMenuItem";
-            this.removeToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
-            this.removeToolStripMenuItem.Text = "&Remove";
-            this.removeToolStripMenuItem.Click += new System.EventHandler(this.removeToolStripMenuItem_Click);
-            // 
-            // moveToTopToolStripMenuItem
-            // 
-            this.moveToTopToolStripMenuItem.Name = "moveToTopToolStripMenuItem";
-            this.moveToTopToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
-            this.moveToTopToolStripMenuItem.Text = "Move To &Top";
-            this.moveToTopToolStripMenuItem.Click += new System.EventHandler(this.moveToTopToolStripMenuItem_Click);
-            // 
-            // moveUpToolStripMenuItem
-            // 
-            this.moveUpToolStripMenuItem.Name = "moveUpToolStripMenuItem";
-            this.moveUpToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
-            this.moveUpToolStripMenuItem.Text = "Move &Up";
-            this.moveUpToolStripMenuItem.Click += new System.EventHandler(this.moveUpToolStripMenuItem_Click);
-            // 
-            // moveDownToolStripMenuItem
-            // 
-            this.moveDownToolStripMenuItem.Name = "moveDownToolStripMenuItem";
-            this.moveDownToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
-            this.moveDownToolStripMenuItem.Text = "Move &Down";
-            this.moveDownToolStripMenuItem.Click += new System.EventHandler(this.moveDownToolStripMenuItem_Click);
-            // 
-            // moveToBottomToolStripMenuItem
-            // 
-            this.moveToBottomToolStripMenuItem.Name = "moveToBottomToolStripMenuItem";
-            this.moveToBottomToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
-            this.moveToBottomToolStripMenuItem.Text = "Move To &Bottom";
-            this.moveToBottomToolStripMenuItem.Click += new System.EventHandler(this.moveToBottomToolStripMenuItem_Click);
-            // 
-            // toolStripSeparator1
-            // 
-            this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(177, 6);
-            // 
-            // toolStripMenuItem1
-            // 
-            this.toolStripMenuItem1.Name = "toolStripMenuItem1";
-            this.toolStripMenuItem1.Size = new System.Drawing.Size(180, 22);
-            this.toolStripMenuItem1.Text = "Remove A&ll";
-            this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click);
-            // 
-            // toolStripSeparator2
-            // 
-            this.toolStripSeparator2.Name = "toolStripSeparator2";
-            this.toolStripSeparator2.Size = new System.Drawing.Size(177, 6);
-            // 
             // toolStripMenuItem2
             // 
             this.toolStripMenuItem2.Name = "toolStripMenuItem2";
-            this.toolStripMenuItem2.Size = new System.Drawing.Size(180, 22);
+            this.toolStripMenuItem2.Size = new System.Drawing.Size(162, 22);
             this.toolStripMenuItem2.Text = "&Copy";
             this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click);
             // 
             // toolStripSeparator3
             // 
             this.toolStripSeparator3.Name = "toolStripSeparator3";
-            this.toolStripSeparator3.Size = new System.Drawing.Size(177, 6);
+            this.toolStripSeparator3.Size = new System.Drawing.Size(159, 6);
+            // 
+            // editToolStripMenuItem
+            // 
+            this.editToolStripMenuItem.Name = "editToolStripMenuItem";
+            this.editToolStripMenuItem.Size = new System.Drawing.Size(162, 22);
+            this.editToolStripMenuItem.Text = "&Edit";
+            this.editToolStripMenuItem.Click += new System.EventHandler(this.editToolStripMenuItem_Click);
+            // 
+            // toolStripSeparator2
+            // 
+            this.toolStripSeparator2.Name = "toolStripSeparator2";
+            this.toolStripSeparator2.Size = new System.Drawing.Size(159, 6);
+            // 
+            // removeToolStripMenuItem
+            // 
+            this.removeToolStripMenuItem.Name = "removeToolStripMenuItem";
+            this.removeToolStripMenuItem.Size = new System.Drawing.Size(162, 22);
+            this.removeToolStripMenuItem.Text = "&Remove";
+            this.removeToolStripMenuItem.Click += new System.EventHandler(this.removeToolStripMenuItem_Click);
+            // 
+            // toolStripMenuItem1
+            // 
+            this.toolStripMenuItem1.Name = "toolStripMenuItem1";
+            this.toolStripMenuItem1.Size = new System.Drawing.Size(162, 22);
+            this.toolStripMenuItem1.Text = "Remove A&ll";
+            this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click);
+            // 
+            // toolStripSeparator1
+            // 
+            this.toolStripSeparator1.Name = "toolStripSeparator1";
+            this.toolStripSeparator1.Size = new System.Drawing.Size(159, 6);
+            // 
+            // moveToTopToolStripMenuItem
+            // 
+            this.moveToTopToolStripMenuItem.Name = "moveToTopToolStripMenuItem";
+            this.moveToTopToolStripMenuItem.Size = new System.Drawing.Size(162, 22);
+            this.moveToTopToolStripMenuItem.Text = "Move To &Top";
+            this.moveToTopToolStripMenuItem.Click += new System.EventHandler(this.moveToTopToolStripMenuItem_Click);
+            // 
+            // moveUpToolStripMenuItem
+            // 
+            this.moveUpToolStripMenuItem.Name = "moveUpToolStripMenuItem";
+            this.moveUpToolStripMenuItem.Size = new System.Drawing.Size(162, 22);
+            this.moveUpToolStripMenuItem.Text = "Move &Up";
+            this.moveUpToolStripMenuItem.Click += new System.EventHandler(this.moveUpToolStripMenuItem_Click);
+            // 
+            // moveDownToolStripMenuItem
+            // 
+            this.moveDownToolStripMenuItem.Name = "moveDownToolStripMenuItem";
+            this.moveDownToolStripMenuItem.Size = new System.Drawing.Size(162, 22);
+            this.moveDownToolStripMenuItem.Text = "Move &Down";
+            this.moveDownToolStripMenuItem.Click += new System.EventHandler(this.moveDownToolStripMenuItem_Click);
+            // 
+            // moveToBottomToolStripMenuItem
+            // 
+            this.moveToBottomToolStripMenuItem.Name = "moveToBottomToolStripMenuItem";
+            this.moveToBottomToolStripMenuItem.Size = new System.Drawing.Size(162, 22);
+            this.moveToBottomToolStripMenuItem.Text = "Move To &Bottom";
+            this.moveToBottomToolStripMenuItem.Click += new System.EventHandler(this.moveToBottomToolStripMenuItem_Click);
+            // 
+            // tImageBox1
+            // 
+            this.tImageBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.tImageBox1.BackColor = System.Drawing.Color.Transparent;
+            this.tImageBox1.BackColorHover = System.Drawing.Color.Transparent;
+            this.tImageBox1.BackColorNormal = System.Drawing.Color.Transparent;
+            this.tImageBox1.BackColorSelected = System.Drawing.Color.Transparent;
+            this.tImageBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
+            this.tImageBox1.ErrorImage = null;
+            this.tImageBox1.HoverImage = global::FizzyLauncher.UIResource.edit2;
+            this.tImageBox1.Image = global::FizzyLauncher.UIResource.edit;
+            this.tImageBox1.ImageHover = global::FizzyLauncher.UIResource.edit2;
+            this.tImageBox1.ImageNormal = global::FizzyLauncher.UIResource.edit;
+            this.tImageBox1.ImageSelected = null;
+            this.tImageBox1.InitialImage = null;
+            this.tImageBox1.IsSelected = false;
+            this.tImageBox1.Location = new System.Drawing.Point(106, 24);
+            this.tImageBox1.Name = "tImageBox1";
+            this.tImageBox1.NormalImage = global::FizzyLauncher.UIResource.edit;
+            this.tImageBox1.SelectedImage = null;
+            this.tImageBox1.Size = new System.Drawing.Size(18, 18);
+            this.tImageBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+            this.tImageBox1.TabIndex = 7;
+            this.tImageBox1.TabStop = false;
+            this.toolTip1.SetToolTip(this.tImageBox1, "Edit");
+            this.tImageBox1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.tImageBox1_MouseClick);
+            this.tImageBox1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.tImageBox1_MouseClick);
             // 
             // TListBox
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
+            this.Controls.Add(this.tImageBox1);
             this.Controls.Add(this.imageBox5);
             this.Controls.Add(this.imageBox4);
             this.Controls.Add(this.imageBox3);
@@ -296,6 +327,7 @@ namespace RyzStudio.Windows.ThemedForms
             ((System.ComponentModel.ISupportInitialize)(this.imageBox3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.imageBox1)).EndInit();
             this.contextMenuStrip1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.tImageBox1)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -321,5 +353,6 @@ namespace RyzStudio.Windows.ThemedForms
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
         private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1;
+        private Forms.TImageBox tImageBox1;
     }
 }
diff --git a/UIResource.Designer.cs b/UIResource.Designer.cs
index c79c10f..d8654e6 100644
--- a/UIResource.Designer.cs
+++ b/UIResource.Designer.cs
@@ -60,6 +60,66 @@ namespace FizzyLauncher {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap arrow_down {
+            get {
+                object obj = ResourceManager.GetObject("arrow_down", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap arrow_down2 {
+            get {
+                object obj = ResourceManager.GetObject("arrow_down2", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap arrow_up {
+            get {
+                object obj = ResourceManager.GetObject("arrow_up", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap arrow_up2 {
+            get {
+                object obj = ResourceManager.GetObject("arrow_up2", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap circle_menu {
+            get {
+                object obj = ResourceManager.GetObject("circle_menu", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap circle_menu2 {
+            get {
+                object obj = ResourceManager.GetObject("circle_menu2", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -120,6 +180,26 @@ namespace FizzyLauncher {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap edit {
+            get {
+                object obj = ResourceManager.GetObject("edit", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap edit2 {
+            get {
+                object obj = ResourceManager.GetObject("edit2", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -183,9 +263,9 @@ namespace FizzyLauncher {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap menu {
+        internal static System.Drawing.Bitmap plus {
             get {
-                object obj = ResourceManager.GetObject("menu", resourceCulture);
+                object obj = ResourceManager.GetObject("plus", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
@@ -193,29 +273,9 @@ namespace FizzyLauncher {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap menu2 {
+        internal static System.Drawing.Bitmap plus2 {
             get {
-                object obj = ResourceManager.GetObject("menu2", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap square_plus {
-            get {
-                object obj = ResourceManager.GetObject("square_plus", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap square_plus2 {
-            get {
-                object obj = ResourceManager.GetObject("square_plus2", resourceCulture);
+                object obj = ResourceManager.GetObject("plus2", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
@@ -239,45 +299,5 @@ namespace FizzyLauncher {
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap triangle_down {
-            get {
-                object obj = ResourceManager.GetObject("triangle_down", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap triangle_down2 {
-            get {
-                object obj = ResourceManager.GetObject("triangle_down2", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap triangle_up {
-            get {
-                object obj = ResourceManager.GetObject("triangle_up", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap triangle_up2 {
-            get {
-                object obj = ResourceManager.GetObject("triangle_up2", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
     }
 }
diff --git a/UIResource.resx b/UIResource.resx
index 2104efd..20df970 100644
--- a/UIResource.resx
+++ b/UIResource.resx
@@ -118,6 +118,24 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="arrow_down" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\UI\arrow_down.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="arrow_down2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\UI\arrow_down2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="arrow_up" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\UI\arrow_up.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="arrow_up2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\UI\arrow_up2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="circle_menu" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\UI\circle_menu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="circle_menu2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\UI\circle_menu2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="close" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\UI\close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -136,6 +154,12 @@
   <data name="disk2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\UI\disk2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\UI\edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="edit2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\UI\edit2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="file" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\UI\file.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -154,17 +178,11 @@
   <data name="help2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\UI\help2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="menu" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Resources\UI\menu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\UI\plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="menu2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Resources\UI\menu2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="square_plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Resources\UI\square_plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="square_plus2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Resources\UI\square_plus2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="plus2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\UI\plus2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="trash" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\UI\trash.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -172,16 +190,4 @@
   <data name="trash2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\UI\trash2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="triangle_down" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Resources\UI\triangle_down.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="triangle_down2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Resources\UI\triangle_down2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="triangle_up" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Resources\UI\triangle_up.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="triangle_up2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Resources\UI\triangle_up2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
 </root>
\ No newline at end of file