Merge "Fix button assets and styles." into honeycomb