Use non-legacy icon names