diff --git a/css/styles.css b/css/styles.css
index 9d0a710adba0fefa4a74fee6f816f02828dd164a..93829b7ef963ef75d24dc98908645ab990385a25 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -35,10 +35,10 @@ body.login p.info { width:16em; margin:4em auto; padding:1em; background-color:#
#login input[type=submit] { width:5em; border:1px solid #ddd; background-color:#fff; font-size:2em; }
#login input[type=submit]:hover, #login input[type=submit]:focus { background-color:#ccc; outline:0; }
-/* USER MENU ---------------------------------------------------------------- */
+/* META NAVIGATION (Settings, Log out) ---------------------------------------------------------------- */
#metanav { float:right; position:relative; top:1.5em; list-style:none; margin:0; padding:0; }
#metanav li { display:inline; }
-#metanav li a { padding:1em; }
+#metanav li a { margin:.1em; padding:1em; }
#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; outline:0; box-shadow:#444 0 1px 0; -moz-box-shadow:#444 0 1px 0; -webkit-box-shadow:#444 0 1px 0; }
#metanav li a img { vertical-align:middle; }
diff --git a/help/appinfo/app.php b/help/appinfo/app.php
index 661b554f417130f422ffadd3b88b61e66269e358..c4e9eb5717c6abbdd511dd9a5fa653c9a445c55c 100644
--- a/help/appinfo/app.php
+++ b/help/appinfo/app.php
@@ -1,5 +1,6 @@
<?php
-OC_APP::register( array( "id" => "help", "name" => "Help" ));
+OC_APP::register( array( "order" => 1, "id" => "help", "name" => "Help" ));
+OC_APP::addSettingsPage( array( "order" => 2, "href" => OC_HELPER::linkTo( "help", "index.php" ), "name" => "Help", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
?>
diff --git a/img/layout/back.png b/img/layout/back.png
index 900ae719adce3a4da03c8cb58d9c637be8eb1540..86abbe0cabe37a4b47f32241b5f327bc346f98ce 100644
Binary files a/img/layout/back.png and b/img/layout/back.png differ
diff --git a/img/layout/help.png b/img/layout/help.png
deleted file mode 100644
index bf29c09f8c171eaff20d4fd4983aa1b32f54a027..0000000000000000000000000000000000000000
Binary files a/img/layout/help.png and /dev/null differ
diff --git a/img/layout/logout.png b/img/layout/logout.png
index 0ee7e1b14cd38dd869f46ebefdca8f293c6bb9d6..74dcd33bee7b1bd0d502068f570e300fa0f4d9ce 100644
Binary files a/img/layout/logout.png and b/img/layout/logout.png differ
diff --git a/img/layout/settings.png b/img/layout/settings.png
index 8821c353e5d38e23e1f32a29dc0e62369dc0c148..ff650ecb0b0eaa766a055ec8d5f31648539177d6 100644
Binary files a/img/layout/settings.png and b/img/layout/settings.png differ
diff --git a/templates/layout.admin.php b/templates/layout.admin.php
index e20b7e48ece8a4cf1dcce74de246048614f16ded..9f5a17560598e9d50dcae81585a123a335569681 100644
--- a/templates/layout.admin.php
+++ b/templates/layout.admin.php
@@ -17,10 +17,9 @@
<a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img src="<?php echo image_path('', 'owncloud-logo-small-white.png'); ?>" alt="ownCloud" /></a>
<ul id="metanav">
- <li><a href="<?php echo link_to('', 'index.php'); ?>" title=""><img src="<?php echo image_path('', 'layout/back.png'); ?>"></a></li>
- <li><a href="<?php echo link_to('settings', 'index.php'); ?>" title=""><img src="<?php echo image_path('', 'layout/settings.png'); ?>"></a></li>
- <li><a href="<?php echo link_to('help', 'index.php'); ?>" title=""><img src="<?php echo image_path('', 'layout/help.png'); ?>"></a></li>
- <li><a href="<?php echo link_to('', 'index.php?logout=true'); ?>" title=""><img src="<?php echo image_path('', 'layout/logout.png'); ?>"></a></li>
+ <li><a href="<?php echo link_to('', 'index.php'); ?>" title="Back"><img src="<?php echo image_path('', 'layout/back.png'); ?>"></a></li>
+ <li><a href="<?php echo link_to('settings', 'index.php'); ?>" title="Settings"><img src="<?php echo image_path('', 'layout/settings.png'); ?>"></a></li>
+ <li><a href="<?php echo link_to('', 'index.php?logout=true'); ?>" title="Log out"><img src="<?php echo image_path('', 'layout/logout.png'); ?>"></a></li>
</ul>
</div>
diff --git a/templates/layout.user.php b/templates/layout.user.php
index 1ab2d01d9ddab2d09b42996422d0beca69921423..b03fca930820fa0cdb9ecd750ba79979cf161bc3 100644
--- a/templates/layout.user.php
+++ b/templates/layout.user.php
@@ -17,12 +17,8 @@
<a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img src="<?php echo image_path('', 'owncloud-logo-small-white.png'); ?>" alt="ownCloud" /></a>
<ul id="metanav">
- <?php if( OC_APP::getActiveNavigationEntry() == "help" ): ?>
- <li><a href="<?php echo link_to('', 'index.php'); ?>" title=""><img src="<?php echo image_path('', 'layout/back.png'); ?>"></a></li>
- <?php endif; ?>
- <li><a href="<?php echo link_to('settings', 'index.php'); ?>" title=""><img src="<?php echo image_path('', 'layout/settings.png'); ?>"></a></li>
- <li><a href="<?php echo link_to('help', 'index.php'); ?>" title=""><img src="<?php echo image_path('', 'layout/help.png'); ?>"></a></li>
- <li><a href="<?php echo link_to('', 'index.php'); ?>?logout=true" title=""><img src="<?php echo image_path('', 'layout/logout.png'); ?>"></a></li>
+ <li><a href="<?php echo link_to('settings', 'index.php'); ?>" title="Settings"><img src="<?php echo image_path('', 'layout/settings.png'); ?>"></a></li>
+ <li><a href="<?php echo link_to('', 'index.php'); ?>?logout=true" title="Log out"><img src="<?php echo image_path('', 'layout/logout.png'); ?>"></a></li>
</ul>
</div>