Adding icon from local machine
Fixing conflicts