Fixes double editable icons appearing.
Merge pull request #3595 from ehelms/fix-double-icons

Fixes double editable icons appearing.