icons and more tweaks