Reorder colour picker. New sprite for header. Remove dead code.