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

* commit '5a6bb13a7ac58a0f4a77e588c0bb8b8465f212fe':
  Fix button assets and styles.