More non-iconage.

[storybox]

Didn't take as long as expected. I did get a little frustrated though, but it was my fault for working on it at 2am.