diff --git a/css/navbar.icons.css b/css/navbar.icons.css
index 823ecc6..79dbb46 100644
--- a/css/navbar.icons.css
+++ b/css/navbar.icons.css
@@ -78,7 +78,7 @@
 .no-svg .navbar-bar .navbar-icon-help.navbar-active:before {
   background-image: url("../icons/ffffff/questionmark-disc.png");
 }
-#navbar-administration .navbar-bar .navbar-icon.element-hidden {
+.navbar-bar .navbar-icon.element-hidden {
   display: none;
 }
 
@@ -247,7 +247,30 @@
 .no-svg .navbar-icon-help.navbar-active:before {
   background-image: url("../icons/000000/questionmark-disc.png");
 }
-
+.np-svg #navbar-administration .navbar-menu .navbar-icon.navbar-handle::before {
+  background-image: url("../icons/787878/push-right.png");
+  background-size: 75%;
+}
+#navbar-administration .navbar-tray-horizontal .navbar-menu .navbar-icon.navbar-handle::before {
+  background-image: url("../icons/787878/push-right.svg");
+  background-size: 75%;
+}
+.np-svg #navbar-administration .navbar-tray-horizontal .navbar-menu .navbar-menu .navbar-icon.navbar-handle.open:before {
+  background-image: url("../icons/5181c6/push-right.png");
+  background-size: 75%;
+}
+#navbar-administration .navbar-tray-horizontal .navbar-menu .navbar-menu .navbar-icon.navbar-handle.open:before {
+  background-image: url("../icons/5181c6/push-right.svg");
+  background-size: 75%;
+}
+#navbar-administration .navbar-menu .navbar-level-1 > .navbar-box .navbar-icon.navbar-handle::before {
+  background-image: url("../icons/787878/chevron-disc-down.svg");
+  background-size: 75%;
+}
+#navbar-administration .navbar-menu .navbar-level-1 > .navbar-box .navbar-icon.navbar-handle.open::before {
+  background-image: url("../icons/5181c6/chevron-disc-down.svg");
+  background-size: 75%;
+}
 @media only screen and (min-width: 16.5em) {
   #navbar-administration .navbar-bar .navbar-icon {
     margin-left: 0;
@@ -331,30 +354,26 @@
   left: 1.6667em; /* LTR */
 }
 #navbar-administration .navbar-icon.navbar-handle:before {
-  background-image: url("../icons/5181c6/chevron-disc-down.svg");
+  background-image: url("../icons/787878/chevron-disc-down.svg");
 }
 .no-svg #navbar-administration .navbar-icon.navbar-handle:before {
-  background-image: url("../icons/5181c6/chevron-disc-down.png");
+  background-image: url("../icons/787878/chevron-disc-down.png");
 }
 #navbar-administration .navbar-icon.navbar-handle.open:before {
-  background-image: url("../icons/787878/chevron-disc-up.svg");
+  background-image: url("../icons/5181c6/chevron-disc-up.svg");
 }
 .no-svg #navbar-administration .navbar-icon.navbar-handle.open:before {
-  background-image: url("../icons/787878/chevron-disc-up.png");
-}
-#navbar-administration .navbar-menu .navbar-menu .navbar-icon.navbar-handle:before {
-  background-image: url("../icons/5181c6/twistie-down.svg");
-  background-size: 75%;
+  background-image: url("../icons/5181c6/chevron-disc-up.png");
 }
 .no-svg #navbar-administration .navbar-menu .navbar-menu .navbar-icon.navbar-handle:before {
   background-image: url("../icons/5181c6/twistie-down.png");
   background-size: auto auto;
 }
-#navbar-administration .navbar-menu .navbar-menu .navbar-icon.navbar-handle.open:before {
+#navbar-administration .navbar-menu .navbar-menu > .nav-box .navbar-icon.navbar-handle.open:before {
   background-image: url("../icons/787878/twistie-up.svg");
   background-size: 75%;
 }
-.no-svg #navbar-administration .navbar-menu .navbar-menu .navbar-icon.navbar-handle.open:before {
+.no-svg #navbar-administration .navbar-menu .navbar-menu > .nav-box .navbar-icon.navbar-handle.open:before {
   background-image: url("../icons/787878/twistie-up.png");
   background-size: auto auto;
 }
@@ -407,3 +426,10 @@
   background-image: url("../icons/787878/push-up.png");
 }
 
+/**
+ * Horizontal dock override
+ */
+#navbar-administration .navbar-tray-horizontal .navbar-icon.navbar-handle:focus {
+  background: none!important;
+}
+
diff --git a/css/navbar.menu.css b/css/navbar.menu.css
index 3151636..3db2812 100644
--- a/css/navbar.menu.css
+++ b/css/navbar.menu.css
@@ -12,11 +12,11 @@
   position: relative;
   width: auto;
 }
-#navbar-administration .navbar-tray-horizontal .navbar-menu .navbar-handle,
 #navbar-administration .navbar-tray-horizontal .navbar-menu .navbar-menu,
 #navbar-administration .navbar-tray-vertical .navbar-menu > .navbar-twisty > .navbar-menu {
   display: none;
 }
+#navbar-administration .navbar-tray-horizontal .navbar-twisty.open > .navbar-menu,
 #navbar-administration .navbar-tray-vertical .navbar-twisty.open > .navbar-menu {
   display: block; /* Show the sub-menus */
 }
@@ -31,43 +31,91 @@
   font-weight: bold;
 }
 
