diff --git a/addressbook/inc/hook_admin.inc.php b/addressbook/inc/hook_admin.inc.php
index 588bb3841a..b9a7fdce96 100644
--- a/addressbook/inc/hook_admin.inc.php
+++ b/addressbook/inc/hook_admin.inc.php
@@ -20,6 +20,6 @@
 			'Global Categories'  => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname=' . $appname . '&global_cats=True')
 		);
 //Do not modify below this line
-		display_section($appname,$appname,$file);
+		display_section($appname,$file);
 	}
 ?>
diff --git a/admin/inc/hook_admin.inc.php b/admin/inc/hook_admin.inc.php
index 95a4e9c055..4bf753b3ba 100644
--- a/admin/inc/hook_admin.inc.php
+++ b/admin/inc/hook_admin.inc.php
@@ -72,5 +72,5 @@
 	}
  
 	/* Do not modify below this line */
-	display_section('admin','admin',$file);
+	display_section('admin',$file);
 ?>
diff --git a/admin/index.php b/admin/index.php
index 8946c6a3f7..45b9d71b2f 100755
--- a/admin/index.php
+++ b/admin/index.php
@@ -34,10 +34,10 @@
 	$GLOBALS['admin_tpl']->set_var('title',lang('Administration'));
 
 	// This func called by the includes to dump a row header
-	function section_start($name='',$icon='',$appname='')
+	function section_start($appname='',$icon='')
 	{
-		$GLOBALS['admin_tpl']->set_var('app_name',lang($name));
-		$GLOBALS['admin_tpl']->set_var('a_name',$appname);
+		$GLOBALS['admin_tpl']->set_var('app_title',lang($appname));
+		$GLOBALS['admin_tpl']->set_var('app_name',$appname);
 		$GLOBALS['admin_tpl']->set_var('app_icon',$icon);
 		if ($icon)
 		{
@@ -61,20 +61,12 @@
 		$GLOBALS['admin_tpl']->parse('rows','spacer_row',True);
 	}
 
-	function display_section($appname,$title,$file)
+	function display_section($appname,$file)
 	{
 		if(is_array($file))
 		{
-			section_start($title,
-				$GLOBALS['phpgw']->common->image(
-					$appname,
-					Array(
-						'navbar',
-						$appname,
-						'nonav'
-					)
-				),
-				$appname
+			section_start($appname,
+				$GLOBALS['phpgw']->common->image($appname,Array('navbar',$appname,'nonav'),'',True)
 			);
 
 			while(list($text,$url) = each($file))
@@ -86,7 +78,8 @@
 	}
 
 	$GLOBALS['phpgw']->hooks->process('admin');
-	$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array(
+	$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array
+	(
 		'body_data' => $GLOBALS['admin_tpl']->parse('out','list')
 	));
 ?>
diff --git a/admin/templates/default/index.tpl b/admin/templates/default/index.tpl
index e5bd231b27..ddec4f9489 100755
--- a/admin/templates/default/index.tpl
+++ b/admin/templates/default/index.tpl
@@ -26,14 +26,14 @@
 
 <!-- BEGIN app_row -->
  <tr class="row_off">
-  <td width="5%" valign="middle"><img src="{app_icon}" alt="[ {app_name} ]"> <a name="{a_name}"></a></td>
-  <td width="95%" valign="middle"><strong>&nbsp;&nbsp;{app_name}</strong></td>
+  <td width="5%" valign="middle"><img src="{app_icon}" alt="[ {app_title} ]"> <a name="{app_name}"></a></td>
+  <td width="95%" valign="middle"><b>&nbsp;&nbsp;{app_title}</b></td>
  </tr>
 <!-- END app_row -->
 
 <!-- BEGIN app_row_noicon -->
  <tr class="row_off">
-  <td colspan="2" width="95%" valign="middle"><strong>&nbsp;&nbsp;{app_name}</strong> <a name="{a_name}"></a></td>
+  <td colspan="2" width="95%" valign="middle"><b>&nbsp;&nbsp;{app_title}</b> <a name="{app_name}"></a></td>
  </tr>
 <!-- END app_row_noicon -->
 
diff --git a/calendar/inc/hook_admin.inc.php b/calendar/inc/hook_admin.inc.php
index 80287670b8..63d8ae5c00 100755
--- a/calendar/inc/hook_admin.inc.php
+++ b/calendar/inc/hook_admin.inc.php
@@ -21,6 +21,6 @@
 			'Global categories'				=> $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname=' . $appname . '&global_cats=True')
 		);
 //Do not modify below this line
-		display_section($appname,$appname,$file);
+		display_section($appname,$file);
 	}
 ?>
diff --git a/infolog/inc/hook_admin.inc.php b/infolog/inc/hook_admin.inc.php
index 18517a8670..ba6c1a184c 100644
--- a/infolog/inc/hook_admin.inc.php
+++ b/infolog/inc/hook_admin.inc.php
@@ -8,17 +8,17 @@
 	*  Free Software Foundation; either version 2 of the License, or (at your  *
 	*  option) any later version.                                              *
 	\**************************************************************************/
-
 	/* $Id$ */
-{
-// Only Modify the $file and $title variables.....
-	$title = $appname;
-	$file = Array(
-		'Site configuration' => $GLOBALS['phpgw']->link('/index.php',array('menuaction' => 'infolog.uiinfolog.admin' )),
-		'Global Categories'  => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname=' . $appname . '&global_cats=True'),
-		'CSV-Import' => $GLOBALS['phpgw']->link('/infolog/csv_import.php')
-	);
+
+	{
+		$file = Array
+		(
+			'Site configuration' => $GLOBALS['phpgw']->link('/index.php',array('menuaction' => 'infolog.uiinfolog.admin' )),
+			'Global Categories'  => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname=' . $appname . '&global_cats=True'),
+			'CSV-Import' => $GLOBALS['phpgw']->link('/infolog/csv_import.php')
+		);
+
 //Do not modify below this line
-	display_section($appname,$title,$file);
-}
+		display_section($appname,$file);
+	}
 ?>
\ No newline at end of file
diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php
index b57f169781..3218db1f1e 100644
--- a/phpgwapi/inc/class.common.inc.php
+++ b/phpgwapi/inc/class.common.inc.php
@@ -819,7 +819,7 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
 			}
 		}
 
