Changed launcher icon and edge icon
Fixed mindmap icon in folder view being to the left
Merge remote-tracking branch 'origin/iconfix'