Bug 1048938 - Part 2 of visual uplift
WIP
WIP
WIP
Savepoint
WIP
Savepoint
Savepoint