-		function find_image($appname,$image)
+		function find_image($appname,$image,$navbar=False)
 		{
 			static $imgpref;
 			if(! @$imgpref)
@@ -839,34 +839,38 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
 			}
 			if (!@is_array($this->found_files[$appname]))
 			{
-				$imagedir_olddefault = '/'.$appname.'/images';
-				$imagedir_default    = '/'.$appname.'/templates/default/images';
 				$imagedir = '/'.$appname.'/templates/'.$GLOBALS['phpgw_info']['server']['template_set'].'/images';
 
-				if (@is_dir(PHPGW_INCLUDE_ROOT.$imagedir_olddefault))
+				if (!$navbar)
 				{
-					$d = dir(PHPGW_INCLUDE_ROOT.$imagedir_olddefault);
-					while (false != ($entry = $d->read()))
-					{
-						if ($entry != '.' && $entry != '..')
-						{
-							$this->found_files[$appname][$entry] = $imagedir_olddefault;
-						}
-					}
-					$d->close();
-				}
+					$imagedir_olddefault = '/'.$appname.'/images';
+					$imagedir_default    = '/'.$appname.'/templates/default/images';
 
-				if (@is_dir(PHPGW_INCLUDE_ROOT.$imagedir_default))
-				{
-					$d = dir(PHPGW_INCLUDE_ROOT.$imagedir_default);
-					while (false != ($entry = $d->read()))
+					if (@is_dir(PHPGW_INCLUDE_ROOT.$imagedir_olddefault))
 					{
-						if ($entry != '.' && $entry != '..')
+						$d = dir(PHPGW_INCLUDE_ROOT.$imagedir_olddefault);
+						while (false != ($entry = $d->read()))
 						{
-							$this->found_files[$appname][$entry] = $imagedir_default;
+							if ($entry != '.' && $entry != '..')
+							{
+								$this->found_files[$appname][$entry] = $imagedir_olddefault;
+							}
 						}
+						$d->close();
+					}
+
+					if (@is_dir(PHPGW_INCLUDE_ROOT.$imagedir_default))
+					{
+						$d = dir(PHPGW_INCLUDE_ROOT.$imagedir_default);
+						while (false != ($entry = $d->read()))
+						{
+							if ($entry != '.' && $entry != '..')
+							{
+								$this->found_files[$appname][$entry] = $imagedir_default;
+							}
+						}
+						$d->close();
 					}
-					$d->close();
 				}
 
 				if (@is_dir(PHPGW_INCLUDE_ROOT.$imagedir))
@@ -922,7 +926,7 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
 			return $imgfile;
 		}
 
