fix copy-paste errors

seems one example containing 'icon' was copy-pasted all over the place
Merge commit 'e246638a20a0ed1e6547787b74144c3411531556'