diff --git a/src/modules/pricing-card.module/fields.json b/src/modules/pricing-card.module/fields.json
index fa756fcb0..69aa6e0a7 100644
--- a/src/modules/pricing-card.module/fields.json
+++ b/src/modules/pricing-card.module/fields.json
@@ -30,6 +30,7 @@
     "label": "Features list icon",
     "name": "feature_icon",
     "type": "icon",
+    "icon_set" : "fontawesome-6.4.2",
     "default": {
       "name": "check",
       "type": "SOLID",
diff --git a/src/modules/social-follow.module/fields.json b/src/modules/social-follow.module/fields.json
index 70bab8cbe..d99d1a941 100644
--- a/src/modules/social-follow.module/fields.json
+++ b/src/modules/social-follow.module/fields.json
@@ -15,7 +15,7 @@
         "type": "choice",
         "choices": [
           ["facebook-f", "Facebook"],
-          ["twitter", "Twitter"],
+          ["x-twitter", "Twitter"],
           ["instagram", "Instagram"],
           ["linkedin-in", "LinkedIn"],
           ["youtube", "YouTube"],
@@ -33,6 +33,7 @@
         "label": "Custom icon",
         "name": "custom_icon",
         "type": "icon",
+        "icon_set" : "fontawesome-6.4.2",
         "visibility": {
           "controlling_field": "social_account",
           "controlling_value_regex": "custom_icon",
@@ -108,7 +109,7 @@
         }
       },
       {
-        "social_account": "twitter",
+        "social_account": "x-twitter",
         "social_link": {
           "no_follow": false,
           "open_in_new_tab": true,
diff --git a/src/modules/social-follow.module/module.html b/src/modules/social-follow.module/module.html
index 5fc3cdc75..7e5c3f291 100644
--- a/src/modules/social-follow.module/module.html
+++ b/src/modules/social-follow.module/module.html
@@ -104,8 +104,10 @@
 
     {# Sets a custom icon if the custom option is selected #}
 
-    {% if item.social_account != "custom_icon" %}
-      {% set social_icon = item.social_account %}
+    {% if item.social_account == "whatsapp" %}
+      {% set social_icon = "What's App" %}
+    {% elif item.social_account != "custom_icon" %}
+      {% set social_icon = item.social_account|replace("-", " ") %}
     {% else %}
       {% set social_icon = item.custom_icon.name %}
     {% endif %}
@@ -118,6 +120,7 @@
       {% icon
         extra_classes="social-links__icon",
         name="{{ social_icon }}",
+        icon_set="fontawesome-6.4.2"
         purpose="semantic",
         style="SOLID",
         title="{{ item.accessibility.title }}",