Added icon for URLs, refactor URL detection