merge keymap and iconmap to correct classes and only update entities
that have changed