diff --git a/art/textures/popup-menu-disabled.9.png b/art/textures/menu-item-disabled.9.png
similarity index 100%
rename from art/textures/popup-menu-disabled.9.png
rename to art/textures/menu-item-disabled.9.png
diff --git a/art/textures/popup-menu-down.9.png b/art/textures/menu-item-down.9.png
similarity index 100%
rename from art/textures/popup-menu-down.9.png
rename to art/textures/menu-item-down.9.png
diff --git a/art/textures/popup-menu-over.9.png b/art/textures/menu-item-over.9.png
similarity index 100%
rename from art/textures/popup-menu-over.9.png
rename to art/textures/menu-item-over.9.png
diff --git a/art/textures/menu-item.9.png b/art/textures/menu-item.9.png
new file mode 100644
index 00000000..3d906bd1
Binary files /dev/null and b/art/textures/menu-item.9.png differ
diff --git a/art/textures/popup-menu.9.png b/art/textures/popup-menu.9.png
index 77a2d18c..d1217051 100644
Binary files a/art/textures/popup-menu.9.png and b/art/textures/popup-menu.9.png differ
diff --git a/art/textures/separator-menu.png b/art/textures/separator-menu.png
index b99a132b..d3cc0fbd 100644
Binary files a/art/textures/separator-menu.png and b/art/textures/separator-menu.png differ
diff --git a/art/textures/separator-tool.png b/art/textures/separator-tool.png
new file mode 100644
index 00000000..449057e2
Binary files /dev/null and b/art/textures/separator-tool.png differ
diff --git a/art/textures/separator-vertical.png b/art/textures/separator-vertical.png
index 0897266a..0172dbc5 100644
Binary files a/art/textures/separator-vertical.png and b/art/textures/separator-vertical.png differ
diff --git a/art/textures/separator.png b/art/textures/separator.png
index b99a132b..ac604e7c 100644
Binary files a/art/textures/separator.png and b/art/textures/separator.png differ
diff --git a/assets/style/uiskin.atlas b/assets/style/uiskin.atlas
index 9dbb14fa..9ea5c2b0 100644
--- a/assets/style/uiskin.atlas
+++ b/assets/style/uiskin.atlas
@@ -83,14 +83,14 @@ align-simple-up
   index: -1
 animation-up
   rotate: false
-  xy: 915, 63
+  xy: 585, 15
   size: 15, 15
   orig: 15, 15
   offset: 0, 0
   index: -1
 border
   rotate: false
-  xy: 632, 2
+  xy: 712, 32
   size: 5, 5
   split: 2, 2, 2, 2
   pad: 1, 1, 1, 1
@@ -99,21 +99,21 @@ border
   index: -1
 border-circle
   rotate: false
-  xy: 563, 40
+  xy: 556, 2
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 border-circle-error
   rotate: false
-  xy: 579, 40
+  xy: 749, 63
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 border-error
   rotate: false
-  xy: 449, 2
+  xy: 543, 3
   size: 11, 11
   split: 5, 5, 5, 5
   pad: 1, 1, 1, 1
@@ -122,7 +122,7 @@ border-error
   index: -1
 border-textfield
   rotate: false
-  xy: 1011, 52
+  xy: 679, 32
   size: 11, 5
   split: 5, 5, 2, 2
   pad: 5, 5, 1, 1
@@ -131,21 +131,21 @@ border-textfield
   index: -1
 box-colapse-off
   rotate: false
-  xy: 462, 2
+  xy: 585, 2
   size: 11, 11
   orig: 11, 11
   offset: 0, 0
   index: -1
 box-colapse-on
   rotate: false
-  xy: 475, 2
+  xy: 598, 2
   size: 11, 11
   orig: 11, 11
   offset: 0, 0
   index: -1
 button
   rotate: false
-  xy: 901, 58
+  xy: 777, 41
   size: 12, 20
   split: 5, 5, 5, 4
   pad: 5, 5, 2, 2
@@ -154,7 +154,7 @@ button
   index: -1
 button-dark
   rotate: false
-  xy: 775, 57
+  xy: 665, 32
   size: 12, 20
   split: 5, 5, 5, 4
   pad: 4, 4, 3, 3
