Add icons and some modifications