Add icons and cleaning up