another icon selected for the switcher, several code changes and enhancements