Changed some icons and solved some errors