Nalexander/bug 974124 borders padding colours

No sense doing a bunch of tiny PRs for these things.  First 2 will want uplift; last 3 are strings.