Re #6451. Redrawing picking image every time made it slow.