Clean up more button style handling.

Also make it follow the material button text style.