diff --git a/admin/inc/hook_manual.inc.php b/admin/inc/hook_manual.inc.php
index b88784272b..7208da11cd 100755
--- a/admin/inc/hook_manual.inc.php
+++ b/admin/inc/hook_manual.inc.php
@@ -16,9 +16,13 @@
 		global $phpgw, $phpgw_info, $treemenu;
 	}
 
-	$treemenu[] = '..<img src="'.$phpgw->common->image($appname,'navbar.gif').'" border="0" alt="'.ucwords($appname).'">'.ucwords($appname).'|'.$phpgw->link('/'.$appname.'/help/'.$appname.'.php')."\n";
+	$font = $phpgw_info['theme']['font'];
+	$navbar = $phpgw_info['user']['preferences']['common']['navbar_format'];
+
+	$treemenu[] = '..'.($navbar != 'text'?'<img src="'.$phpgw->common->image($appname,'navbar.gif').'" border="0" alt="'.ucwords($appname).'">':'').($navbar != 'icons'?'<font face="'.$font.'">'.ucwords($appname).'</font>':'').'|'.$phpgw->link('/'.$appname.'/help/index.php');
+	$treemenu[] = '...<font face="'.$font.'">Overview</font>|'.$phpgw->link('/'.$appname.'/help/'.$appname.'.php');
 // Modify the $treemenu variables from here down.....
-	$treemenu[] = '...<font face="'.$phpgw_info['theme']['font'].'">Account Management</font>|'.$phpgw->link('/'.$appname.'/help/account.php')."\n";
-	$treemenu[] = '...<font face="'.$phpgw_info['theme']['font'].'">Session Management</font>|'.$phpgw->link('/'.$appname.'/help/session.php')."\n";
-	$treemenu[] = '...<font face="'.$phpgw_info['theme']['font'].'">Other</font>|'.$phpgw->link('/'.$appname.'/help/other.php')."\n";
+	$treemenu[] = '...<font face="'.$font.'">Account Management</font>|'.$phpgw->link('/'.$appname.'/help/account.php');
+	$treemenu[] = '...<font face="'.$font.'">Session Management</font>|'.$phpgw->link('/'.$appname.'/help/session.php');
+	$treemenu[] = '...<font face="'.$font.'">Other</font>|'.$phpgw->link('/'.$appname.'/help/other.php');
 ?>
diff --git a/preferences/inc/hook_manual.inc.php b/preferences/inc/hook_manual.inc.php
index 4f43d90ae1..75a18a3df6 100755
--- a/preferences/inc/hook_manual.inc.php
+++ b/preferences/inc/hook_manual.inc.php
@@ -16,8 +16,12 @@
 		global $phpgw, $phpgw_info, $treemenu;
 	}
 
-	$treemenu[] = '..<img src="'.$phpgw->common->image($appname,'navbar.gif').'" border="0" alt="'.ucwords($appname).'">'.ucwords($appname).'|/'.$appname.'/help/'.$appname.'.php'."\n";
+	$font = $phpgw_info['theme']['font'];
+	$navbar = $phpgw_info['user']['preferences']['common']['navbar_format'];
+
+	$treemenu[] = '..'.($navbar != 'text'?'<img src="'.$phpgw->common->image($appname,'navbar.gif').'" border="0" alt="'.ucwords($appname).'">':'').($navbar != 'icons'?'<font face="'.$font.'">'.ucwords($appname).'</font>':'').'|'.$phpgw->link('/'.$appname.'/help/index.php');
+	$treemenu[] = '...<font face="'.$font.'">Overview</font>|'.$phpgw->link('/'.$appname.'/help/'.$appname.'.php');
 // Modify the $treemenu variables from here down.....
-	$treemenu[] = '...<font face="'.$phpgw_info['theme']['font'].'">Settings</font>|/'.$appname.'/help/settings.php'."\n";
+	$treemenu[] = '...<font face="'.$font.'">Settings</font>|/'.$appname.'/help/settings.php'."\n";
 	$treemenu[] = '...<font face="'.$phpgw_info['theme']['font'].'">Other</font>|/'.$appname.'/help/other.php'."\n";
 ?>