This is mainly an update to match the design guidelines. See also bug 55552644. Change-Id: I1c83fb33b7dca412905d21b588c5754d1d3c5cfe