dwg icon + better location detection