Adding icons
Merging from pull