Icon add and hashmap fix