diff --git a/addons/website/static/src/snippets/s_social_media/000.scss b/addons/website/static/src/snippets/s_social_media/000.scss
index b5b1d34e3b0..ce1574f99ce 100644
--- a/addons/website/static/src/snippets/s_social_media/000.scss
+++ b/addons/website/static/src/snippets/s_social_media/000.scss
@@ -8,7 +8,7 @@
         margin: 0 .4rem 0 0;
     }
     a {
-        i.fa {
+        i.fa, span.fa {
             display: flex;
             justify-content: center;
             align-items: center;
diff --git a/addons/website/static/src/snippets/s_social_media/options.js b/addons/website/static/src/snippets/s_social_media/options.js
index 32e3d46df69..f4965033be1 100644
--- a/addons/website/static/src/snippets/s_social_media/options.js
+++ b/addons/website/static/src/snippets/s_social_media/options.js
@@ -4,6 +4,7 @@ import fonts from '@web_editor/js/wysiwyg/fonts';
 import weUtils from '@web_editor/js/common/utils';
 import options from '@web_editor/js/editor/snippets.options';
 import { _t } from "@web/core/l10n/translation";
+import { ICON_SELECTOR } from "@web_editor/js/editor/odoo-editor/src/utils/utils";
 
 let dbSocialValues;
 let dbSocialValuesProm;
@@ -129,7 +130,7 @@ options.registry.SocialMedia = options.Class.extend({
                         anchorEl = this.$target[0].querySelector(':scope > a').cloneNode(true);
                         this._removeSocialMediaClasses(anchorEl);
                     }
-                    const iEl = anchorEl.querySelector("i");
+                    const iEl = anchorEl.querySelector(ICON_SELECTOR);
                     if (iEl) {
                         const faIcon = isDbField ? `fa-${entry.media}` : 'fa-pencil';
                         iEl.classList.add(faIcon);
@@ -156,7 +157,7 @@ options.registry.SocialMedia = options.Class.extend({
                         // Propose an icon only for valid URLs (no mailto).
                         const socialMedia = this._findRelevantSocialMedia(entry.display_name);
                         if (socialMedia) {
-                            const iEl = anchorEl.querySelector('i');
+                            const iEl = anchorEl.querySelector(ICON_SELECTOR);
                             this._removeSocialMediaClasses(anchorEl);
                             anchorEl.classList.add(`s_social_media_${socialMedia}`);
                             if (iEl) {
@@ -347,7 +348,7 @@ options.registry.SocialMedia = options.Class.extend({
     _removeSocialMediaClasses(anchorEl) {
         let regx = new RegExp('\\b' + 's_social_media_' + '[^1-9][^ ]*[ ]?\\b');
         anchorEl.className = anchorEl.className.replace(regx, '');
-        const iEl = anchorEl.querySelector('i');
+        const iEl = anchorEl.querySelector(ICON_SELECTOR);
         if (iEl) {
             regx = new RegExp('\\b' + 'fa-' + '[^1-9][^ ]*[ ]?\\b');
             // Remove every fa classes except fa-x sizes.