--- a/javamanager/javainstaller/installer/javasrc.s60/com/nokia/mj/impl/installer/applicationregistrator/SifRegistrator.java	Mon May 03 12:27:20 2010 +0300
+++ b/javamanager/javainstaller/installer/javasrc.s60/com/nokia/mj/impl/installer/applicationregistrator/SifRegistrator.java	Fri May 14 15:47:24 2010 +0300
@@ -654,7 +654,11 @@
         {
             groupName = ""; // default installation group
         }
-        String iconFilename = aSuiteInfo.getRegisteredIconPath(aIndex);
+        String iconFilename = null;
+        if (!appInfo.getUseDefaultIcon())
+        {
+            iconFilename = aSuiteInfo.getRegisteredIconPath(aIndex);
+        }
         Log.log("SifRegistrator iconFilename " + aIndex + ": " + iconFilename);
         int numberOfIcons = 1;
         // Initalize localized names for the application.
@@ -736,7 +740,7 @@
         {
             if (aSuite.getComponentId() == null)
             {
-                Log.logWarning(
+                Log.log(
                     "SifRegistrator.registerLocalizedComponentName: cid not present in suite");
                 return;
             }
@@ -749,7 +753,7 @@
                 (ApplicationInfo)aSuite.getApplications().elementAt(aIndex);
             if (app.getComponentId() == null)
             {
-                Log.logWarning(
+                Log.log(
                     "SifRegistrator.registerLocalizedComponentName: cid not present in app");
                 return;
             }
@@ -785,7 +789,7 @@
     {
         if (aSuite.getComponentId() == null)
         {
-            Log.logWarning(
+            Log.log(
                 "SifRegistrator.registerLocalizedProperties: cid not present in suite");
             return;
         }