Use non-legacy icon names
Merge pull request #3454 from leigh123linux/remove_legacy_icon_names

Use non-legacy icon names