If there is an application icon set then use that first instead of creating a default one

If there is an application icon set then use that first instead of creating a default one, this will prevent a chance of flickering on the icon if the machine is slow and the old icon is shown first before the new one.