Fix to make toggling work for radio/checkbox buttons that have icons, when clicking on the icon portion of a button.