Fixed Crashing issues; updated icon :(