diff --git a/src/_h5ai/client/css/inc/sidebar.less b/src/_h5ai/client/css/inc/sidebar.less
index de554303..60dcdf78 100644
--- a/src/_h5ai/client/css/inc/sidebar.less
+++ b/src/_h5ai/client/css/inc/sidebar.less
@@ -4,8 +4,6 @@
     overflow: auto;
     flex: 0 0 auto;
     order: 0;
-    // width: 264px;
-    // border-right: 1px solid @col-border;
     border-right: 2px solid rgba(0, 0, 0, 0.06);
     background: #fafafa;
     z-index: 1;
@@ -24,55 +22,42 @@
         }
     }
 
-    a, a:active, a:visited, span.element {
-        color: @col;
-        cursor: pointer;
-        text-decoration: none;
-        // opacity: 0.7;
-        .transition(all 0.2s ease-in-out);
-
-        display: block;
-        outline: 0;
-        border-radius: 2px;
-
-        &:hover {
-            opacity: 1.0;
-            background: rgba(0,0,0,0.03);
-            // box-shadow: inset 0 0 4px 0 rgba(0,0,0,0.4);
-        }
-    }
-
-    .current {
-        a, span.element {
-            opacity: 1.0;
-            background: rgba(0,0,0,0.03);
-            box-shadow: inset 0 0 4px 0 rgba(0,0,0,0.4);
-        }
-    }
-
-    img {
-        width: 24px;
-        height: 24px;
-        padding: 12px;
-    }
-
-    .view {
+    .button {
         display: inline-block;
         margin: 4px;
         border-radius: 2px;
+        color: @col;
+        cursor: pointer;
+        // opacity: 0.7;
+        .transition(all 0.2s ease-in-out);
+
+        &:hover {
+            // opacity: 1.0;
+            background: rgba(0,0,0,0.03);
+            // box-shadow: inset 0 0 4px 0 rgba(0,0,0,0.4);
+        }
+
+        &.active {
+            // opacity: 1.0;
+            background: rgba(0,0,0,0.03);
+            box-shadow: inset 0 0 4px 0 rgba(0,0,0,0.4);
+        }
+
+        img {
+            width: 24px;
+            height: 24px;
+            padding: 12px;
+        }
     }
 
     .select {
         background: transparent;
-        width: 175px;
         overflow: hidden;
         border-radius: 2px;
         outline: 0;
-
-        &:hover {
-            background: rgba(0,0,0,0.03);
-            // box-shadow: inset 0 0 4px 0 rgba(0,0,0,0.4);
-        }
+        width: 142px;
+        margin: 4px;
+        line-height: 48px;
     }
 
     input, select {
@@ -85,8 +70,8 @@
         color: @col;
         background: transparent;
         width: 100%;
-        height: 30px;
-        line-height: 30px;
+        // height: 30px;
+        // line-height: 30px;
         border: 0 solid #000;
         cursor: pointer;
         outline: 0;
@@ -98,16 +83,19 @@
    }
 
     select {
-        width: 200px;
-        padding: 0 4px;
+        width: 172px;
+        padding: 0 8px;
+        line-height: 48px;
     }
 
     input[type='range'] {
         border-radius: 2px;
         width: 142px;
         margin: 4px;
-        padding: 9px;
+        padding: 8px;
         vertical-align: middle;
+        height: 30px;
+        line-height: 30px;
     }
 
     .range-track() {
diff --git a/src/_h5ai/client/css/inc/topbar.less b/src/_h5ai/client/css/inc/topbar.less
index d7e3b38c..3604623f 100644
--- a/src/_h5ai/client/css/inc/topbar.less
+++ b/src/_h5ai/client/css/inc/topbar.less
@@ -23,6 +23,9 @@
     order: 99;
     text-align: center;
     padding: 6px 12px;
+    // max-width: 80px;
+    overflow: hidden;
+    height: 36px;
     .transition(all 0.2s ease-in-out);
 
     &, &:active, &:visited {
@@ -32,6 +35,7 @@
     }
     &:hover {
         color: @col-hover;
+        background: rgba(0,0,0,0.03);
     }
     &:focus {
         outline: 0;
@@ -52,13 +56,13 @@
     .tool {
         display: inline-block;
         cursor: pointer;
-        .transition(all 0.2s ease-in-out);
 
         img {
             display: inline-block;
             width: 24px;
             height: 24px;
             padding: 12px;
+            .transition(all 0.2s ease-in-out);
         }
 
         &:hover img {
diff --git a/src/_h5ai/client/images/fallback/ar.svg b/src/_h5ai/client/images/fallback/ar.svg
index e96fe183..00fd05e2 100644
--- a/src/_h5ai/client/images/fallback/ar.svg
+++ b/src/_h5ai/client/images/fallback/ar.svg
@@ -25,7 +25,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -44,13 +44,15 @@
      inkscape:window-height="1056"
      id="namedview6"
      showgrid="true"
-     inkscape:zoom="19.666667"
-     inkscape:cx="8.0871817"
-     inkscape:cy="9.1262198"
+     inkscape:zoom="27.812867"
+     inkscape:cx="14.432271"
+     inkscape:cy="11.316291"
      inkscape:window-x="49"
      inkscape:window-y="24"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg2">
+     inkscape:current-layer="svg2"
+     showguides="true"
+     inkscape:guide-bbox="true">
     <inkscape:grid
        type="xygrid"
        id="grid2987"
@@ -61,6 +63,6 @@
   </sodipodi:namedview>
   <path
      style="fill:#555555;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     d="M 5 3 C 3.892 3 3 3.892 3 5 L 3 19 C 3 20.108 3.892 21 5 21 L 19 21 C 20.108 21 21 20.108 21 19 L 21 5 C 21 3.892 20.108 3 19 3 L 5 3 z M 5 5 L 10 5 L 10 11 L 14 11 L 14 5 L 19 5 L 19 19 L 5 19 L 5 5 z "
+     d="M 5 3 C 3.892 3 3 3.892 3 5 L 3 19 C 3 20.108 3.892 21 5 21 L 19 21 C 20.108 21 21 20.108 21 19 L 21 5 C 21 3.892 20.108 3 19 3 L 5 3 z M 10 5 L 14 5 L 14 11 L 10 11 L 10 5 z "
      id="rect2989" />
 </svg>
diff --git a/src/_h5ai/client/images/fallback/aud.svg b/src/_h5ai/client/images/fallback/aud.svg
index 7d4fc587..66abac39 100644
--- a/src/_h5ai/client/images/fallback/aud.svg
+++ b/src/_h5ai/client/images/fallback/aud.svg
@@ -22,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -42,8 +42,8 @@
      id="namedview6"
      showgrid="true"
      inkscape:zoom="39.333334"
-     inkscape:cx="10.6976"
-     inkscape:cy="11.929211"
+     inkscape:cx="4.4514337"
+     inkscape:cy="10.912262"
      inkscape:window-x="49"
      inkscape:window-y="24"
      inkscape:window-maximized="1"
@@ -58,6 +58,6 @@
   </sodipodi:namedview>
   <path
      style="fill:#555555;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     d="M 6 2 C 4.892 2 4 2.892 4 4 L 4 20 C 4 21.108 4.892 22 6 22 L 18 22 C 19.108 22 20 21.108 20 20 L 20 4 C 20 2.892 19.108 2 18 2 L 6 2 z M 6 4 L 18 4 L 18 20 L 6 20 L 6 4 z M 13 7 L 11 9 L 11 13.03125 C 10.663553 13.11256 10.3107 13.240075 9.96875 13.4375 C 8.7730184 14.127856 8.1170364 15.282561 8.53125 16 C 8.9454636 16.717439 10.273018 16.721606 11.46875 16.03125 C 12.409945 15.487851 12.99224 14.675541 13 14 L 13 9.8125 L 13.71875 10.53125 L 15.125 9.125 L 13 7 z "
+     d="M 6 2 C 4.892 2 4 2.892 4 4 L 4 20 C 4 21.108 4.892 22 6 22 L 18 22 C 19.108 22 20 21.108 20 20 L 20 4 C 20 2.892 19.108 2 18 2 L 6 2 z M 13.125 7.125 C 15.352778 7.630556 17 9.6222227 17 12 C 17 14.377778 15.352778 16.369444 13.125 16.875 L 13.125 15.71875 C 14.730556 15.240972 15.875 13.761111 15.875 12 C 15.875 10.238888 14.730556 8.759028 13.125 8.28125 L 13.125 7.125 z M 12 7.5625 L 12 16.4375 L 9.21875 13.65625 L 7 13.65625 L 7 10.34375 L 9.21875 10.34375 L 12 7.5625 z M 13.125 9.75 C 13.947223 10.16111 14.5 11.016666 14.5 12 C 14.5 12.983333 13.947223 13.813195 13.125 14.21875 L 13.125 9.75 z "
      id="rect2989" />
 </svg>
diff --git a/src/_h5ai/client/images/fallback/bin.svg b/src/_h5ai/client/images/fallback/bin.svg
index 3c839ce7..2ab90ceb 100644
--- a/src/_h5ai/client/images/fallback/bin.svg
+++ b/src/_h5ai/client/images/fallback/bin.svg
@@ -45,7 +45,7 @@
      id="namedview6"
      showgrid="true"
      inkscape:zoom="19.666667"
-     inkscape:cx="8.0363342"
+     inkscape:cx="1.9854868"
      inkscape:cy="9.1262198"
      inkscape:window-x="49"
      inkscape:window-y="24"
@@ -61,7 +61,7 @@
   </sodipodi:namedview>
   <path
      style="fill:#555555;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     d="M 5 3 C 3.892 3 3 3.892 3 5 L 3 19 C 3 20.108 3.892 21 5 21 L 19 21 C 20.108 21 21 20.108 21 19 L 21 5 C 21 3.892 20.108 3 19 3 L 5 3 z M 5 5 L 19 5 L 19 19 L 5 19 L 5 5 z M 11.1875 8 C 11.08755 8 11.011995 8.05735 11 8.15625 L 10.84375 9.21875 C 10.599856 9.31905 10.395409 9.4686 10.1875 9.625 L 9.1875 9.21875 C 9.09554 9.17675 8.985479 9.2235 8.9375 9.3125 L 8.125 10.6875 C 8.07302 10.7765 8.11153 10.878 8.1875 10.9375 L 9.03125 11.59375 C 9.01526 11.72175 9 11.8679 9 12 C 9 12.1321 9.01525 12.27825 9.03125 12.40625 L 8.1875 13.0625 C 8.11154 13.1095 8.07702 13.2246 8.125 13.3125 L 8.9375 14.6875 C 8.98548 14.7765 9.099538 14.81215 9.1875 14.78125 L 10.1875 14.375 C 10.395409 14.535 10.599856 14.68165 10.84375 14.78125 L 11 15.84375 C 11.01199 15.94075 11.087544 16 11.1875 16 L 12.8125 16 C 12.91245 16 12.988006 15.94265 13 15.84375 L 13.15625 14.78125 C 13.400139 14.68095 13.604591 14.5314 13.8125 14.375 L 14.8125 14.78125 C 14.90446 14.82425 15.014521 14.7765 15.0625 14.6875 L 15.875 13.3125 C 15.92298 13.2235 15.88847 13.122 15.8125 13.0625 L 14.96875 12.40625 C 14.98474 12.27825 15 12.1359 15 12 C 15 11.864 14.98475 11.72175 14.96875 11.59375 L 15.8125 10.9375 C 15.88846 10.8905 15.92297 10.7754 15.875 10.6875 L 15.0625 9.3125 C 15.01452 9.2235 14.90046 9.18785 14.8125 9.21875 L 13.8125 9.625 C 13.604591 9.465 13.400139 9.31835 13.15625 9.21875 L 13 8.15625 C 12.98801 8.05925 12.912463 8 12.8125 8 L 11.1875 8 z M 12 10.59375 C 12.77166 10.59375 13.40625 11.2279 13.40625 12 C 13.40625 12.7721 12.77166 13.40625 12 13.40625 C 11.228341 13.40625 10.59375 12.7721 10.59375 12 C 10.59375 11.2279 11.228341 10.59375 12 10.59375 z "
+     d="M 5 3 C 3.892 3 3 3.892 3 5 L 3 19 C 3 20.108 3.892 21 5 21 L 19 21 C 20.108 21 21 20.108 21 19 L 21 5 C 21 3.892 20.108 3 19 3 L 5 3 z M 10.78125 6 L 13.21875 6 C 13.368695 6 13.482015 6.1045 13.5 6.25 L 13.75 7.8125 C 14.115834 7.9619 14.406887 8.1975 14.71875 8.4375 L 16.21875 7.8125 C 16.35069 7.76615 16.52178 7.83525 16.59375 7.96875 L 17.8125 10.03125 C 17.884455 10.1631 17.83269 10.33575 17.71875 10.40625 L 16.46875 11.375 C 16.49275 11.567 16.5 11.796 16.5 12 C 16.5 12.20385 16.49273 12.433 16.46875 12.625 L 17.71875 13.59375 C 17.83271 13.683 17.88447 13.83525 17.8125 13.96875 L 16.59375 16.03125 C 16.521782 16.164875 16.35669 16.252 16.21875 16.1875 L 14.71875 15.5625 C 14.406887 15.7971 14.115834 16.03705 13.75 16.1875 L 13.5 17.75 C 13.482009 17.898355 13.368675 18 13.21875 18 L 10.78125 18 C 10.63131 18 10.517985 17.8955 10.5 17.75 L 10.28125 16.1875 C 9.9154091 16.0381 9.593114 15.8025 9.28125 15.5625 L 7.78125 16.1875 C 7.649307 16.23385 7.47822 16.16475 7.40625 16.03125 L 6.1875 13.96875 C 6.11553 13.8369 6.16731 13.66425 6.28125 13.59375 L 7.5625 12.625 C 7.5385 12.433 7.5 12.19815 7.5 12 C 7.5 11.80185 7.538515 11.567 7.5625 11.375 L 6.28125 10.40625 C 6.167295 10.317 6.10953 10.16475 6.1875 10.03125 L 7.40625 7.96875 C 7.4782185 7.835255 7.64331 7.7495 7.78125 7.8125 L 9.28125 8.4375 C 9.593114 8.2029 9.9154091 7.96295 10.28125 7.8125 L 10.5 6.25 C 10.517993 6.10165 10.631325 6 10.78125 6 z M 12 9.875 C 10.842512 9.875 9.90625 10.84185 9.90625 12 C 9.90625 13.15815 10.842512 14.125 12 14.125 C 13.15749 14.125 14.125 13.15815 14.125 12 C 14.125 10.84185 13.15749 9.875 12 9.875 z "
      id="rect2989" />
   <g
      id="g4"
diff --git a/src/_h5ai/client/images/fallback/file.png b/src/_h5ai/client/images/fallback/file.png
index b3af9777..1d4edd75 100644
Binary files a/src/_h5ai/client/images/fallback/file.png and b/src/_h5ai/client/images/fallback/file.png differ
diff --git a/src/_h5ai/client/images/fallback/file.svg b/src/_h5ai/client/images/fallback/file.svg
index ba2b8576..3638eb11 100644
--- a/src/_h5ai/client/images/fallback/file.svg
+++ b/src/_h5ai/client/images/fallback/file.svg
@@ -13,7 +13,10 @@
    version="1.1"
    id="svg2"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="file.svg">
+   sodipodi:docname="file.svg"
+   inkscape:export-filename="/home/lars/env/workspace/web/h5ai/src/_h5ai/client/images/fallback/file.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
   <metadata
      id="metadata10">
     <rdf:RDF>
@@ -22,6 +25,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -41,8 +45,8 @@
      id="namedview6"
      showgrid="true"
      inkscape:zoom="19.666667"
-     inkscape:cx="17.036334"
-     inkscape:cy="9.1262198"
+     inkscape:cx="8.5956562"
+     inkscape:cy="8.6177452"
      inkscape:window-x="49"
      inkscape:window-y="24"
      inkscape:window-maximized="1"
@@ -57,6 +61,14 @@
   </sodipodi:namedview>
   <path
      style="fill:#555555;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     d="M 6 2 C 4.892 2 4 2.892 4 4 L 4 20 C 4 21.108 4.892 22 6 22 L 18 22 C 19.108 22 20 21.108 20 20 L 20 4 C 20 2.892 19.108 2 18 2 L 6 2 z M 6 4 L 18 4 L 18 20 L 6 20 L 6 4 z "
-     id="rect2989" />
+     d="m -22.98305,1.8983051 c -1.108,0 -2,0.892 -2,2 l 0,15.9999999 c 0,1.108 0.892,2 2,2 l 12,0 c 1.1079996,0 1.9999996,-0.892 1.9999996,-2 l 0,-15.9999999 c 0,-1.108 -0.892,-2 -1.9999996,-2 z"
+     id="rect2989"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="sssssssss" />
+  <path
+     inkscape:connector-curvature="0"
+     d="m 14,1.9999996 -8,0 c -1.1,0 -1.99,0.9 -1.99,2 L 4,20 c 0,1.1 0.89,2 1.99,2 L 18,22 c 1.1,0 2,-0.9 2,-2 L 20,7.9999996 z m -1,7 0,-5.5 5.5,5.5 z"
+     id="path6"
+     style="fill:#555555;fill-opacity:1;stroke:none"
+     sodipodi:nodetypes="csccssscccccc" />
 </svg>
diff --git a/src/_h5ai/client/images/fallback/img.svg b/src/_h5ai/client/images/fallback/img.svg
index fe2994c6..0ead3263 100644
--- a/src/_h5ai/client/images/fallback/img.svg
+++ b/src/_h5ai/client/images/fallback/img.svg
@@ -41,9 +41,9 @@
      inkscape:window-height="1056"
      id="namedview6"
      showgrid="true"
-     inkscape:zoom="39.333334"
-     inkscape:cx="12.511288"
-     inkscape:cy="10.758352"
+     inkscape:zoom="27.812867"
+     inkscape:cx="10.001398"
+     inkscape:cy="11.191821"
      inkscape:window-x="49"
      inkscape:window-y="24"
      inkscape:window-maximized="1"
@@ -58,6 +58,8 @@
   </sodipodi:namedview>
   <path
      style="fill:#555555;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     d="M 4 4 C 2.892 4 2 4.892 2 6 L 2 18 C 2 19.108 2.892 20 4 20 L 20 20 C 21.108 20 22 19.108 22 18 L 22 6 C 22 4.892 21.108 4 20 4 L 4 4 z M 4 6 L 20 6 L 20 18 L 4 18 L 4 6 z M 8 8 L 6 16 L 18 16 L 15 11 L 12 13 L 8 8 z M 13 8 C 13 9.1045695 13.895431 10 15 10 C 16.104569 10 17 9.1045695 17 8 L 13 8 z "
-     id="rect2989" />
+     d="M 4,4 C 2.892,4 2,4.892 2,6 l 0,12 c 0,1.108 0.892,2 2,2 l 16,0 c 1.108,0 2,-0.892 2,-2 L 22,6 C 22,4.892 21.108,4 20,4 z m 5,6 4,5 3,-2 3,4 -14,0 z"
+     id="rect2989"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ssssssssscccccc" />
 </svg>
diff --git a/src/_h5ai/client/images/fallback/txt.svg b/src/_h5ai/client/images/fallback/txt.svg
index ef8348e7..03db4a13 100644
--- a/src/_h5ai/client/images/fallback/txt.svg
+++ b/src/_h5ai/client/images/fallback/txt.svg
@@ -13,7 +13,7 @@
    version="1.1"
    id="svg2"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="txt.svg"
+   sodipodi:docname="file.svg"
    inkscape:export-filename="/home/lars/env/workspace/web/h5ai/src/_h5ai/client/images/fallback/file.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
@@ -25,7 +25,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -45,8 +45,8 @@
      id="namedview6"
      showgrid="true"
      inkscape:zoom="19.666667"
-     inkscape:cx="8.0871817"
-     inkscape:cy="9.1262198"
+     inkscape:cx="8.5956562"
+     inkscape:cy="8.6177452"
      inkscape:window-x="49"
      inkscape:window-y="24"
      inkscape:window-maximized="1"
@@ -61,28 +61,13 @@
   </sodipodi:namedview>
   <path
      style="fill:#555555;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     d="M 6 2 C 4.892 2 4 2.892 4 4 L 4 20 C 4 21.108 4.892 22 6 22 L 18 22 C 19.108 22 20 21.108 20 20 L 20 4 C 20 2.892 19.108 2 18 2 L 6 2 z M 6 4 L 18 4 L 18 20 L 6 20 L 6 4 z "
-     id="rect2989" />
-  <rect
-     style="fill:#555555;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     id="rect3031"
-     width="8"
-     height="2"
-     x="8"
-     y="6"
-     rx="0" />
-  <rect
-     style="fill:#555555;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     id="rect3801"
-     width="6"
-     height="2"
-     x="8"
-     y="10" />
-  <rect
-     style="fill:#555555;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     id="rect3803"
-     width="7"
-     height="2"
-     x="8"
-     y="14" />
+     d="m -22.98305,1.8983051 c -1.108,0 -2,0.892 -2,2 l 0,15.9999999 c 0,1.108 0.892,2 2,2 l 12,0 c 1.1079996,0 1.9999996,-0.892 1.9999996,-2 l 0,-15.9999999 c 0,-1.108 -0.892,-2 -1.9999996,-2 z"
+     id="rect2989"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="sssssssss" />
+  <path
+     inkscape:connector-curvature="0"
+     d="M 14,1.9999996 H 6 c -1.1,0 -1.99,0.9 -1.99,2 L 4,20 c 0,1.1 0.89,2 1.99,2 H 18 c 1.1,0 2,-0.9 2,-2 V 7.9999996 l -6,-6 z M 16,18 H 8 v -2 h 8 v 2 z m 0,-4 H 8 v -2 h 8 v 2 z M 13,8.9999996 v -5.5 l 5.5,5.5 H 13 z"
+     id="path6"
+     style="stroke:none;fill:#555555;fill-opacity:1" />
 </svg>
diff --git a/src/_h5ai/client/images/fallback/txt1.svg b/src/_h5ai/client/images/fallback/txt1.svg
new file mode 100644
index 00000000..e27bf89d
--- /dev/null
+++ b/src/_h5ai/client/images/fallback/txt1.svg
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="24"
+   width="24"
+   viewBox="0 0 24 24"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="txt.svg"
+   inkscape:export-filename="/home/lars/env/workspace/web/h5ai/src/_h5ai/client/images/fallback/file.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1871"
+     inkscape:window-height="1056"
+     id="namedview6"
+     showgrid="true"
+     inkscape:zoom="19.666667"
+     inkscape:cx="8.0871817"
+     inkscape:cy="9.1262198"
+     inkscape:window-x="49"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2987"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:#555555;fill-opacity:1;fill-rule:nonzero;stroke:none"
+     d="M 6,2 C 4.892,2 4,2.892 4,4 l 0,16 c 0,1.108 0.892,2 2,2 l 12,0 c 1.108,0 2,-0.892 2,-2 L 20,4 C 20,2.892 19.108,2 18,2 z M 7,6 17,6 17,8 7,8 z m 0,4 8,0 0,2 -8,0 z m 0,4 9,0 0,2 -9,0 z"
+     id="rect2989"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="sssssssssccccccccccccccc" />
+</svg>
diff --git a/src/_h5ai/client/images/fallback/vid.svg b/src/_h5ai/client/images/fallback/vid.svg
index 20bc0152..310801de 100644
--- a/src/_h5ai/client/images/fallback/vid.svg
+++ b/src/_h5ai/client/images/fallback/vid.svg
@@ -22,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -42,7 +42,7 @@
      id="namedview6"
      showgrid="true"
      inkscape:zoom="39.333334"
-     inkscape:cx="12.511288"
+     inkscape:cx="11.031068"
      inkscape:cy="11.775301"
      inkscape:window-x="49"
      inkscape:window-y="24"
@@ -58,6 +58,8 @@
   </sodipodi:namedview>
   <path
      style="fill:#555555;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     d="M 4 4 C 2.892 4 2 4.892 2 6 L 2 18 C 2 19.108 2.892 20 4 20 L 20 20 C 21.108 20 22 19.108 22 18 L 22 6 C 22 4.892 21.108 4 20 4 L 4 4 z M 6 6 L 18 6 L 18 18 L 6 18 L 6 6 z M 3 7 L 5 7 L 5 8 L 3 8 L 3 7 z M 19 7 L 21 7 L 21 8 L 19 8 L 19 7 z M 8 8 L 8 16 L 16 16 L 16 12.6875 L 15 11 L 12 13 L 8 8 z M 12.96875 8 C 12.96875 9.1045695 13.864181 10 14.96875 10 C 15.343389 10 15.700256 9.897989 16 9.71875 L 16 8 L 12.96875 8 z M 3 10 L 5 10 L 5 11 L 3 11 L 3 10 z M 19 10 L 21 10 L 21 11 L 19 11 L 19 10 z M 3 13 L 5 13 L 5 14 L 3 14 L 3 13 z M 19 13 L 21 13 L 21 14 L 19 14 L 19 13 z M 3 16 L 5 16 L 5 17 L 3 17 L 3 16 z M 19 16 L 21 16 L 21 17 L 19 17 L 19 16 z "
-     id="rect2989" />
+     d="M 4,4 C 2.892,4 2,4.892 2,6 l 0,12 c 0,1.108 0.892,2 2,2 l 16,0 c 1.108,0 2,-0.892 2,-2 L 22,6 C 22,4.892 21.108,4 20,4 z M 3,7 5,7 5,8 3,8 z m 16,0 2,0 0,1 -2,0 z m -16,3 2,0 0,1 -2,0 z m 6.03125,0 4,5 3,-2 L 17,14.28125 17,17 7,17 7,13.5625 z M 19,10 l 2,0 0,1 -2,0 z m -16,3 2,0 0,1 -2,0 z m 16,0 2,0 0,1 -2,0 z m -16,3 2,0 0,1 -2,0 z m 16,0 2,0 0,1 -2,0 z"
+     id="rect2989"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ssssssssscccccccccccccccccccccccccccccccccccccccccccccccc" />
 </svg>
diff --git a/src/_h5ai/client/images/settings.svg b/src/_h5ai/client/images/settings.svg
index 7ccdaf00..de2f0f93 100644
--- a/src/_h5ai/client/images/settings.svg
+++ b/src/_h5ai/client/images/settings.svg
@@ -39,14 +39,22 @@
      inkscape:window-width="1871"
      inkscape:window-height="1056"
      id="namedview8"
-     showgrid="false"
-     inkscape:zoom="9.8333333"
-     inkscape:cx="-5.8983051"
-     inkscape:cy="12"
+     showgrid="true"
+     inkscape:zoom="27.812867"
+     inkscape:cx="13.030903"
+     inkscape:cy="10.827333"
      inkscape:window-x="49"
      inkscape:window-y="24"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
+     inkscape:current-layer="svg2">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2983"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <path
      d="M0 0h24v24h-24z"
      fill="none"
diff --git a/src/_h5ai/client/images/view-tree.svg b/src/_h5ai/client/images/view-tree.svg
new file mode 100644
index 00000000..efa43652
--- /dev/null
+++ b/src/_h5ai/client/images/view-tree.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   id="svg2"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="view-tree.svg">
+  <metadata
+     id="metadata14">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1871"
+     inkscape:window-height="1056"
+     id="namedview10"
+     showgrid="true"
+     inkscape:zoom="29.5"
+     inkscape:cx="14.196793"
+     inkscape:cy="9.927285"
+     inkscape:window-x="49"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2991"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:#555555"
+     d="M 4,3 4,6 7,6 7,3 z m 5,0 0,3 8,0 0,-3 z m -3,5 0,3 3,0 0,-3 z m 5,0 0,3 9,0 0,-3 z m -5,5 0,3 3,0 0,-3 z m 5,0 0,3 6,0 0,-3 z m -5,5 0,3 3,0 0,-3 z m 5,0 0,3 8,0 0,-3 z"
+     id="rect2993"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccc" />
+</svg>
diff --git a/src/_h5ai/client/js/inc/ext/tree.js b/src/_h5ai/client/js/inc/ext/tree.js
index 33ebd867..773ebd00 100644
--- a/src/_h5ai/client/js/inc/ext/tree.js
+++ b/src/_h5ai/client/js/inc/ext/tree.js
@@ -1,4 +1,4 @@
-modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/event', 'core/location'], function (_, $, allsettings, resource, event, location) {
+modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/store', 'core/event', 'core/location'], function (_, $, allsettings, resource, store, event, location) {
 
     var settings = _.extend({
             enabled: false,
@@ -14,6 +14,14 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e
                     '<span class="label"/>' +
                 '</a>' +
             '</span>';
+    var settingsTemplate =
+            '<div class="block">' +
+                '<h1 class="l10n-tree">Tree</h1>' +
+                '<div id="view-tree" class="button view">' +
+                    '<img src="' + resource.image('view-tree') + '" alt="view-tree"/>' +
+                '</div>' +
+            '</div>';
+    var storekey = 'ext/tree';
 
 
     function update(item) {
@@ -50,18 +58,6 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e
                 }
             }
 
-            // is it the domain?
-            if (item.isDomain()) {
-                $html.addClass('domain');
-                // $img.attr('src', resource.image('home'));
-            }
-
-            // is it the root?
-            if (item.isRoot()) {
-                $html.addClass('root');
-                // $img.attr('src', resource.image('home'));
-            }
-
             // is it the current folder?
             if (item.isCurrentFolder()) {
                 $html.addClass('current');
@@ -91,7 +87,6 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e
             }
         }
 
-
         if (item.$tree) {
             item.$tree.replaceWith($html);
         }
@@ -157,13 +152,23 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e
         });
     }
 
+    function updateSettings() {
+
+        if (store.get(storekey)) {
+            $('#view-tree').addClass('active');
+            $('#tree').show();
+        } else {
+            $('#view-tree').removeClass('active');
+            $('#tree').hide();
+        }
+    }
+
     function onLocationChanged(item) {
 
         fetchTree(item, function (root) {
 
-            $('#tree')
-                .append(update(root))
-                .show();
+            $('#tree').append(update(root));
+            updateSettings();
         });
     }
 
@@ -177,6 +182,20 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e
             .appendTo('#main-row')
             .on('click', '.indicator', createOnIndicatorClick());
 
+        $(settingsTemplate)
+            .appendTo('#settings')
+            .find('#view-tree')
+            .on('click', function (ev) {
+
+                store.put(storekey, !store.get(storekey));
+                updateSettings();
+                ev.preventDefault();
+            });
+
+        // ensure stored value is boolean, default to true
+        store.put(storekey, store.get(storekey) !== false);
+        updateSettings();
+
         event.sub('location.changed', onLocationChanged);
     }
 
diff --git a/src/_h5ai/client/js/inc/view/viewmode.js b/src/_h5ai/client/js/inc/view/viewmode.js
index 6d8b5bff..dddf701d 100644
--- a/src/_h5ai/client/js/inc/view/viewmode.js
+++ b/src/_h5ai/client/js/inc/view/viewmode.js
@@ -7,10 +7,8 @@ modulejs.define('view/viewmode', ['_', '$', 'core/settings', 'core/resource', 'c
         }, allsettings.view);
     var storekey = 'viewmode';
     var modeTemplate =
-            '<div id="view-[MODE]" class="view">' +
-                '<a href="#">' +
-                    '<img src="' + resource.image('view-[MODE]') + '" alt="view-[MODE]"/>' +
-                '</a>' +
+            '<div id="view-[MODE]" class="button view">' +
+                '<img src="' + resource.image('view-[MODE]') + '" alt="view-[MODE]"/>' +
             '</div>';
     var sizeTemplate =
             '<input id="view-size" type="range" min="0" max="0" value="0">';
@@ -82,10 +80,10 @@ modulejs.define('view/viewmode', ['_', '$', 'core/settings', 'core/resource', 'c
 
         _.each(modes, function (m) {
             if (m === mode) {
-                $('#view-' + m).addClass('current');
+                $('#view-' + m).addClass('active');
                 $view.addClass('view-' + m).show();
             } else {
-                $('#view-' + m).removeClass('current');
+                $('#view-' + m).removeClass('active');
                 $view.removeClass('view-' + m);
             }
         });
@@ -112,7 +110,7 @@ modulejs.define('view/viewmode', ['_', '$', 'core/settings', 'core/resource', 'c
                 if (_.contains(settings.modes, mode)) {
                     $(modeTemplate.replace(/\[MODE\]/g, mode))
                         .appendTo($viewBlock)
-                        .on('click', 'a', function (ev) {
+                        .on('click', function (ev) {
 
                             update(mode);
                             ev.preventDefault();