Iconification cleanup.