BUG: Fixed button color display