Merge desktop files

See also https://github.com/nemomobile/lipstick/pull/203