Merge "fix another url bar icon bug"