Remove unnecessary #CURRENTPATH# statements
Move more images to @Resources