More Apps icons, missing symlinks and merge upstream icons