diff --git a/phpgwapi/templates/idots/css/idots.css b/phpgwapi/templates/idots/css/idots.css
index f87aabfc98..06c1225102 100755
--- a/phpgwapi/templates/idots/css/idots.css
+++ b/phpgwapi/templates/idots/css/idots.css
@@ -21,7 +21,7 @@ body
 	background-image:url(../images/body-background.png);
 	font-size: 11px; 
 	font-family: Verdana, Arial, Helvetica, sans-serif;
-	padding:14px;
+	padding:3px;
 }
 
 img
@@ -221,7 +221,7 @@ a.textSidebox
 {
 	position:absolute;
 	left:20px;
-	top:14px;
+	top:5px;
 	z-index:51;
 }
 
diff --git a/phpgwapi/templates/idots/hook_settings.inc.php b/phpgwapi/templates/idots/hook_settings.inc.php
index 974c36f1fb..3c4059c08a 100644
--- a/phpgwapi/templates/idots/hook_settings.inc.php
+++ b/phpgwapi/templates/idots/hook_settings.inc.php
@@ -12,6 +12,18 @@
 	/* $Id$ */
 	create_section('Preferences for the idots template set');
 
+	$start_and_logout_icons = array(
+		'yes'       => lang('yes'),
+		'no' => lang('no')
+	);
+
+	create_select_box(
+		'Show home and logout button in main application bar?',
+		'start_and_logout_icons',
+		$start_and_logout_icons,
+		'When you say yes the home and logout buttons are presented as applications in the main top applcation bar.'
+	);
+
 	create_input_box(
 		'Max number of icons in navbar',
 		'max_icons',
diff --git a/phpgwapi/templates/idots/navbar.inc.php b/phpgwapi/templates/idots/navbar.inc.php
index 1f8fac9e7b..8ab051ff88 100644
--- a/phpgwapi/templates/idots/navbar.inc.php
+++ b/phpgwapi/templates/idots/navbar.inc.php
@@ -63,8 +63,18 @@
 				$icon = '<img src="' . $app_data['icon'] . '" alt="' . $title . '" title="'. $title . '" border="0" />';
 
 // 020204 ndee
-				if($app == 'home') $title = "Home";
+				if($app == 'home') $title = lang('Home');
 
+				if($app=='home')
+				{
+					if($GLOBALS['phpgw_info']['user']['preferences']['common']['start_and_logout_icons']=='no')
+					{
+						continue;
+					}
+				}
+
+
+				
 				if($i<$max_icons)
 				{
 					$app_icons .= '<td height="66" valign="bottom" align="center"><a href="' . $app_data['url'] . '"';
@@ -132,9 +142,12 @@
 				}
 			}
 
-			$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_titles .= '<td align=center valign="top" class="appTitles"><a href="'.$GLOBALS['phpgw_info']['navbar']['logout']['url'].'">'.$GLOBALS['phpgw_info']['navbar']['logout']['title'].'</a></td>';
+			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_titles .= '<td align=center valign="top" class="appTitles"><a href="'.$GLOBALS['phpgw_info']['navbar']['logout']['url'].'">'.$GLOBALS['phpgw_info']['navbar']['logout']['title'].'</a></td>';
 
+			}
 //			$var['app_icons'] = $app_icons;
 		if($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format']!='text')
 		{