icons and other fixes