Issue 21054: Added ability to add icons to picker with conditional visibility