Merge "remove old style button bar look"