clean up buttons, deal with font icon issue with :before