Shipbucket

I found myself in deep trouble searching for info of the South African Navy in connection with the heraldics of it. In the era before Nelson Mandela and the abolition of the apartheid (1994) the ship badges were like the british but with a red lion on top instead of the naval crown. It seems to be in 1997 (but I haven't found 100% sure evidence!) when all official heraldic were changed to new ones which represented the South Africa in a more "african" way. My enquiry goes on confirmation on the year and which logo South African Navy has before the shift.
Beneath are examples of ship badges before and after the change and the the present SAN logo. I'll hope some of you are able to provide me with correct information

_________________
Work in progress:
DD County Class PNS Babur (1982)(PAK)
FF Type 21 Class D182 PNS Babur (2000)(PAK)
All relevant Coat of Arms