added the right icons everywhere in the styleguide
resolving conflicts