063d5b91b4
Made overriding dependent on both the icon and the name being identical, this should prevent desktop entries from being mistakenly overridden.