fixed untracked files
EDIT: Changed Icon to the new pin
Merging