Remove gradients, minor cleanup

Fix formatting and grammar and duplicate selectors.  Due to the
duplication, one of the gradients was not taking effect previously
anyway.  Also, the new core buttons do not use gradients, so this
moves us a step closer.

Change-Id: Ifc69ee714be897f02964c82e54b765d48849a45f
Merge "Remove gradients, minor cleanup"