refactoring related view css and moving icon next tiem context for wrap ...

...capablity