added tent icon and two new locations
Merge font mechanics
fixed assets and icons