diff --git a/css/area_header.less b/css/area_header.less
index eedc601..9a560ab 100755
--- a/css/area_header.less
+++ b/css/area_header.less
@@ -142,33 +142,23 @@
         a {
             .fontello();
             .icon-menu();
+            .btn-hover();
 
             display: block;
             min-height: @toggle-size;
             min-width: @toggle-size;
             box-sizing: border-box;
-            background-color: #fff;
             border: 1px solid @ini_border;
             border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
-            color: @ini_nav_menu_color;
             font-size: 1rem;
             text-align: center;
             text-decoration: none;
             line-height: 1;
-            transition: @transition color, @transition background-color, @transition border-color;
 
             &::before {
                 font-size: 1.5rem;
                 margin: .1rem 0 0;
             }
-
-            &:hover,
-            &:active,
-            &:focus {
-                background-color: @ini_nav_menu_hover_bg;
-                border-color: @ini_nav_menu_hover_color;
-                color: @ini_nav_menu_hover_color;
-            }
         }
     }
 
diff --git a/css/area_main-sidebar-nav.less b/css/area_main-sidebar-nav.less
index f5b4eea..618e8c3 100755
--- a/css/area_main-sidebar-nav.less
+++ b/css/area_main-sidebar-nav.less
@@ -91,10 +91,9 @@
 
         // the toggle element
         a {
+            cursor: pointer;
             display: table;
             width: 100%;
-
-            cursor: pointer;
             min-height: @icon-size + @margin-small;
             opacity: 1;
             border: 1px solid transparent;
@@ -103,6 +102,8 @@
             font-size: @font-size-head6;
             font-weight: normal;
             margin: -1px 0 (@font-size-head6 / 2); // moves the toggles back to the left (.4 from li margin)
+            padding-bottom: .4rem;
+            padding-top: .4rem;
             transition: @transition color, @transition background-color, @transition border-color;
 
             span {
@@ -200,6 +201,7 @@
             min-width: @menu-margin;
             height: @icon-size;
             text-align: center;
+            vertical-align: middle;
             color: inherit;
 
             &::after {
@@ -217,7 +219,7 @@
 
                 // wordbreak too late in IE 10
                 @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
-                    top: .5rem;
+                    top: 0;
                     bottom: .5rem;
                     height: 100%;
                     margin: 0;
@@ -254,6 +256,7 @@
 
         span.lbl {
             display: table-cell;
+            font-size: inherit;
             padding-left: .5rem;
         }
     }
@@ -300,26 +303,6 @@
 }
 
 
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* max-width: 1439px */
-
-@media @screen_max-xlg {
-    #dokuwiki__aside {
-        nav {
-            li:not([class]),
-            .li {
-                font-size: @font-size-default;
-
-                * {
-                    font-size: inherit;
-                    font-weight: inherit;
-                }
-            }
-        }
-    }
-}
-
-
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* max-width: 1023px */
 
@@ -343,6 +326,10 @@
                 &:first-child {
                     margin-top: 1.2rem;
                 }
+
+                a {
+                    font-size: @font-size-small;
+                }
             }
 
             a.nav {
@@ -353,25 +340,46 @@
 
             div.nav-panel,
             a.nav {
+                margin-top: 0;
                 padding-right: .8em;
             }
         }
     }
 }
 
+
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* max-width: 1439px */
+/* max-width: 768px */
 
