icon + minor fixes