Steps to reproduce:

1. create and icon mapping set (see screenshot)
2. create a new map and choose automatic icon mapping and chose icon map
3. save and edit map
4. add icon (will show default icon, in my case a server)
5. configure icon to match one of the mappings from the automatic icon map.  a switch has been used in my example.  (choosing a host type and choosing a switch as the host)
6. upon hitting apply, the default server icon does not change, but a little cloud icon gets added to the top of it.  Neither of these icons should be being displayed.
7. save and view the map -> correct icon is displayed (a switch icon)
8. edit map again -> incorrect icons displayed again

Result:
See screenshots

Expected:

automatic icons both while editing and when viewing