Merge "Allow an icon to carry a tint with it, wherever it goes." into mnc-dev