Improving Comment Icon Visibility and Text Readability During Client Revisions

So, going through my first revisions with a client that left comments on a project. One thing I got to say is that it’s very difficult to read when the comment icon is covering text. One, it would be nice to hide that particular comment icon if you’re in the text box that opens from it. Also, another really awesome thing would be just a modal and no icons at all so you can read all the text, maybe a dotted box around the element that the icon is on?