Revert "Integrated new assets from alcor."

I screwed up and didn't see that this change had been merged, and edned up
amending it in highly non-trivial ways. I will submit another change
with includes this stuff plus a bunch more asset tweaks.

This reverts commit ad4007453d3dde6aeed9cc0aa65a300f11da51b8.
42 files changed