fix depricated bug and add two icons
merge