icon is changed and code is optimized