new icon + misc tweaks