diff --git a/blocks/form-input-password/build/render.php b/blocks/form-input-password/build/render.php
index 62c178bb4..52408e622 100644
--- a/blocks/form-input-password/build/render.php
+++ b/blocks/form-input-password/build/render.php
@@ -20,7 +20,15 @@
 			data-wp-each--condition="context.conditionsList"
 			data-wp-each-key="context.condition.id"
 		>
-			<li data-wp-class--is-valid="context.condition.met"><span data-wp-class--icon-hidden="!context.condition.met"><i class="fa fa-solid fa-check"></i></span><span data-wp-class--icon-hidden="context.condition.met"><i class="fa fa-regular fa-xmark"></i></span><span class="password-analyzer__label" data-wp-text="context.condition.label"></span></li>
+			<li data-wp-class--is-valid="context.condition.met">
+				<span data-wp-class--icon-hidden="!context.condition.met">
+					<?php \PRC\Platform\Icons\Render('solid', 'check'); ?>
+				</span>
+				<span data-wp-class--icon-hidden="context.condition.met">
+					<?php \PRC\Platform\Icons\Render('regular', 'xmark'); ?>
+				</span>
+				<span class="password-analyzer__label" data-wp-text="context.condition.label"></span>
+			</li>
 		</template>
 		</ul>
 	</div>
diff --git a/blocks/form-input-password/src/render.php b/blocks/form-input-password/src/render.php
index 62c178bb4..52408e622 100644
--- a/blocks/form-input-password/src/render.php
+++ b/blocks/form-input-password/src/render.php
@@ -20,7 +20,15 @@
 			data-wp-each--condition="context.conditionsList"
 			data-wp-each-key="context.condition.id"
 		>
-			<li data-wp-class--is-valid="context.condition.met"><span data-wp-class--icon-hidden="!context.condition.met"><i class="fa fa-solid fa-check"></i></span><span data-wp-class--icon-hidden="context.condition.met"><i class="fa fa-regular fa-xmark"></i></span><span class="password-analyzer__label" data-wp-text="context.condition.label"></span></li>
+			<li data-wp-class--is-valid="context.condition.met">
+				<span data-wp-class--icon-hidden="!context.condition.met">
+					<?php \PRC\Platform\Icons\Render('solid', 'check'); ?>
+				</span>
+				<span data-wp-class--icon-hidden="context.condition.met">
+					<?php \PRC\Platform\Icons\Render('regular', 'xmark'); ?>
+				</span>
+				<span class="password-analyzer__label" data-wp-text="context.condition.label"></span>
+			</li>
 		</template>
 		</ul>
 	</div>
diff --git a/blocks/navigation-mega-menu/build/render.php b/blocks/navigation-mega-menu/build/render.php
index 52ebcc991..f3e547420 100644
--- a/blocks/navigation-mega-menu/build/render.php
+++ b/blocks/navigation-mega-menu/build/render.php
@@ -92,9 +92,9 @@ class="wp-block-navigation-item__content wp-block-prc-block-navigation-mega-menu
 			<?php if ( 'dropdown' === $icon ) {
 				echo PRC\Platform\Icons\Render('solid', 'caret-down');
 			} elseif( 'mobile' === $icon ) {
-				echo '<i class="fa-light fa-bars"></i>';
+				echo PRC\Platform\Icons\Render('light', 'bars');
 			} elseif ( 'search' === $icon ) {
-				echo '<i class="fa-solid fa-magnifying-glass"></i>';
+				echo PRC\Platform\Icons\Render('solid', 'magnifying-glass');
 			}?>
 		</span>
 	</button>
diff --git a/blocks/navigation-mega-menu/src/render.php b/blocks/navigation-mega-menu/src/render.php
index 52ebcc991..4732705bf 100644
--- a/blocks/navigation-mega-menu/src/render.php
+++ b/blocks/navigation-mega-menu/src/render.php
@@ -92,9 +92,9 @@ class="wp-block-navigation-item__content wp-block-prc-block-navigation-mega-menu
 			<?php if ( 'dropdown' === $icon ) {
 				echo PRC\Platform\Icons\Render('solid', 'caret-down');
 			} elseif( 'mobile' === $icon ) {
-				echo '<i class="fa-light fa-bars"></i>';
+				echo PRC\Platform\Icons\Render('light', 'bars');
 			} elseif ( 'search' === $icon ) {
-				echo '<i class="fa-solid fa-magnifying-glass"></i>';
+				echo PRC\Platform\Icons\Render('solid', 'magnifying-glass');
 			}?>
 		</span>
 	</button>
@@ -113,7 +113,7 @@ class="wp-block-prc-block-navigation-mega-menu__container__close-button"
 			data-wp-on--click="actions.closeMenuOnClick"
 			type="button"
 		>
-			<i class="fa-light fa-circle-minus"></i>
+			<?php echo PRC\Platform\Icons\Render('light', 'circle-minus');?>
 		</button>
 	</div>
 </li>
