Added Icon
Fixed some conflicts