change icon
fix bugs