diff --git a/CHANGES b/CHANGES
index 8dff02dd..2081e42d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 [0.0.6]
 - Update libGDX to 1.9.15-SNAPSHOT
 - Add flipX and flipY flag
+- Add Z-Index controls in `Items Tree`
 - Stability improvements
 
 = Editor =
diff --git a/art/textures/arrow-down.png b/art/textures/arrow-down.png
new file mode 100644
index 00000000..ac20cd4b
Binary files /dev/null and b/art/textures/arrow-down.png differ
diff --git a/art/textures/arrow-over.png b/art/textures/arrow-over.png
new file mode 100644
index 00000000..2cc43a2c
Binary files /dev/null and b/art/textures/arrow-over.png differ
diff --git a/art/textures/arrow.png b/art/textures/arrow.png
new file mode 100644
index 00000000..d3b061cb
Binary files /dev/null and b/art/textures/arrow.png differ
diff --git a/assets/style/uiskin.atlas b/assets/style/uiskin.atlas
index bc8e9b97..2c6e69e3 100644
--- a/assets/style/uiskin.atlas
+++ b/assets/style/uiskin.atlas
@@ -88,9 +88,30 @@ animation-up
   orig: 15, 15
   offset: 0, 0
   index: -1
+arrow
+  rotate: false
+  xy: 670, 15
+  size: 13, 15
+  orig: 13, 15
+  offset: 0, 0
+  index: -1
+arrow-down
+  rotate: false
+  xy: 700, 61
+  size: 13, 15
+  orig: 13, 15
+  offset: 0, 0
+  index: -1
+arrow-over
+  rotate: false
+  xy: 749, 62
+  size: 13, 15
+  orig: 13, 15
+  offset: 0, 0
+  index: -1
 border
   rotate: false
-  xy: 656, 8
+  xy: 919, 56
   size: 5, 5
   split: 2, 2, 2, 2
   pad: 1, 1, 1, 1
@@ -106,7 +127,7 @@ border-circle
   index: -1
 border-circle-error
   rotate: false
-  xy: 749, 63
+  xy: 764, 63
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -122,7 +143,7 @@ border-error
   index: -1
 border-textfield
   rotate: false
-  xy: 679, 32
+  xy: 669, 8
   size: 11, 5
   split: 5, 5, 2, 2
   pad: 5, 5, 1, 1
@@ -145,7 +166,7 @@ box-colapse-on
   index: -1
 button
   rotate: false
-  xy: 777, 41
+  xy: 713, 17
   size: 12, 20
   split: 5, 5, 5, 4
   pad: 5, 5, 2, 2
@@ -181,7 +202,7 @@ button-dark-over
   index: -1
 button-down
   rotate: false
-  xy: 670, 10
+  xy: 679, 39
   size: 12, 20
   split: 5, 5, 5, 4
   pad: 5, 5, 2, 2
@@ -190,7 +211,7 @@ button-down
   index: -1
 button-flat-red
   rotate: false
-  xy: 707, 39
+  xy: 721, 40
   size: 12, 20
   split: 3, 3, 3, 4
   orig: 12, 20
@@ -198,7 +219,7 @@ button-flat-red
   index: -1
 button-flat-red-down
   rotate: false
-  xy: 679, 39
+  xy: 693, 39
   size: 12, 20
   split: 3, 3, 3, 4
   orig: 12, 20
@@ -206,7 +227,7 @@ button-flat-red-down
   index: -1
 button-flat-red-over
   rotate: false
-  xy: 693, 39
+  xy: 707, 39
   size: 12, 20
   split: 3, 3, 3, 4
   orig: 12, 20
@@ -214,7 +235,7 @@ button-flat-red-over
   index: -1
 button-over
   rotate: false
-  xy: 721, 40
+  xy: 735, 40
   size: 12, 20
   split: 5, 5, 5, 4
   pad: 5, 5, 2, 2
@@ -223,7 +244,7 @@ button-over
   index: -1
 button-panel-bg
   rotate: false
-  xy: 735, 40
+  xy: 749, 40
   size: 12, 20
   split: 5, 5, 5, 4
   pad: 4, 4, 1, 1