+#navbar-administration .navbar-tray-horizontal li {
+  position: relative;
+}
+
+#navbar-administration .navbar-tray-horizontal li .navbar-box {
+  width: 100%;
+  top: 0;
+  left: 0;
+}
+
+#navbar-administration .navbar-tray-horizontal li .navbar-menu {
+  position: absolute;
+  border: 1px solid #cacaca;
+  left: -1px;
+  width: auto;
+}
+
+#navbar-administration .navbar-tray-horizontal li.navbar-level-2 .navbar-menu {
+  left: 100%;
+  top: 0;
+  width: 100%;
+}
+
 /**
  * Items.
  */
+#navbar-administration .navbar-level-2,
+#navbar-administration .navbar-level-3,
+#navbar-administration .navbar-level-4,
+#navbar-administration .navbar-level-5,
+#navbar-administration .navbar-level-6,
+#navbar-administration .navbar-level-7,
+#navbar-administration .navbar-level-8 {
+  width: 100%;
+}
+
 #navbar-administration .navbar-level-2 > ul {
   background-color: #fafafa;
   border-bottom-color: #cccccc;
   border-top-color: #e5e5e5;
+  z-index: 2;
 }
 #navbar-administration .navbar-level-3 > ul {
   background-color: #f5f5f5;
   border-bottom-color: #c5c5c5;
   border-top-color: #dddddd;
+  z-index: 3;
 }
 #navbar-administration .navbar-level-4 > ul {
   background-color: #eeeeee;
   border-bottom-color: #bbbbbb;
   border-top-color: #d5d5d5;
+  z-index: 4;
 }
 #navbar-administration .navbar-level-5 > ul {
   background-color: #e5e5e5;
   border-bottom-color: #b5b5b5;
   border-top-color: #cccccc;
+  z-index: 5;
 }
 #navbar-administration .navbar-level-6 > ul {
   background-color: #eeeeee;
   border-bottom-color: #aaaaaa;
   border-top-color: #c5c5c5;
+  z-index: 6;
 }
 #navbar-administration .navbar-level-7 > ul {
   background-color: #fafafa;
   border-bottom-color: #b5b5b5;
   border-top-color: #cccccc;
+  z-index: 7;
 }
 #navbar-administration .navbar-level-8 > ul {
   background-color: #dddddd;
   border-bottom-color: #cccccc;
   border-top-color: #dddddd;
+  z-index: 8;
+}
+
+/*#navbar-administration .navbar-tray-horizontal li.navbar-twisty.navbar-level-1 .navbar-box .navbar-menu-item {
+  margin-right: 1.5em;
+}*/
+
+#navbar-administration .navbar-tray-horizontal li.navbar-twisty > .navbar-box > a {
+  margin-right: 1.5em;
 }
 
 /**
diff --git a/icons/5181c6/push-left.png b/icons/5181c6/push-left.png
index e69de29..8b661fd 100644
Binary files a/icons/5181c6/push-left.png and b/icons/5181c6/push-left.png differ
diff --git a/icons/5181c6/push-left.svg b/icons/5181c6/push-left.svg
index e69de29..d8e02b4 100644
--- a/icons/5181c6/push-left.svg
+++ b/icons/5181c6/push-left.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="16px" height="13px" viewBox="0 0 16 13" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.0.3 (7891) - http://www.bohemiancoding.com/sketch -->
+    <title>Shape</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <path d="M2.5,0 L0.009,0 L0.009,12.029 L2.5,12.029 C2.776,12.029 3,11.804 3,11.529 L3,0.5 C3,0.224 2.776,0 2.5,0 L2.5,0 Z M14.502,4.029 L10.502,4.029 C10.227,4.029 10.002,3.804 10.002,3.529 L10.002,2.529 C10.002,2.254 9.842,2.188 9.648,2.383 L6.354,5.675 C6.16,5.869 6.16,6.188 6.354,6.383 L9.648,9.676 C9.836,9.869 10.002,9.805 10.002,9.53 L10.002,8.53 C10.002,8.259 10.229,8.03 10.502,8.03 L14.502,8.03 C14.777,8.03 15.002,7.805 15.002,7.53 L15.002,4.53 C15.002,4.254 14.777,4.029 14.502,4.029 L14.502,4.029 Z" id="Shape" fill="#5181C6" sketch:type="MSShapeGroup"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/icons/5181c6/push-right.png b/icons/5181c6/push-right.png
index e69de29..3dc5502 100644
Binary files a/icons/5181c6/push-right.png and b/icons/5181c6/push-right.png differ
diff --git a/icons/5181c6/push-right.svg b/icons/5181c6/push-right.svg
index e69de29..eb44ad0 100644
--- a/icons/5181c6/push-right.svg
+++ b/icons/5181c6/push-right.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="15px" height="13px" viewBox="0 0 15 13" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.0.3 (7891) - http://www.bohemiancoding.com/sketch -->
+    <title>Shape</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <path d="M12.501,0 C12.226,0 12.001,0.224 12.001,0.5 L12.001,11.529 C12.001,11.804 12.226,12.029 12.501,12.029 L14.993,12.029 L14.993,0 L12.501,0 L12.501,0 Z M5.353,2.382 C5.159,2.188 5,2.254 5,2.529 L5,3.529 C5,3.804 4.775,4.029 4.5,4.029 L0.5,4.029 C0.225,4.029 0,4.254 0,4.529 L0,7.529 C0,7.8 0.225,8.029 0.5,8.029 L4.5,8.029 C4.775,8.029 5,8.254 5,8.529 L5,9.529 C5,9.8 5.159,9.869 5.354,9.675 L8.649,6.382 C8.842,6.188 8.842,5.869 8.649,5.674 L5.353,2.382 L5.353,2.382 Z" id="Shape" fill="#5181C6" sketch:type="MSShapeGroup"></path>
+    </g>
+</svg>
\ No newline at end of file