Remove comments & Add Icons