am c5573a5a: Merge "Fix button assets and styles." into honeycomb

* commit 'c5573a5ac40d93b4b74608ee1858d04f74cb24f5':
  Fix button assets and styles.