fixing scenario where icon is actually empty.
Merge branch 'latest'