@@ -232,7 +253,7 @@ button-panel-bg
   index: -1
 button-red
   rotate: false
-  xy: 791, 43
+  xy: 727, 20
   size: 12, 18
   split: 5, 5, 4, 3
   pad: 4, 4, 1, 1
@@ -241,7 +262,7 @@ button-red
   index: -1
 button-resource
   rotate: false
-  xy: 763, 41
+  xy: 699, 17
   size: 12, 20
   split: 5, 5, 5, 4
   pad: 4, 4, 1, 1
@@ -250,7 +271,7 @@ button-resource
   index: -1
 button-resource-over
   rotate: false
-  xy: 749, 41
+  xy: 685, 17
   size: 12, 20
   split: 5, 5, 5, 4
   pad: 4, 4, 1, 1
@@ -259,7 +280,7 @@ button-resource-over
   index: -1
 button-window-bg
   rotate: false
-  xy: 805, 43
+  xy: 741, 20
   size: 12, 18
   split: 5, 5, 4, 3
   pad: 4, 4, 1, 1
@@ -282,7 +303,7 @@ close-node-hover
   index: -1
 close-node-pressed
   rotate: false
-  xy: 989, 66
+  xy: 685, 3
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -296,7 +317,7 @@ color-picker-bar-selector
   index: -1
 color-picker-cross
   rotate: false
-  xy: 663, 8
+  xy: 926, 56
   size: 5, 5
   orig: 5, 5
   offset: 0, 0
@@ -387,7 +408,7 @@ expand-icon
   index: -1
 expandable-properties-active-bg
   rotate: false
-  xy: 684, 13
+  xy: 755, 21
   size: 4, 17
   split: 1, 2, 0, 17
   orig: 4, 17
@@ -452,7 +473,7 @@ icon-close-panel
   index: -1
 icon-close-small
   rotate: false
-  xy: 1003, 66
+  xy: 699, 3
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -473,7 +494,7 @@ icon-composite
   index: -1
 icon-composite2
   rotate: false
-  xy: 765, 63
+  xy: 780, 63
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -613,7 +634,7 @@ icon-lock-inactive
   index: -1
 icon-new-layer
   rotate: false
-  xy: 700, 61
+  xy: 876, 62
   size: 13, 15
   orig: 13, 15
   offset: 0, 0
@@ -648,7 +669,7 @@ icon-refresh
   index: -1
 icon-root
   rotate: false
-  xy: 781, 63
+  xy: 796, 63
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -676,21 +697,21 @@ icon-star-outline
   index: -1
 icon-trash
   rotate: false
-  xy: 819, 46
+  xy: 891, 63
   size: 13, 15
   orig: 13, 15
   offset: 0, 0
   index: -1
 icon-trash-disabled
   rotate: false
-  xy: 834, 46
+  xy: 906, 63
   size: 13, 15
   orig: 13, 15
   offset: 0, 0
   index: -1
 icon-trash-over
   rotate: false
-  xy: 849, 46
+  xy: 921, 63
   size: 13, 15
   orig: 13, 15
   offset: 0, 0
@@ -858,7 +879,7 @@ menu-item
   index: -1
 menu-item-disabled
   rotate: false
-  xy: 648, 2
+  xy: 437, 2
   size: 3, 3
   split: 1, 1, 1, 1
   orig: 3, 3
@@ -866,7 +887,7 @@ menu-item-disabled
   index: -1
 menu-item-down
   rotate: false
-  xy: 653, 2
+  xy: 442, 2
   size: 3, 3
   split: 1, 1, 1, 1
   orig: 3, 3
@@ -889,7 +910,7 @@ origin-anchor
   index: -1
 padded-list-selection
   rotate: false
-  xy: 692, 34
+  xy: 669, 3
   size: 10, 3
   split: 4, 4, 1, 1
   pad: 4, 4, 0, 0
@@ -956,7 +977,7 @@ progressbar-vertical
   index: -1
 scroll
   rotate: false
-  xy: 1017, 64
+  xy: 912, 55
   size: 5, 6
   split: 2, 2, 2, 2
   orig: 5, 6
