diff --git a/phpgwapi/templates/idots/navbar.inc.php b/phpgwapi/templates/idots/navbar.inc.php
index 8ab051ff88..f25504ae0d 100644
--- a/phpgwapi/templates/idots/navbar.inc.php
+++ b/phpgwapi/templates/idots/navbar.inc.php
@@ -73,11 +73,18 @@
 					}
 				}
 
-
-				
 				if($i<$max_icons)
 				{
-					$app_icons .= '<td height="66" valign="bottom" align="center"><a href="' . $app_data['url'] . '"';
+					if($GLOBALS['phpgw_info']['user']['preferences']['common']['start_and_logout_icons']=='no')
+					{
+						$tdwidth = 100/($max_icons);
+					}
+					else
+					{
+						$tdwidth = 100/($max_icons+2);
+					}
+
+					$app_icons .= '<td width="'.$tdwidth.'%" height="66" valign="bottom" align="center"><a href="' . $app_data['url'] . '"';
 
 					if(isset($GLOBALS['phpgw_info']['flags']['navbar_target']) && $GLOBALS['phpgw_info']['flags']['navbar_target'])
 					{
@@ -144,7 +151,8 @@
 
 			if($GLOBALS['phpgw_info']['user']['preferences']['common']['start_and_logout_icons']!='no')
 			{
-				$app_icons .= '<td height="32" valign="bottom" align="center"><a href="'.$GLOBALS['phpgw_info']['navbar']['logout']['url'].'"><img src="'.$GLOBALS['phpgw_info']['navbar']['logout']['icon'].'"></a></td>';
+				$app_icons .= '<td width="'.$tdwidth.'%"height="32" valign="bottom" align="center"><a 
+href="'.$GLOBALS['phpgw_info']['navbar']['logout']['url'].'"><img src="'.$GLOBALS['phpgw_info']['navbar']['logout']['icon'].'"></a></td>';
 				$app_titles .= '<td align=center valign="top" class="appTitles"><a href="'.$GLOBALS['phpgw_info']['navbar']['logout']['url'].'">'.$GLOBALS['phpgw_info']['navbar']['logout']['title'].'</a></td>';
 
 			}