diff --git a/core/css/styles.css b/core/css/styles.css
index 5d3864f4b3..fa7421e094 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -1,6 +1,6 @@
 * { margin:0; padding:0; border:0; cursor:default; }
 body { background:#fefefe; font:normal 80%/1.6em "Lucida Grande", Arial, Verdana, sans-serif; color:#000; }
-#header { position:fixed; top:0; z-index:100; width:100%; height:2.5em; padding:0.5em 1.5em; background:#1d2d44; -moz-box-shadow:0 0 10px #000, inset 0 -2px 10px #222; -webkit-box-shadow:0 0 10px #000, inset 0 -2px 10px #222; box-shadow:0 0 10px #000, inset 0 -2px 10px #222; }
+#header { position:fixed; top:0; z-index:100; width:100%; height:2.5em; padding:.5em; background:#1d2d44; -moz-box-shadow:0 0 10px #000, inset 0 -2px 10px #222; -webkit-box-shadow:0 0 10px #000, inset 0 -2px 10px #222; box-shadow:0 0 10px #000, inset 0 -2px 10px #222; }
 #body-settings #header { background:#313131; }
 #owncloud { float:left; }
 h1 { margin:1em 3em 1em 0; border-bottom:1px solid #666; text-transform:uppercase; font-weight:normal; font-style:italic; color:#666; }
@@ -72,7 +72,7 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', end
 .prettybutton:hover, .prettybutton:focus { background-color:#ccc; outline:0; }
 
 /* META NAVIGATION (Settings, Log out) ---------------------------------------------------------------- */ 
-#metanav { float:right; position:relative; top:0.5em; right:2.5em; list-style:none; margin:0; padding:0; }
+#metanav { float:right; position:relative; top:.5em; right:1em; list-style:none; margin:0; padding:0; }
 #metanav li { display:inline; }
 #metanav li a { margin:.2em; padding:.7em; }
 #metanav li a:hover, #metanav li a:focus { background:rgba(0,0,0,.5); -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; box-shadow:#555 0 1px 0; -moz-box-shadow:#555 0 1px 0; -webkit-box-shadow:#555 0 1px 0; }
@@ -82,20 +82,17 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', end
 form.searchbox { display:inline; position:fixed; top:.9em; right:9em; margin:0; padding:0; }
 input[type="search"] { font-size:1em; padding-left:2em; background:#eee url('../img/actions/search.png') .5em center no-repeat; }
 
-
-
 /* NAVIGATION ------------------------------------------------------------- */
-#plugins { position:fixed; top:3.5em; float:left; width:15.7em; padding:0; z-index:50; 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; } }
-#plugins ul { list-style-type:none; border-top:1px solid #ccc; }
-#plugins a { display:block; padding:0.5em 0.5em 0.5em 3em; background-position:1.5em center; background-repeat:no-repeat; border-bottom:1px solid #ddd; border-top:1px solid #fff; text-decoration:none; font-size:1.2em; color:#666; }
-#plugins a.active, #plugins a:hover, #plugins a:focus, #plugins a.selected { background-color:#ccc; border-top:1px solid #ccc; border-bottom:1px solid #ccc; color:#000; outline:0; }
-#plugins a:active { outline:0; }
-#plugins .subentry { background-color:#ddd; border-top:1px solid #aaa; color:#000; outline:0; }
-#plugins .subentry.active { background-color:#bbb; border-top:1px solid #aaa; color:#000; outline:0; }
-#plugins li.subentry a { padding-left:3.7em; font-size:1em; }
+#navigation { position:fixed; top:3.5em; float:left; width:12.5em; padding:0; z-index:50; 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; } }
+#navigation ul { list-style-type:none; border-top:1px solid #ccc; }
+#navigation a { display:block; padding:.5em .5em .5em 2.5em; background-position:1em center; background-repeat:no-repeat; border-bottom:1px solid #ddd; border-top:1px solid #fff; text-decoration:none; font-size:1.2em; color:#666; }
+#navigation a.active, #navigation a:hover, #navigation a:focus, #navigation a.selected { background-color:#ccc; border-top:1px solid #c8c8c8; border-bottom:1px solid #ccc; color:#000; outline:0; }
+#navigation .subentry { background-color:#ddd; border-top:1px solid #aaa; color:#555; outline:0; }
+#navigation .subentry.active { background-color:#bbb; border-top:1px solid #888; border-bottom:1px solid #bbb; outline:0; }
+#navigation li.subentry a { padding-left:3.1em; font-size:1em; }
 
 /* CONTENT ------------------------------------------------------------------ */
-#content { margin:3.5em 0 0 15.7em; }
+#content { margin:3.5em 0 0 12.5em; }
 
 /* USER SETTINGS ------------------------------------------------------------ */
 #quota_indicator { margin:0 4em 1em 0; padding:0; border:1px solid #ddd; border-radius:10px; -webkit-border-radius:10px; -moz-border-radius:10px; }
diff --git a/core/templates/layout.admin.php b/core/templates/layout.admin.php
index be4419af84..d70c54f7b1 100644
--- a/core/templates/layout.admin.php
+++ b/core/templates/layout.admin.php
@@ -37,7 +37,7 @@
 		</div>
 
 		<div id="main">
-			<div id="plugins">
+			<div id="navigation">
 				<ul>
 					<?php foreach($_['settingsnavigation'] as $entry):?>
 						<li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title="" <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>><?php echo $entry['name'] ?></a></li>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 33de9d5f72..217dd19c3d 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -41,7 +41,7 @@
 			<div id="content">
 				<?php echo $_['content']; ?>
 			</div>
-			<div id="plugins">
+			<div id="navigation">
 				<ul>
 					<?php foreach($_['navigation'] as $entry): ?>
 						<li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title="" <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>><?php echo $entry['name']; ?></a>