Fixed some icons, and minor things