add new icons, fix some bugs