Icons URL handling logic improvements.