Issue 21054: Beginnings of picker with icon