Merge proposals dependent on lp://staging/~deryck/launchpad/hot-bugs-list-color-icons-439128

1. hot-bugs-list-color-icons-439128
2. Dependent merge proposals