Added icon and tuned some stuff