Upstream merge

Merging in what's current in puppet.
Added icons current used in prod.