Adding icons
Pulling in the latest updates from Ocupado