@@ -163,7 +163,7 @@ button-dark
   index: -1
 button-dark-down
   rotate: false
-  xy: 747, 57
+  xy: 637, 32
   size: 12, 20
   split: 5, 5, 5, 4
   pad: 4, 4, 3, 3
@@ -172,7 +172,7 @@ button-dark-down
   index: -1
 button-dark-over
   rotate: false
-  xy: 761, 57
+  xy: 651, 32
   size: 12, 20
   split: 5, 5, 5, 4
   pad: 4, 4, 4, 3
@@ -181,7 +181,7 @@ button-dark-over
   index: -1
 button-down
   rotate: false
-  xy: 789, 57
+  xy: 670, 10
   size: 12, 20
   split: 5, 5, 5, 4
   pad: 5, 5, 2, 2
@@ -190,7 +190,7 @@ button-down
   index: -1
 button-flat-red
   rotate: false
-  xy: 831, 57
+  xy: 707, 39
   size: 12, 20
   split: 3, 3, 3, 4
   orig: 12, 20
@@ -198,7 +198,7 @@ button-flat-red
   index: -1
 button-flat-red-down
   rotate: false
-  xy: 803, 57
+  xy: 679, 39
   size: 12, 20
   split: 3, 3, 3, 4
   orig: 12, 20
@@ -206,7 +206,7 @@ button-flat-red-down
   index: -1
 button-flat-red-over
   rotate: false
-  xy: 817, 57
+  xy: 693, 39
   size: 12, 20
   split: 3, 3, 3, 4
   orig: 12, 20
@@ -214,7 +214,7 @@ button-flat-red-over
   index: -1
 button-over
   rotate: false
-  xy: 845, 57
+  xy: 721, 40
   size: 12, 20
   split: 5, 5, 5, 4
   pad: 5, 5, 2, 2
@@ -223,7 +223,7 @@ button-over
   index: -1
 button-panel-bg
   rotate: false
-  xy: 859, 57
+  xy: 735, 40
   size: 12, 20
   split: 5, 5, 5, 4
   pad: 4, 4, 1, 1
@@ -232,7 +232,7 @@ button-panel-bg
   index: -1
 button-red
   rotate: false
-  xy: 712, 34
+  xy: 791, 43
   size: 12, 18
   split: 5, 5, 4, 3
   pad: 4, 4, 1, 1
@@ -241,7 +241,7 @@ button-red
   index: -1
 button-resource
   rotate: false
-  xy: 887, 58
+  xy: 763, 41
   size: 12, 20
   split: 5, 5, 5, 4
   pad: 4, 4, 1, 1
@@ -250,7 +250,7 @@ button-resource
   index: -1
 button-resource-over
   rotate: false
-  xy: 873, 57
+  xy: 749, 41
   size: 12, 20
   split: 5, 5, 5, 4
   pad: 4, 4, 1, 1
@@ -259,7 +259,7 @@ button-resource-over
   index: -1
 button-window-bg
   rotate: false
-  xy: 726, 35
+  xy: 805, 43
   size: 12, 18
   split: 5, 5, 4, 3
   pad: 4, 4, 1, 1
@@ -268,35 +268,35 @@ button-window-bg
   index: -1
 close-node
   rotate: false
-  xy: 532, 11
+  xy: 515, 2
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 close-node-hover
   rotate: false
-  xy: 607, 24
+  xy: 529, 2
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 close-node-pressed
   rotate: false
-  xy: 618, 8
+  xy: 989, 66
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 color-picker-bar-selector
   rotate: false
-  xy: 609, 8
+  xy: 674, 64
   size: 7, 14
   orig: 7, 14
   offset: 0, 0
   index: -1
 color-picker-cross
   rotate: false
-  xy: 639, 2
+  xy: 674, 3
   size: 5, 5
   orig: 5, 5
   offset: 0, 0
@@ -310,7 +310,7 @@ color-picker-selector-horizontal
   index: -1
 color-picker-selector-vertical
   rotate: false
-  xy: 558, 2
+  xy: 569, 18
   size: 1, 3
   orig: 1, 3
   offset: 0, 0
@@ -326,7 +326,7 @@ console-background
   index: -1
 cursor
   rotate: false
