Wip refactor icomoon