Match style from Pau's wireframes more closely

Change-Id: I8f9e20037600074782670ddfca362f59b85f2fa5