Rework the picture download behavior

Should fix #412