Document icon helper improve
merge master