-		function image($appname,$image='',$ext='',$use_lang=True)
+		function image($appname,$image='',$ext='',$navbar=False,$use_lang=True)
 		{
 			if (!is_array($image))
 			{
@@ -949,16 +953,16 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
 				}
 				else
 				{
-					$image_found = $this->find_image($appname,$img.$ext);
+					$image_found = $this->find_image($appname,$img.$ext,$navbar);
 				}
 			}
 			return $image_found;
 		}
 
-		function image_on($appname,$image,$extension='_on')
+		function image_on($appname,$image,$extension='_on',$navbar=False)
 		{
-			$with_extension = $this->image($appname,$image,$extension);
-			$without_extension = $this->image($appname,$image);
+			$with_extension = $this->image($appname,$image,$extension,$navbar);
+			$without_extension = $this->image($appname,$image,'',$navbar);
 			if($with_extension != '')
 			{
 				return $with_extension;
@@ -1301,6 +1305,15 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
 			unset($value);
 			unset($newarray);
 
+			if ($GLOBALS['phpgw_info']['server']['template_set'] == 'idsociety')
+			{
+				$navbar = True;
+			}
+			else
+			{
+				$navbar = False;
+			}
+
 			while (list($app,$data) = each($GLOBALS['phpgw_info']['user']['apps']))
 			{
 				if (is_long($app))
@@ -1311,18 +1324,18 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
 				if ($GLOBALS['phpgw_info']['apps'][$app]['status'] != 2 && $GLOBALS['phpgw_info']['apps'][$app]['status'] != 3)
 				{
 					$GLOBALS['phpgw_info']['navbar'][$app]['title']	= lang($data['title']);
-					$GLOBALS['phpgw_info']['navbar'][$app]['url']		= $GLOBALS['phpgw']->link('/' . $app . '/index.php');
+					$GLOBALS['phpgw_info']['navbar'][$app]['url']	= $GLOBALS['phpgw']->link('/' . $app . '/index.php');
 					$GLOBALS['phpgw_info']['navbar'][$app]['name']	= $app;
 
 					if ($app != $GLOBALS['phpgw_info']['flags']['currentapp'])
 					{
-						$GLOBALS['phpgw_info']['navbar'][$app]['icon']		= $this->image($app,Array('navbar','nonav'));
-						$GLOBALS['phpgw_info']['navbar'][$app]['icon_hover']	= $this->image_on($app,Array('navbar','nonav'),'-over');
+						$GLOBALS['phpgw_info']['navbar'][$app]['icon']			= $this->image($app,Array('navbar','nonav'),'',$navbar);
+						$GLOBALS['phpgw_info']['navbar'][$app]['icon_hover']	= $this->image_on($app,Array('navbar','nonav'),'-over',$navbar);
 					}
 					else
 					{
-						$GLOBALS['phpgw_info']['navbar'][$app]['icon']		= $this->image_on($app,Array('navbar','nonav'),'-over');
-						$GLOBALS['phpgw_info']['navbar'][$app]['icon_hover']	= $this->image($app,Array('navbar','nonav'));
+						$GLOBALS['phpgw_info']['navbar'][$app]['icon']			= $this->image_on($app,Array('navbar','nonav'),'-over',$navbar);
+						$GLOBALS['phpgw_info']['navbar'][$app]['icon_hover']	= $this->image($app,Array('navbar','nonav'),'',$navbar);
 					}
 				}
 			}
diff --git a/phpgwapi/templates/idsociety/css/phpgw.css b/phpgwapi/templates/idsociety/css/phpgw.css
index b93da08434..2b29ce80b4 100644
--- a/phpgwapi/templates/idsociety/css/phpgw.css
+++ b/phpgwapi/templates/idsociety/css/phpgw.css
@@ -60,6 +60,7 @@ a.th,a.th_text
 td.left
 {
 	background: url(../images/nav_bar_left_spacer.png);
+	height: 22;
 }
 
 .bottom