diff --git a/phpgwapi/templates/jerryr/class.jerryr_framework.inc.php b/phpgwapi/templates/jerryr/class.jerryr_framework.inc.php
index d9cf54d407..2605560831 100644
--- a/phpgwapi/templates/jerryr/class.jerryr_framework.inc.php
+++ b/phpgwapi/templates/jerryr/class.jerryr_framework.inc.php
@@ -49,8 +49,11 @@ class jerryr_framework extends idots_framework
                  {
                         $this->_add_topmenu_item('preferences');
                  }
-
-                 $this->_add_topmenu_item('about',lang('About %1',$GLOBALS['egw_info']['apps'][$GLOBALS['egw_info']['flags']['currentapp']]['title']));
+		if($GLOBALS['egw_info']['user']['apps']['manual'] && $this->apps['manual'])
+		{
+			$this->_add_topmenu_item('manual');
+		}
+                 //$this->_add_topmenu_item('about',lang('About %1',$GLOBALS['egw_info']['apps'][$GLOBALS['egw_info']['flags']['currentapp']]['title']));
                  $this->_add_topmenu_item('logout');
 
                  $this->tplsav2->assign('info_icons',$this->topmenu_icon_arr);
diff --git a/phpgwapi/templates/jerryr/navbar.tpl b/phpgwapi/templates/jerryr/navbar.tpl
index 19da99f963..44ef66823b 100644
--- a/phpgwapi/templates/jerryr/navbar.tpl
+++ b/phpgwapi/templates/jerryr/navbar.tpl
@@ -47,7 +47,7 @@
 					<table width="100%" border="0" cellspacing="0" cellpadding="0">
 						<tr>
 <!-- BEGIN app_icon_block -->
-							<td width="{tdwidth}%" align="center" class="iconBack" onmouseover="this.className='iconBackHover'" onmouseout="this.className='iconBack'" ><a href="{url}" {target}><img src="{icon}" alt="{title}" title="{title}" border="0" /></a></td>
+							<td width="{tdwidth}%" align="center" class="iconBack" onmouseover="this.className='iconBackHover'" onmouseout="this.className='iconBack'" onclick="location.href='{url}'"><img src="{icon}" alt="{title}" title="{title}" border="0" /></td>
 <!-- END app_icon_block -->
 <!-- BEGIN app_extra_icons_icon -->
 							<td width="26" valign="top" align="right" style="padding-right:3px; padding-top:20px;">