Enhanced icon behavour