Vox icons, stuff from master.

I really wish people would commit fixes to bef as well as master.