From 4900244c4ca4894c7760e3552741b07c07c86d0f Mon Sep 17 00:00:00 2001
From: Mykyta Synelnikov <nsinelnikov.work@gmail.com>
Date: Thu, 25 Apr 2024 02:43:57 +0300
Subject: [PATCH] - changed the place for the icon field because select2
 styling don't work properly work at the bottom of the modal;

---
 assets/css/um-members-rtl.min.css           |  1 +
 assets/js/admin/common.js                   |  6 +-
 assets/js/admin/common.min.js               |  2 +-
 includes/admin/core/class-admin-metabox.php | 98 +++++++--------------
 includes/core/class-builtin.php             | 84 +++++++++---------
 5 files changed, 79 insertions(+), 112 deletions(-)

diff --git a/assets/css/um-members-rtl.min.css b/assets/css/um-members-rtl.min.css
index e69de29b..1b0630ad 100644
--- a/assets/css/um-members-rtl.min.css
+++ b/assets/css/um-members-rtl.min.css
@@ -0,0 +1 @@
+.um-directory .um-member-directory-header .um-member-directory-header-row.um-member-directory-search-row{justify-content:flex-start}.um-directory .um-member-directory-header .um-member-directory-header-row .um-member-directory-search-line label{margin:0 0 0 10px}.um-directory .um-member-directory-header .um-member-directory-header-row .um-member-directory-nav-line .um-member-directory-view-type{margin:0 0 0 10px}.um-directory .um-member-directory-header .um-member-directory-header-row .um-member-directory-nav-line .um-member-directory-sorting .um-member-directory-sorting-a a{margin:0 0 0 5px}.um-directory .um-member-directory-header .um-member-directory-header-row .um-member-directory-nav-line .um-member-directory-sorting .um-member-directory-sorting-a .um-new-dropdown{right:-12px;left:auto}.um-directory .um-member-directory-header .um-member-directory-header-row .um-member-directory-nav-line .um-member-directory-filters .um-member-directory-filters-a a{margin:0 0 0 5px}.um-directory .um-member-directory-header .um-member-directory-header-row .um-search .um-search-filter.um-datepicker-filter-type input,.um-directory .um-member-directory-header .um-member-directory-header-row .um-search .um-search-filter.um-timepicker-filter-type input{margin:0 0 0 5px!important}.um-directory .um-member-directory-header .um-member-directory-header-row .um-search .um-search-filter.um-datepicker-filter-type input:nth-child(even),.um-directory .um-member-directory-header .um-member-directory-header-row .um-search .um-search-filter.um-timepicker-filter-type input:nth-child(even){margin:0 5px 0 0!important}.um-directory .um-member-directory-header .um-member-directory-header-row .um-filtered-line .um-members-filter-tag{margin:0 0 5px 10px}.um-directory .um-member-directory-header .um-member-directory-header-row .um-filtered-line .um-members-filter-tag:first-child{margin-left:10px}.um-directory .um-member-directory-header .um-member-directory-header-row .um-filtered-line .um-members-filter-tag .um-members-filter-remove{margin-left:0;margin-right:10px}.um-directory .um-members-wrapper .um-members.um-members-grid .um-member .um-member-card .um-members-edit-btn a.um-edit-profile-btn:before{margin-right:0;margin-left:8px}.um-directory .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-container .um-member-photo{margin:0 0 0 15px}.um-directory .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-container .um-member-card .um-member-card-content{margin:0 0 0 10px}.um-directory .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-container .um-member-card .um-member-card-actions .um-member-cog .um-new-dropdown{right:auto;left:0;text-align:right}.um-directory .um-members-pagination-box .um-members-pagi{align-items:center}.um-directory .um-members-pagination-box .um-members-pagi .pagi.pagi-arrow{transform:rotate(180deg)}.um-directory.uimob340 .um-member-directory-header .um-member-directory-header-row .um-member-directory-nav-line .um-member-directory-view-type{margin:0 0 0 2px}.um-directory.uimob340 .um-member-directory-header .um-member-directory-header-row .um-member-directory-nav-line .um-member-directory-sorting .um-new-dropdown{right:auto;left:0}.um-directory.uimob340 .um-members-wrapper .um-members.um-members-list .um-member .um-member-photo{margin:0 0 0 10px}.um-directory.uimob340 .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-footer .um-member-card-footer-buttons{margin:0 0 0 10px}.um-directory.uimob500 .um-member-directory-header .um-member-directory-header-row .um-member-directory-nav-line .um-member-directory-view-type{margin:0 0 0 5px}.um-directory.uimob500 .um-members-wrapper .um-members.um-members-list .um-member .um-member-photo{margin:0 0 0 10px}.um-directory.uimob500 .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-footer{align-items:flex-start}.um-directory.uimob500 .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-footer .um-member-card-footer-buttons{margin:0 0 0 10px}.um-directory.uimob500 .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-footer .um-member-card-footer-buttons .um-members-list-footer-button-wrapper{margin:0 0 5px 10px}.um-directory.uimob800 .um-members-wrapper .um-members.um-members-list .um-member .um-member-photo{margin:0 0 0 10px}.um-directory.uimob800 .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-footer .um-member-card-footer-buttons{margin:0 0 0 10px}.um-directory.uimob800 .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-footer .um-member-card-footer-buttons .um-members-list-footer-button-wrapper{margin:0 0 5px 10px}
\ No newline at end of file
diff --git a/assets/js/admin/common.js b/assets/js/admin/common.js
index d3356a19..0c5d83f7 100644
--- a/assets/js/admin/common.js
+++ b/assets/js/admin/common.js
@@ -91,10 +91,8 @@ UM.admin = {
 					containerCssClass : 'um-select2-icon-container'
 				};
 
