diff --git a/includes/core/class-builtin.php b/includes/core/class-builtin.php
index 4e790c6f..fdae828e 100644
--- a/includes/core/class-builtin.php
+++ b/includes/core/class-builtin.php
@@ -251,7 +251,7 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 					'in_fields' => false,
 					'form_only' => true,
 					'conditional_support' => 0,
-					'icon' => 'um-faicon-pencil',
+					'icon' => 'fas fa-pencil',
 					'col1' => array('_id','_background','_text_color','_padding','_margin','_border','_borderradius','_borderstyle','_bordercolor'),
 					'col2' => array('_heading','_heading_text','_heading_background_color','_heading_text_color','_icon','_icon_color','_css_class'),
 				),
@@ -917,7 +917,7 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 					'pretty_format' => 1,
 					'years'         => 115,
 					'years_x'       => 'past',
-					'icon'          => 'um-faicon-calendar',
+					'icon'          => 'far fa-calendar-days',
 				),
 
 				'gender'               => array(
@@ -956,7 +956,7 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 					'editable'   => true,
 					'url_target' => '_blank',
 					'url_rel'    => 'nofollow',
-					'icon'       => 'um-faicon-facebook',
+					'icon'       => 'fab fa-facebook-f',
 					'validate'   => 'facebook_url',
 					'url_text'   => 'Facebook',
 					'advanced'   => 'social',
@@ -974,11 +974,11 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 					'editable'   => true,
 					'url_target' => '_blank',
 					'url_rel'    => 'nofollow',
-					'icon'       => 'um-faicon-twitter', // 'fa-brands fa-x-twitter' for new FA styles
+					'icon'       => 'fab fa-square-x-twitter',
 					'validate'   => 'twitter_url',
 					'url_text'   => 'X',
 					'advanced'   => 'social',
-					'color'      => '#4099FF', // #0f1419 for X symbol
+					'color'      => '#0f1419',
 					'match'      => 'https://twitter.com/',
 				),
 
@@ -992,7 +992,7 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 					'editable'   => true,
 					'url_target' => '_blank',
 					'url_rel'    => 'nofollow',
-					'icon'       => 'um-faicon-linkedin',
+					'icon'       => 'fab fa-linkedin-in',
 					'validate'   => 'linkedin_url',
 					'url_text'   => 'LinkedIn',
 					'advanced'   => 'social',
@@ -1010,7 +1010,7 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 					'editable'   => true,
 					'url_target' => '_blank',
 					'url_rel'    => 'nofollow',
-					'icon'       => 'um-faicon-instagram',
+					'icon'       => 'fab fa-instagram',
 					'validate'   => 'instagram_url',
 					'url_text'   => 'Instagram',
 					'advanced'   => 'social',
@@ -1028,7 +1028,7 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 					'editable'   => true,
 					'url_target' => '_blank',
 					'url_rel'    => 'nofollow',
-					'icon'       => 'um-faicon-skype',
+					'icon'       => 'fab fa-skype',
 					'validate'   => 'skype',
 					'url_text'   => __( 'Join chat', 'ultimate-member' ),
 				),
@@ -1043,7 +1043,7 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 					'editable'   => true,
 					'url_target' => '_blank',
 					'url_rel'    => 'nofollow',
-					'icon'       => 'um-icon-ios-telephone',
+					'icon'       => 'fab fa-viber',
 					'validate'   => 'phone_number',
 				),
 
@@ -1057,7 +1057,7 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 					'editable'   => true,
 					'url_target' => '_blank',
 					'url_rel'    => 'nofollow',
-					'icon'       => 'um-icon-social-whatsapp',
+					'icon'       => 'fab fa-whatsapp',
 					'validate'   => 'phone_number',
 				),
 
@@ -1071,7 +1071,7 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 					'editable'   => true,
 					'url_target' => '_blank',
 					'url_rel'    => 'nofollow',
-					'icon'       => 'um-faicon-paper-plane',
+					'icon'       => 'fab fa-telegram',
 					'validate'   => 'telegram_url',
 					'url_text'   => 'Telegram',
 					'match'      => 'https://t.me/',
@@ -1100,7 +1100,7 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 					'editable'   => true,
 					'url_target' => '_blank',
 					'url_rel'    => 'nofollow',
-					'icon'       => 'um-icon-ios-musical-note',
+					'icon'       => 'fab fa-tiktok',
 					'validate'   => 'tiktok_url',
 					'url_text'   => 'TikTok',
 					'advanced'   => 'social',
@@ -1116,7 +1116,7 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 					'required'   => 0,
 					'public'     => 1,
 					'editable'   => true,
-					'icon'       => 'um-faicon-twitch',
+					'icon'       => 'fab fa-twitch',
 					'url_target' => '_blank',
 					'url_rel'    => 'nofollow',
 					'validate'   => 'twitch_url',
@@ -1134,7 +1134,7 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 					'required'   => 0,
 					'public'     => 1,
 					'editable'   => true,
-					'icon'       => 'um-icon-social-reddit',
+					'icon'       => 'fab fa-reddit-alien',
 					'url_target' => '_blank',
 					'url_rel'    => 'nofollow',
 					'validate'   => 'reddit_url',
@@ -1154,7 +1154,7 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 					'editable'   => true,
 					'url_target' => '_blank',
 					'url_rel'    => 'nofollow',
-					'icon'       => 'um-faicon-youtube',
+					'icon'       => 'fab fa-youtube',
 					'validate'   => 'youtube_url',
 					'url_text'   => __( 'YouTube', 'ultimate-member' ),
 					'advanced'   => 'social',
@@ -1175,7 +1175,7 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 					'editable'   => true,
 					'url_target' => '_blank',
 					'url_rel'    => 'nofollow',
-					'icon'       => 'um-faicon-soundcloud',
+					'icon'       => 'fab fa-soundcloud',
 					'validate'   => 'soundcloud_url',
 					'url_text'   => 'SoundCloud',
 					'advanced'   => 'social',
@@ -1227,7 +1227,7 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 					'public'   => 1,
 					'editable' => true,
 					'validate' => 'phone_number',
-					'icon'     => 'um-faicon-phone',
+					'icon'     => 'fas fa-phone',
 				),
 
 				'mobile_number'        => array(
@@ -1239,7 +1239,7 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 					'public'   => 1,
 					'editable' => true,
 					'validate' => 'phone_number',
-					'icon'     => 'um-faicon-mobile',
+					'icon'     => 'fas fa-mobile-screen',
 				),
 
 				// private use ( not public list )
@@ -1250,7 +1250,7 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 					'type' => 'image',
 					'label' => __('Change your profile photo','ultimate-member'),
 					'upload_text' => __('Upload your photo here','ultimate-member'),
-					'icon' => 'um-faicon-camera',
+					'icon' => 'fas fa-camera',
 					'crop' => 1,
 					'max_size' => ( UM()->options()->get('profile_photo_max_size') ) ? UM()->options()->get('profile_photo_max_size') : 999999999,
 					'min_width' => str_replace('px','',UM()->options()->get('profile_photosize')),
@@ -1264,7 +1264,7 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 					'type' => 'image',
 					'label' => __('Change your cover photo','ultimate-member'),
 					'upload_text' => __('Upload profile cover here','ultimate-member'),
-					'icon' => 'um-faicon-picture-o',
+					'icon' => 'far fa-image',
 					'crop' => 2,
 					'max_size' => ( UM()->options()->get('cover_photo_max_size') ) ? UM()->options()->get('cover_photo_max_size') : 999999999,
 					'modal_size' => 'large',