diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 0b886fc3fa..1e25ccd36d 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -82,8 +82,8 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
.selectedActions a img { position:relative; top:.3em; }
/* add breadcrumb divider to the File item in navigation panel */
-#navigation>ul>li:first-child { background:url('%webroot%/core/img/breadcrumb-start.svg') no-repeat 12.5em 0px; width:12.5em; padding-right:1em; position:fixed; }
-#navigation>ul>li:first-child+li { padding-top:2.9em; }
+#navigation>ul>li:first-child { background:url('%webroot%/core/img/breadcrumb-start.svg') no-repeat 65px 0; width:65px; padding-right:1em; position:fixed; }
+#navigation>ul>li:first-child+li { padding-top:68px; }
#scanning-message{ top:40%; left:40%; position:absolute; display:none; }
diff --git a/core/css/styles.css b/core/css/styles.css
index a6c1050407..b29133bf79 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -58,7 +58,7 @@ input[type="submit"].highlight{ background:#ffc100; border:1px solid #db0; text-
/* CONTENT ------------------------------------------------------------------ */
#controls { padding: 0 0.5em; width:100%; top:3.5em; height:2.8em; margin:0; background:#f7f7f7; border-bottom:1px solid #eee; position:fixed; z-index:50; -moz-box-shadow:0 -3px 7px #000; -webkit-box-shadow:0 -3px 7px #000; box-shadow:0 -3px 7px #000; }
#controls .button { display:inline-block; }
-#content { top: 3.5em; left: 12.5em; position: absolute; }
+#content { top: 3.5em; left: 65px; position: absolute; }
#leftcontent, .leftcontent { position:fixed; overflow: auto; top:6.4em; width:20em; background:#f8f8f8; border-right:1px solid #ddd; }
#leftcontent li, .leftcontent li { background:#f8f8f8; padding:.5em .8em; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; -webkit-transition:background-color 200ms; -moz-transition:background-color 200ms; -o-transition:background-color 200ms; transition:background-color 200ms; }
#leftcontent li:hover, #leftcontent li:active, #leftcontent li.active, .leftcontent li:hover, .leftcontent li:active, .leftcontent li.active { background:#eee; }
@@ -95,14 +95,15 @@ label.infield { cursor: text !important; }
/* NAVIGATION ------------------------------------------------------------- */
-#navigation { position:fixed; top:3.5em; float:left; width:12.5em; padding:0; z-index:75; height:100%; background:#eee; border-right: 1px #ccc solid; -moz-box-shadow: -3px 0 7px #000; -webkit-box-shadow: -3px 0 7px #000; box-shadow: -3px 0 7px #000; overflow:hidden;}
-#navigation a { display:block; padding:.6em .5em .4em 2.5em; background:#eee 1em center no-repeat; border-bottom:1px solid #ddd; border-top:1px solid #fff; text-decoration:none; font-size:1.2em; color:#666; text-shadow:#f8f8f8 0 1px 0; }
-#navigation a.active, #navigation a:hover, #navigation a:focus { background-color:#dbdbdb; border-top:1px solid #d4d4d4; border-bottom:1px solid #ccc; color:#333; }
-#navigation a.active { background-color:#ddd; }
+#navigation { position:fixed; top:3.5em; float:left; width:65px; padding:0; z-index:75; height:100%; background:#30343a url('../img/noise.png') repeat; border-right: 1px #ccc solid; -moz-box-shadow: -3px 0 7px #000; -webkit-box-shadow: -3px 0 7px #000; box-shadow: -3px 0 7px #000; overflow:hidden;}
+#navigation a { display:block; padding:4px; background:transparent; text-decoration:none; font-size:10px; text-align:center; color:#000; text-shadow:#444 0 1px 0; }
+#navigation li:first-child { padding-top:8px; }
+#navigation a img { display:block; width:32px; height:32px; margin:0 auto; }
+#navigation a.active, #navigation a:hover, #navigation a:focus { color:#888; text-shadow:#000 0 -1px 0; }
+#navigation a.active { }
#navigation #settings { position:absolute; bottom:3.5em; width:100%; }
+#navigation #settings img { width:32px; height:32px; }
#expand { position:relative; z-index:100; margin-bottom:-.5em; padding:.5em 10.1em .7em 1.2em; cursor:pointer; }
-#expand+span { position:absolute; z-index:99; margin:-1.7em 0 0 2.5em; font-size:1.2em; color:#666; text-shadow:#f8f8f8 0 1px 0; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; -webkit-transition:opacity 300ms; -moz-transition:opacity 300ms; -o-transition:opacity 300ms; transition:opacity 300ms; }
-#expand:hover+span, #expand+span:hover { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; cursor:pointer; }
/* VARIOUS REUSABLE SELECTORS */
.hidden { display:none; }
diff --git a/core/img/noise.png b/core/img/noise.png
new file mode 100644
index 0000000000..8fdda17b5e
Binary files /dev/null and b/core/img/noise.png differ
diff --git a/core/img/places/home.svg b/core/img/places/home.svg
index 4b45ef12bc..8224d9750e 100644
--- a/core/img/places/home.svg
+++ b/core/img/places/home.svg
@@ -14,8 +14,8 @@
width="16"
height="16"
id="svg11300"
- inkscape:version="0.48.1 r9760"
- sodipodi:docname="help.svg"
+ inkscape:version="0.48.3.1 r9886"
+ sodipodi:docname="home.svg"
inkscape:export-filename="/home/jancborchardt/jancborchardt/ownCloud/icons/help.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
@@ -41,16 +41,16 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1280"
- inkscape:window-height="776"
+ inkscape:window-height="800"
id="namedview24"
showgrid="true"
showguides="true"
inkscape:guide-bbox="true"
inkscape:zoom="22.627418"
inkscape:cx="14.025105"
- inkscape:cy="9.2202448"
+ inkscape:cy="3.9169442"
inkscape:window-x="0"
- inkscape:window-y="24"
+ inkscape:window-y="-31"
inkscape:window-maximized="1"
inkscape:current-layer="g4146">
-
-
-
-
-
+
+
diff --git a/core/img/places/music.svg b/core/img/places/music.svg
index 1f39766097..0a810c8887 100644
--- a/core/img/places/music.svg
+++ b/core/img/places/music.svg
@@ -14,8 +14,8 @@
width="16"
height="16"
id="svg11300"
- inkscape:version="0.48.1 r9760"
- sodipodi:docname="search.svg"
+ inkscape:version="0.48.3.1 r9886"
+ sodipodi:docname="music.svg"
inkscape:export-filename="/home/jancborchardt/jancborchardt/ownCloud/icons/search.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
@@ -41,7 +41,7 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1280"
- inkscape:window-height="776"
+ inkscape:window-height="800"
id="namedview24"
showgrid="true"
showguides="true"
@@ -50,7 +50,7 @@
inkscape:cx="-2.2078397"
inkscape:cy="6.5568429"
inkscape:window-x="0"
- inkscape:window-y="24"
+ inkscape:window-y="-31"
inkscape:window-maximized="1"
inkscape:current-layer="svg11300">
-
+
-
-
-
-
+
diff --git a/core/img/places/picture.svg b/core/img/places/picture.svg
index 26c3d6312c..8d7848bb97 100644
--- a/core/img/places/picture.svg
+++ b/core/img/places/picture.svg
@@ -14,8 +14,8 @@
width="16"
height="16"
id="svg11300"
- inkscape:version="0.48.1 r9760"
- sodipodi:docname="audio.svg"
+ inkscape:version="0.48.3.1 r9886"
+ sodipodi:docname="picture.svg"
inkscape:export-filename="/home/jancborchardt/jancborchardt/ownCloud/icons/audio.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
@@ -27,7 +27,7 @@
image/svg+xml
-
+
@@ -41,7 +41,7 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1280"
- inkscape:window-height="776"
+ inkscape:window-height="800"
id="namedview24"
showgrid="true"
showguides="true"
@@ -50,7 +50,7 @@
inkscape:cx="14.025105"
inkscape:cy="9.2202448"
inkscape:window-x="0"
- inkscape:window-y="24"
+ inkscape:window-y="-31"
inkscape:window-maximized="1"
inkscape:current-layer="g4146">
-
-
-
-
+
+
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 1f16fdf7c6..2509026dfa 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -44,17 +44,25 @@