Conforming to the mocks: changing padding, height... on phones and 7". Change-Id: I8aa1fc78002fb19932037714c67ebeba7b707ef4