Make icon naming more precise