Added, Icons, and Picker
Added, Icons, and Picker
issues