new icons and some fixies