reorganized icon naming and generation