Merge "Status bar icons as expressions of white." into klp-dev