diff --git a/phpgwapi/templates/jerryr/head.inc.php b/phpgwapi/templates/jerryr/head.inc.php
index 6b8311fe96..ba85aafacd 100644
--- a/phpgwapi/templates/jerryr/head.inc.php
+++ b/phpgwapi/templates/jerryr/head.inc.php
@@ -41,7 +41,7 @@
 	//pngfix defaults to yes
 	if(!$GLOBALS['phpgw_info']['user']['preferences']['common']['disable_pngfix'])
 	{
-		$pngfix_src = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/idots/js/pngfix.js';
+		$pngfix_src = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/jerryr/js/pngfix.js';
 		$pngfix ='<!-- This solves the Internet Explorer PNG-transparency bug, but only for IE 5.5 and higher --> 
 		<!--[if gte IE 5.5000]>
 		<script src="'.$pngfix_src.'" type="text/javascript">
@@ -51,13 +51,13 @@
 
 	if(!$GLOBALS['phpgw_info']['user']['preferences']['common']['disable_slider_effects'])
 	{
-		$slider_effects_src = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/idots/js/slidereffects.js';
+		$slider_effects_src = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/jerryr/js/slidereffects.js';
 		$slider_effects = '<script src="'.$slider_effects_src.'" type="text/javascript">
 		</script>';
 	}
 	else
 	{
-		$simple_show_hide_src = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/idots/js/simple_show_hide.js';
+		$simple_show_hide_src = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/jerryr/js/simple_show_hide.js';
 		$simple_show_hide = '<script src="'.$simple_show_hide_src.'" type="text/javascript">
 		</script>';
 	}
diff --git a/phpgwapi/templates/jerryr/navbar.inc.php b/phpgwapi/templates/jerryr/navbar.inc.php
index c819b63a75..b86ec5cbb1 100644
--- a/phpgwapi/templates/jerryr/navbar.inc.php
+++ b/phpgwapi/templates/jerryr/navbar.inc.php
@@ -13,25 +13,25 @@
 
 	function parse_navbar($force = False)
 	{
-		$GLOBALS['idots_tpl'] = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
+		$GLOBALS['jerryr_tpl'] = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
 
-		$GLOBALS['idots_tpl']->set_file(
+		$GLOBALS['jerryr_tpl']->set_file(
 			array(
 				'navbar' => 'navbar.tpl'
 			)
 		);
 
-		$GLOBALS['idots_tpl']->set_block('navbar','navbar_header','navbar_header');
-		$GLOBALS['idots_tpl']->set_block('navbar','extra_blocks_header','extra_block_header');
-		$GLOBALS['idots_tpl']->set_block('navbar','extra_block_row','extra_block_row');
-		$GLOBALS['idots_tpl']->set_block('navbar','extra_block_spacer','extra_block_spacer');
-		$GLOBALS['idots_tpl']->set_block('navbar','extra_blocks_footer','extra_blocks_footer');
-		$GLOBALS['idots_tpl']->set_block('navbar','sidebox_hide_header','sidebox_hide_header');
-		$GLOBALS['idots_tpl']->set_block('navbar','sidebox_hide_footer','sidebox_hide_footer');
-		$GLOBALS['idots_tpl']->set_block('navbar','appbox','appbox');
-		$GLOBALS['idots_tpl']->set_block('navbar','navbar_footer','navbar_footer');
+		$GLOBALS['jerryr_tpl']->set_block('navbar','navbar_header','navbar_header');
+		$GLOBALS['jerryr_tpl']->set_block('navbar','extra_blocks_header','extra_block_header');
+		$GLOBALS['jerryr_tpl']->set_block('navbar','extra_block_row','extra_block_row');
+		$GLOBALS['jerryr_tpl']->set_block('navbar','extra_block_spacer','extra_block_spacer');
+		$GLOBALS['jerryr_tpl']->set_block('navbar','extra_blocks_footer','extra_blocks_footer');
+		$GLOBALS['jerryr_tpl']->set_block('navbar','sidebox_hide_header','sidebox_hide_header');
+		$GLOBALS['jerryr_tpl']->set_block('navbar','sidebox_hide_footer','sidebox_hide_footer');
+		$GLOBALS['jerryr_tpl']->set_block('navbar','appbox','appbox');
+		$GLOBALS['jerryr_tpl']->set_block('navbar','navbar_footer','navbar_footer');
 
-		$var['img_root'] = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/idots/images';
+		$var['img_root'] = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/jerryr/images';
 		$var['table_bg_color'] = $GLOBALS['phpgw_info']['theme']['navbar_bg'];
 
 		if($GLOBALS['phpgw_info']['user']['preferences']['common']['click_or_onmouseover']=='onmouseover')
@@ -63,7 +63,7 @@
 
 				if($i<$max_icons)
 				{
-					$app_icons .= '<td height="66" valign="bottom" align="center"><a href="' . $app_data['url'] . '"';
+					$app_icons .= '<td height="40" valign="bottom" align="center"><a href="' . $app_data['url'] . '"';
 					
 					if(isset($GLOBALS['phpgw_info']['flags']['navbar_target']) && $GLOBALS['phpgw_info']['flags']['navbar_target'])
 					{
@@ -183,8 +183,8 @@
 		$var['logo_url'] = $GLOBALS['phpgw_info']['server']['login_logo_url']?$GLOBALS['phpgw_info']['server']['login_logo_url']:'http://www.eGroupWare.org';
 		$var['logo_title'] = $GLOBALS['phpgw_info']['server']['login_logo_title']?$GLOBALS['phpgw_info']['server']['login_logo_title']:'www.eGroupWare.org';
 
-		$GLOBALS['idots_tpl']->set_var($var);
-		$GLOBALS['idots_tpl']->pfp('out','navbar_header');
+		$GLOBALS['jerryr_tpl']->set_var($var);
+		$GLOBALS['jerryr_tpl']->pfp('out','navbar_header');
 
 		/******************************************************\
 		* The sidebox menu's                                   *
@@ -208,18 +208,18 @@
 
 		if($GLOBALS['phpgw_info']['user']['preferences']['common']['auto_hide_sidebox']==1)
 		{
-			$GLOBALS['idots_tpl']->set_var('show_menu_event',$show_menu_event);
-			$GLOBALS['idots_tpl']->pparse('out','sidebox_hide_header');
+			$GLOBALS['jerryr_tpl']->set_var('show_menu_event',$show_menu_event);
+			$GLOBALS['jerryr_tpl']->pparse('out','sidebox_hide_header');
 
 			display_sidebox('',$menu_title,$file);
 			$GLOBALS['phpgw']->hooks->single('sidebox_menu',$GLOBALS['phpgw_info']['flags']['currentapp']);
 
-			$GLOBALS['idots_tpl']->pparse('out','sidebox_hide_footer');
+			$GLOBALS['jerryr_tpl']->pparse('out','sidebox_hide_footer');
 
 			$var['sideboxcolstart']='';
 
-			$GLOBALS['idots_tpl']->set_var($var);
-			$GLOBALS['idots_tpl']->pparse('out','appbox');
+			$GLOBALS['jerryr_tpl']->set_var($var);
+			$GLOBALS['jerryr_tpl']->pparse('out','appbox');
 			$var['remove_padding'] = 'style="padding-left:0px;"';
 			$var['sideboxcolend'] = '';
 		}
@@ -228,8 +228,8 @@
 			$var['menu_link'] = '';
 			$var['sideboxcolstart'] = '<td id="tdSidebox" valign="top">';
 			$var['remove_padding'] = '';
-			$GLOBALS['idots_tpl']->set_var($var);
-			$GLOBALS['idots_tpl']->pparse('out','appbox');
+			$GLOBALS['jerryr_tpl']->set_var($var);
+			$GLOBALS['jerryr_tpl']->pparse('out','appbox');
 
 			display_sidebox('',$menu_title,$file);
 			$GLOBALS['phpgw']->hooks->single('sidebox_menu',$GLOBALS['phpgw_info']['flags']['currentapp']);
@@ -237,8 +237,8 @@
 			$var['sideboxcolend'] = '</td>';
 		}
 
-		$GLOBALS['idots_tpl']->set_var($var);
-		$GLOBALS['idots_tpl']->pparse('out','navbar_footer');
+		$GLOBALS['jerryr_tpl']->set_var($var);
+		$GLOBALS['jerryr_tpl']->pparse('out','navbar_footer');
 
 		// If the application has a header include, we now include it
 		if(!@$GLOBALS['phpgw_info']['flags']['noappheader'] && @isset($_GET['menuaction']))
@@ -258,15 +258,15 @@
 		if(!$appname || ($appname==$GLOBALS['phpgw_info']['flags']['currentapp'] && $file))
 		{
 			$var['lang_title']=$menu_title;//$appname.' '.lang('Menu');
-			$GLOBALS['idots_tpl']->set_var($var);
-			$GLOBALS['idots_tpl']->pfp('out','extra_blocks_header');
+			$GLOBALS['jerryr_tpl']->set_var($var);
+			$GLOBALS['jerryr_tpl']->pfp('out','extra_blocks_header');
 
 			foreach($file as $text => $url)
 			{
 				sidebox_menu_item($url,$text);
 			}
 
-			$GLOBALS['idots_tpl']->pparse('out','extra_blocks_footer');
+			$GLOBALS['jerryr_tpl']->pparse('out','extra_blocks_footer');
 		}
 	}
 
@@ -274,11 +274,11 @@
 	{
 		if($item_text === '_NewLine_' || $item_link === '_NewLine_')
 		{
-			$GLOBALS['idots_tpl']->pparse('out','extra_block_spacer');
+			$GLOBALS['jerryr_tpl']->pparse('out','extra_block_spacer');
 		}
 		else
 		{
-			$var['icon_or_star']='<img src="'.$GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/idots/images'.'/orange-ball.png" width="9" height="9" alt="ball"/>';
+			$var['icon_or_star']='<img src="'.$GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/jerryr/images'.'/menu_icon.png" width="9" height="9" alt="Menu Icon"/>';
 			$var['target'] = '';
 			if(is_array($item_link))
 			{
@@ -299,22 +299,22 @@
 				$var['lang_item'] = lang($item_text);
 				$var['item_link'] = $item_link;
 			}
-			$GLOBALS['idots_tpl']->set_var($var);
-			$GLOBALS['idots_tpl']->pparse('out','extra_block_row');
+			$GLOBALS['jerryr_tpl']->set_var($var);
+			$GLOBALS['jerryr_tpl']->pparse('out','extra_block_row');
 		}
 	}
 
 	function parse_navbar_end()
 	{
-		$GLOBALS['idots_tpl'] = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
+		$GLOBALS['jerryr_tpl'] = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
 
-		$GLOBALS['idots_tpl']->set_file(
+		$GLOBALS['jerryr_tpl']->set_file(
 			array(
 				'footer' => 'footer.tpl'
 			)
 		);
 		$var = Array(
-			'img_root'       => $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/idots/images',
+			'img_root'       => $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/jerryr/images',
 			'table_bg_color' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
 			'version'        => $GLOBALS['phpgw_info']['server']['versions']['phpgwapi']
 		);
@@ -332,6 +332,6 @@
 		}
 
 		$var['powered_by'] = lang('Powered by phpGroupWare version %1',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
-		$GLOBALS['idots_tpl']->set_var($var);
-		$GLOBALS['idots_tpl']->pfp('out','footer');
+		$GLOBALS['jerryr_tpl']->set_var($var);
+		$GLOBALS['jerryr_tpl']->pfp('out','footer');
 	}
diff --git a/phpgwapi/templates/jerryr/navbar.tpl b/phpgwapi/templates/jerryr/navbar.tpl
index 3f1fc08656..456edb533f 100644
--- a/phpgwapi/templates/jerryr/navbar.tpl
+++ b/phpgwapi/templates/jerryr/navbar.tpl
@@ -8,7 +8,7 @@
 	<div id="divAppIconBar">
 		<table width="100%" border="0" cellspacing="0" cellpadding="0">
 			<tr>
-				<td width="180" valign="top" align="left"><img src="{img_root}/grey-pixel.png" width="1" height="68" alt="spacer" /></td>
+				<td width="180" valign="top" align="left"><img src="{img_root}/grey-pixel.png" width="1" height="40" alt="spacer" /></td>
 				<td>
 					<table width="100%" border="0" cellspacing="0" cellpadding="0">
 						<tr>
@@ -23,7 +23,7 @@
 
 				{app_extra_icons_icon}
 	
-				<td width="1" valign="top" align="right"><img src="{img_root}/grey-pixel.png" width="1" height="68" alt="spacer" /></td>
+				<td width="1" valign="top" align="right"><img src="{img_root}/grey-pixel.png" width="1" height="40" alt="spacer" /></td>
 			</tr>
 		</table>
 	</div>
@@ -47,10 +47,10 @@
 <!-- BEGIN sidebox_hide_header -->
 	<!--<script language="javascript" src="SlideOut.js"></script>-->
 	<script language="javascript">
-		new ypSlideOutMenu("menu2", "right", 0, 165, 160, 200)
+		new ypSlideOutMenu("menu2", "right", 0, 60, 160, 200)
 	</script>
 
-	<div id="sideboxdragarea" style="position:absolute;left:0px;top:175px">
+	<div id="sideboxdragarea" style="position:absolute;left:0px;top:70px">
 	<a href="#" {show_menu_event}="ypSlideOutMenu.showMenu('menu2')" onmouseover="//ypSlideOutMenu.showMenu('menu2')" title="{lang_show_menu}"><img src="{img_root}/dragarea_right.png" /></a>
 	</div>
 
diff --git a/phpgwapi/templates/jerryr/navbar_app.tpl b/phpgwapi/templates/jerryr/navbar_app.tpl
index d6169e4fa7..41c22d8359 100755
--- a/phpgwapi/templates/jerryr/navbar_app.tpl
+++ b/phpgwapi/templates/jerryr/navbar_app.tpl
@@ -1,3 +1,3 @@
-<!--	<TD width="10%" align=center><img src="{img_root}/admin.jpg" width="60" height="62"></TD>-->
+<!--	<TD width="10%" align=center><img src="{img_root}/admin.jpg" width="60" height="46"></TD>-->
 
 <!--<td align="center" width="{width}">{value}</td>-->