diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php
index d796af8f2e..4efa02ee86 100644
--- a/phpgwapi/inc/class.common.inc.php
+++ b/phpgwapi/inc/class.common.inc.php
@@ -816,15 +816,15 @@
 
 			if(isset($this->found_files[$appname]['images'][$image.'.png']))
 			{
-				$imgfile = $GLOBALS['phpgw_info']['server']['webserver_url'].$this->found_files[$appname]['images'][$image.'.png'].'/'.$image;
+				$imgfile = $GLOBALS['phpgw_info']['server']['webserver_url'].$this->found_files[$appname]['images'][$image.'.png'].'/'.$image.'.png';
 			}
 			elseif(isset($this->found_files[$appname]['images'][$image.'.jpg']))
 			{
-				$imgfile = $GLOBALS['phpgw_info']['server']['webserver_url'].$this->found_files[$appname]['images'][$image.'.jpg'].'/'.$image;
+				$imgfile = $GLOBALS['phpgw_info']['server']['webserver_url'].$this->found_files[$appname]['images'][$image.'.jpg'].'/'.$image.'.jpg';
 			}
 			elseif(isset($this->found_files[$appname]['images'][$image.'.gif']))
 			{
-				$imgfile = $GLOBALS['phpgw_info']['server']['webserver_url'].$this->found_files[$appname]['images'][$image.'.gif'].'/'.$image;
+				$imgfile = $GLOBALS['phpgw_info']['server']['webserver_url'].$this->found_files[$appname]['images'][$image.'.gif'].'/'.$image.'.gif';
 			}
 			elseif(isset($this->found_files[$appname]['images'][$image]))
 			{
@@ -846,28 +846,14 @@
 				$c_image = count($image);
 				while($image_found == '' && $i<$c_image)
 				{
-					if($this->found_files[$appname]['images'][$image[$i]])
-					{
-						$image_found = $GLOBALS['phpgw_info']['server']['webserver_url'].$this->found_files[$appname]['images'][$image[$i]].'/'.$image[$i];
-					}
-					else
-					{
-						$image_found = $this->find_image($appname,$image[$i]);
-					}
+					$image_found = $this->find_image($appname,$image[$i]);
 					$i++;
 				}
 				return $image_found;
 			}
 			elseif($image != '')
 			{
-				if($this->found_files[$appname]['images'][$image])
-				{
-					return $GLOBALS['phpgw_info']['server']['webserver_url'].$this->found_files[$appname]['images'][$image].'/'.$image;
-				}
-				else
-				{
-					return $this->find_image($appname,$image);
-				}
+				return $this->find_image($appname,$image);
 			}
 			else
 			{
@@ -917,17 +903,17 @@
 					$GLOBALS['phpgw_info']['navbar'][$permission[0]]['title'] = $GLOBALS['phpgw_info']['apps'][$permission[0]]['title'];
 					$GLOBALS['phpgw_info']['navbar'][$permission[0]]['url']   = $GLOBALS['phpgw']->link('/' . $permission[0] . '/index.php');
 					$GLOBALS['phpgw_info']['navbar'][$permission[0]]['name']  = $permission[0];
-/*
+
 					if ($permission[0] != $GLOBALS['phpgw_info']['flags']['currentapp'])
 					{
 						$GLOBALS['phpgw_info']['navbar'][$permission[0]]['icon']  = $this->image($permission[0],'navbar');
+						$GLOBALS['phpgw_info']['navbar'][$permission[0]]['icon_hover']  = $this->image_on($permission[0],'navbar','-over');
 					}
 					else
 					{
 						$GLOBALS['phpgw_info']['navbar'][$permission[0]]['icon']  = $this->image_on($permission[0],'navbar','-over');
+						$GLOBALS['phpgw_info']['navbar'][$permission[0]]['icon_hover']  = $this->image($permission[0],'navbar');
 					}
-*/
-					$GLOBALS['phpgw_info']['navbar'][$permission[0]]['icon']  = $this->image($permission[0],'navbar.gif');
 
 					if($GLOBALS['phpgw_info']['navbar'][$permission[0]]['icon'] == '')
 					{
@@ -1785,3 +1771,4 @@
 			}
 		}
 	}//end common class
+
diff --git a/phpgwapi/templates/idsociety/navbar.inc.php b/phpgwapi/templates/idsociety/navbar.inc.php
index 5e8980f0cb..4910301fa1 100644
--- a/phpgwapi/templates/idsociety/navbar.inc.php
+++ b/phpgwapi/templates/idsociety/navbar.inc.php
@@ -56,9 +56,8 @@
 			{
 				$title = '<img src="' . $app[1]['icon'] . '" alt="' . $app[1]['title'] . '" title="'
 					. lang($app[1]['title']) . '" border="0" name="' . $app[0] . '">';
-
-				$img_src_over = $GLOBALS['phpgw']->common->image($app[0],'navbar-over.gif');
-				$img_src_out = $GLOBALS['phpgw']->common->image($app[0],'navbar.gif');
+				$img_src_over = $app[1]['icon_hover'];
+				$img_src_out = $app[1]['icon'];
 
 				// onMouseOver="two.src='rollover/admin_over.gif'" onMouseOut="two.src='images/admin.gif'"><img src="images/admin.gif" border="0" name="two"
 				$applications .= '<tr><td><a href="' . $app[1]['url'] . '"';