-				if ( $iconSelector.parents('.um-admin-tri').length ) {
-					select2_atts.dropdownParent = $iconSelector.parents('.um-admin-tri');
-				} else if ( $iconSelector.parents('._heading_text').length ) {
-					select2_atts.dropdownParent = $iconSelector.parents('._heading_text');
+				if ( $iconSelector.parents('.um-icon-select-field-wrapper').length ) {
+					select2_atts.dropdownParent = $iconSelector.parents('.um-icon-select-field-wrapper');
 				}
 
 				$iconSelector.select2( select2_atts ).on( 'change', function () {
diff --git a/assets/js/admin/common.min.js b/assets/js/admin/common.min.js
index 91a9e9f8..eacca538 100644
--- a/assets/js/admin/common.min.js
+++ b/assets/js/admin/common.min.js
@@ -1 +1 @@
-"object"!=typeof window.UM&&(window.UM={}),"object"!=typeof window.UM.admin&&(window.UM.admin={}),UM.admin={tooltip:{all:null,init:function(){var t=jQuery(".um_tooltip");0<t.length&&(UM.admin.tooltip.all=t.tooltip({tooltipClass:"um_tooltip",content:function(){return jQuery(this).attr("title")}}))},close:function(){null!==UM.admin.tooltip.all&&0<UM.admin.tooltip.all&&"function"==typeof UM.admin.tooltip.all.tooltip&&UM.admin.tooltip.all.tooltip("close")}},colorPicker:{init:function(){var t=jQuery(".um-admin-colorpicker");t.length&&t.wpColorPicker()}},iconSelector:{init:function(){let n=jQuery(".um-icon-select-field");function t(t){var n=t.element;return void 0!==n?jQuery('<span><i class="'+jQuery(n).val()+'"></i> '+t.text+"</span>"):jQuery('<span><i class="'+t.id+'"></i> '+t.text+"</span>")}var i;n.length&&(i={ajax:{url:wp.ajax.settings.url,dataType:"json",delay:250,data:function(t){return{search:t.term,action:"um_get_icons",page:t.page||1,nonce:um_admin_scripts.nonce}},processResults:function(t,n){n.page=n.page||1;var i=[];return t.data.icons&&jQuery.each(t.data.icons,function(t,n){i.push({id:t,text:n.label})}),{results:i,pagination:{more:50*n.page<t.data.total_count}}},cache:!0},minimumInputLength:0,allowClear:!0,width:"100%",allowHtml:!0,templateSelection:t,templateResult:t,dropdownCssClass:"um-select2-icon-dropdown",containerCssClass:"um-select2-icon-container"},n.parents(".um-admin-tri").length?i.dropdownParent=n.parents(".um-admin-tri"):n.parents("._heading_text").length&&(i.dropdownParent=n.parents("._heading_text")),n.select2(i).on("change",function(){var t=n.siblings(".um_admin_fonticon_wrapper");0<t.length&&(t.find(".um_old_icon_field_value").val(n.val()),t.hide())}))}}},jQuery(document).ready(function(){UM.admin.tooltip.init(),UM.admin.colorPicker.init(),UM.admin.iconSelector.init()});
\ No newline at end of file
+"object"!=typeof window.UM&&(window.UM={}),"object"!=typeof window.UM.admin&&(window.UM.admin={}),UM.admin={tooltip:{all:null,init:function(){var t=jQuery(".um_tooltip");0<t.length&&(UM.admin.tooltip.all=t.tooltip({tooltipClass:"um_tooltip",content:function(){return jQuery(this).attr("title")}}))},close:function(){null!==UM.admin.tooltip.all&&0<UM.admin.tooltip.all&&"function"==typeof UM.admin.tooltip.all.tooltip&&UM.admin.tooltip.all.tooltip("close")}},colorPicker:{init:function(){var t=jQuery(".um-admin-colorpicker");t.length&&t.wpColorPicker()}},iconSelector:{init:function(){let n=jQuery(".um-icon-select-field");function t(t){var n=t.element;return void 0!==n?jQuery('<span><i class="'+jQuery(n).val()+'"></i> '+t.text+"</span>"):jQuery('<span><i class="'+t.id+'"></i> '+t.text+"</span>")}var e;n.length&&(e={ajax:{url:wp.ajax.settings.url,dataType:"json",delay:250,data:function(t){return{search:t.term,action:"um_get_icons",page:t.page||1,nonce:um_admin_scripts.nonce}},processResults:function(t,n){n.page=n.page||1;var e=[];return t.data.icons&&jQuery.each(t.data.icons,function(t,n){e.push({id:t,text:n.label})}),{results:e,pagination:{more:50*n.page<t.data.total_count}}},cache:!0},minimumInputLength:0,allowClear:!0,width:"100%",allowHtml:!0,templateSelection:t,templateResult:t,dropdownCssClass:"um-select2-icon-dropdown",containerCssClass:"um-select2-icon-container"},n.parents(".um-icon-select-field-wrapper").length&&(e.dropdownParent=n.parents(".um-icon-select-field-wrapper")),n.select2(e).on("change",function(){var t=n.siblings(".um_admin_fonticon_wrapper");0<t.length&&(t.find(".um_old_icon_field_value").val(n.val()),t.hide())}))}}},jQuery(document).ready(function(){UM.admin.tooltip.init(),UM.admin.colorPicker.init(),UM.admin.iconSelector.init()});
\ No newline at end of file
diff --git a/includes/admin/core/class-admin-metabox.php b/includes/admin/core/class-admin-metabox.php
index b5d9b514..0006fd2c 100644
--- a/includes/admin/core/class-admin-metabox.php
+++ b/includes/admin/core/class-admin-metabox.php
@@ -1559,73 +1559,41 @@ if ( ! class_exists( 'um\admin\core\Admin_Metabox' ) ) {
 					$um_icons_list = get_option( 'um_icons_list' );
 
 					$first_activation_date = get_option( 'um_first_activation_date', false );
+
+					$wrapper_classes = array(
+						'um-icon-select-field-wrapper',
+					);
+					if ( 'row' === $this->set_field_type ) {
+						$wrapper_classes[] = '_heading_text';
+					}
+					$wrapper_classes = implode( ' ', $wrapper_classes );
+
 					// @todo new version
 					if ( empty( $first_activation_date ) || $first_activation_date >= 1713342395 || empty( $this->edit_mode_value ) || array_key_exists( $this->edit_mode_value, $um_icons_list ) ) {
-						if ( 'row' === $this->set_field_type ) {
-							?>
-
-							<p class="_heading_text">
-								<label for="_icon"><?php esc_html_e( 'Icon', 'ultimate-member' ); ?> <?php UM()->tooltip( __( 'Select an icon to appear in the field. Leave blank if you do not want an icon to show in the field.', 'ultimate-member' ) ); ?></label>
-								<select name="_icon" id="_icon" class="um-icon-select-field" data-placeholder="<?php esc_attr_e( 'Select Icon', 'ultimate-member' ); ?>" >
-									<option value=""><?php esc_html_e( 'Select Icon', 'ultimate-member' ); ?></option>
-									<?php if ( ! empty( $this->edit_mode_value ) && array_key_exists( $this->edit_mode_value, $um_icons_list ) ) { ?>
-										<option value="<?php echo esc_attr( $this->edit_mode_value ); ?>" selected><?php echo esc_html( $um_icons_list[ $this->edit_mode_value ]['label'] ); ?></option>
-									<?php } ?>
-								</select>
-							</p>
-
-						<?php } else { ?>
-
-							<div class="um-admin-tri">
-								<p>
-									<label for="_icon"><?php esc_html_e( 'Icon', 'ultimate-member' ); ?> <?php UM()->tooltip( __( 'Select an icon to appear in the field. Leave blank if you do not want an icon to show in the field.', 'ultimate-member' ) ); ?></label>
-									<select name="_icon" id="_icon" class="um-icon-select-field" data-placeholder="<?php esc_attr_e( 'Select Icon', 'ultimate-member' ); ?>">
-										<option value=""><?php esc_html_e( 'Select Icon', 'ultimate-member' ); ?></option>
-										<?php if ( ! empty( $this->edit_mode_value ) && array_key_exists( $this->edit_mode_value, $um_icons_list ) ) { ?>
-											<option value="<?php echo esc_attr( $this->edit_mode_value ); ?>" selected><?php echo esc_html( $um_icons_list[ $this->edit_mode_value ]['label'] ); ?></option>
-										<?php } ?>
-									</select>
-								</p>
-							</div>
-
-							<?php
-						}
-					} else {
-						if ( 'row' === $this->set_field_type ) {
-							?>
-
-							<p class="_heading_text">
-								<label for="um_ui_icon_new"><?php esc_html_e( 'Icon', 'ultimate-member' ); ?> <?php UM()->tooltip( __( 'Select an icon to appear in the field. Leave blank if you do not want an icon to show in the field.', 'ultimate-member' ) ); ?></label>
-								<select name="um_ui_icon_new" id="um_ui_icon_new" class="um-icon-select-field" data-placeholder="<?php esc_attr_e( 'Select Icon', 'ultimate-member' ); ?>" >
-									<option value=""><?php esc_html_e( 'Select Icon', 'ultimate-member' ); ?></option>
-								</select>
-								<span class="um_admin_fonticon_wrapper">
-									<span><?php esc_html_e( 'Icon is outdated. Please set the new one above.', 'ultimate-member' ); ?></span>
-									<input type="hidden" name="_icon" id="_icon" class="um_old_icon_field_value" value="<?php echo esc_attr( $this->edit_mode_value ); ?>" />
-									<span class="um-admin-icon-value"><i class="<?php echo esc_attr( $this->edit_mode_value ); ?>"></i></span>
-									<span class="um-admin-icon-clear show"><i class="um-icon-android-cancel"></i></span>
-								</span>
-							</p>
-
-						<?php } else { ?>
-
-							<div class="um-admin-tri">
-								<p>
-									<label for="um_ui_icon_new"><?php esc_html_e( 'Icon', 'ultimate-member' ); ?> <?php UM()->tooltip( __( 'Select an icon to appear in the field. Leave blank if you do not want an icon to show in the field.', 'ultimate-member' ) ); ?></label>
-									<select name="um_ui_icon_new" id="um_ui_icon_new" class="um-icon-select-field" data-placeholder="<?php esc_attr_e( 'Select Icon', 'ultimate-member' ); ?>">
-										<option value=""><?php esc_html_e( 'Select Icon', 'ultimate-member' ); ?></option>
-									</select>
-									<span class="um_admin_fonticon_wrapper">
-										<span><?php esc_html_e( 'Icon is outdated. Please set the new one above.', 'ultimate-member' ); ?></span>
-										<input type="hidden" name="_icon" id="_icon" class="um_old_icon_field_value" value="<?php echo esc_attr( $this->edit_mode_value ); ?>" />
-										<span class="um-admin-icon-value"><i class="<?php echo esc_attr( $this->edit_mode_value ); ?>"></i></span>
-										<span class="um-admin-icon-clear show"><i class="um-icon-android-cancel"></i></span>
-									</span>
-								</p>
-							</div>
-
-							<?php
-						}
+						?>
+						<p class="<?php echo esc_attr( $wrapper_classes ); ?>">
+							<label for="_icon"><?php esc_html_e( 'Icon', 'ultimate-member' ); ?> <?php UM()->tooltip( __( 'Select an icon to appear in the field. Leave blank if you do not want an icon to show in the field.', 'ultimate-member' ) ); ?></label>
+							<select name="_icon" id="_icon" class="um-icon-select-field" data-placeholder="<?php esc_attr_e( 'Select Icon', 'ultimate-member' ); ?>" >
+								<option value=""><?php esc_html_e( 'Select Icon', 'ultimate-member' ); ?></option>
+								<?php if ( ! empty( $this->edit_mode_value ) && array_key_exists( $this->edit_mode_value, $um_icons_list ) ) { ?>
+									<option value="<?php echo esc_attr( $this->edit_mode_value ); ?>" selected><?php echo esc_html( $um_icons_list[ $this->edit_mode_value ]['label'] ); ?></option>
+								<?php } ?>
+							</select>
+						</p>
+					<?php } else { ?>
+						<p class="<?php echo esc_attr( $wrapper_classes ); ?>">
+							<label for="um_ui_icon_new"><?php esc_html_e( 'Icon', 'ultimate-member' ); ?> <?php UM()->tooltip( __( 'Select an icon to appear in the field. Leave blank if you do not want an icon to show in the field.', 'ultimate-member' ) ); ?></label>
+							<select name="um_ui_icon_new" id="um_ui_icon_new" class="um-icon-select-field" data-placeholder="<?php esc_attr_e( 'Select Icon', 'ultimate-member' ); ?>" >
+								<option value=""><?php esc_html_e( 'Select Icon', 'ultimate-member' ); ?></option>
+							</select>
+							<span class="um_admin_fonticon_wrapper">
+								<span><?php esc_html_e( 'Icon is outdated. Please set the new one above.', 'ultimate-member' ); ?></span>
+								<input type="hidden" name="_icon" id="_icon" class="um_old_icon_field_value" value="<?php echo esc_attr( $this->edit_mode_value ); ?>" />
+								<span class="um-admin-icon-value"><i class="<?php echo esc_attr( $this->edit_mode_value ); ?>"></i></span>
+								<span class="um-admin-icon-clear show"><i class="um-icon-android-cancel"></i></span>
+							</span>
+						</p>
+						<?php
 					}
 					break;
 
diff --git a/includes/core/class-builtin.php b/includes/core/class-builtin.php
index a3dd150e..4e790c6f 100644
--- a/includes/core/class-builtin.php
+++ b/includes/core/class-builtin.php
@@ -259,8 +259,8 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 				'text' => array(
 					'name' => 'Text Box',
 					'col1' => array('_title','_metakey','_help','_default','_min_chars','_visibility'),
-					'col2' => array('_label','_placeholder','_public','_roles','_validate','_custom_validate','_max_chars'),
-					'col3' => array('_required','_editable','_icon'),
+					'col2' => array('_label','_icon','_placeholder','_public','_roles','_validate','_custom_validate','_max_chars'),
+					'col3' => array('_required','_editable'),
 					'validate' => array(
 						'_title' => array(
 							'mode' => 'required',
@@ -275,8 +275,8 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 				'tel' => array(
 					'name' => __( 'Telephone', 'ultimate-member' ),
 					'col1' => array('_title','_metakey','_help','_default','_min_chars','_visibility'),
-					'col2' => array('_label','_placeholder','_public','_roles','_validate','_custom_validate','_max_chars'),
-					'col3' => array('_required','_editable','_icon'),
+					'col2' => array('_label','_icon','_placeholder','_public','_roles','_validate','_custom_validate','_max_chars'),
+					'col3' => array('_required','_editable'),
 					'validate' => array(
 						'_title' => array(
 							'mode' => 'required',
@@ -291,8 +291,8 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 				'number' => array(
 					'name' => __('Number','ultimate-member'),
 					'col1' => array('_title','_metakey','_help','_default','_min','_visibility'),
-					'col2' => array('_label','_placeholder','_public','_roles','_validate','_custom_validate','_max'),
-					'col3' => array('_required','_editable','_icon'),
+					'col2' => array('_label','_icon','_placeholder','_public','_roles','_validate','_custom_validate','_max'),
+					'col3' => array('_required','_editable'),
 					'validate' => array(
 						'_title' => array(
 							'mode' => 'required',
@@ -307,8 +307,8 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 				'textarea' => array(
 					'name' => 'Textarea',
 					'col1' => array('_title','_metakey','_help','_height','_max_chars','_max_words','_visibility'),
-					'col2' => array('_label','_placeholder','_public','_roles','_default','_html'),
-					'col3' => array('_required','_editable','_icon'),
+					'col2' => array('_label','_icon','_placeholder','_public','_roles','_default','_html'),
+					'col3' => array('_required','_editable'),
 					'validate' => array(
 						'_title' => array(
 							'mode' => 'required',
@@ -323,8 +323,8 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 				'select' => array(
 					'name' => 'Dropdown',
 					'col1' => array('_title','_metakey','_help','_default','_options','_visibility'),
-					'col2' => array('_label','_placeholder','_public','_roles','_custom_dropdown_options_source','_parent_dropdown_relationship'),
-					'col3' => array('_required','_editable','_icon'),
+					'col2' => array('_label','_icon','_placeholder','_public','_roles','_custom_dropdown_options_source','_parent_dropdown_relationship'),
+					'col3' => array('_required','_editable'),
 					'validate' => array(
 						'_title' => array(
 							'mode' => 'required',
@@ -343,8 +343,8 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 				'multiselect' => array(
 					'name' => 'Multi-Select',
 					'col1' => array('_title','_metakey','_help','_default','_options','_visibility'),
-					'col2' => array('_label','_placeholder','_public','_roles','_min_selections','_max_selections','_custom_dropdown_options_source'),
-					'col3' => array('_required','_editable','_icon'),
+					'col2' => array('_label','_icon','_placeholder','_public','_roles','_min_selections','_max_selections','_custom_dropdown_options_source'),
+					'col3' => array('_required','_editable'),
 					'validate' => array(
 						'_title' => array(
 							'mode' => 'required',
@@ -363,8 +363,8 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 				'radio' => array(
 					'name' => 'Radio',
 					'col1' => array('_title','_metakey','_help','_default','_options','_visibility'),
-					'col2' => array('_label','_public','_roles'),
-					'col3' => array('_required','_editable','_icon'),
+					'col2' => array('_label','_icon','_public','_roles'),
+					'col3' => array('_required','_editable'),
 					'validate' => array(
 						'_title' => array(
 							'mode' => 'required',
@@ -383,8 +383,8 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 				'checkbox' => array(
 					'name' => 'Checkbox',
 					'col1' => array('_title','_metakey','_help','_default','_options','_visibility'),
-					'col2' => array('_label','_public','_roles','_max_selections'),
-					'col3' => array('_required','_editable','_icon'),
+					'col2' => array('_label','_icon','_public','_roles','_max_selections'),
+					'col3' => array('_required','_editable'),
 					'validate' => array(
 						'_title' => array(
 							'mode' => 'required',
@@ -403,8 +403,8 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 				'url' => array(
 					'name' => 'URL',
 					'col1' => array('_title','_metakey','_help','_default','_url_text','_visibility'),
-					'col2' => array('_label','_placeholder','_url_target','_url_rel','_public','_roles','_validate','_custom_validate'),
-					'col3' => array('_required','_editable','_icon'),
+					'col2' => array('_label','_icon','_placeholder','_url_target','_url_rel','_public','_roles','_validate','_custom_validate'),
+					'col3' => array('_required','_editable'),
 					'validate' => array(
 						'_title' => array(
 							'mode' => 'required',
@@ -419,8 +419,8 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 				'password' => array(
 					'name' => 'Password',
 					'col1' => array('_title','_metakey','_help','_min_chars','_max_chars','_visibility'),
-					'col2' => array('_label','_placeholder','_public','_roles','_force_good_pass','_force_confirm_pass','_label_confirm_pass'),
-					'col3' => array('_required','_editable','_icon'),
+					'col2' => array('_label','_icon','_placeholder','_public','_roles','_force_good_pass','_force_confirm_pass','_label_confirm_pass'),
+					'col3' => array('_required','_editable'),
 					'validate' => array(
 						'_title' => array(
 							'mode' => 'required',
@@ -435,8 +435,8 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 				'image' => array(
 					'name' => 'Image Upload',
 					'col1' => array('_title','_metakey','_help','_allowed_types','_max_size','_crop','_visibility'),
-					'col2' => array('_label','_public','_roles','_upload_text','_upload_help_text','_button_text'),
-					'col3' => array('_required','_editable','_icon'),
+					'col2' => array('_label','_icon','_public','_roles','_upload_text','_upload_help_text','_button_text'),
+					'col3' => array('_required','_editable'),
 					'validate' => array(
 						'_title' => array(
 							'mode' => 'required',
@@ -455,8 +455,8 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 				'file' => array(
 					'name' => 'File Upload',
 					'col1' => array('_title','_metakey','_help','_allowed_types','_max_size','_visibility'),
-					'col2' => array('_label','_public','_roles','_upload_text','_upload_help_text','_button_text'),
-					'col3' => array('_required','_editable','_icon'),
+					'col2' => array('_label','_icon','_public','_roles','_upload_text','_upload_help_text','_button_text'),
+					'col3' => array('_required','_editable'),
 					'validate' => array(
 						'_title' => array(
 							'mode' => 'required',
@@ -475,8 +475,8 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 				'date' => array(
 					'name'     => 'Date Picker',
 					'col1'     => array( '_title', '_metakey', '_help', '_default', '_range', '_years', '_years_x', '_range_start', '_range_end', '_visibility' ),
-					'col2'     => array( '_label', '_placeholder', '_public', '_roles', '_format', '_format_custom', '_pretty_format', '_disabled_weekdays' ),
-					'col3'     => array( '_required', '_editable', '_icon' ),
+					'col2'     => array( '_label', '_icon', '_placeholder', '_public', '_roles', '_format', '_format_custom', '_pretty_format', '_disabled_weekdays' ),
+					'col3'     => array( '_required', '_editable' ),
 					'validate' => array(
 						'_title'       => array(
 							'mode'  => 'required',
@@ -501,8 +501,8 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 				'time' => array(
 					'name' => 'Time Picker',
 					'col1' => array('_title','_metakey','_help','_format','_visibility'),
-					'col2' => array('_label','_placeholder','_default','_public','_roles','_intervals'),
-					'col3' => array('_required','_editable','_icon'),
+					'col2' => array('_label','_icon','_placeholder','_default','_public','_roles','_intervals'),
+					'col3' => array('_required','_editable'),
 					'validate' => array(
 						'_title' => array(
 							'mode' => 'required',
@@ -517,8 +517,8 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 				'rating' => array(
 					'name' => 'Rating',
 					'col1' => array('_title','_metakey','_help','_visibility'),
-					'col2' => array('_label','_public','_roles','_number','_default'),
-					'col3' => array('_required','_editable','_icon'),
+					'col2' => array('_label','_icon','_public','_roles','_number','_default'),
+					'col3' => array('_required','_editable'),
 					'validate' => array(
 						'_title' => array(
 							'mode' => 'required',
@@ -590,8 +590,8 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 				'googlemap' => array(
 					'name' => 'Google Map',
 					'col1' => array('_title','_metakey','_help','_visibility'),
-					'col2' => array('_label','_placeholder','_public','_roles','_validate','_custom_validate'),
-					'col3' => array('_required','_editable','_icon'),
+					'col2' => array('_label','_icon','_placeholder','_public','_roles','_validate','_custom_validate'),
+					'col3' => array('_required','_editable'),
 					'validate' => array(
 						'_title' => array(
 							'mode' => 'required',
@@ -606,8 +606,8 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 				'youtube_video' => array(
 					'name' => 'YouTube Video',
 					'col1' => array('_title','_metakey','_help','_visibility'),
-					'col2' => array('_label','_placeholder','_public','_roles','_validate','_custom_validate'),
-					'col3' => array('_required','_editable','_icon'),
+					'col2' => array('_label','_icon','_placeholder','_public','_roles','_validate','_custom_validate'),
+					'col3' => array('_required','_editable'),
 					'validate' => array(
 						'_title' => array(
 							'mode' => 'required',
@@ -622,8 +622,8 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 				'vimeo_video' => array(
 					'name' => 'Vimeo Video',
 					'col1' => array('_title','_metakey','_help','_visibility'),
-					'col2' => array('_label','_placeholder','_public','_roles','_validate','_custom_validate'),
-					'col3' => array('_required','_editable','_icon'),
+					'col2' => array('_label','_icon','_placeholder','_public','_roles','_validate','_custom_validate'),
+					'col3' => array('_required','_editable'),
 					'validate' => array(
 						'_title' => array(
 							'mode' => 'required',
@@ -638,8 +638,8 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 				'soundcloud_track' => array(
 					'name' => 'SoundCloud Track',
 					'col1' => array('_title','_metakey','_help','_visibility'),
-					'col2' => array('_label','_placeholder','_public','_roles','_validate','_custom_validate'),
-					'col3' => array('_required','_editable','_icon'),
+					'col2' => array('_label','_icon','_placeholder','_public','_roles','_validate','_custom_validate'),
+					'col3' => array('_required','_editable'),
 					'validate' => array(
 						'_title' => array(
 							'mode' => 'required',
@@ -653,8 +653,8 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 				'spotify' => array(
 					'name'     => __( 'Spotify URL', 'ultimate-member' ),
 					'col1'     => array('_title','_metakey','_help','_visibility'),
-					'col2'     => array('_label','_placeholder','_public','_roles','_validate','_custom_validate'),
-					'col3'     => array('_required','_editable','_icon'),
+					'col2'     => array('_label','_icon','_placeholder','_public','_roles','_validate','_custom_validate'),
+					'col3'     => array('_required','_editable'),
 					'validate' => array(
 						'_title'   => array(
 							'mode'  => 'required',
@@ -668,8 +668,8 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 				'oembed'           => array(
 					'name'     => __( 'oEmbed', 'ultimate-member' ),
 					'col1'     => array( '_title', '_metakey', '_help', '_default', '_visibility' ),
-					'col2'     => array( '_label', '_placeholder', '_public', '_roles', '_validate', '_custom_validate' ),
-					'col3'     => array( '_required', '_editable', '_icon' ),
+					'col2'     => array( '_label', '_icon', '_placeholder', '_public', '_roles', '_validate', '_custom_validate' ),
+					'col3'     => array( '_required', '_editable' ),
 					'validate' => array(
 						'_title'   => array(
 							'mode'  => 'required',