diff --git a/css/area_main-sidebar-content.less b/css/area_main-sidebar-content.less
index d30d5d4..94cfa27 100644
--- a/css/area_main-sidebar-content.less
+++ b/css/area_main-sidebar-content.less
@@ -11,7 +11,11 @@
 
         ul,
         ol {
-            padding-left: @margin-small;
+            padding-left: 1.8rem;
+
+            @media @screen_md-lg {
+                padding-left: @menu-margin-lg;
+            }
 
             li {
                 margin-left: 0;
diff --git a/css/area_main-sidebar-nav.less b/css/area_main-sidebar-nav.less
index f6af9e2..4d52064 100755
--- a/css/area_main-sidebar-nav.less
+++ b/css/area_main-sidebar-nav.less
@@ -8,8 +8,7 @@
 
 #dokuwiki__aside {
     @icon-size: @font-size-big;
-    @menu-margin: @icon-size + @margin-small * 2; // FIXME this is still wrong
-    @menu-margin-lg: 1.3rem;
+    @menu-margin: @icon-size + @margin-small * 2;
 
     nav > p,
     .mmissuelist li,
@@ -100,18 +99,18 @@
         .align-items();
 
         cursor: pointer;
-        height: @icon-size + @margin-small;
+        min-height: @icon-size + @margin-small;
         opacity: 1;
         border: 1px solid transparent;
         border-radius: @fix_border-radius;
         color: @ini_nav_menu_color;
         font-size: @font-size-head6;
         font-weight: normal;
-        margin: -1px 0 (@font-size-head6 / 2) -(@menu-margin); // moves the toggles back to the left
+        margin: -1px 0 (@font-size-head6 / 2) -(@menu-margin - .4); // moves the toggles back to the left (.4 from li margin)
         transition: @transition color, @transition background-color, @transition border-color;
 
         @media @screen_md-lg {
-            margin-left: -(@menu-margin-lg + 1);
+            margin-left: -(@menu-margin-lg + .8);
         }
 
         span {
diff --git a/css/area_main-sidebar-search.less b/css/area_main-sidebar-search.less
index 0046aa6..eeef1b3 100644
--- a/css/area_main-sidebar-search.less
+++ b/css/area_main-sidebar-search.less
@@ -10,7 +10,7 @@
     @icon-search_font-size: @font-size-big;
 
     @media @screen_md-lg {
-        margin-left: -1rem;
+        margin-left: -(@menu-margin-lg);
     }
 
     p.toggleSearch a,
@@ -169,10 +169,13 @@
         }
     }
 
+
+/* + + + + +  suggestionlist  + + + + + */
     #qsearch__out {
         left: auto;
         top: auto;
         width: 100%;
+        min-width: 20rem;
     }
 }
 
diff --git a/css/base.less b/css/base.less
index ce9e7df..4b8c3b9 100755
--- a/css/base.less
+++ b/css/base.less
@@ -62,6 +62,8 @@
 
 
 /* navigation left */
+@menu-margin-lg: 1.3rem;
+
 @quicksearch-button-color: @noopentasks-color; /* autosuggest, submit in quicksearch */
 @suggestion-zebra:         #EEE;
 
diff --git a/css/base_structure.less b/css/base_structure.less
index 83957ce..f86e2f8 100755
--- a/css/base_structure.less
+++ b/css/base_structure.less
@@ -74,7 +74,7 @@
     }
 
     .tools .row > .col-xs-12 {
-        z-index: 1;
+        z-index: 5; // SPR-945 sometimes too small space for suggestionlist
     }
 
     .header .row > .col-xs-12 {