Retry merge if working file remains.
Modify icon, add launcher icon.
Add space between application name so that word wrap inside launcher becomes better.