Revert two instances of missed icon-plus-2
Four more uses of icon-plus-2
Merge pull request #881 from Sophist-UK/revert_missed_icon-plus-2

Revert missed icon plus 2