diff --git a/phpgwapi/templates/default/head.inc.php b/phpgwapi/templates/default/head.inc.php
index a696ba4a25..03efca34c1 100644
--- a/phpgwapi/templates/default/head.inc.php
+++ b/phpgwapi/templates/default/head.inc.php
@@ -32,8 +32,8 @@
 	$tpl->set_file(array('head' => 'head.tpl'));
 
 	$var = Array (
-		'img_icon'      => PHPGW_IMAGES . '/favicon.ico',
-		'img_shortcut'  => PHPGW_IMAGES . '/favicon.ico',
+		'img_icon'      => PHPGW_IMAGES_DIR . '/favicon.ico',
+		'img_shortcut'  => PHPGW_IMAGES_DIR . '/favicon.ico',
 		'charset'       => lang('charset'),
 		'font_family'   => $GLOBALS['phpgw_info']['theme']['font'],
 		'website_title' => $GLOBALS['phpgw_info']['server']['site_title'],
diff --git a/phpgwapi/templates/idsociety/head.inc.php b/phpgwapi/templates/idsociety/head.inc.php
index 2bc7e5f971..650fb589bb 100644
--- a/phpgwapi/templates/idsociety/head.inc.php
+++ b/phpgwapi/templates/idsociety/head.inc.php
@@ -42,8 +42,8 @@
 	$tpl->set_unknowns('remove');
 	$tpl->set_file(array('head' => 'head.tpl'));
 	$var = Array (
-		'img_icon'      => PHPGW_IMAGES . '/favicon.ico',
-		'img_shortcut'  => PHPGW_IMAGES . '/favicon.ico',
+		'img_icon'      => PHPGW_IMAGES_DIR . '/favicon.ico',
+		'img_shortcut'  => PHPGW_IMAGES_DIR . '/favicon.ico',
 		'charset'		=> lang('charset'),
 		'font_family'	=> $GLOBALS['phpgw_info']['theme']['font'],
 		'website_title'	=> $GLOBALS['phpgw_info']['server']['site_title'],
diff --git a/phpgwapi/templates/justweb/head.inc.php b/phpgwapi/templates/justweb/head.inc.php
index f526c88edd..80bd8047c8 100644
--- a/phpgwapi/templates/justweb/head.inc.php
+++ b/phpgwapi/templates/justweb/head.inc.php
@@ -31,15 +31,16 @@
 	$tpl->set_unknowns('remove');
 	$tpl->set_file(array('head' => 'head.tpl'));
 
-	$var = Array (
-		'img_icon'      => PHPGW_IMAGES . '/favicon.ico',
-		'img_shortcut'  => PHPGW_IMAGES . '/favicon.ico',
+	$var = Array
+	(
+		'img_icon'      => PHPGW_IMAGES_DIR . '/favicon.ico',
+		'img_shortcut'  => PHPGW_IMAGES_DIR . '/favicon.ico',
 		'webserver_url'	=> $GLOBALS['phpgw_info']['server']['webserver_url'],
-		'home'		=> $GLOBALS['phpgw']->link('/index.php'),
-		'appt'		=> $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'calendar.uicalendar.day')),
-		'todo'		=> $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'todo.uitodo.add')),
-		'prefs'		=> $GLOBALS['phpgw']->link('/preferences/index.php'),
-		'email'		=> $GLOBALS['phpgw']->link('/email/preferences.php'),
+		'home'			=> $GLOBALS['phpgw']->link('/index.php'),
+		'appt'			=> $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'calendar.uicalendar.day')),
+		'todo'			=> $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'todo.uitodo.add')),
+		'prefs'			=> $GLOBALS['phpgw']->link('/preferences/index.php'),
+		'email'			=> $GLOBALS['phpgw']->link('/email/preferences.php'),
 		'calendar'		=> $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'calender.uicalendar.preferences')),
 		'addressbook'	=> $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'addressbook.uiaddressbook.preferences')),
 		'charset'		=> lang('charset'),