icons and some fixes