diff --git a/blocks/social-share-sheet/build/render.php b/blocks/social-share-sheet/build/render.php
index 8c4da0a7f..3ef47344b 100644
--- a/blocks/social-share-sheet/build/render.php
+++ b/blocks/social-share-sheet/build/render.php
@@ -27,8 +27,11 @@
 	'data-wp-on--click' => 'actions.onClick',
 ));
 
+$icon = \PRC\Platform\Icons\Render('sharp', 'up-from-bracket');
+
 echo wp_sprintf(
-	'<a %1$s><span class="wp-block-prc-block-social-share-sheet__label">Share</span><i class="fa-sharp fa-solid fa-up-from-bracket"></i></a>',
+	'<a %1$s><span class="wp-block-prc-block-social-share-sheet__label">Share</span>%2$s</a>',
 	$block_wrapper_attrs,
+	$icon,
 	$content,
 );
diff --git a/blocks/social-share-sheet/src/render.php b/blocks/social-share-sheet/src/render.php
index 8c4da0a7f..3ef47344b 100644
--- a/blocks/social-share-sheet/src/render.php
+++ b/blocks/social-share-sheet/src/render.php
@@ -27,8 +27,11 @@
 	'data-wp-on--click' => 'actions.onClick',
 ));
 
+$icon = \PRC\Platform\Icons\Render('sharp', 'up-from-bracket');
+
 echo wp_sprintf(
-	'<a %1$s><span class="wp-block-prc-block-social-share-sheet__label">Share</span><i class="fa-sharp fa-solid fa-up-from-bracket"></i></a>',
+	'<a %1$s><span class="wp-block-prc-block-social-share-sheet__label">Share</span>%2$s</a>',
 	$block_wrapper_attrs,
+	$icon,
 	$content,
 );
diff --git a/blocks/taxonomy-list-link/src/render.php b/blocks/taxonomy-list-link/src/render.php
index 4fcf0890c..0e9752336 100644
--- a/blocks/taxonomy-list-link/src/render.php
+++ b/blocks/taxonomy-list-link/src/render.php
@@ -11,14 +11,10 @@
 $enable_sub_menu = $attributes['enableSubMenu'] ?? false;
 $block_template  = $enable_sub_menu && !empty($content) ? '<div %1$s>%2$s<div class="wp-block-prc-block-taxonomy-list-link__sub-menu">%3$s</div></div>' : '<div %1$s>%2$s</div>';
 $label_template  = !empty( $attributes['url'] ) ? '<a href="%1$s" class="wp-block-prc-block-taxonomy-list-link__label">%2$s</a>' : '<span class="wp-block-prc-block-taxonomy-list-link__label">%2$s</span>';
-$label_template  = $is_sub_heading ? $label_template . '<i class="fa-solid fa-chevron-right fa-xs"></i>' : $label_template;
+$label_template  = $is_sub_heading ? $label_template . \PRC\Platform\Icons\Render('solid', 'chevron-right') : $label_template;
 $label_template  = $enable_sub_menu && !empty($content) ? ( empty( $attributes['url'] ) ? '<span class="wp-block-prc-block-taxonomy-list-link__label wp-block-prc-block-taxonomy-list-link__toggle">%2$s</span>%3$s' : '<a href="%1$s" class="wp-block-prc-block-taxonomy-list-link__label">%2$s</a>%3$s' ) : $label_template;
 
-$icon_template = wp_sprintf(
-	'<i class="%1$s"></i><i class="%2$s"></i>',
-	'fa-light fa-circle-plus',
-	'fa-light fa-circle-minus'
-);
+$icon_template =\PRC\Platform\Icons\Render('light', 'circle-plus') . \PRC\Platform\Icons\Render('light', 'circle-minus');
 
 /**
  * Build an array with CSS classes defining the colors
@@ -36,11 +32,7 @@
 
 if ( array_key_exists('className', $attributes) && 'is-style-sub-expand' === $attributes['className'] ) {
 	$attributes['label'] = "More";
-	$icon_template = wp_sprintf(
-		'<i class="%1$s"></i><i class="%2$s"></i>',
-		'fa-light fa-plus fa-xs',
-		'fa-light fa-minus fa-xs'
-	);
+	$icon_template = \PRC\Platform\Icons\Render('light', 'plus') . \PRC\Platform\Icons\Render('light', 'minus');
 }
 
 $block_id = 'item-' . md5( wp_json_encode( $attributes ) );
diff --git a/blocks/yoast-seo-breadcrumbs/yoast-seo-breadcrumbs.php b/blocks/yoast-seo-breadcrumbs/yoast-seo-breadcrumbs.php
index b63b0099d..9b021c836 100644
--- a/blocks/yoast-seo-breadcrumbs/yoast-seo-breadcrumbs.php
+++ b/blocks/yoast-seo-breadcrumbs/yoast-seo-breadcrumbs.php
@@ -59,7 +59,7 @@ public function enqueue_assets() {
 	 * @hook wpseo_breadcrumb_separator
 	 */
 	public function modify_separator($separator) {
-		return '<i class="fa fa-solid fa-chevron-right"></i>';
+		return \PRC\Platform\Icons\Render('solid', 'chevron-right');
 	}
 
 	/**