icon fix
merge code