Separate out button colour to fix contrast

Change-Id: I9c3e0f30bd5f1c3ed10c19dcb149158e6b2d64b6