Add 512x512 icon, tweak sound stuff
fix merge conflict