Allow maki and npmaki to work side by side
Move icons to npmaki or maki