@@ -973,7 +994,7 @@ scroll-horizontal
   index: -1
 scroll-knob-horizontal
   rotate: false
-  xy: 929, 57
+  xy: 1016, 65
   size: 6, 5
   split: 2, 2, 0, 5
   pad: -1, -1, 2, 2
@@ -982,7 +1003,7 @@ scroll-knob-horizontal
   index: -1
 scroll-knob-vertical
   rotate: false
-  xy: 1017, 72
+  xy: 905, 55
   size: 5, 6
   split: 2, 2, 2, 2
   orig: 5, 6
@@ -1025,7 +1046,7 @@ selection
   index: -1
 selection-anchor
   rotate: false
-  xy: 908, 53
+  xy: 638, 4
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
@@ -1067,7 +1088,7 @@ separator-vertical
   index: -1
 slider
   rotate: false
-  xy: 439, 8
+  xy: 682, 9
   size: 1, 4
   orig: 1, 4
   offset: 0, 0
@@ -1130,14 +1151,14 @@ splitpane-over
   index: -1
 splitpane-vertical
   rotate: false
-  xy: 658, 2
+  xy: 682, 3
   size: 1, 4
   orig: 1, 4
   offset: 0, 0
   index: -1
 splitpane-vertical-over
   rotate: false
-  xy: 661, 2
+  xy: 933, 57
   size: 1, 4
   orig: 1, 4
   offset: 0, 0
@@ -1191,7 +1212,7 @@ tab-inactive
   index: -1
 textfield
   rotate: false
-  xy: 829, 63
+  xy: 844, 63
   size: 14, 14
   split: 2, 2, 3, 2
   orig: 14, 14
@@ -1199,7 +1220,7 @@ textfield
   index: -1
 textfield-light
   rotate: false
-  xy: 813, 63
+  xy: 828, 63
   size: 14, 14
   split: 3, 3, 4, 3
   orig: 14, 14
@@ -1207,7 +1228,7 @@ textfield-light
   index: -1
 textfield-light-over
   rotate: false
-  xy: 797, 63
+  xy: 812, 63
   size: 14, 14
   split: 3, 3, 4, 3
   orig: 14, 14
@@ -1215,7 +1236,7 @@ textfield-light-over
   index: -1
 textfield-over
   rotate: false
-  xy: 797, 63
+  xy: 812, 63
   size: 14, 14
   split: 2, 2, 3, 2
   orig: 14, 14
@@ -1223,7 +1244,7 @@ textfield-over
   index: -1
 thumbnail
   rotate: false
-  xy: 437, 2
+  xy: 431, 2
   size: 4, 4
   split: 1, 2, 1, 2
   orig: 4, 4
@@ -1231,7 +1252,7 @@ thumbnail
   index: -1
 thumbnail-over
   rotate: false
-  xy: 431, 2
+  xy: 679, 33
   size: 4, 4
   split: 1, 2, 1, 2
   orig: 4, 4
@@ -1239,7 +1260,7 @@ thumbnail-over
   index: -1
 tint-border
   rotate: false
-  xy: 648, 7
+  xy: 1016, 72
   size: 6, 6
   split: 2, 2, 2, 2
   orig: 6, 6
@@ -1312,7 +1333,7 @@ toolbar-down
   index: -1
 toolbar-normal
   rotate: false
-  xy: 638, 4
+  xy: 649, 4
   size: 8, 9
   split: 2, 2, 3, 3
   orig: 8, 9
@@ -1320,7 +1341,7 @@ toolbar-normal
   index: -1
 toolbar-over
   rotate: false
-  xy: 919, 53
+  xy: 659, 4
   size: 8, 9
   split: 2, 2, 3, 3
   orig: 8, 9
@@ -1328,7 +1349,7 @@ toolbar-over
   index: -1
 tooltip-bg
   rotate: false
-  xy: 704, 34
+  xy: 905, 50
   size: 3, 3
   split: 1, 1, 1, 1
   orig: 3, 3
@@ -1343,21 +1364,21 @@ touchpad-knob
   index: -1
 tree-minus
   rotate: false
