Added icon images
Cleanup