diff --git a/src/block-components/icon/index.js b/src/block-components/icon/index.js
index c17dbb5a8..f968cca94 100644
--- a/src/block-components/icon/index.js
+++ b/src/block-components/icon/index.js
@@ -211,9 +211,9 @@ export const Icon = props => {
 			if ( processedIconRef.current === _icon && _icon ) {
 				dispatch( 'stackable/page-icons' ).removePageIcon( _icon )
 				processedIconRef.current = null
-				setIcon( _icon ) // Use the original icon directly
-				lastIconValueRef.current = _icon
 			}
+			setIcon( _icon ) // Use the original icon directly
+			lastIconValueRef.current = _icon
 			return
 		}
 
diff --git a/src/block/icon-list/save.js b/src/block/icon-list/save.js
index 3c936fcac..e0bd466e3 100644
--- a/src/block/icon-list/save.js
+++ b/src/block/icon-list/save.js
@@ -39,7 +39,9 @@ export const Save = props => {
 		blockAlignmentClass,
 		responsiveClass,
 		textClasses,
-	] )
+	], {
+		'stk__use-custom-icon-color': attributes.useCustomIconColor,
+	} )
 	const tagNameClassNames = classnames( [
 		attributes.ordered ? 'stk-block-icon-list__ol' : 'stk-block-icon-list__ul',
 		attributes.listDisplayStyle && attributes.listDisplayStyle === 'grid' ? 'stk-block-icon-list--grid' : 'stk-block-icon-list--column',