-  xy: 880, 49
+  xy: 713, 3
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 tree-plus
   rotate: false
-  xy: 894, 50
+  xy: 891, 49
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 tree-selection
   rotate: false
-  xy: 937, 57
+  xy: 439, 7
   size: 5, 5
   split: 2, 2, 2, 2
   pad: 1, 1, 1, 1
@@ -1373,70 +1394,70 @@ vis-blue
   index: -1
 vis-check
   rotate: false
-  xy: 845, 63
+  xy: 860, 63
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-check-down
   rotate: false
-  xy: 861, 63
+  xy: 936, 64
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-check-over
   rotate: false
-  xy: 864, 47
+  xy: 952, 64
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-check-tick
   rotate: false
-  xy: 877, 63
+  xy: 968, 64
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-check-tick-disabled
   rotate: false
-  xy: 893, 64
+  xy: 984, 64
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-radio
   rotate: false
-  xy: 909, 64
+  xy: 1000, 64
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-radio-down
   rotate: false
-  xy: 925, 64
+  xy: 727, 4
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-radio-over
   rotate: false
-  xy: 941, 64
+  xy: 743, 4
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-radio-tick
   rotate: false
-  xy: 957, 64
+  xy: 761, 24
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-radio-tick-disabled
   rotate: false
-  xy: 973, 64
+  xy: 761, 8
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -1450,7 +1471,7 @@ vis-red
   index: -1
 white
   rotate: false
-  xy: 944, 59
+  xy: 910, 50
   size: 3, 3
   orig: 3, 3
   offset: 0, 0
diff --git a/assets/style/uiskin.json b/assets/style/uiskin.json
index df7a88e6..7080fcd1 100644
--- a/assets/style/uiskin.json
+++ b/assets/style/uiskin.json
@@ -476,6 +476,11 @@
       imageOver: icon-trash-over,
       imageUp: icon-trash
     },
+    arrow-button: {
+      imageDown: arrow-down,
+      imageOver: arrow-over,
+      imageUp: arrow
+    },
     image-button: {
       imageUp: image-up
     },
diff --git a/assets/style/uiskin.png b/assets/style/uiskin.png
index 4a5302f8..1b5b41b4 100644
Binary files a/assets/style/uiskin.png and b/assets/style/uiskin.png differ
diff --git a/src/main/java/games/rednblack/editor/view/ui/UIMainTable.java b/src/main/java/games/rednblack/editor/view/ui/UIMainTable.java
index fa34a805..50b04ee5 100644
--- a/src/main/java/games/rednblack/editor/view/ui/UIMainTable.java
+++ b/src/main/java/games/rednblack/editor/view/ui/UIMainTable.java
@@ -95,7 +95,7 @@ public class UIMainTable extends VisTable {
 		//TreeView
 		UIItemsTreeBoxMediator uiItemsTreeBoxMediator = facade.retrieveMediator(UIItemsTreeBoxMediator.NAME);
 		UIItemsTreeBox itemsBox = uiItemsTreeBoxMediator.getViewComponent();
-		leftBoxesPanel.add(itemsBox).width(184).fillX().maxHeight(600).top();
+		leftBoxesPanel.add(itemsBox).width(184).fillX().maxHeight(620).top();
 		middleTable.add(leftBoxesPanel).top().left().expand().padTop(15).padLeft(16);
 	}
 
diff --git a/src/main/java/games/rednblack/editor/view/ui/box/UIItemsTreeBox.java b/src/main/java/games/rednblack/editor/view/ui/box/UIItemsTreeBox.java
index 0c07e04a..a13b545e 100644
--- a/src/main/java/games/rednblack/editor/view/ui/box/UIItemsTreeBox.java
+++ b/src/main/java/games/rednblack/editor/view/ui/box/UIItemsTreeBox.java
@@ -27,11 +27,9 @@ import com.badlogic.gdx.scenes.scene2d.ui.Cell;
 import com.badlogic.gdx.scenes.scene2d.ui.Tree;
 import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
 import com.badlogic.gdx.scenes.scene2d.utils.Selection;
+import com.badlogic.gdx.utils.Align;
 import com.badlogic.gdx.utils.Array;
