diff --git a/inc/function-search-fields.php b/inc/function-search-fields.php
index 5201a5c5..4bffe8af 100755
--- a/inc/function-search-fields.php
+++ b/inc/function-search-fields.php
@@ -32,7 +32,7 @@ function opalestate_property_render_field_template( $field, $label, $type = 'sel
 			case 'input': ?>
                 <label class="opalestate-label opalestate-label--<?php echo sanitize_html_class( $field ); ?>"><?php echo esc_html( $label ); ?></label>
                 <div class="input-group-number">
-                    <i class="fa icon-property-<?php echo esc_attr( $field ); ?>"></i>
+                    <i class="<?php echo opalestate_get_property_meta_icon( $field ); ?>"></i>
                     <input class="form-control" value="1" type="text" name="info[<?php echo $field; ?>]" placeholder="<?php echo esc_attr( $label ); ?>"/>
                     <div class="btn-actions">
                         <span class="btn-minus"><i class="fa fa-minus"></i></span>
diff --git a/templates/single-property/meta.php b/templates/single-property/meta.php
index e872fc3e..07ad76f4 100755
--- a/templates/single-property/meta.php
+++ b/templates/single-property/meta.php
@@ -26,7 +26,7 @@ $meta = $property->get_meta_shortinfo();
 				<?php if ( $meta ) : ?>
 					<?php foreach ( $meta as $key => $info ) : ?>
                         <li class="property-label-<?php echo esc_attr( $key ); ?>">
-                            <i class="fa icon-property-<?php echo esc_attr( $key ); ?>"></i><?php echo esc_html( $info['label'] ); ?> <span>
+                            <i class="<?php echo opalestate_get_property_meta_icon( $key ); ?>"></i><?php echo esc_html( $info['label'] ); ?> <span>
 							<?php echo apply_filters( 'opalestate-pro' . $key . '_unit_format', trim( $info['value'] ) ); ?></span>
                         </li>
 					<?php endforeach; ?>
diff --git a/templates/single-property/short-meta.php b/templates/single-property/short-meta.php
index e46869e8..e859d9a6 100755
--- a/templates/single-property/short-meta.php
+++ b/templates/single-property/short-meta.php
@@ -11,7 +11,7 @@ if ( empty( $meta_content ) ) {
 				<?php if ( trim( $info['value'] ) ) : ?>
                     <li class="property-label-<?php echo esc_attr( $key ); ?>">
                         <div class="icon-box">
-                            <i class="icon-property-<?php echo esc_attr( $key ); ?>"></i>
+                            <i class="<?php echo opalestate_get_property_meta_icon( $key ); ?>"></i>
                         </div>
                         <div class="info-meta">
                                 <span class="label-content">
diff --git a/templates/user/content-property.php b/templates/user/content-property.php
index 66913d93..ed26407f 100755
--- a/templates/user/content-property.php
+++ b/templates/user/content-property.php
@@ -59,7 +59,7 @@ $meta     = $property->get_meta_shortinfo();
 						<?php if ( $meta ) : ?>
 							<?php foreach ( $meta as $key => $info ) : ?>
                                 <li class="property-label-<?php echo esc_attr( $key ); ?>" data-toggle="tooltip" data-placement="top" title="<?php echo esc_attr( $info['label'] ); ?>">
-                                    <i class="icon-property-<?php echo esc_attr( $key ); ?>"></i>
+                                    <i class="<?php echo opalestate_get_property_meta_icon( $key ); ?>"></i>
                                     <span class="label-property"><?php echo esc_html( $info['label'] ); ?></span>
                                     <span class="label-content"><?php echo apply_filters( 'opalestate-pro' . $key . '_unit_format', trim( $info['value'] ) ); ?></span>
                                 </li>