Bug 1048938 - Part 2 of visual uplift, r=NiKo`