-@media @screen_max-xlg {
-    #dokuwiki__aside {
-        nav {
-            li:not([class]),
-            .li {
-                font-size: @font-size-default;
+@media @screen_max-xs {
+    body.show-mobile-sidebar {
+        .page-wrapper > .tools {
+            top: 2.5rem;
+        }
 
-                * {
-                    font-size: inherit;
-                    font-weight: inherit;
+        #dokuwiki__aside {
+            left: 1.25rem;
+            right: 1.25rem;
+            width: auto;
+            max-width: 100%;
+            margin-top: -1rem;
+        }
+    }
+}
+
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* max-width: 480px */
+
+@media @screen_max-xxs {
+    body.show-mobile-sidebar {
+        #dokuwiki__aside {
+            left: 4px;
+            right: 4px;
+
+            > nav {
+                a {
+                    font-size: @font-size-default;
                 }
             }
         }
diff --git a/css/area_main-sidebar-search.less b/css/area_main-sidebar-search.less
index 337ef5b..77a7552 100644
--- a/css/area_main-sidebar-search.less
+++ b/css/area_main-sidebar-search.less
@@ -4,6 +4,7 @@
  * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
  */
 
+
 .search.main-sidebar {
     @main-ico-dummy: @font-size-big + @margin-small*2; //FIXME copied from area_main-sidebar-nav
     @icon-size: @page-header_height;
@@ -180,18 +181,20 @@
 }
 
 
-/* + + + + +  wide page content  + + + + + */
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* min-width: 1024px */
+
 @media @screen_min-md {
+
+    // wide page content
     .wide-content {
         .search.main-sidebar {
-            display: block;
-
             p.toggleSearch {
                 position: relative;
                 z-index: 1;
                 display: block;
                 float: left;
-                width: auto;
+                width: 100%;
             }
 
             form {
@@ -216,10 +219,27 @@
 }
 
 
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* max-width: 1023px */
+
 @media @screen_max-md {
-    .show-mobile-sidebar {
+
+    // show when toggled
+    body.show-mobile-sidebar {
+        p.toggleSearch {
+            display: none !important;
+        }
+
         .search.main-sidebar {
-            display: block;
+            display: block !important;
+            position: relative;
+            z-index: 1;
+            margin-left: -1px;
+            margin-right: -1px;
+
+            form {
+                margin-bottom: 1rem;
+            }
         }
     }
 }
diff --git a/css/area_nav-pagetools.less b/css/area_nav-pagetools.less
index d86af60..5a0dc24 100755
--- a/css/area_nav-pagetools.less
+++ b/css/area_nav-pagetools.less
@@ -21,6 +21,7 @@
 .pagetools-item(img_backto, 12);
 */
 
+
 #dokuwiki__aside {
     @media @screen_max-md {
         display: none !important;
@@ -82,6 +83,27 @@ nav#dokuwiki__pagetools {
                     background-color: transparent;
                 }
 
+                &:focus {
+                    box-shadow: @box-shadow;
+                    background-image: none;
+                    background-color: @ini_background;
+                    color: @ini_existing;
+                    padding-top: 2px;
+                    padding-bottom: 2px;
+                    padding-right: 0;
+
+                    span {
+                        position: relative;
+                        display: inline;
+                        width: auto;
+                        height: auto;
+                    }
+
+                    svg {
+                        fill: @ini_existing;
+                    }
+                }
+
                 span {
                     .sr-only();
 
diff --git a/css/area_nav-usertools.less b/css/area_nav-usertools.less
index 26f5a1a..a18909f 100755
--- a/css/area_nav-usertools.less
+++ b/css/area_nav-usertools.less
@@ -33,6 +33,14 @@
         padding: 0;
         margin: (@very-small-spacing * 2) -.25rem 0 0;
 
+        @media @screen_max-md {
+            margin-right: .5rem;
+        }
+
+        @media @screen_max-xxs {
+            margin-right: -.3rem;
+        }
+
         li {
             .btn-usertools-wrapper(); // uniform li
             .btn-usertools-num();
@@ -108,7 +116,7 @@
                 @media @screen_max-xs {
                     position: absolute;
                     top: @headericons-margin-xxs;
-                    right: (@toggle-size + @headericons-margin-xxs);
+                    right: 2.9rem;
                     overflow: hidden;
                     white-space: nowrap;
                     margin: -1px 0 0;
@@ -116,6 +124,7 @@
 
                 @media @screen_max-xxs {
                     left: -10px;
+                    right: (@toggle-size + @headericons-margin-xxs);
                     width: auto;
                 }
 
@@ -178,11 +187,11 @@
                     &:focus,
                     &:active {
                         background-color: @ini_nav_menu_hover_color;
-                        border-color: @ini_nav_menu_hover_color;
                         color: @ini_nav_menu_hover_bg;
 
                         &::before {
                             opacity: 1;
+                            border-color: @ini_nav_menu_hover_bg;
                         }
 
                         bdi,
diff --git a/css/base_mixins.less b/css/base_mixins.less
index 9725764..e17ee37 100755
--- a/css/base_mixins.less
+++ b/css/base_mixins.less
@@ -151,7 +151,7 @@
     &:active,
     &:focus {
         background-color: @ini_nav_menu_hover_color;
-        border-color: @ini_nav_menu_hover_bg;
+        border-color: @ini_nav_menu_hover_color;
         color: @ini_nav_menu_hover_bg;
 
         .prefix {
diff --git a/css/plugins/edittable.less b/css/plugins/edittable.less
index 487c003..0a2c2e4 100644
--- a/css/plugins/edittable.less
+++ b/css/plugins/edittable.less
@@ -26,6 +26,10 @@
                 padding-right: .3em;
                 transition: @transition background-color, @transition border-color, @transition color;
 
+                @media @screen_md-xlg {
+                    margin-top: -1px; // for best position of edit-tab beneeth table
+                }
+
                 &:hover,
                 &:focus,
                 &:active {