Also adjust some padding and set correct highlight background. Bug: 3383060 Change-Id: I5a4abe98c49efd156523085418958b69df6c8d85