Merge "Update buttons to use proper styles." into pi-dev