[RichieBoy67]

It has been awhile but I used replacement variables. I believe that fixed the avatars.

I used this in htaccess:
RewriteEngine On
RewriteCond %{HTTPS} !=on
RewriteCond %{HTTP:X-Forwarded-Proto} !https [NC]
RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]

For wordpress there is a plug in. I will look at one of my sites and let you know what it is. I cannot recall right now.

##
The wordpress plug in is Really Simple SSL

You may still have to do work though to fix it depending on plug ins, themes, widgets, etc. I did on a couple of my sites.