-  xy: 43, 2
+  xy: 39, 2
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
@@ -341,7 +341,7 @@ default-pane
   index: -1
 default-pane-noborder
   rotate: false
-  xy: 46, 2
+  xy: 679, 61
   size: 1, 1
   split: 0, 0, 0, 0
   orig: 1, 1
@@ -387,7 +387,7 @@ expand-icon
   index: -1
 expandable-properties-active-bg
   rotate: false
-  xy: 540, 30
+  xy: 684, 13
   size: 4, 17
   split: 1, 2, 0, 17
   orig: 4, 17
@@ -395,21 +395,21 @@ expandable-properties-active-bg
   index: -1
 expandable-properties-collapse-off
   rotate: false
-  xy: 532, 2
+  xy: 516, 16
   size: 7, 7
   orig: 7, 7
   offset: 0, 0
   index: -1
 expandable-properties-collapse-on
   rotate: false
-  xy: 673, 38
+  xy: 525, 16
   size: 7, 7
   orig: 7, 7
   offset: 0, 0
   index: -1
 expandable-properties-inactive-bg
   rotate: false
-  xy: 740, 35
+  xy: 579, 3
   size: 4, 18
   split: 1, 2, 0, 18
   orig: 4, 18
@@ -424,14 +424,14 @@ icon-animation
   index: -1
 icon-arrow-left
   rotate: false
-  xy: 488, 2
+  xy: 611, 2
   size: 6, 11
   orig: 6, 11
   offset: 0, 0
   index: -1
 icon-arrow-right
   rotate: false
-  xy: 632, 9
+  xy: 619, 2
   size: 6, 11
   orig: 6, 11
   offset: 0, 0
@@ -452,7 +452,7 @@ icon-close-panel
   index: -1
 icon-close-small
   rotate: false
-  xy: 637, 24
+  xy: 1003, 66
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -473,7 +473,7 @@ icon-composite
   index: -1
 icon-composite2
   rotate: false
-  xy: 595, 40
+  xy: 765, 63
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -578,14 +578,14 @@ icon-library-over
   index: -1
 icon-link-active
   rotate: false
-  xy: 932, 63
+  xy: 602, 15
   size: 15, 15
   orig: 15, 15
   offset: 0, 0
   index: -1
 icon-link-inactive
   rotate: false
-  xy: 949, 63
+  xy: 619, 15
   size: 15, 15
   orig: 15, 15
   offset: 0, 0
@@ -613,7 +613,7 @@ icon-lock-inactive
   index: -1
 icon-new-layer
   rotate: false
-  xy: 562, 22
+  xy: 700, 61
   size: 13, 15
   orig: 13, 15
   offset: 0, 0
@@ -648,7 +648,7 @@ icon-refresh
   index: -1
 icon-root
   rotate: false
-  xy: 546, 23
+  xy: 781, 63
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -676,35 +676,35 @@ icon-star-outline
   index: -1
 icon-trash
   rotate: false
-  xy: 577, 23
+  xy: 819, 46
   size: 13, 15
   orig: 13, 15
   offset: 0, 0
   index: -1
 icon-trash-disabled
   rotate: false
-  xy: 592, 23
+  xy: 834, 46
   size: 13, 15
   orig: 13, 15
   offset: 0, 0
   index: -1
 icon-trash-over
   rotate: false
-  xy: 562, 5
+  xy: 849, 46
   size: 13, 15
   orig: 13, 15
   offset: 0, 0
   index: -1
 icon-unlink-active
   rotate: false
-  xy: 966, 63
+  xy: 636, 15
   size: 15, 15
   orig: 15, 15
   offset: 0, 0
   index: -1
 icon-unlink-inactive
   rotate: false
-  xy: 983, 63
+  xy: 653, 15
   size: 15, 15
   orig: 15, 15
   offset: 0, 0
@@ -767,14 +767,14 @@ icon-zoomout-over
   index: -1
 image-up
   rotate: false
-  xy: 1000, 63
+  xy: 683, 61
   size: 15, 15
   orig: 15, 15
   offset: 0, 0
   index: -1
 layer-bg
   rotate: false
