modified icon and fix some function