add icon
fix bugs
merge conflict