[Bug 436644] registration has two desktop files - they should be merged into one