Revert "Issue #2352857 by thamas: Fixed Improve the display of trigger icon (pencil)."

Needs more discussion.

This reverts commit b983fad1585b19378ed39b5fc4ccc40779bac733.