Simplify button color scheme, update icon