Added images for the button icons
Merge conflicts resolved