-import com.kotcrab.vis.ui.widget.VisLabel;
-import com.kotcrab.vis.ui.widget.VisScrollPane;
-import com.kotcrab.vis.ui.widget.VisTable;
-import com.kotcrab.vis.ui.widget.VisTree;
+import com.kotcrab.vis.ui.widget.*;
 import games.rednblack.editor.HyperLap2DFacade;
 import games.rednblack.editor.renderer.components.MainItemComponent;
 import games.rednblack.editor.renderer.components.NodeComponent;
@@ -39,6 +37,7 @@ import games.rednblack.editor.renderer.components.ParentNodeComponent;
 import games.rednblack.editor.renderer.components.ZIndexComponent;
 import games.rednblack.editor.renderer.factory.EntityFactory;
 import games.rednblack.editor.renderer.utils.ComponentRetriever;
+import games.rednblack.h2d.common.MsgAPI;
 import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory;
 import games.rednblack.editor.utils.runtime.EntityUtils;
 import games.rednblack.editor.view.stage.Sandbox;
@@ -52,6 +51,8 @@ public class UIItemsTreeBox extends UICollapsibleBox {
     private UIItemsTreeNode rootNode;
     private Set<Entity> lastSelection;
 
+    private final VisImageButton zUp, zDown;
+
     Sandbox sandbox;
 
     public UIItemsTreeBox() {
@@ -60,7 +61,31 @@ public class UIItemsTreeBox extends UICollapsibleBox {
         facade = HyperLap2DFacade.getInstance();
         treeTable = new VisTable();
         treeTable.left();
+        zUp = StandardWidgetsFactory.createImageButton("arrow-button");
+        StandardWidgetsFactory.addTooltip(zUp, "Move Z-Index Up");
+        zDown = StandardWidgetsFactory.createImageButton("arrow-button");
+        zDown.setTransform(true);
+        zDown.setRotation(180);
+        zDown.setOrigin(zUp.getPrefWidth() / 2, zUp.getPrefHeight() / 2);
+        StandardWidgetsFactory.addTooltip(zDown, "Move Z-Index Down");
+
         createCollapsibleWidget(treeTable);
+
+        zUp.addListener(new ClickListener() {
+            @Override
+            public void clicked(InputEvent event, float x, float y) {
+                sandbox.itemControl.itemZIndexChange(sandbox.getSelector().getCurrentSelection(), true);
+                facade.sendNotification(MsgAPI.ACTION_Z_INDEX_CHANGED, sandbox.getSelector().getCurrentSelection());
+            }
+        });
+
+        zDown.addListener(new ClickListener() {
+            @Override
+            public void clicked(InputEvent event, float x, float y) {
+                sandbox.itemControl.itemZIndexChange(sandbox.getSelector().getCurrentSelection(), false);
+                facade.sendNotification(MsgAPI.ACTION_Z_INDEX_CHANGED, sandbox.getSelector().getCurrentSelection());
+            }
+        });
     }
 
     UIItemsTreeNode rootTreeNode;
@@ -72,7 +97,7 @@ public class UIItemsTreeBox extends UICollapsibleBox {
         tree = new VisTree<>();
         VisScrollPane scroller = StandardWidgetsFactory.createScrollPane(tree);
         scroller.setFlickScroll(false);
-        treeTable.add(scroller).width(177).maxHeight(570);
+        treeTable.add(scroller).width(177).maxHeight(570).colspan(2);
         //
         rootTreeNode = addTreeRoot(rootScene, null);
         rootTreeNode.setExpanded(true);
@@ -82,6 +107,12 @@ public class UIItemsTreeBox extends UICollapsibleBox {
 
         if (lastSelection != null)
             setSelection(lastSelection);
+
+        treeTable.row().padTop(5);
+        treeTable.add(new Separator("tool")).colspan(2).padTop(2).padBottom(2).fill().expand().row();
+
+        treeTable.add(zUp).padLeft(zUp.getPrefWidth() + 10).left();
+        treeTable.add(zDown).padRight(zDown.getPrefWidth() + 10).right();
     }
 
     public void sortTree() {