Here are your pictures re-sized so they can post here:

If you are ordering parts, see if you can find a correct extractor screw since the one you have currently sits proud of the extractor and it should be much more flush, as in the pictures linked above. Not that important but it would look better.

---