minor tweaks to icons and controller