Minor update to loadIcon()
Merged changes
Fixed imports