Added checks to workaround missing auto-gen ico file as well. fixes #2216