RF-13522: Fixed a broken figure x-ref and cleaned up remaining figure x-refs