--- a/src/hbservers/hbthemeserver/hbicondatacache_p.cpp	Thu Sep 02 20:44:51 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbicondatacache_p.cpp	Fri Sep 17 08:32:10 2010 +0300
@@ -229,6 +229,13 @@
     }
     // Get the cache item associated with the key
     item = (*cache)[(key)];
+    
+    if ((item->vectorIconData.type == INVALID_FORMAT) &&
+            (item->rasterIconData.type == INVALID_FORMAT)) {
+                cache->remove(key);
+                delete item;
+                return 0;
+    }
 
 //Debug Code for Test Purpose
 #ifdef HB_ICON_CACHE_DEBUG