Both side view mirrors, wiggly, have to realign every drive

[Codes2]

Hello,
My E93 side view mirrors (not electric folding) wiggle in the folding area.
Recently I have to adjust both mirrors after getting in in order see see what is expected.
The auto adjustment on unlock is ok. (As is the memory)
It's that the mirror assembly now pivots enough that it's unsafe to use unless I compensate every drive. (I can pull them both back lightly before getting in to get a predicted view, but I always forget)

Anyone else have/had this?
I don't want to glue as someone is bound to fold them in on me.

Thanks!