icons and fixes