Use span instead of image in some places

Chrome/Webkit has a problem with using img without src and will put thin
borders around elements like that.  Instead, use spans