Refactor/icon item

This will make the API more consistent. It issues a deprecation warning and automatically migrates to the new name. In PM 2.1 we'll remove the migration, and in 2.2 the deprecation warning.
Moved this method below, made it private.