BHV-693: Fix/optimize ToggleButton