change icon
delete unused image file
fix merge conflict