diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php
index 87efd7a7b9..b459ff2fd3 100644
--- a/phpgwapi/inc/class.common.inc.php
+++ b/phpgwapi/inc/class.common.inc.php
@@ -743,7 +743,14 @@ class common
 	 */
 	static function find_image($appname,$image)
 	{
-		$imagedir = '/'.$appname.'/templates/'.$GLOBALS['egw_info']['user']['preferences']['common']['template_set'].'/images';
+		if ($appname != 'phpgwapi')
+		{
+			$imagedir = $GLOBALS['egw']->framework->template_dir.'/images';
+		}
+		else
+		{
+			$imagedir = '/'.$appname.'/templates/'.$GLOBALS['egw_info']['user']['preferences']['common']['template_set'].'/images';
+		}
 		$vfs_imagedir = $GLOBALS['egw_info']['server']['vfs_image_dir'];
 
 		if (!isset(self::$found_files[$appname]))