Added icon and fixed minor bugs

Added icon and fixed minor bugs