Issue #21500 - fixed issues with picker text overlapping icons