Updated for new icons and configurations.