fixed few bugs
Add ICON