Icon and map fix + Window dismantling

Restoring the diona nymph icon and bringing APCs up to date with new methods.