radio and checkbox added
icon conflict fix