Add Icons & small changes