Added handling for new "App icon" setting