Merge "Some fixes to our jQuery UI skin for buttons"