refactored decorators and attempted to add tests to decorators
changed core color to blue and introduced a css class to hide icons from appearing twice