diff --git a/phpgwapi/templates/edge-it/navbar.inc.php b/phpgwapi/templates/edge-it/navbar.inc.php
index e2b813dbee..f2d5d4de51 100644
--- a/phpgwapi/templates/edge-it/navbar.inc.php
+++ b/phpgwapi/templates/edge-it/navbar.inc.php
@@ -58,7 +58,6 @@
 
 		foreach($GLOBALS['phpgw_info']['navbar'] as $app => $app_data)
 		{
-			//if($app != 'home' && $app != 'preferences' && $app != 'about' && $app != 'logout')
 			if($app != 'preferences' && $app != 'about' && $app != 'logout')
 			{
 				$title = $GLOBALS['phpgw_info']['apps'][$app]['title'];
@@ -67,11 +66,8 @@
 
 				if($app=='home')
 				{
+					$title = lang('home');
 					$icon = '<img src="' . $app_data['icon'] . '" alt="' . lang('home') . '" title="' . lang('home') . '" border="0" />';
-					if($GLOBALS['phpgw_info']['user']['preferences']['common']['start_and_logout_icons']=='no')
-					{
-						continue;
-					}
 				}
 
 				if($i<$max_icons)
diff --git a/phpgwapi/templates/idots/navbar.inc.php b/phpgwapi/templates/idots/navbar.inc.php
index a25b17b3e6..1268e5aeff 100644
--- a/phpgwapi/templates/idots/navbar.inc.php
+++ b/phpgwapi/templates/idots/navbar.inc.php
@@ -58,7 +58,6 @@
 
 		foreach($GLOBALS['phpgw_info']['navbar'] as $app => $app_data)
 		{
-			//if($app != 'home' && $app != 'preferences' && $app != 'about' && $app != 'logout')
 			if($app != 'preferences' && $app != 'about' && $app != 'logout')
 			{
 				$title = $GLOBALS['phpgw_info']['apps'][$app]['title'];
@@ -67,11 +66,8 @@
 
 				if($app=='home')
 				{
+					$title = lang('home');
 					$icon = '<img src="' . $app_data['icon'] . '" alt="' . lang('home') . '" title="' . lang('home') . '" border="0" />';
-					if($GLOBALS['phpgw_info']['user']['preferences']['common']['start_and_logout_icons']=='no')
-					{
-						continue;
-					}
 				}
 
 				if($i<$max_icons)
diff --git a/phpgwapi/templates/jerryr/navbar.inc.php b/phpgwapi/templates/jerryr/navbar.inc.php
index 9c624020b5..ed443eee5a 100644
--- a/phpgwapi/templates/jerryr/navbar.inc.php
+++ b/phpgwapi/templates/jerryr/navbar.inc.php
@@ -56,22 +56,15 @@
 
 		foreach($GLOBALS['phpgw_info']['navbar'] as $app => $app_data)
 		{
-			//if($app != 'home' && $app != 'preferences' && $app != 'about' && $app != 'logout')
 			if($app != 'preferences' && $app != 'about' && $app != 'logout')
 			{
 				$title = $GLOBALS['phpgw_info']['apps'][$app]['title'];
 				$icon = '<img src="' . $app_data['icon'] . '" alt="' . $title . '" title="'. $title . '" border="0" />';
 
-// 300304 ndee
-				if($app == 'home') $title = lang('Home');
-
 				if($app=='home')
 				{
+					$title = lang('home');
 					$icon = '<img src="' . $app_data['icon'] . '" alt="' . lang('home') . '" title="' . lang('home') . '" border="0" />';
-					if($GLOBALS['phpgw_info']['user']['preferences']['common']['start_and_logout_icons']=='no')
-					{
-						continue;
-					}
 				}
 
 				if($i<$max_icons)