--- a/javamanager/javainstaller/installer/javasrc/com/nokia/mj/impl/installer/midp2/install/steps/ConvertIcons.java	Tue Jul 06 14:10:26 2010 +0300
+++ b/javamanager/javainstaller/installer/javasrc/com/nokia/mj/impl/installer/midp2/install/steps/ConvertIcons.java	Wed Aug 18 09:43:15 2010 +0300
@@ -258,10 +258,11 @@
                     // the attribute MIDlet-<N>
                     iconName = newApp.getIconPath();
                 }
-                if (iconName.length() == 0)
+                if (iconName.length() == 0 || iconName.equals(suiteIconName))
                 {
-                    // No MIDlet icon defined, use already converted suite
-                    // icon if it exists
+                    // No MIDlet icon defined or MIDlet icon defined to be
+                    // the same as suite icon, use already converted suite
+                    // icon if it exists.
                     if (suiteIconFile.length() > 0)
                     {
                         // Must make separate copy of the suite icon for each