Improved support for description and icon for a radio button (choice)