Massive MC1.5.1 changes

Massive changes to cope with MC1.5.1
MC1.5.1-style icons