Improved pick image drawing. Re #6212.