diff --git a/calendar/inc/class.calendar_favorite_portlet.inc.php b/calendar/inc/class.calendar_favorite_portlet.inc.php
index 406310225a..8a7bbaaa79 100644
--- a/calendar/inc/class.calendar_favorite_portlet.inc.php
+++ b/calendar/inc/class.calendar_favorite_portlet.inc.php
@@ -55,7 +55,8 @@ class calendar_favorite_portlet extends home_favorite_portlet
 	{
 
 		// Always load app's css
-		egw_framework::includeCSS('calendar','app');
+		egw_framework::includeCSS('calendar', 'app-'.$GLOBALS['egw_info']['user']['preferences']['common']['theme']) ||
+			egw_framework::includeCSS('calendar','app');
 		
 		if($this->favorite['state']['view'] == 'listview' || is_array($this->favorite) && !$this->favorite['state']['view'])
 		{
diff --git a/home/inc/class.home_favorite_portlet.inc.php b/home/inc/class.home_favorite_portlet.inc.php
index d2d87fca70..34753076d5 100644
--- a/home/inc/class.home_favorite_portlet.inc.php
+++ b/home/inc/class.home_favorite_portlet.inc.php
@@ -121,7 +121,8 @@ class home_favorite_portlet extends home_portlet
 
 
 		// Always load app's css
-		egw_framework::includeCSS($this->context['appname'],'app');
+		egw_framework::includeCSS($this->context['appname'], 'app-'.$GLOBALS['egw_info']['user']['preferences']['common']['theme']) ||
+			egw_framework::includeCSS($this->context['appname'],'app');
 
 		// Always load app's javascript, so most actions have a chance of working
 		egw_framework::validate_file('','app',$this->context['appname']);
diff --git a/home/inc/class.home_link_portlet.inc.php b/home/inc/class.home_link_portlet.inc.php
index 66dcc6aa0f..c309252910 100644
--- a/home/inc/class.home_link_portlet.inc.php
+++ b/home/inc/class.home_link_portlet.inc.php
@@ -117,7 +117,8 @@ class home_link_portlet extends home_portlet
 		{
 
 			// Always load app's css
-			egw_framework::includeCSS($this->context['entry']['app'],'app');
+			egw_framework::includeCSS($this->context['entry']['app'], 'app-'.$GLOBALS['egw_info']['user']['preferences']['common']['theme']) ||
+				egw_framework::includeCSS($this->context['entry']['app'],'app');
 			
 			try
 			{
diff --git a/phpgwapi/inc/class.egw_framework.inc.php b/phpgwapi/inc/class.egw_framework.inc.php
index c01886263d..16d9cf33ad 100644
--- a/phpgwapi/inc/class.egw_framework.inc.php
+++ b/phpgwapi/inc/class.egw_framework.inc.php
@@ -2276,7 +2276,8 @@ abstract class egw_framework
 		$app = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		// try to add app specific css file
-		self::includeCSS($app,'app');
+		self::includeCSS($app, 'app-'.$GLOBALS['egw_info']['user']['preferences']['common']['theme']) ||
+			self::includeCSS($app,'app');
 
 		// add all css files from egw_framework::includeCSS()
 		$query = null;