Added Yellow Icon
lots of new changes