Changed name of icon to avoid conflict
Fixed some timing issues