Added icons & controller & service changes