-  xy: 1017, 59
+  xy: 572, 2
   size: 5, 19
   split: 2, 2, 0, 19
   orig: 5, 19
@@ -790,21 +790,21 @@ layer-bg-over
   index: -1
 library-up
   rotate: false
-  xy: 695, 37
+  xy: 715, 62
   size: 15, 15
   orig: 15, 15
   offset: 0, 0
   index: -1
 list-selection
   rotate: false
-  xy: 49, 2
+  xy: 42, 2
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 list-selection-white
   rotate: false
-  xy: 52, 2
+  xy: 45, 2
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
@@ -818,7 +818,7 @@ logo
   index: -1
 menu-bg
   rotate: false
-  xy: 650, 47
+  xy: 540, 16
   size: 14, 31
   split: 2, 2, 0, 31
   orig: 14, 31
@@ -834,7 +834,7 @@ menu-bg-down
   index: -1
 menu-bg-over
   rotate: false
-  xy: 618, 54
+  xy: 642, 54
   size: 14, 24
   split: 2, 2, 0, 24
   orig: 14, 24
@@ -842,22 +842,54 @@ menu-bg-over
   index: -1
 menu-bg-up
   rotate: false
-  xy: 634, 54
+  xy: 658, 54
   size: 14, 24
   split: 2, 2, 0, 24
   orig: 14, 24
   offset: 0, 0
   index: -1
+menu-item
+  rotate: false
+  xy: 887, 47
+  size: 3, 3
+  split: 1, 1, 1, 1
+  orig: 3, 3
+  offset: 0, 0
+  index: -1
+menu-item-disabled
+  rotate: false
+  xy: 674, 59
+  size: 3, 3
+  split: 1, 1, 1, 1
+  orig: 3, 3
+  offset: 0, 0
+  index: -1
+menu-item-down
+  rotate: false
+  xy: 674, 54
+  size: 3, 3
+  split: 1, 1, 1, 1
+  orig: 3, 3
+  offset: 0, 0
+  index: -1
+menu-item-over
+  rotate: false
+  xy: 442, 9
+  size: 3, 3
+  split: 1, 1, 1, 1
+  orig: 3, 3
+  offset: 0, 0
+  index: -1
 origin-anchor
   rotate: false
-  xy: 651, 36
+  xy: 627, 4
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
   index: -1
 padded-list-selection
   rotate: false
-  xy: 541, 2
+  xy: 658, 10
   size: 10, 3
   split: 4, 4, 1, 1
   pad: 4, 4, 0, 0
@@ -866,7 +898,7 @@ padded-list-selection
   index: -1
 panel
   rotate: false
-  xy: 682, 40
+  xy: 556, 18
   size: 11, 36
   split: 3, 3, 33, 2
   orig: 11, 36
@@ -874,7 +906,7 @@ panel
   index: -1
 particle-up
   rotate: false
-  xy: 546, 39
+  xy: 732, 62
   size: 15, 15
   orig: 15, 15
   offset: 0, 0
@@ -888,46 +920,22 @@ pin
   index: -1
 popup-menu
   rotate: false
-  xy: 577, 2
-  size: 3, 3
-  split: 1, 1, 1, 1
-  orig: 3, 3
-  offset: 0, 0
-  index: -1
-popup-menu-disabled
-  rotate: false
-  xy: 540, 25
-  size: 3, 3
-  split: 1, 1, 1, 1
-  orig: 3, 3
-  offset: 0, 0
-  index: -1
-popup-menu-down
-  rotate: false
-  xy: 553, 2
-  size: 3, 3
-  split: 1, 1, 1, 1
-  orig: 3, 3
-  offset: 0, 0
-  index: -1
-popup-menu-over
-  rotate: false
-  xy: 640, 9
-  size: 3, 3
-  split: 1, 1, 1, 1
-  orig: 3, 3
+  xy: 594, 56
+  size: 22, 22
+  split: 7, 7, 7, 7
+  orig: 22, 22
   offset: 0, 0
   index: -1
 progressbar
   rotate: false
-  xy: 327, 22
+  xy: 553, 49
   size: 1, 5
   orig: 1, 5
   offset: 0, 0
   index: -1
 progressbar-filled
   rotate: false
