consolidate css, new icon-default button test