Button icon styles fix
Button icon fixes, segmented control