Fix icon names, most of them should work now.