-  xy: 671, 29
+  xy: 327, 22
   size: 1, 5
   orig: 1, 5
   offset: 0, 0
@@ -948,7 +956,7 @@ progressbar-vertical
   index: -1
 scroll
   rotate: false
-  xy: 1011, 44
+  xy: 1017, 64
   size: 5, 6
   split: 2, 2, 2, 2
   orig: 5, 6
@@ -956,7 +964,7 @@ scroll
   index: -1
 scroll-horizontal
   rotate: false
-  xy: 515, 2
+  xy: 545, 49
   size: 6, 5
   split: 2, 2, 0, 5
   pad: -1, -1, 2, 2
@@ -965,7 +973,7 @@ scroll-horizontal
   index: -1
 scroll-knob-horizontal
   rotate: false
-  xy: 523, 2
+  xy: 666, 3
   size: 6, 5
   split: 2, 2, 0, 5
   pad: -1, -1, 2, 2
@@ -974,7 +982,7 @@ scroll-knob-horizontal
   index: -1
 scroll-knob-vertical
   rotate: false
-  xy: 643, 46
+  xy: 1017, 72
   size: 5, 6
   split: 2, 2, 2, 2
   orig: 5, 6
@@ -982,14 +990,14 @@ scroll-knob-vertical
   index: -1
 select-box-list-bg
   rotate: false
-  xy: 55, 2
+  xy: 48, 2
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 select-box-list-bg-white
   rotate: false
-  xy: 58, 2
+  xy: 51, 2
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
@@ -1010,70 +1018,84 @@ select-up
   index: -1
 selection
   rotate: false
-  xy: 61, 2
+  xy: 54, 2
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 selection-anchor
   rotate: false
-  xy: 662, 36
+  xy: 880, 52
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
   index: -1
 separator
   rotate: false
-  xy: 255, 2
-  size: 1, 2
-  orig: 1, 2
+  xy: 57, 2
+  size: 1, 1
+  orig: 1, 1
   offset: 0, 0
   index: -1
 separator-menu
   rotate: false
-  xy: 255, 2
-  size: 1, 2
-  orig: 1, 2
+  xy: 60, 2
+  size: 1, 1
+  orig: 1, 1
+  offset: 0, 0
+  index: -1
+separator-tool
+  rotate: false
+  xy: 63, 2
+  size: 1, 1
+  orig: 1, 1
+  offset: 0, 0
+  index: -1
+tree-over
+  rotate: false
+  xy: 63, 2
+  size: 1, 1
+  orig: 1, 1
   offset: 0, 0
   index: -1
 separator-vertical
   rotate: false
-  xy: 39, 2
-  size: 2, 1
-  orig: 2, 1
+  xy: 66, 2
+  size: 1, 1
+  orig: 1, 1
   offset: 0, 0
   index: -1
 slider
   rotate: false
-  xy: 615, 2
+  xy: 439, 8
   size: 1, 4
   orig: 1, 4
   offset: 0, 0
   index: -1
 slider-knob
   rotate: false
-  xy: 695, 54
+  xy: 585, 32
   size: 11, 22
   orig: 11, 22
   offset: 0, 0
   index: -1
 slider-knob-disabled
   rotate: false
-  xy: 708, 54
+  xy: 598, 32
   size: 11, 22
   orig: 11, 22
   offset: 0, 0
   index: -1
 slider-knob-down
   rotate: false
-  xy: 721, 55
+  xy: 611, 32
   size: 11, 22
   orig: 11, 22
   offset: 0, 0
   index: -1
 slider-knob-over
   rotate: false
-  xy: 734, 55
+  xy: 624, 32
   size: 11, 22
   orig: 11, 22
   offset: 0, 0
@@ -1108,14 +1130,14 @@ splitpane-over
   index: -1
 splitpane-vertical
   rotate: false
-  xy: 618, 2
+  xy: 681, 4
   size: 1, 4
   orig: 1, 4
   offset: 0, 0
   index: -1
 splitpane-vertical-over
   rotate: false
-  xy: 621, 2
+  xy: 684, 2
   size: 1, 4
   orig: 1, 4
   offset: 0, 0
@@ -1138,14 +1160,14 @@ sticky-note
   index: -1
 sub-menu
   rotate: false
