Fix + Abstract icon and click issue [story:46209159]