CW-480 - overwrite icons