-  xy: 1018, 43
+  xy: 534, 16
   size: 4, 7
   orig: 4, 7
   offset: 0, 0
   index: -1
 sub-menu-bg
   rotate: false
-  xy: 666, 47
+  xy: 569, 23
   size: 14, 31
   split: 2, 2, 0, 31
   orig: 14, 31
@@ -1169,7 +1191,7 @@ tab-inactive
   index: -1
 textfield
   rotate: false
-  xy: 915, 47
+  xy: 829, 63
   size: 14, 14
   split: 2, 2, 3, 2
   orig: 14, 14
@@ -1177,7 +1199,7 @@ textfield
   index: -1
 textfield-light
   rotate: false
-  xy: 627, 38
+  xy: 813, 63
   size: 14, 14
   split: 3, 3, 4, 3
   orig: 14, 14
@@ -1185,7 +1207,7 @@ textfield-light
   index: -1
 textfield-light-over
   rotate: false
-  xy: 611, 38
+  xy: 797, 63
   size: 14, 14
   split: 3, 3, 4, 3
   orig: 14, 14
@@ -1193,7 +1215,7 @@ textfield-light-over
   index: -1
 textfield-over
   rotate: false
-  xy: 611, 38
+  xy: 797, 63
   size: 14, 14
   split: 2, 2, 3, 2
   orig: 14, 14
@@ -1201,7 +1223,7 @@ textfield-over
   index: -1
 thumbnail
   rotate: false
-  xy: 609, 2
+  xy: 437, 2
   size: 4, 4
   split: 1, 2, 1, 2
   orig: 4, 4
@@ -1217,7 +1239,7 @@ thumbnail-over
   index: -1
 tint-border
   rotate: false
-  xy: 643, 38
+  xy: 658, 2
   size: 6, 6
   split: 2, 2, 2, 2
   orig: 6, 6
@@ -1290,7 +1312,7 @@ toolbar-down
   index: -1
 toolbar-normal
   rotate: false
-  xy: 439, 3
+  xy: 638, 4
   size: 8, 9
   split: 2, 2, 3, 3
   orig: 8, 9
@@ -1298,7 +1320,7 @@ toolbar-normal
   index: -1
 toolbar-over
   rotate: false
-  xy: 651, 25
+  xy: 648, 4
   size: 8, 9
   split: 2, 2, 3, 3
   orig: 8, 9
@@ -1306,7 +1328,7 @@ toolbar-over
   index: -1
 tooltip-bg
   rotate: false
-  xy: 582, 2
+  xy: 684, 8
   size: 3, 3
   split: 1, 1, 1, 1
   orig: 3, 3
@@ -1314,35 +1336,28 @@ tooltip-bg
   index: -1
 touchpad-knob
   rotate: false
-  xy: 594, 56
+  xy: 618, 56
   size: 22, 22
   orig: 22, 22
   offset: 0, 0
   index: -1
 tree-minus
   rotate: false
-  xy: 661, 26
+  xy: 692, 29
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-tree-over
-  rotate: false
-  xy: 64, 2
-  size: 1, 1
-  orig: 1, 1
-  offset: 0, 0
-  index: -1
 tree-plus
   rotate: false
-  xy: 640, 14
+  xy: 702, 29
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tree-selection
   rotate: false
-  xy: 674, 31
+  xy: 880, 45
   size: 5, 5
   split: 2, 2, 2, 2
   pad: 1, 1, 1, 1
@@ -1351,91 +1366,91 @@ tree-selection
   index: -1
 vis-blue
   rotate: false
-  xy: 67, 2
+  xy: 69, 2
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 vis-check
   rotate: false
-  xy: 931, 47
+  xy: 845, 63
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-check-down
   rotate: false
-  xy: 947, 47
+  xy: 861, 63
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-check-over
   rotate: false
-  xy: 963, 47
+  xy: 864, 47
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-check-tick
   rotate: false
-  xy: 979, 47
+  xy: 877, 63
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-check-tick-disabled
   rotate: false
-  xy: 995, 47
+  xy: 893, 64
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-radio
   rotate: false
-  xy: 516, 9
+  xy: 909, 64
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-radio-down
   rotate: false
