diff --git a/plugins/libkolab/skins/elastic/libkolab.less b/plugins/libkolab/skins/elastic/libkolab.less
index 27b64d1a..03a57c5e 100644
--- a/plugins/libkolab/skins/elastic/libkolab.less
+++ b/plugins/libkolab/skins/elastic/libkolab.less
@@ -1,277 +1,284 @@
 /**
  * Kolab core library
  *
  * This file contains Elastic skin styles for various Kolab plugins.
  *
  * @author Aleksander Machniak <machniak@kolabsys.com>
  *
  * Copyright (C) 2012-2018, Kolab Systems AG <contact@kolabsys.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 @import (reference) "../../../../skins/elastic/styles/variables";
 @import (reference) "../../../../skins/elastic/styles/mixins";
 
 
 /*** Common folders list extensions ***/
 
 .listing {
     // Fix focus indicator, because we add div element in the list record
     @media screen and (min-width: @screen-width-large) {
         li > div a {
             border-left: 2px solid transparent;
         }
         li > div a:focus {
             border-left: 2px solid @color-list-focus-indicator;
             outline: 0;
         }
     }
 
     li {
         & > div {
             display: flex;
 
             & > a:first-child {
                 .overflow-ellipsis;
                 position: relative;
                 flex-grow: 1;
 
                 &:after {
                     color: #ccc;
                     position: absolute;
                     top: 0;
                     right: 0;
                     height: @listing-line-height !important;
                     font-size: 1.1em !important;
                 }
             }
 
             &.tasklist .listname:before {
                 // TODO: tasklist icon
             }
 
             &.calendar .calname:before {
                 // TODO: clendar icon
             }
 
             &.folder .listname:before {
                 &:extend(.font-icon-class);
                 content: @fa-var-sticky-note;
                 margin-right: .5rem;
             }
 
             span.handle {
                 // TODO calendar/tasklist color indicator
             }
 
             span.actions {
                 a.remove {
                     display: none;
                 }
             }
 
             a.quickview:before {
                 content: @fa-var-eye; // TODO: disabled button state
             }
 
             &.focusview {
                 span.actions {
                     a.quickview:before {
                         content: @fa-var-eye;
                     }
                 }
             }
 
             .subscribed {
                 cursor: pointer;
                 // reset listing's link style
                 padding: 0;
                 border-left: 0;
                 width: auto;
 
                 &:before {
                     .font-icon-regular(@fa-var-bookmark); // TODO: better icon
                     height: auto;
                     color: @color-link;
                     margin-right: .25rem;
                 }
             }
 
             // span.subscribed is used on addressbooks list, a.subscribed in other places
             span.subscribed:before {
                 &:extend(.font-icon-class);
                 .font-icon-regular(@fa-var-bookmark); // TODO: better icon
             }
 
             &.subscribed {
                 .subscribed:before {
                     .font-icon-solid(@fa-var-bookmark); // TODO: better icon
                 }
             }
         }
 
         &.selected > div {
             color: @color-list-selected;
             background-color: @color-list-selected-background;
         }
 
         &.shared > div a:first-child {
             padding-right: 1.6em;
 
             &:after {
                 &:extend(.font-icon-class);
                 content: @fa-var-share-alt;
             }
         }
 
         &.user > div a:first-child {
             padding-right: 1.6em;
 
             &:after {
                 &:extend(.font-icon-class);
                 content: @fa-var-user;
             }
         }
 
         &.readonly:not(.virtual) > div a:first-child {
             padding-right: 1.6em;
 
             &:after {
                 &:extend(.font-icon-class);
                 content: @fa-var-lock;
             }
         }
 
         &.other.user > div {
             span.calname {
                 // TODO @fa-var-user;
             }
         }
 
         &.shared > div {
             span.calname {
                 // TODO @fa-var-share-alt;
             }
         }
 
         & > div.readonly {
             span.calname {
                 // TODO: @fa-var-lock;
             }
         }
 
         &.virtual > div > a {
             opacity: .5;
         }
     }
 
+    // Tree structure fix
+    &.treelist:not(.notree) {
+        & > li > div > a {
+            padding-left: @listing-treetoggle-width;
+        }
+    }
+
     input.flex-checkbox {
         position: relative !important;
         margin: 0 0 0 .25em !important;
 
         & + label {
             position: relative !important;
             margin: 0 .3em 0 -1em !important;
             right: 0 !important;
         }
     }
 
     li.droptarget > div {
         background-color: @color-list-droptarget-background;
     }
 }
 
 html.touch .listing {
     li {
         & > div {
             a:after {
                 height: @listing-touch-line-height !important;
             }
         }
     }
 }
 
 .searchresults {
     .boxtitle {
         line-height: 2rem !important;
         font-size: 80%;
         padding: 0 .5rem;
         margin: 0;
         color: @color-popover-separator;
         background-color: @color-popover-separator-background;
         text-align: center;
         border-bottom: 1px solid @color-layout-border;
     }
 }
 
 .toolbarmenu.listing li {
     &.search {
         padding: .25rem .5rem;
         .input-group {
 
             i.icon {
                 font-size: 80%;
                 padding: .5rem;
             }
 
             input {
                 font-size: 100%;
             }
         }
     }
 
     a.history:before {
         content: @fa-var-history;
     }
 }
 
 .formbuttons-secondary-kolab {
     display: inline;
 }
 
 a.history {
     &.disabled {
         display: none;
     }
 
     &:before {
         &:extend(.font-icon-class);
         content: @fa-var-history;
         display: inline;
         float: none;
     }
 }
 
 // E.g. notes preview frame
 .watermark {
     & > * {
         display: none;
     }
 
     &.formcontainer {
         background: transparent !important;
 
         &  > * {
             display: initial;
         }
     }
 }
 
 @import "include/calendar";
 @import "include/kolab_activesync";
 @import "include/kolab_delegation";
 @import "include/kolab_notes";
 @import "include/kolab_tags";
 @import "include/tasklist";