Made Icon arrays client-side only

And some other misc tweaks