icon and some fix