Maki icons work

Tho still issues to resolve and support to add