--- a/javamanager/javainstaller/installer/src.s60/applicationregistrator/sifregistrator.cpp	Fri Sep 17 08:28:21 2010 +0300
+++ b/javamanager/javainstaller/installer/src.s60/applicationregistrator/sifregistrator.cpp	Mon Oct 04 00:10:53 2010 +0300
@@ -583,8 +583,8 @@
         CCaptionAndIconInfo *tmpCaptionAndIconInfo =
             CCaptionAndIconInfo::NewLC(
                 /*aCaption=*/ *tmpCaption,
-                /*aIconFileName=*/ KNullDesC,
-                /*aNumOfAppIcons=*/ 0);
+                /*aIconFileName=*/ (NULL != aIconFilename? *iconFilename: KNullDesC()),
+                /*aNumOfAppIcons=*/ numberOfAppIcons);
         CLocalizableAppInfo *tmpLocAppInfo =
             CLocalizableAppInfo::NewLC(
                 /*aShortCaption=*/ KNullDesC,
@@ -701,12 +701,16 @@
         HBufC *value = CreateHBufCFromJavaStringLC(aEnv, aValue);
         if (KUnspecifiedLocale == aLanguage)
         {
+            __UHEAP_MARK;
             aScr->SetComponentPropertyL(aComponentId, *name, *value);
+            __UHEAP_MARKEND;
         }
         else
         {
+            __UHEAP_MARK;
             aScr->SetComponentPropertyL(
                 aComponentId, *name, *value, (TLanguage)aLanguage);
+            __UHEAP_MARKEND;
         }
         CleanupStack::PopAndDestroy(value);
         CleanupStack::PopAndDestroy(name);