neaten declaration
neaten up core icons