Handle the case where the replacement URL is left blank
Improved icons