change icon and fix bugs
add icons