Restore some styling lost in the revert merge-conflict.
Merge branch 'pencil-from-mockup' into testing