Icon use improvements.