add some new icons and resolve issues