Door handle and barrel installation

[ballsdeep]

I can’t seem to get the barrel to sit flush inside the handle. It went out for paint and came back like this. They had installed the barrel with the tabs on the inner door skin but I think the tabs should be on the outer door skin am I right? Trouble is when I tried do it this way the handle doesn’t want to sit flush against the door? Am I missing something here or just need to be a big boy and tighten it down? 

[evinX]

Its missing the clear plastic surround that lights up

[ballsdeep]

Mine never had them and it wasn’t like this before it went away. 

[ballsdeep]

I found this image and it does seem like the barrel tabs should be on the outer skin, I reckon the body shop has bolted the handle back on with the barrel tabs on the inside causing the recess to push out.