lots of icons and and some changes