-  xy: 546, 7
+  xy: 925, 64
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-radio-over
   rotate: false
-  xy: 577, 7
+  xy: 941, 64
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-radio-tick
   rotate: false
-  xy: 593, 7
+  xy: 957, 64
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-radio-tick-disabled
   rotate: false
-  xy: 621, 22
+  xy: 973, 64
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-red
   rotate: false
-  xy: 70, 2
+  xy: 72, 2
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 white
   rotate: false
-  xy: 587, 2
+  xy: 690, 24
   size: 3, 3
   orig: 3, 3
   offset: 0, 0
@@ -1534,7 +1549,7 @@ window-action-restore-pressed
   index: -1
 window-bg
   rotate: false
-  xy: 73, 2
+  xy: 75, 2
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
diff --git a/assets/style/uiskin.json b/assets/style/uiskin.json
index 63805474..403c080e 100644
--- a/assets/style/uiskin.json
+++ b/assets/style/uiskin.json
@@ -692,11 +692,7 @@
   },
   com.kotcrab.vis.ui.widget.PopupMenu$PopupMenuStyle: {
     default: {
-      background: popup-menu,
-      border: border
-    },
-    noborder: {
-      background: button
+      background: popup-menu
     }
   },
   com.kotcrab.vis.ui.widget.Separator$SeparatorStyle: {
@@ -711,6 +707,10 @@
     menu: {
       background: separator-menu,
       thickness: 2
+    },
+    tool: {
+      background: separator-tool,
+      thickness: 2
     }
   },
   com.kotcrab.vis.ui.widget.VisSplitPane$VisSplitPaneStyle: {
@@ -725,10 +725,9 @@
   },
   com.kotcrab.vis.ui.widget.MenuItem$MenuItemStyle: {
     default: {
-      down: popup-menu-down,
-      up: popup-menu,
-      over: popup-menu-over,
-      disabled: popup-menu,
+      down: menu-item-down,
+      up : menu-item
+      over: menu-item-over,
       font: default-font,
       fontColor: hyperlap2d-menuitem-grey,
       disabledFontColor: hyperlap2d-menuitem-disabled-grey,
diff --git a/assets/style/uiskin.png b/assets/style/uiskin.png
index c779e5a4..00adda1d 100644
Binary files a/assets/style/uiskin.png and b/assets/style/uiskin.png differ
diff --git a/hyperlap2d-common-api b/hyperlap2d-common-api
index 46176a23..0d29a8b1 160000
--- a/hyperlap2d-common-api
+++ b/hyperlap2d-common-api
@@ -1 +1 @@
-Subproject commit 46176a230d7fe7516b0e8a19707c867e2ac92a92
+Subproject commit 0d29a8b1a1855674cc4f4b1648eb1ed0b680ecfc
diff --git a/src/main/java/games/rednblack/editor/view/menu/FileMenu.java b/src/main/java/games/rednblack/editor/view/menu/FileMenu.java
index 56d72564..e538093d 100644
--- a/src/main/java/games/rednblack/editor/view/menu/FileMenu.java
+++ b/src/main/java/games/rednblack/editor/view/menu/FileMenu.java
@@ -6,6 +6,7 @@ import com.kotcrab.vis.ui.widget.PopupMenu;
 import games.rednblack.editor.data.manager.PreferencesManager;
 import games.rednblack.editor.event.MenuItemListener;
 import games.rednblack.editor.utils.KeyBindingsLayout;
+import games.rednblack.h2d.common.view.ui.widget.H2DPopupMenu;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -44,7 +45,7 @@ public class FileMenu extends H2DMenu {
         //
         addSeparator();
         MenuItem recentProjectsMenuItem = new MenuItem("Recent Projects");
-        recentProjectsPopupMenu = new PopupMenu();
+        recentProjectsPopupMenu = new H2DPopupMenu(false);
         recentProjectsMenuItem.setSubMenu(recentProjectsPopupMenu);
         recentProjectsMenuItems = new Array<>();
         addItem(recentProjectsMenuItem);
diff --git a/src/main/java/games/rednblack/editor/view/ui/box/UIToolBoxMediator.java b/src/main/java/games/rednblack/editor/view/ui/box/UIToolBoxMediator.java
index 225ccbe2..78ba3818 100644
--- a/src/main/java/games/rednblack/editor/view/ui/box/UIToolBoxMediator.java
+++ b/src/main/java/games/rednblack/editor/view/ui/box/UIToolBoxMediator.java
@@ -58,7 +58,7 @@ public class UIToolBoxMediator extends Mediator<UIToolBox> {
         toolList.put(PolygonTool.NAME, new PolygonTool());
         viewComponent.addToolButton(PolygonTool.NAME, toolList.get(PolygonTool.NAME));
 
-        viewComponent.addSeparator().width(31);
+        viewComponent.add(new Separator("tool")).padTop(2).padBottom(2).fill().expand().row();
 
         toolList.put(TextTool.NAME, new TextTool());
         viewComponent.addToolButton(TextTool.NAME, toolList.get(TextTool.NAME));
@@ -72,7 +72,7 @@ public class UIToolBoxMediator extends Mediator<UIToolBox> {
     public void addTool(String toolName, VisImageButton.VisImageButtonStyle toolBtnStyle, boolean addSeparator, Tool tool) {
         toolList.put(toolName, tool);
         if(addSeparator) {
-            viewComponent.add(new Separator("menu")).padTop(2).padBottom(2).fill().expand().row();
+            viewComponent.add(new Separator("tool")).padTop(2).padBottom(2).fill().expand().row();
         }
         viewComponent.addToolButton(toolName, toolBtnStyle, tool);
 
diff --git a/src/main/java/games/rednblack/editor/view/ui/dialog/NodeEditorDialog.java b/src/main/java/games/rednblack/editor/view/ui/dialog/NodeEditorDialog.java
index 0afef23c..047e0992 100644
--- a/src/main/java/games/rednblack/editor/view/ui/dialog/NodeEditorDialog.java
+++ b/src/main/java/games/rednblack/editor/view/ui/dialog/NodeEditorDialog.java
@@ -201,7 +201,7 @@ public class NodeEditorDialog extends H2DDialog implements Graph<GraphBox<Action
             }
         }
 
-        PopupMenu createdPopup = new PopupMenu("noborder");
+        PopupMenu createdPopup = new H2DPopupMenu(false);
         MenuItem createdMenuItem = new MenuItem(menuSplit[startIndex]);
         createdMenuItem.setSubMenu(createdPopup);
         popupMenu.addItem(createdMenuItem);
diff --git a/src/main/java/games/rednblack/editor/view/ui/widget/CustomMenu.java b/src/main/java/games/rednblack/editor/view/ui/widget/CustomMenu.java
index a84e9120..d174ccf6 100644
--- a/src/main/java/games/rednblack/editor/view/ui/widget/CustomMenu.java
+++ b/src/main/java/games/rednblack/editor/view/ui/widget/CustomMenu.java
@@ -6,13 +6,13 @@ import com.badlogic.gdx.scenes.scene2d.InputEvent;
 import com.badlogic.gdx.scenes.scene2d.InputListener;
 import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
 import com.kotcrab.vis.ui.VisUI;
-import com.kotcrab.vis.ui.widget.PopupMenu;
 import com.kotcrab.vis.ui.widget.VisTextButton;
+import games.rednblack.h2d.common.view.ui.widget.H2DPopupMenu;
 
 /**
  * Created by hayk on 5/22/2015.
  */
-public class CustomMenu extends PopupMenu {
+public class CustomMenu extends H2DPopupMenu {
     private CustomMenuBar menuBar;
     public VisTextButton openButton;
 
@@ -47,14 +47,15 @@ public class CustomMenu extends PopupMenu {
     }
 
     private void switchMenu () {
-        menuBar.closeMenu();
-        showMenu();
+        if (menuBar.getCurrentMenu() != this) {
+            menuBar.closeMenu();
+            showMenu();
+        }
     }
 
     private void showMenu () {
         Vector2 pos = openButton.localToStageCoordinates(new Vector2(0, 0));
-        setPosition(pos.x, pos.y - getHeight());
-        openButton.getStage().addActor(this);
+        super.showMenu(openButton.getStage(), pos.x, pos.y);
         menuBar.setCurrentMenu(this);
     }