Updating from default icon
Updating from default icon
Removed extra Dummy button and other unused code