Add icons and cleanup