diff --git a/assets/css/admin/forms-rtl.css b/assets/css/admin/forms-rtl.css
index 34a9e1a8..ced0caf4 100644
--- a/assets/css/admin/forms-rtl.css
+++ b/assets/css/admin/forms-rtl.css
@@ -3,13 +3,3 @@
   float: right; }
   .um-form-fields-section label input {
     float: right; }
-
-.select2-container .select2-choice > .select2-chosen {
-  text-align: right !important;
-  margin-right: 10px !important;
-  margin-left: 26px !important; }
-
-.select2-container .select2-choice .select2-arrow {
-  border: none !important;
-  right: auto !important;
-  left: 0 !important; }
diff --git a/assets/css/admin/forms-rtl.min.css b/assets/css/admin/forms-rtl.min.css
index ad338699..bc4d2694 100644
--- a/assets/css/admin/forms-rtl.min.css
+++ b/assets/css/admin/forms-rtl.min.css
@@ -1 +1 @@
-.um-form-fields-section{padding:0 0 0 10px;float:right}.um-form-fields-section label input{float:right}.select2-container .select2-choice>.select2-chosen{text-align:right!important;margin-right:10px!important;margin-left:26px!important}.select2-container .select2-choice .select2-arrow{border:none!important;right:auto!important;left:0!important}
\ No newline at end of file
+.um-form-fields-section{padding:0 0 0 10px;float:right}.um-form-fields-section label input{float:right}
\ No newline at end of file
diff --git a/assets/css/admin/forms-rtl.sass b/assets/css/admin/forms-rtl.sass
index ce0b9073..9e7c9bf0 100644
--- a/assets/css/admin/forms-rtl.sass
+++ b/assets/css/admin/forms-rtl.sass
@@ -5,13 +5,13 @@
     input
       float: right
 
-.select2-container
-  .select2-choice
-    & > .select2-chosen
-      text-align: right !important
-      margin-right: 10px !important
-      margin-left: 26px !important
-    .select2-arrow
-      border: none !important
-      right: auto !important
-      left: 0 !important
+//.select2-container
+//  .select2-choice
+//    & > .select2-chosen
+//      text-align: right !important
+//      margin-right: 10px !important
+//      margin-left: 26px !important
+//    .select2-arrow
+//      border: none !important
+//      right: auto !important
+//      left: 0 !important
diff --git a/assets/css/admin/forms.css b/assets/css/admin/forms.css
index 43945840..77ebdea2 100644
--- a/assets/css/admin/forms.css
+++ b/assets/css/admin/forms.css
@@ -42,14 +42,6 @@
     overflow: auto;
     border: 1px solid #a1a1a1; }
 
-.um-form-table .um-forms-line td .select2 {
-  margin: 1px 0 0 0; }
-  .um-form-table .um-forms-line td .select2 .select2-selection__rendered {
-    line-height: 26px; }
-  .um-form-table .um-forms-line td .select2 .select2-selection__clear {
-    top: -1px;
-    margin-right: 0; }
-
 .um-form-table .um-forms-line[data-field_type="same_page_update"] {
   vertical-align: baseline; }
   .um-form-table .um-forms-line[data-field_type="same_page_update"] th,
@@ -355,103 +347,24 @@ input[type="number"].um-forms-field {
   padding: 2px 4px !important;
   border-width: 1px !important; }
 
-body.um-admin .select2.select2-container .select2-selection {
-  display: block !important;
-  height: 28px !important;
-  padding: 0 0 0 12px !important;
-  overflow: hidden !important;
-  position: relative !important;
-  white-space: nowrap !important;
-  line-height: 25px !important;
-  color: #666 !important;
-  font-size: 13px !important;
-  text-align: left !important;
-  text-decoration: none !important;
-  -moz-border-radius: 2px !important;
-  -webkit-border-radius: 2px !important;
-  border-radius: 2px !important;
-  background-clip: padding-box !important;
-  -webkit-touch-callout: none;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-  background: #fff none !important;
-  border: 1px solid #ddd !important; }
-  body.um-admin .select2.select2-container .select2-selection .select2-selection__arrow {
-    display: inline-block !important;
-    width: 34px !important;
-    height: 100% !important;
-    position: absolute !important;
-    right: 0 !important;
-    top: 0 !important;
-    -moz-border-radius: 0 2px 2px 0 !important;
-    -webkit-border-radius: 0 2px 2px 0 !important;
-    border-radius: 0 2px 2px 0 !important;
-    background-clip: padding-box !important;
-    text-align: center !important;
-    background: transparent !important;
-    border-left: 0 !important; }
-    body.um-admin .select2.select2-container .select2-selection .select2-selection__arrow b[role="presentation"] {
-      display: none; }
-      body.um-admin .select2.select2-container .select2-selection .select2-selection__arrow b[role="presentation"]:before {
-        content: "\f3d0" !important;
-        font-size: 27px !important;
-        font-family: "Ionicons" !important;
-        width: 100% !important;
-        display: block;
-        height: 100%;
-        line-height: 28px;
-        color: #aaaaaa; }
-
-body.um-admin .select2.select2-container .select2-search--inline {
-  line-height: 37px !important; }
-
-body.um-admin .select2.select2-container--open .select2-dropdown {
-  border: 1px solid #ddd !important; }
-
-body.um-admin .select2-results li {
-  list-style: none;
-  display: list-item;
-  background-image: none;
-  font-size: 13px;
-  margin: 5px !important;
-  padding: 3px 0 !important;
-  color: #666 !important; }
-  body.um-admin .select2-results li.select2-results__option.select2-results__option--highlighted {
-    background: none !important;
-    background: #f4f4f4 !important;
-    color: #666 !important; }
-
-body.um-admin .select2-container--default .select2-selection--single .select2-selection__rendered {
-  line-height: 25px; }
-
-body.um-admin .select2-container--default .select2-selection--multiple {
-  height: auto !important; }
-  body.um-admin .select2-container--default .select2-selection--multiple .select2-selection__clear {
-    cursor: pointer;
-    float: right;
-    margin-top: 0;
-    margin-right: 5px;
-    font-size: 25px; }
-
-body.um-admin .select2-container--default .select2-results__option[aria-selected="true"] {
-  background: transparent !important; }
-
-body.um-admin .select2-selection__clear {
-  right: 10px;
-  font-size: 25px;
-  color: #aaaaaa !important;
-  font-weight: 300 !important; }
-
-body.um-admin .select2-selection--multiple .select2-selection__rendered {
-  box-sizing: border-box;
-  list-style: none;
-  margin: 0;
-  padding: 0;
-  width: 100%;
-  line-height: 20px;
+span.um-admin-icon-value {
+  margin: 0 10px;
   font-size: 13px; }
+  span.um-admin-icon-value i {
+    font-size: 28px;
+    color: #0085ba;
+    position: relative;
+    top: 5px; }
 
-body.um-admin .select2-drop-active {
-  z-index: 99999 !important; }
+span.um-admin-icon-clear {
+  display: none;
+  cursor: pointer;
+  position: relative;
+  color: #ccc; }
+  span.um-admin-icon-clear.show {
+    display: inline-block; }
+  span.um-admin-icon-clear:hover {
+    color: #777; }
+  span.um-admin-icon-clear i {
+    font-size: 20px;
+    vertical-align: middle; }
diff --git a/assets/css/admin/forms.min.css b/assets/css/admin/forms.min.css
index 1b6c4057..125ae377 100644
--- a/assets/css/admin/forms.min.css
+++ b/assets/css/admin/forms.min.css
@@ -1 +1 @@
-.um-form-table .um-forms-line[data-conditional]{display:none}.um-form-table .um-forms-line[data-field_type=checkbox] td label{font-style:italic}.um-form-table .um-forms-line label .um-req{color:#a00;margin:0 0 0 3px;font-weight:400}.um-form-table .um-forms-line .um-text-delete{color:#a00;float:left}.um-form-table .um-forms-line .um-text-delete:hover{color:red}.um-form-table .um-forms-line .um-multi-text-add-option{margin-bottom:14px}.um-form-table .um-forms-line .icon_preview{display:none;max-width:200px;max-height:200px;padding:5px;cursor:pointer;border:1px solid #e3e3e3;background:#f7f7f7;border-radius:3px;height:auto;width:auto!important}.um-form-table .um-forms-line td .um-same-page-update-wrapper{display:none;margin:7px 0 0 0}.um-form-table .um-forms-line td .um-same-page-update-wrapper input.um-admin-form-same-page-update{margin:7px 0 0 0}.um-form-table .um-forms-line td .um-same-page-update-wrapper .upgrade_log{margin:7px 0 0 0;width:100%;height:150px;overflow:auto;border:1px solid #a1a1a1}.um-form-table .um-forms-line td .select2{margin:1px 0 0 0}.um-form-table .um-forms-line td .select2 .select2-selection__rendered{line-height:26px}.um-form-table .um-forms-line td .select2 .select2-selection__clear{top:-1px;margin-right:0}.um-form-table .um-forms-line[data-field_type=same_page_update]{vertical-align:baseline}.um-form-table .um-forms-line[data-field_type=same_page_update] td,.um-form-table .um-forms-line[data-field_type=same_page_update] th{vertical-align:baseline}.um-form-table.um-third-column .um-forms-line th{width:33%}.um-form-table.um-half-column .um-forms-line th{width:50%}.um-form-table.um-two-thirds-column .um-forms-line th{width:83%}.um-form-table.um-top-label .um-forms-line td{padding:0 0 15px 0}.um-form-table.um-top-label .um-forms-line td label{margin:0 0 5px 0;display:inline-block}.um-form-table.um-top-label .um-forms-line[data-field_type=icon] td label{width:100%;display:block;margin:0 0 5px 0}.um-form-table .description{font-style:italic;clear:both}.um_admin_fonticon_wrapper{display:flex;flex-direction:row;justify-content:flex-start;align-items:center;flex-wrap:nowrap}.um_admin_fonticon_wrapper .um-admin-icon-value{line-height:1}.um_admin_fonticon_wrapper .um-admin-icon-value i{top:0}input[type=date].um-forms-field,input[type=number].um-forms-field,input[type=password].um-forms-field,input[type=text].um-forms-field,input[type=time].um-forms-field,input[type=url].um-forms-field,select.um-forms-field,textarea.um-forms-field{box-sizing:border-box}input[type=date].um-forms-field.um-long-field,input[type=number].um-forms-field.um-long-field,input[type=password].um-forms-field.um-long-field,input[type=text].um-forms-field.um-long-field,input[type=time].um-forms-field.um-long-field,input[type=url].um-forms-field.um-long-field,select.um-forms-field.um-long-field,textarea.um-forms-field.um-long-field{width:100%!important}input[type=date].um-forms-field.um-medium-field,input[type=number].um-forms-field.um-medium-field,input[type=password].um-forms-field.um-medium-field,input[type=text].um-forms-field.um-medium-field,input[type=time].um-forms-field.um-medium-field,input[type=url].um-forms-field.um-medium-field,select.um-forms-field.um-medium-field,textarea.um-forms-field.um-medium-field{width:50%!important}input[type=date].um-forms-field.um-small-field,input[type=number].um-forms-field.um-small-field,input[type=password].um-forms-field.um-small-field,input[type=text].um-forms-field.um-small-field,input[type=time].um-forms-field.um-small-field,input[type=url].um-forms-field.um-small-field,select.um-forms-field.um-small-field,textarea.um-forms-field.um-small-field{width:25%!important}input[type=number].um-forms-field{padding-right:0}.um-md-default-filters-list,.um-multi-selects-list,.um-multi-text-list{float:left;width:100%;margin:0 0 10px 0}.um-hidden-md-default-filters,.um-hidden-multi-selects,.um-hidden-multi-text{display:none!important}.um-md-default-filters-option-line{float:left;width:100%;clear:both;border-bottom:1px solid #eee;padding:0 0 5px 0;margin:5px 0 0 0}.um-md-default-filters-option-line .um-field-wrapper{float:left;width:calc(100% - 60px);line-height:30px;box-sizing:border-box}.um-md-default-filters-option-line .um-field-wrapper2{float:left;width:calc(100% - 60px);line-height:30px;box-sizing:border-box}.um-md-default-filters-option-line .um-field-wrapper2.um{margin:5px 0 0 0}.um-md-default-filters-option-line .um-field-wrapper2 .ui-slider-range.ui-widget-header{background:#44b0ec;border:1px solid #44b0ec!important;margin-top:-1px}.um-md-default-filters-option-line .um-field-wrapper2 select{width:100%;float:left}.um-md-default-filters-option-line .um-field-wrapper2 input{width:100%;float:left}.um-md-default-filters-option-line .um-field-wrapper2 input.um-datepicker-filter,.um-md-default-filters-option-line .um-field-wrapper2 input.um-timepicker-filter{width:calc(50% - 7px)!important;float:left}.um-md-default-filters-option-line .um-field-wrapper2 input.um-datepicker-filter:first-child,.um-md-default-filters-option-line .um-field-wrapper2 input.um-timepicker-filter:first-child{margin-right:11px}.um-md-default-filters-option-line .um-field-wrapper2 .um-slider{margin:5px 9px 0 9px;width:calc(100% - 18px);box-sizing:border-box;display:block}.um-md-default-filters-option-line .um-field-control{float:left;width:60px;line-height:30px;padding:0 10px;box-sizing:border-box}.um-multi-selects-option-line{float:left;width:100%;padding:0;clear:both;margin:0 0 5px 0}.um-multi-selects-option-line.um-admin-drag-fld{display:flex;flex-direction:row;justify-content:flex-start;align-items:center;flex-wrap:nowrap;background:0 0;border:none}.um-multi-selects-option-line.um-admin-drag-fld .um-field-wrapper{width:calc(100% - 90px)}.um-multi-selects-option-line.um-admin-drag-fld .um-field-icon{float:left;width:20px;text-align:left;line-height:30px}.um-multi-selects-option-line .um-field-wrapper{float:left;width:calc(100% - 60px);line-height:30px;box-sizing:border-box}.um-multi-selects-option-line .um-field-wrapper.um-custom-order-fields{margin:5px 0 0 0}.um-multi-selects-option-line .um-field-wrapper.um-custom-order-fields label{float:left;width:100%;line-height:30px;box-sizing:border-box;margin:0!important;padding:0!important;font-weight:700;display:flex;flex-direction:row;justify-content:space-beetween;align-items:baseline;flex-wrap:nowrap}.um-multi-selects-option-line .um-field-wrapper.um-custom-order-fields label input[type=text],.um-multi-selects-option-line .um-field-wrapper.um-custom-order-fields label select{width:auto;display:inline;font-weight:400;max-width:70%;flex:.9}.um-multi-selects-option-line .um-field-wrapper input,.um-multi-selects-option-line .um-field-wrapper select{float:left;width:100%;margin:0}.um-multi-selects-option-line .um-field-control{float:left;width:60px;line-height:30px;padding:0 10px;box-sizing:border-box}.um-multi-text-option-line{float:left;width:100%;padding:0;clear:both;margin:0 0 5px 0}.um-multi-text-option-line .um-field-wrapper{float:left;width:calc(100% - 90px);line-height:30px;box-sizing:border-box}.um-multi-text-option-line .um-field-wrapper input,.um-multi-text-option-line .um-field-wrapper select{float:left;width:100%;margin:0}.um-multi-text-option-line .um-field-control{float:left;width:60px;line-height:30px;padding:0 10px;box-sizing:border-box}.um-form-fields-section{float:left;clear:none;margin:0;padding:0 10px 0 0;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box}.um-form-fields-section label{float:left;width:100%;margin:0;padding:0}.um-form-fields-section label input{float:left;margin-top:0}.um-form-fields-section label span{float:left;width:calc(100% - 20px)}@media screen and (max-width:782px){input[type=text].um-forms-field.um-medium-field,select.um-forms-field.um-medium-field,textarea.um-forms-field.um-medium-field{width:100%!important}input[type=text].um-forms-field.um-small-field,select.um-forms-field.um-small-field,textarea.um-forms-field.um-small-field{width:50%!important}.um-form-fields-section{width:100%!important}.um-admin-metabox .um-form-fields-section label{line-height:22px!important;margin:0 0 12px 0!important}.um-admin-metabox .um-form-fields-section label span{width:calc(100% - 30px)}.um-multi-selects-option-line,.um-multi-text-option-line{margin:0 0 6px 0}.um-forms-line label{float:left;width:100%}.um-form-table.um-half-column .um-forms-line th,.um-form-table.um-third-column .um-forms-line th,.um-form-table.um-two-thirds-column .um-forms-line th{float:left;width:100%;margin-bottom:5px}.um-form-table.um-half-column .um-forms-line th label,.um-form-table.um-third-column .um-forms-line th label,.um-form-table.um-two-thirds-column .um-forms-line th label{float:left;width:100%}.um-form-table.um-half-column .um-forms-line td,.um-form-table.um-third-column .um-forms-line td,.um-form-table.um-two-thirds-column .um-forms-line td{float:left;width:100%}}.um-sortable-items-field .um-sortable-item{cursor:move!important;padding:5px;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;border:1px solid #7e8993;border-radius:4px;-moz-border-radius:4px;background:#fff;height:42px;line-height:28px;display:flex;flex-direction:row;justify-content:flex-start;align-items:center;flex-wrap:nowrap}.um-sortable-items-field .um-sortable-item.um-hidden-item{display:none}.um-sortable-items-field .um-sortable-item .um-field-icon{width:20px;text-align:left;margin:0 10px 0 0}.wp-picker-container input.wp-color-picker[type=text]{width:68px!important;float:left!important;padding:2px 4px!important;border-width:1px!important}body.um-admin .select2.select2-container .select2-selection{display:block!important;height:28px!important;padding:0 0 0 12px!important;overflow:hidden!important;position:relative!important;white-space:nowrap!important;line-height:25px!important;color:#666!important;font-size:13px!important;text-align:left!important;text-decoration:none!important;-moz-border-radius:2px!important;-webkit-border-radius:2px!important;border-radius:2px!important;background-clip:padding-box!important;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background:#fff none!important;border:1px solid #ddd!important}body.um-admin .select2.select2-container .select2-selection .select2-selection__arrow{display:inline-block!important;width:34px!important;height:100%!important;position:absolute!important;right:0!important;top:0!important;-moz-border-radius:0 2px 2px 0!important;-webkit-border-radius:0 2px 2px 0!important;border-radius:0 2px 2px 0!important;background-clip:padding-box!important;text-align:center!important;background:0 0!important;border-left:0!important}body.um-admin .select2.select2-container .select2-selection .select2-selection__arrow b[role=presentation]{display:none}body.um-admin .select2.select2-container .select2-selection .select2-selection__arrow b[role=presentation]:before{content:"\f3d0"!important;font-size:27px!important;font-family:Ionicons!important;width:100%!important;display:block;height:100%;line-height:28px;color:#aaa}body.um-admin .select2.select2-container .select2-search--inline{line-height:37px!important}body.um-admin .select2.select2-container--open .select2-dropdown{border:1px solid #ddd!important}body.um-admin .select2-results li{list-style:none;display:list-item;background-image:none;font-size:13px;margin:5px!important;padding:3px 0!important;color:#666!important}body.um-admin .select2-results li.select2-results__option.select2-results__option--highlighted{background:0 0!important;background:#f4f4f4!important;color:#666!important}body.um-admin .select2-container--default .select2-selection--single .select2-selection__rendered{line-height:25px}body.um-admin .select2-container--default .select2-selection--multiple{height:auto!important}body.um-admin .select2-container--default .select2-selection--multiple .select2-selection__clear{cursor:pointer;float:right;margin-top:0;margin-right:5px;font-size:25px}body.um-admin .select2-container--default .select2-results__option[aria-selected=true]{background:0 0!important}body.um-admin .select2-selection__clear{right:10px;font-size:25px;color:#aaa!important;font-weight:300!important}body.um-admin .select2-selection--multiple .select2-selection__rendered{box-sizing:border-box;list-style:none;margin:0;padding:0;width:100%;line-height:20px;font-size:13px}body.um-admin .select2-drop-active{z-index:99999!important}
\ No newline at end of file
+.um-form-table .um-forms-line[data-conditional]{display:none}.um-form-table .um-forms-line[data-field_type=checkbox] td label{font-style:italic}.um-form-table .um-forms-line label .um-req{color:#a00;margin:0 0 0 3px;font-weight:400}.um-form-table .um-forms-line .um-text-delete{color:#a00;float:left}.um-form-table .um-forms-line .um-text-delete:hover{color:red}.um-form-table .um-forms-line .um-multi-text-add-option{margin-bottom:14px}.um-form-table .um-forms-line .icon_preview{display:none;max-width:200px;max-height:200px;padding:5px;cursor:pointer;border:1px solid #e3e3e3;background:#f7f7f7;border-radius:3px;height:auto;width:auto!important}.um-form-table .um-forms-line td .um-same-page-update-wrapper{display:none;margin:7px 0 0 0}.um-form-table .um-forms-line td .um-same-page-update-wrapper input.um-admin-form-same-page-update{margin:7px 0 0 0}.um-form-table .um-forms-line td .um-same-page-update-wrapper .upgrade_log{margin:7px 0 0 0;width:100%;height:150px;overflow:auto;border:1px solid #a1a1a1}.um-form-table .um-forms-line[data-field_type=same_page_update]{vertical-align:baseline}.um-form-table .um-forms-line[data-field_type=same_page_update] td,.um-form-table .um-forms-line[data-field_type=same_page_update] th{vertical-align:baseline}.um-form-table.um-third-column .um-forms-line th{width:33%}.um-form-table.um-half-column .um-forms-line th{width:50%}.um-form-table.um-two-thirds-column .um-forms-line th{width:83%}.um-form-table.um-top-label .um-forms-line td{padding:0 0 15px 0}.um-form-table.um-top-label .um-forms-line td label{margin:0 0 5px 0;display:inline-block}.um-form-table.um-top-label .um-forms-line[data-field_type=icon] td label{width:100%;display:block;margin:0 0 5px 0}.um-form-table .description{font-style:italic;clear:both}.um_admin_fonticon_wrapper{display:flex;flex-direction:row;justify-content:flex-start;align-items:center;flex-wrap:nowrap}.um_admin_fonticon_wrapper .um-admin-icon-value{line-height:1}.um_admin_fonticon_wrapper .um-admin-icon-value i{top:0}input[type=date].um-forms-field,input[type=number].um-forms-field,input[type=password].um-forms-field,input[type=text].um-forms-field,input[type=time].um-forms-field,input[type=url].um-forms-field,select.um-forms-field,textarea.um-forms-field{box-sizing:border-box}input[type=date].um-forms-field.um-long-field,input[type=number].um-forms-field.um-long-field,input[type=password].um-forms-field.um-long-field,input[type=text].um-forms-field.um-long-field,input[type=time].um-forms-field.um-long-field,input[type=url].um-forms-field.um-long-field,select.um-forms-field.um-long-field,textarea.um-forms-field.um-long-field{width:100%!important}input[type=date].um-forms-field.um-medium-field,input[type=number].um-forms-field.um-medium-field,input[type=password].um-forms-field.um-medium-field,input[type=text].um-forms-field.um-medium-field,input[type=time].um-forms-field.um-medium-field,input[type=url].um-forms-field.um-medium-field,select.um-forms-field.um-medium-field,textarea.um-forms-field.um-medium-field{width:50%!important}input[type=date].um-forms-field.um-small-field,input[type=number].um-forms-field.um-small-field,input[type=password].um-forms-field.um-small-field,input[type=text].um-forms-field.um-small-field,input[type=time].um-forms-field.um-small-field,input[type=url].um-forms-field.um-small-field,select.um-forms-field.um-small-field,textarea.um-forms-field.um-small-field{width:25%!important}input[type=number].um-forms-field{padding-right:0}.um-md-default-filters-list,.um-multi-selects-list,.um-multi-text-list{float:left;width:100%;margin:0 0 10px 0}.um-hidden-md-default-filters,.um-hidden-multi-selects,.um-hidden-multi-text{display:none!important}.um-md-default-filters-option-line{float:left;width:100%;clear:both;border-bottom:1px solid #eee;padding:0 0 5px 0;margin:5px 0 0 0}.um-md-default-filters-option-line .um-field-wrapper{float:left;width:calc(100% - 60px);line-height:30px;box-sizing:border-box}.um-md-default-filters-option-line .um-field-wrapper2{float:left;width:calc(100% - 60px);line-height:30px;box-sizing:border-box}.um-md-default-filters-option-line .um-field-wrapper2.um{margin:5px 0 0 0}.um-md-default-filters-option-line .um-field-wrapper2 .ui-slider-range.ui-widget-header{background:#44b0ec;border:1px solid #44b0ec!important;margin-top:-1px}.um-md-default-filters-option-line .um-field-wrapper2 select{width:100%;float:left}.um-md-default-filters-option-line .um-field-wrapper2 input{width:100%;float:left}.um-md-default-filters-option-line .um-field-wrapper2 input.um-datepicker-filter,.um-md-default-filters-option-line .um-field-wrapper2 input.um-timepicker-filter{width:calc(50% - 7px)!important;float:left}.um-md-default-filters-option-line .um-field-wrapper2 input.um-datepicker-filter:first-child,.um-md-default-filters-option-line .um-field-wrapper2 input.um-timepicker-filter:first-child{margin-right:11px}.um-md-default-filters-option-line .um-field-wrapper2 .um-slider{margin:5px 9px 0 9px;width:calc(100% - 18px);box-sizing:border-box;display:block}.um-md-default-filters-option-line .um-field-control{float:left;width:60px;line-height:30px;padding:0 10px;box-sizing:border-box}.um-multi-selects-option-line{float:left;width:100%;padding:0;clear:both;margin:0 0 5px 0}.um-multi-selects-option-line.um-admin-drag-fld{display:flex;flex-direction:row;justify-content:flex-start;align-items:center;flex-wrap:nowrap;background:0 0;border:none}.um-multi-selects-option-line.um-admin-drag-fld .um-field-wrapper{width:calc(100% - 90px)}.um-multi-selects-option-line.um-admin-drag-fld .um-field-icon{float:left;width:20px;text-align:left;line-height:30px}.um-multi-selects-option-line .um-field-wrapper{float:left;width:calc(100% - 60px);line-height:30px;box-sizing:border-box}.um-multi-selects-option-line .um-field-wrapper.um-custom-order-fields{margin:5px 0 0 0}.um-multi-selects-option-line .um-field-wrapper.um-custom-order-fields label{float:left;width:100%;line-height:30px;box-sizing:border-box;margin:0!important;padding:0!important;font-weight:700;display:flex;flex-direction:row;justify-content:space-beetween;align-items:baseline;flex-wrap:nowrap}.um-multi-selects-option-line .um-field-wrapper.um-custom-order-fields label input[type=text],.um-multi-selects-option-line .um-field-wrapper.um-custom-order-fields label select{width:auto;display:inline;font-weight:400;max-width:70%;flex:.9}.um-multi-selects-option-line .um-field-wrapper input,.um-multi-selects-option-line .um-field-wrapper select{float:left;width:100%;margin:0}.um-multi-selects-option-line .um-field-control{float:left;width:60px;line-height:30px;padding:0 10px;box-sizing:border-box}.um-multi-text-option-line{float:left;width:100%;padding:0;clear:both;margin:0 0 5px 0}.um-multi-text-option-line .um-field-wrapper{float:left;width:calc(100% - 90px);line-height:30px;box-sizing:border-box}.um-multi-text-option-line .um-field-wrapper input,.um-multi-text-option-line .um-field-wrapper select{float:left;width:100%;margin:0}.um-multi-text-option-line .um-field-control{float:left;width:60px;line-height:30px;padding:0 10px;box-sizing:border-box}.um-form-fields-section{float:left;clear:none;margin:0;padding:0 10px 0 0;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box}.um-form-fields-section label{float:left;width:100%;margin:0;padding:0}.um-form-fields-section label input{float:left;margin-top:0}.um-form-fields-section label span{float:left;width:calc(100% - 20px)}@media screen and (max-width:782px){input[type=text].um-forms-field.um-medium-field,select.um-forms-field.um-medium-field,textarea.um-forms-field.um-medium-field{width:100%!important}input[type=text].um-forms-field.um-small-field,select.um-forms-field.um-small-field,textarea.um-forms-field.um-small-field{width:50%!important}.um-form-fields-section{width:100%!important}.um-admin-metabox .um-form-fields-section label{line-height:22px!important;margin:0 0 12px 0!important}.um-admin-metabox .um-form-fields-section label span{width:calc(100% - 30px)}.um-multi-selects-option-line,.um-multi-text-option-line{margin:0 0 6px 0}.um-forms-line label{float:left;width:100%}.um-form-table.um-half-column .um-forms-line th,.um-form-table.um-third-column .um-forms-line th,.um-form-table.um-two-thirds-column .um-forms-line th{float:left;width:100%;margin-bottom:5px}.um-form-table.um-half-column .um-forms-line th label,.um-form-table.um-third-column .um-forms-line th label,.um-form-table.um-two-thirds-column .um-forms-line th label{float:left;width:100%}.um-form-table.um-half-column .um-forms-line td,.um-form-table.um-third-column .um-forms-line td,.um-form-table.um-two-thirds-column .um-forms-line td{float:left;width:100%}}.um-sortable-items-field .um-sortable-item{cursor:move!important;padding:5px;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;border:1px solid #7e8993;border-radius:4px;-moz-border-radius:4px;background:#fff;height:42px;line-height:28px;display:flex;flex-direction:row;justify-content:flex-start;align-items:center;flex-wrap:nowrap}.um-sortable-items-field .um-sortable-item.um-hidden-item{display:none}.um-sortable-items-field .um-sortable-item .um-field-icon{width:20px;text-align:left;margin:0 10px 0 0}.wp-picker-container input.wp-color-picker[type=text]{width:68px!important;float:left!important;padding:2px 4px!important;border-width:1px!important}span.um-admin-icon-value{margin:0 10px;font-size:13px}span.um-admin-icon-value i{font-size:28px;color:#0085ba;position:relative;top:5px}span.um-admin-icon-clear{display:none;cursor:pointer;position:relative;color:#ccc}span.um-admin-icon-clear.show{display:inline-block}span.um-admin-icon-clear:hover{color:#777}span.um-admin-icon-clear i{font-size:20px;vertical-align:middle}
\ No newline at end of file
diff --git a/assets/css/admin/forms.sass b/assets/css/admin/forms.sass
index 61949efe..cb510702 100644
--- a/assets/css/admin/forms.sass
+++ b/assets/css/admin/forms.sass
@@ -46,13 +46,19 @@
           height: 150px
           overflow: auto
           border: 1px solid #a1a1a1
-      .select2
-        margin: 1px 0 0 0
-        .select2-selection__rendered
-          line-height: 26px
-        .select2-selection__clear
-          top: -1px
-          margin-right: 0
+      //.select2
+      //  margin: 1px 0 0 0
+      //  .select2-selection__rendered
+      //    line-height: 28px
+      //    padding: 0
+      //    color: #2c3338
+      //  .select2-selection__clear
+      //    margin-right: 0
+      //    right: 5px
+      //    font-size: 24px
+      //    color: #2c3338 !important
+      //    font-weight: 300 !important
+      //    top: -2px
 
     &[data-field_type="same_page_update"]
       vertical-align: baseline
@@ -365,104 +371,124 @@ input[type="number"]
     padding: 2px 4px !important
     border-width: 1px !important
 
-body.#{$prefix}admin
-  .select2
-    &.select2-container
-      .select2-selection
-        display: block !important
-        height: 28px !important
-        padding: 0 0 0 12px !important
-        overflow: hidden !important
-        position: relative !important
-        white-space: nowrap !important
-        line-height: 25px !important
-        color: #666 !important
-        font-size: 13px !important
-        text-align: left !important
-        text-decoration: none !important
-        -moz-border-radius: 2px !important
-        -webkit-border-radius: 2px !important
-        border-radius: 2px !important
-        background-clip: padding-box !important
-        -webkit-touch-callout: none
-        -webkit-user-select: none
-        -moz-user-select: none
-        -ms-user-select: none
-        user-select: none
-        background: #fff none !important
-        border: 1px solid #ddd !important
-        .select2-selection__arrow
-          display: inline-block !important
-          width: 34px !important
-          height: 100% !important
-          position: absolute !important
-          right: 0 !important
-          top: 0 !important
-          -moz-border-radius: 0 2px 2px 0 !important
-          -webkit-border-radius: 0 2px 2px 0 !important
-          border-radius: 0 2px 2px 0 !important
-          background-clip: padding-box !important
-          text-align: center !important
-          background: transparent !important
-          border-left: 0 !important
-          b[role="presentation"]
-            display: none
-            &:before
-              content: "\f3d0" !important
-              font-size: 27px !important
-              font-family: "Ionicons" !important
-              width: 100% !important
-              display: block
-              height: 100%
-              line-height: 28px
-              color: #aaaaaa
-      .select2-search--inline
-        line-height: 37px !important
-    &.select2-container--open
-      .select2-dropdown
-        border: 1px solid #ddd !important
-  .select2-results
-    li
-      list-style: none
-      display: list-item
-      background-image: none
-      font-size: 13px
-      margin: 5px !important
-      padding: 3px 0 !important
-      color: #666 !important
-      &.select2-results__option
-        &.select2-results__option--highlighted
-          background: none !important
-          background: #f4f4f4 !important
-          color: #666 !important
-  .select2-container--default
-    .select2-selection--single
-      .select2-selection__rendered
-         line-height: 25px
-    .select2-selection--multiple
-      height: auto !important
-      .select2-selection__clear
-        cursor: pointer
-        float: right
-        margin-top: 0
-        margin-right: 5px
-        font-size: 25px
-    .select2-results__option[aria-selected="true"]
-      background: transparent !important
-  .select2-selection__clear
-    right: 10px
-    font-size: 25px
-    color: #aaaaaa !important
-    font-weight: 300 !important
-  .select2-selection--multiple
-    .select2-selection__rendered
-      box-sizing: border-box
-      list-style: none
-      margin: 0
-      padding: 0
-      width: 100%
-      line-height: 20px
-      font-size: 13px
+//body.#{$prefix}admin
+//  .select2
+//    &.select2-container
+//      .select2-selection
+//        width: 100%
+//        display: block !important
+//        min-height: 30px !important
+//        padding: 0 0 0 8px !important
+//        margin: 0 1px !important
+//        overflow: hidden !important
+//        position: relative !important
+//        white-space: nowrap !important
+//        color: #2c3338 !important
+//        font-size: 14px !important
+//        line-height: 2 !important
+//        text-align: left !important
+//        text-decoration: none !important
+//        +border-radius(3px,3px,3px,3px)
+//        background-clip: padding-box !important
+//        -webkit-touch-callout: none
+//        -webkit-user-select: none
+//        -moz-user-select: none
+//        -ms-user-select: none
+//        user-select: none
+//        background: #fff none !important
+//        border: 1px solid #8c8f94 !important
+//        .select2-selection__arrow
+//          display: inline-block !important
+//          width: 34px !important
+//          height: 100% !important
+//          position: absolute !important
+//          right: 0 !important
+//          top: 0 !important
+//          -moz-border-radius: 0 2px 2px 0 !important
+//          -webkit-border-radius: 0 2px 2px 0 !important
+//          border-radius: 0 2px 2px 0 !important
+//          background-clip: padding-box !important
+//          text-align: center !important
+//          background: transparent !important
+//          border-left: 0 !important
+//          b[role="presentation"]
+//            display: none
+//            &:before
+//              content: "\f3d0" !important
+//              font-size: 27px !important
+//              font-family: "Ionicons" !important
+//              width: 100% !important
+//              display: block
+//              height: 100%
+//              line-height: 28px
+//              color: #aaaaaa
+//      .select2-search--inline
+//        line-height: 37px !important
+//    &.select2-container--open
+//      .select2-dropdown
+//        border: 1px solid #ddd !important
+//  .select2-results
+//    li
+//      list-style: none
+//      display: list-item
+//      background-image: none
+//      font-size: 13px
+//      margin: 5px !important
+//      padding: 3px 0 !important
+//      color: #666 !important
+//      &.select2-results__option
+//        &.select2-results__option--highlighted
+//          background: none !important
+//          background: #f4f4f4 !important
+//          color: #666 !important
+//  .select2-container--default
+//    .select2-selection--multiple
+//      height: auto !important
+//      .select2-selection__clear
+//        cursor: pointer
+//        float: right
+//        margin-top: 0
+//        margin-right: 5px
+//        font-size: 25px
+//    .select2-results__option[aria-selected="true"]
+//      background: transparent !important
+//  .select2-selection__clear
+//    right: 5px
+//    font-size: 24px
+//    color: #555 !important
+//    font-weight: 300 !important
+//    top: -2px
+//  .select2-selection--multiple
+//    .select2-selection__rendered
+//      box-sizing: border-box
+//      list-style: none
+//      margin: 0
+//      padding: 0
+//      width: 100%
+//      line-height: 20px
+//      font-size: 13px
+//
+//  .select2-drop-active
+//    z-index: 99999 !important
 
-  .select2-drop-active
-    z-index: 99999 !important
+span.um-admin-icon-value
+  margin: 0 10px
+  font-size: 13px
+  i
+    font-size: 28px
+    color: #0085ba
+    position: relative
+    top: 5px
+
+span.um-admin-icon-clear
+  display: none
+  cursor: pointer
+  position: relative
+  color: #ccc
+  &.show
+    display: inline-block
+  &:hover
+    color: #777
+  i
+    font-size: 20px
+    vertical-align: middle
diff --git a/assets/css/admin/modal.css b/assets/css/admin/modal.css
index 6fa82d87..a666a9eb 100644
--- a/assets/css/admin/modal.css
+++ b/assets/css/admin/modal.css
@@ -138,25 +138,3 @@ p._icon_search {
     text-align: center;
     padding: 15px 20px;
     display: inline-block; }
-
-span.um-admin-icon-value {
-  margin: 0 10px;
-  font-size: 13px; }
-  span.um-admin-icon-value i {
-    font-size: 28px;
-    color: #0085ba;
-    position: relative;
-    top: 5px; }
-
-span.um-admin-icon-clear {
-  display: none;
-  cursor: pointer;
-  position: relative;
-  color: #ccc; }
-  span.um-admin-icon-clear.show {
-    display: inline-block; }
-  span.um-admin-icon-clear:hover {
-    color: #777; }
-  span.um-admin-icon-clear i {
-    font-size: 20px;
-    vertical-align: middle; }
diff --git a/assets/css/admin/modal.min.css b/assets/css/admin/modal.min.css
index ab8bb152..b11cfcc7 100644
--- a/assets/css/admin/modal.min.css
+++ b/assets/css/admin/modal.min.css
@@ -1 +1 @@
-.um-admin-overlay{background:rgba(0,0,0,.7);width:100%;height:100%;position:fixed;top:0;left:0;z-index:10000}.um-admin-modal{border-radius:3px;background:#fff;position:fixed;top:50%!important;left:50%!important;display:none;z-index:10001;box-sizing:border-box;width:730px;margin-left:-365px}.um-admin-modal.normal{width:730px;margin-left:-365px}.um-admin-modal.smaller{width:500px;margin-left:-250px}.um-admin-modal.small{width:400px;margin-left:-200px}.um-admin-modal input[type=submit].button-primary{padding:0 12px!important;vertical-align:middle!important;line-height:24px!important}.um-admin-modal .um-admin-modal-body{padding:10px 20px 10px 20px;max-height:500px;overflow:auto}.um-admin-modal .um-admin-modal-body.um-admin-metabox label{margin:0!important}.um-admin-modal .um-admin-modal-body.um-admin-metabox .um-admin-editor-h{margin-top:12px}.um-admin-modal .um-admin-modal-body.um-admin-metabox .um-admin-editor-h label{margin:0 0 4px 0!important}.um-admin-modal .um-admin-modal-body.um-admin-metabox .wp-editor-wrap{margin:0 0 4px 0!important}.um-admin-modal .um-admin-modal-body.um-admin-metabox .wp-editor-wrap textarea{border:0!important}.um-admin-modal a.button-primary{padding:0 12px!important;vertical-align:middle!important}.um-admin-modal a.button{padding:0 12px!important;vertical-align:middle!important}.um-admin-modal a.button i:before{display:block;top:0}.um-admin-modal h3{font-size:14px;line-height:14px;font-weight:400;color:#fff}.um-admin-modal h4{margin:0 0 10px 0!important}.um-admin-modal label{font-size:13px;color:#aaa}.um-admin-modal p{font-size:13px;color:#aaa}.um-admin-modal.loading .um-admin-modal-body{height:200px;background:url(../../img/ajax-loader.gif) no-repeat center}.um-admin-modal-close{position:absolute;color:#fff!important;right:16px;top:14px;font-size:22px;text-decoration:none;opacity:.4}.um-admin-modal-close:hover{opacity:1}.um-admin-modal-head{padding:4px 20px;background:#0085ba;position:relative;border-radius:3px 3px 0 0}.um-admin-modal-foot{padding:20px 0!important;border-top:1px solid #ddd;text-align:center;background:#eee;border-radius:0 0 3px 3px}.um-admin-modal-foot a,.um-admin-modal-foot input{margin:0 10px!important;font-size:14px!important}#UM_fonticons div.um-admin-metabox{padding-bottom:22px!important}p._icon_search{position:relative;width:85%!important;margin:0 auto!important;padding:12px 0 0 0!important}p._icon_search:before{position:absolute;right:6px;top:12px;font-size:20px;content:"\f4a4";font-family:Ionicons;color:#999}p._icon_search:before input[type=text]{padding-right:40px!important}.um-admin-icons{padding:0 0 15px 12px;float:left}.um-admin-icons span{cursor:pointer;float:left;margin:5px;color:#777;border:4px solid #eee;border-radius:3px}.um-admin-icons span.highlighted,.um-admin-icons span:hover{color:#0085ba;border-color:#0085ba}.um-admin-icons i{vertical-align:middle!important;font-size:24px;width:24px;text-align:center;padding:15px 20px;display:inline-block}span.um-admin-icon-value{margin:0 10px;font-size:13px}span.um-admin-icon-value i{font-size:28px;color:#0085ba;position:relative;top:5px}span.um-admin-icon-clear{display:none;cursor:pointer;position:relative;color:#ccc}span.um-admin-icon-clear.show{display:inline-block}span.um-admin-icon-clear:hover{color:#777}span.um-admin-icon-clear i{font-size:20px;vertical-align:middle}
\ No newline at end of file
+.um-admin-overlay{background:rgba(0,0,0,.7);width:100%;height:100%;position:fixed;top:0;left:0;z-index:10000}.um-admin-modal{border-radius:3px;background:#fff;position:fixed;top:50%!important;left:50%!important;display:none;z-index:10001;box-sizing:border-box;width:730px;margin-left:-365px}.um-admin-modal.normal{width:730px;margin-left:-365px}.um-admin-modal.smaller{width:500px;margin-left:-250px}.um-admin-modal.small{width:400px;margin-left:-200px}.um-admin-modal input[type=submit].button-primary{padding:0 12px!important;vertical-align:middle!important;line-height:24px!important}.um-admin-modal .um-admin-modal-body{padding:10px 20px 10px 20px;max-height:500px;overflow:auto}.um-admin-modal .um-admin-modal-body.um-admin-metabox label{margin:0!important}.um-admin-modal .um-admin-modal-body.um-admin-metabox .um-admin-editor-h{margin-top:12px}.um-admin-modal .um-admin-modal-body.um-admin-metabox .um-admin-editor-h label{margin:0 0 4px 0!important}.um-admin-modal .um-admin-modal-body.um-admin-metabox .wp-editor-wrap{margin:0 0 4px 0!important}.um-admin-modal .um-admin-modal-body.um-admin-metabox .wp-editor-wrap textarea{border:0!important}.um-admin-modal a.button-primary{padding:0 12px!important;vertical-align:middle!important}.um-admin-modal a.button{padding:0 12px!important;vertical-align:middle!important}.um-admin-modal a.button i:before{display:block;top:0}.um-admin-modal h3{font-size:14px;line-height:14px;font-weight:400;color:#fff}.um-admin-modal h4{margin:0 0 10px 0!important}.um-admin-modal label{font-size:13px;color:#aaa}.um-admin-modal p{font-size:13px;color:#aaa}.um-admin-modal.loading .um-admin-modal-body{height:200px;background:url(../../img/ajax-loader.gif) no-repeat center}.um-admin-modal-close{position:absolute;color:#fff!important;right:16px;top:14px;font-size:22px;text-decoration:none;opacity:.4}.um-admin-modal-close:hover{opacity:1}.um-admin-modal-head{padding:4px 20px;background:#0085ba;position:relative;border-radius:3px 3px 0 0}.um-admin-modal-foot{padding:20px 0!important;border-top:1px solid #ddd;text-align:center;background:#eee;border-radius:0 0 3px 3px}.um-admin-modal-foot a,.um-admin-modal-foot input{margin:0 10px!important;font-size:14px!important}#UM_fonticons div.um-admin-metabox{padding-bottom:22px!important}p._icon_search{position:relative;width:85%!important;margin:0 auto!important;padding:12px 0 0 0!important}p._icon_search:before{position:absolute;right:6px;top:12px;font-size:20px;content:"\f4a4";font-family:Ionicons;color:#999}p._icon_search:before input[type=text]{padding-right:40px!important}.um-admin-icons{padding:0 0 15px 12px;float:left}.um-admin-icons span{cursor:pointer;float:left;margin:5px;color:#777;border:4px solid #eee;border-radius:3px}.um-admin-icons span.highlighted,.um-admin-icons span:hover{color:#0085ba;border-color:#0085ba}.um-admin-icons i{vertical-align:middle!important;font-size:24px;width:24px;text-align:center;padding:15px 20px;display:inline-block}
\ No newline at end of file
diff --git a/assets/css/admin/modal.sass b/assets/css/admin/modal.sass
index 94078cf8..d450f068 100644
--- a/assets/css/admin/modal.sass
+++ b/assets/css/admin/modal.sass
@@ -145,25 +145,3 @@ p._icon_search
     text-align: center
     padding: 15px 20px
     display: inline-block
-
-span.um-admin-icon-value
-  margin: 0 10px
-  font-size: 13px
-  i
-    font-size: 28px
-    color: #0085ba
-    position: relative
-    top: 5px
-
-span.um-admin-icon-clear
-  display: none
-  cursor: pointer
-  position: relative
-  color: #ccc
-  &.show
-    display: inline-block
-  &:hover
-    color: #777
-  i
-    font-size: 20px
-    vertical-align: middle
diff --git a/assets/js/admin/builder.js b/assets/js/admin/builder.js
index 387c1e30..b7092761 100644
--- a/assets/js/admin/builder.js
+++ b/assets/js/admin/builder.js
@@ -955,16 +955,6 @@ jQuery( document ).ready( function() {
 
 	});
 
-	/**
-		choose font icon
-	 **/
-	jQuery(document.body).on('click', '.um-admin-icons span', function(){
-		var icon = jQuery(this).attr('data-code');
-		jQuery(this).parent().find('span').removeClass('highlighted');
-		jQuery(this).addClass('highlighted');
-		jQuery('#UM_fonticons').find('a.um-admin-modal-back').attr("data-code", icon);
-	});
-
 	if ( !jQuery('.um-admin-drag').length ) {
 		return false;
 	}
diff --git a/assets/js/admin/builder.min.js b/assets/js/admin/builder.min.js
index 4114bed9..6a3f9e77 100644
--- a/assets/js/admin/builder.min.js
+++ b/assets/js/admin/builder.min.js
@@ -1 +1 @@
-function UM_Drag_and_Drop(){jQuery(".um-admin-drag-col,.um-admin-drag-group").sortable({items:".um-admin-drag-fld",connectWith:".um-admin-drag-col,.um-admin-drag-group",placeholder:"um-fld-placeholder",forcePlaceholderSize:!0,update:function(e,i){jQuery("#publish").attr("disabled","disabled"),i.item.hasClass("um-field-type-group")&&0<i.item.parents(".um-field-type-group").length?(jQuery(".um-admin-drag-col,.um-admin-drag-group").sortable("cancel"),jQuery("#publish").prop("disabled",!1)):(UM_Change_Field_Col(),UM_Change_Field_Grp(),UM_Rows_Refresh())}}),jQuery(".um-admin-drag-rowsubs").sortable({items:".um-admin-drag-rowsub",placeholder:"um-rowsub-placeholder",forcePlaceholderSize:!0,zIndex:9999999999,update:function(){jQuery("#publish").attr("disabled","disabled"),UM_update_subrows(),UM_Rows_Refresh()}}).disableSelection(),jQuery(".um-admin-drag-rowsub").sortable({items:".um-admin-drag-col",zIndex:9999999999,update:function(){jQuery("#publish").attr("disabled","disabled"),(row=jQuery(this)).find(".um-admin-drag-col").removeClass("cols-1 cols-2 cols-3 cols-last cols-middle"),row.find(".um-admin-drag-col").addClass("cols-"+row.find(".um-admin-drag-col").length),row.find(".um-admin-drag-col:last").addClass("cols-last"),3==row.find(".um-admin-drag-col").length&&row.find(".um-admin-drag-col:eq(1)").addClass("cols-middle"),UM_Change_Field_Col(),UM_Change_Field_Grp(),UM_Rows_Refresh()}}).disableSelection(),jQuery(".um-admin-drag-ajax").sortable({items:".um-admin-drag-row",handle:".um-admin-drag-row-start",zIndex:9999999999,placeholder:"um-row-placeholder",forcePlaceholderSize:!0,out:function(){UM.common.tipsy.hide()},update:function(){jQuery("#publish").attr("disabled","disabled"),UM_update_rows(),UM_Change_Field_Col(),UM_Change_Field_Grp(),UM_Rows_Refresh()}}).disableSelection()}function UM_update_rows(){var e=0;jQuery('a[data-remove_element="um-admin-drag-row"]').remove(),jQuery(".um-admin-drag-row").each(function(){e++,row=jQuery(this),1!=e&&row.find(".um-admin-drag-row-icons").append('<a href="#" class="um-tip-n" title="Delete Row" data-remove_element="um-admin-drag-row"><i class="um-faicon-trash-o"></i></a>')})}function UM_update_subrows(){jQuery('a[data-remove_element="um-admin-drag-rowsub"]').remove(),jQuery(".um-admin-drag-row").each(function(){c=0,jQuery(this).find(".um-admin-drag-rowsub").each(function(){c++,row=jQuery(this),1!=c&&row.find(".um-admin-drag-rowsub-icons").append('<a href="#" class="um-tip-n" title="Delete Row" data-remove_element="um-admin-drag-rowsub"><i class="um-faicon-trash-o"></i></a>')})})}function UM_Change_Field_Col(){jQuery(".um-admin-drag-col .um-admin-drag-fld").each(function(){cols=jQuery(this).parents(".um-admin-drag-rowsub").find(".um-admin-drag-col").length,(col=jQuery(this).parents(".um-admin-drag-col")).hasClass("cols-last")?(1==cols&&(saved_col=1),3==cols?saved_col=3:2==cols&&(saved_col=2)):saved_col=col.hasClass("cols-middle")&&3==cols?2:1,jQuery(this).data("column",saved_col)})}function UM_Change_Field_Grp(){jQuery(".um-admin-drag-col .um-admin-drag-fld:not(.um-field-type-group)").each(function(){0==jQuery(this).parents(".um-admin-drag-group").length?jQuery(this).data("group",""):jQuery(this).data("group",jQuery(this).parents(".um-admin-drag-fld.um-field-type-group").data("key"))})}function UM_Rows_Refresh(){jQuery(".um_update_order_fields").empty();var i,d=0;jQuery(".um-admin-drag-row").each(function(){d++,row=jQuery(this),col_num="",row.find(".um-admin-drag-rowsub").each(function(){(subrow=jQuery(this)).find(".um-admin-drag-col").removeClass("cols-1 cols-2 cols-3 cols-last cols-middle"),subrow.find(".um-admin-drag-col").addClass("cols-"+subrow.find(".um-admin-drag-col").length),subrow.find(".um-admin-drag-col:last").addClass("cols-last"),3==subrow.find(".um-admin-drag-col").length&&subrow.find(".um-admin-drag-col:eq(1)").addClass("cols-middle"),col_num=col_num?col_num+":"+subrow.find(".um-admin-drag-col").length:subrow.find(".um-admin-drag-col").length}),jQuery(".um_update_order_fields").append('<input type="hidden" name="_um_rowcols_'+d+'_cols" id="_um_rowcols_'+d+'_cols" value="'+col_num+'" />'),sub_rows_count=row.find(".um-admin-drag-rowsub").length;var e=jQuery(this).attr("data-original");jQuery(".um_update_order_fields").append('<input type="hidden" name="_um_row_'+d+'" id="_um_row_'+d+'" value="_um_row_'+d+'" />'),jQuery(".um_update_order_fields").append('<input type="hidden" name="_um_roworigin_'+d+'_val" id="_um_roworigin_'+d+'_val" value="'+e+'" />'),jQuery(".um_update_order_fields").append('<input type="hidden" name="_um_rowsub_'+d+'_rows" id="_um_rowsub_'+d+'_rows" value="'+sub_rows_count+'" />'),jQuery(this).attr("data-original","_um_row_"+d)}),i=0,jQuery(".um-admin-drag-col .um-admin-drag-fld").each(function(){var e;jQuery(this).hasClass("group")||(""!=(e=jQuery(this).data("group"))?(0==jQuery(".um-admin-drag-fld.um-field-type-group."+e).find(".um-admin-drag-group").find(jQuery(this)).length&&jQuery(this).appendTo(jQuery(".um-admin-drag-fld.um-field-type-group."+e).find(".um-admin-drag-group")),jQuery(".um_update_order_fields").append('<input type="hidden" name="um_group_'+jQuery(this).data("key")+'" id="um_group_'+jQuery(this).data("key")+'" value="'+e+'" />')):jQuery(".um_update_order_fields").append('<input type="hidden" name="um_group_'+jQuery(this).data("key")+'" id="um_group_'+jQuery(this).data("key")+'" value="" />')),i++,row="_um_row_"+(row=jQuery(this).parents(".um-admin-drag-row").index()+1),3==(saved_col=jQuery(this).data("column"))&&jQuery(this).appendTo(jQuery(this).parents(".um-admin-drag-rowsub").find(".um-admin-drag-col:eq(2)")),2==saved_col&&jQuery(this).appendTo(jQuery(this).parents(".um-admin-drag-rowsub").find(".um-admin-drag-col:eq(1)")),sub_row=jQuery(this).parents(".um-admin-drag-rowsub").index(),jQuery(".um_update_order_fields").append('<input type="hidden" name="um_position_'+jQuery(this).data("key")+'" id="um_position_'+jQuery(this).data("key")+'" value="'+i+'" />'),jQuery(".um_update_order_fields").append('<input type="hidden" name="um_row_'+jQuery(this).data("key")+'" id="um_row_'+jQuery(this).data("key")+'" value="'+row+'" />'),jQuery(".um_update_order_fields").append('<input type="hidden" name="um_subrow_'+jQuery(this).data("key")+'" id="um_subrow_'+jQuery(this).data("key")+'" value="'+sub_row+'" />'),jQuery(".um_update_order_fields").append('<input type="hidden" name="um_col_'+jQuery(this).data("key")+'" id="um_col_'+jQuery(this).data("key")+'" value="'+saved_col+'" />')}),UM_Drag_and_Drop(),UM_Add_Icon(),jQuery.ajax({url:wp.ajax.settings.url,type:"POST",data:jQuery(".um_update_order").serialize(),success:function(){jQuery("#publish").prop("disabled",!1)}})}function UM_Add_Icon(){var e='<a href="#" class="um-admin-drag-add-field um-tip-n" title="Add Field" data-modal="UM_fields" data-modal-size="normal" data-dynamic-content="um_admin_show_fields" data-arg2="'+jQuery(".um-admin-drag-ajax").data("form_id")+'" data-arg1=""><i class="um-icon-plus"></i></a>';jQuery(".um-admin-drag-col").each(function(){0==jQuery(this).find(".um-admin-drag-add-field").length||jQuery(this).find(".um-admin-drag-add-field").remove(),jQuery(this).append(e)}),jQuery(".um-admin-drag-group").each(function(){0==jQuery(this).find(".um-admin-drag-add-field").length||jQuery(this).find(".um-admin-drag-add-field").remove(),jQuery(this).append(e)})}function um_builder_delete_field_ajax(i){var e,d;0<UM.admin.builder.fieldsToDelete.length?(d=UM.admin.builder.fieldsToDelete.shift(),e=jQuery(d).find('[data-silent_action="um_admin_remove_field"]').data("arg1"),d=jQuery(d).find('[data-silent_action="um_admin_remove_field"]').data("arg2"),jQuery.ajax({url:wp.ajax.settings.url,type:"POST",data:{action:"um_do_ajax_action",act_id:"um_admin_remove_field",arg1:e,arg2:d,nonce:um_admin_scripts.nonce},success:function(e){um_builder_delete_field_ajax(i)},error:function(e){i()}})):i()}function um_form_select_tab(e,i){var d=jQuery("input#form__um_mode");e.parents(".um-admin-boxed-links").find("a").removeClass("um-admin-activebg"),e.addClass("um-admin-activebg"),jQuery(".um-admin div#side-sortables").show(),jQuery('div[id^="um-admin-form"]').hide(),jQuery("#submitdiv").show(),jQuery("div#um-admin-form-mode,div#um-admin-form-title,div#um-admin-form-builder,div#um-admin-form-shortcode").show(),jQuery('div[id^="um-admin-form-'+e.data("role")+'"]').show(),i&&d.val(e.data("role")),jQuery(".empty-container").css({border:"none"}),jQuery(".um-admin-builder").removeClass().addClass("um-admin-builder "+d.val())}function um_admin_update_builder(){var e=jQuery(".um-admin-builder").data("form_id");return jQuery.ajax({url:wp.ajax.settings.url,type:"POST",data:{action:"um_update_builder",form_id:e,nonce:um_admin_scripts.nonce},success:function(e){jQuery(".um-admin-drag-ajax").html(e),UM.common.tipsy.hide(),allow_update_via_col_click=!1,jQuery(".um-admin-drag-ctrls.columns a.active").each(function(){jQuery(this).trigger("click")}).promise().done(function(){allow_update_via_col_click=!0}),UM_Rows_Refresh()},error:function(e){}}),!1}"object"!=typeof window.UM&&(window.UM={}),"object"!=typeof window.UM.admin&&(window.UM.admin={}),UM.admin.builder={deleteProcess:[],fieldsToDelete:[],fieldConditions:{refresh:function(){var e=jQuery(".um-adm-conditional");0<e.length&&e.each(function(){jQuery(this).trigger("change")})}},tinyMCE:{editor:{},init:function(i,e){var d,a=jQuery("#"+i);("object"==typeof tinyMCE&&null!==tinyMCE.get(i)?(tinyMCE.triggerSave(),tinyMCE.EditorManager.execCommand("mceRemoveEditor",!0,i),"4"===tinyMCE.majorVersion?window.tinyMCE.execCommand("mceRemoveEditor",!0,i):window.tinyMCE.execCommand("mceRemoveControl",!0,i),UM.admin.builder.tinyMCE.editor=jQuery("<div>").append(a.parents("#wp-"+i+"-wrap").clone()),a.parents("#wp-"+i+"-wrap").replaceWith('<div class="um_tiny_placeholder"></div>'),jQuery(".um-admin-editor:visible").html(jQuery(UM.admin.builder.tinyMCE.editor).html()),d=void 0===tinyMCEPreInit.mceInit[i]?tinyMCEPreInit.mceInit[i]=tinyMCE.extend({},tinyMCEPreInit.mceInit[i]):tinyMCEPreInit.mceInit[i],"function"==typeof QTags&&(QTags(tinyMCEPreInit.qtInit[i]),QTags._buttonsInit()),"object"==typeof window.switchEditors&&window.switchEditors.go(i),tinyMCE.init(d),tinyMCE.get(i).setContent(e),a):(UM.admin.builder.tinyMCE.editor=jQuery("<div>").append(a.parents("#wp-"+i+"-wrap").clone()),a.parents("#wp-"+i+"-wrap").replaceWith('<div class="um_tiny_placeholder"></div>'),jQuery(".um-admin-editor:visible").html(jQuery(UM.admin.builder.tinyMCE.editor).html()),"function"==typeof QTags&&(QTags(tinyMCEPreInit.qtInit[i]),QTags._buttonsInit()),jQuery("#"+i))).html(e),jQuery("body").on("click",".wp-switch-editor",function(){var e=jQuery(this);e.hasClass("wp-switch-editor")&&"object"==typeof window.switchEditors&&(e=e.hasClass("switch-tmce")?"tmce":"html",window.switchEditors.go(i,e))})}},previewResize:function(){jQuery(".um-admin-modal-body > .um").length&&(jQuery(".um-admin-modal-body > .um").each(function(){(element_width=jQuery(this).width())<=340?(jQuery(this).removeClass("uimob340"),jQuery(this).removeClass("uimob500"),jQuery(this).removeClass("uimob800"),jQuery(this).removeClass("uimob960"),jQuery(this).addClass("uimob340")):element_width<=500?(jQuery(this).removeClass("uimob340"),jQuery(this).removeClass("uimob500"),jQuery(this).removeClass("uimob800"),jQuery(this).removeClass("uimob960"),jQuery(this).addClass("uimob500")):element_width<=800?(jQuery(this).removeClass("uimob340"),jQuery(this).removeClass("uimob500"),jQuery(this).removeClass("uimob800"),jQuery(this).removeClass("uimob960"),jQuery(this).addClass("uimob800")):element_width<=960?(jQuery(this).removeClass("uimob340"),jQuery(this).removeClass("uimob500"),jQuery(this).removeClass("uimob800"),jQuery(this).removeClass("uimob960"),jQuery(this).addClass("uimob960")):960<element_width&&(jQuery(this).removeClass("uimob340"),jQuery(this).removeClass("uimob500"),jQuery(this).removeClass("uimob800"),jQuery(this).removeClass("uimob960")),jQuery(this).css("opacity",1)}),jQuery(".um-admin-modal-body .um-cover, .um-admin-modal-body .um-cover-e").each(function(){var e=jQuery(this),i=e.data("ratio"),d=e.width(),i=i.split(":");calcHeight=Math.round(d/i[0])+"px",e.height(calcHeight),e.find(".um-cover-add").height(calcHeight)}))}},jQuery(window).on("resize",function(){UM.admin.builder.previewResize()}),wp.hooks.addAction("um_admin_modal_success_result","um_admin_builder",function(e,i){UM.admin.builder.fieldConditions.refresh(),jQuery("#_custom_dropdown_options_source").trigger("blur"),0<jQuery(".um-admin-editor:visible").length&&("um_admin_edit_field_popup"===i?UM.admin.builder.tinyMCE.init("um_editor_edit",jQuery(".um-admin-modal:visible .dynamic-mce-content").html()):UM.admin.builder.tinyMCE.init("um_editor_new","")),"um_admin_preview_form"===i&&(UM.admin.builder.previewResize(),"function"==typeof jQuery.fn.um_raty&&jQuery(".um-rating").um_raty({half:!1,starType:"i",number:function(){return jQuery(this).attr("data-number")},score:function(){return jQuery(this).attr("data-score")},scoreName:function(){return jQuery(this).attr("data-key")},hints:!1}),(i=jQuery(".um-admin-preview-overlay")).css("height",+i.siblings(".um").outerHeight(!0)+20+"px")),UM.admin.colorPicker.init(),UM.common.datetimePicker.init()}),wp.hooks.addAction("um_admin_modal_resize","um_admin_builder",function(){jQuery("#UM_preview_form .um-s1").length&&jQuery("#UM_preview_form .um-s1").css({display:"block"}).select2({allowClear:!0}),jQuery("#UM_preview_form .um-s2").length&&jQuery("#UM_preview_form .um-s2").css({display:"block"}).select2({allowClear:!1,minimumResultsForSearch:10})}),wp.hooks.addAction("um_admin_modal_remove","um_admin_builder",function(){0<jQuery(".um-admin-editor:visible").length&&(tinyMCE.triggerSave(),("UM_edit_field"==jQuery(".um-admin-modal:visible").find("form").parent().attr("id")?jQuery("#wp-um_editor_edit-wrap"):jQuery("#wp-um_editor_new-wrap")).remove(),jQuery(".um_tiny_placeholder").replaceWith(jQuery(UM.admin.builder.tinyMCE.editor).html()))}),jQuery(document).ready(function(){if(0<jQuery(".um-admin-boxed-links").length&&um_form_select_tab(jQuery('.um-admin-boxed-links a[data-role="'+jQuery("input#form__um_mode").val()+'"]'),!1),jQuery(".um-admin-boxed-links:not(.is-core-form) a").on("click",function(){um_form_select_tab(jQuery(this),!0)}),jQuery("#wpfooter").hide(),jQuery(document.body).on("change",".um-adm-conditional",function(){var e="checkbox"==jQuery(this).attr("type")?jQuery(this).is(":checked")?1:0:jQuery(this).val();if(jQuery(this).data("cond1"))if(e==jQuery(this).data("cond1")){if(jQuery("."+jQuery(this).data("cond1-show")).show(),jQuery("."+jQuery(this).data("cond1-hide")).hide(),"_roles"==jQuery(this).data("cond1-show"))return!1}else jQuery("."+jQuery(this).data("cond1-show")).hide(),jQuery("."+jQuery(this).data("cond1-hide")).show();if(jQuery(this).data("cond2"))if(e==jQuery(this).data("cond2")){if(jQuery("."+jQuery(this).data("cond2-show")).show(),jQuery("."+jQuery(this).data("cond2-hide")).hide(),"_roles"==jQuery(this).data("cond2-show"))return!1}else jQuery("."+jQuery(this).data("cond2-show")).hide(),jQuery("."+jQuery(this).data("cond2-hide")).show();jQuery(this).data("cond3")&&(e==jQuery(this).data("cond3")?(jQuery("."+jQuery(this).data("cond3-show")).show(),jQuery("."+jQuery(this).data("cond3-hide")).hide()):(jQuery("."+jQuery(this).data("cond3-show")).hide(),jQuery("."+jQuery(this).data("cond3-hide")).show()))}),jQuery(".um-adm-conditional").each(function(){jQuery(this).trigger("change")}),jQuery(document.body).on("click",'a[data-silent_action^="um_"]',function(){var e,i,d,a,n,r,o,t;return void 0===jQuery(this).attr("disabled")&&(e=jQuery(this).data("silent_action"),i=jQuery(this).data("arg1"),d=jQuery(this).data("arg2"),o=r=n=a="",(t=jQuery(".um-col-demon-settings")).data("in_column")&&(a=t.data("in_row"),n=t.data("in_sub_row"),r=t.data("in_column"),o=t.data("in_group")),UM.admin.modal.remove(),jQuery.ajax({url:wp.ajax.settings.url,type:"POST",data:{action:"um_do_ajax_action",act_id:e,arg1:i,arg2:d,in_row:a,in_sub_row:n,in_column:r,in_group:o,nonce:um_admin_scripts.nonce},success:function(e){t.data("in_row","").data("in_sub_row","").data("in_column","").data("in_group",""),UM.admin.modal.resize(),um_admin_update_builder()},error:function(e){}})),!1}),jQuery(document.body).on("click",".um-admin-btns a span.remove",function(e){var i;return e.preventDefault(),confirm(wp.i18n.__("This will permanently delete this custom field from a database and from all forms on your site. Are you sure?","ultimate-member"))&&(jQuery(this).parents("a").remove(),i=jQuery(this).parents("a").data("arg1"),jQuery.ajax({url:wp.ajax.settings.url,type:"POST",data:{action:"um_do_ajax_action",act_id:"um_admin_remove_field_global",arg1:i,nonce:um_admin_scripts.nonce},success:function(e){jQuery("#um-admin-form-builder ."+i).remove()},error:function(e){}})),!1}),jQuery(document.body).on("submit","form.um_add_field",function(e){e.preventDefault();var i=jQuery(".um-admin-cur-condition"),a=(jQuery(i).each(function(e){""!==jQuery(this).find('[id^="_conditional_action"]').val()&&""!==jQuery(this).find('[id^="_conditional_field"]').val()&&""!==jQuery(this).find('[id^="_conditional_operator"]').val()||jQuery(i[e]).find(".um-admin-remove-condition").trigger("click")}),i=jQuery(".um-admin-cur-condition"),jQuery(i).each(function(e){e=0===e?"":e;jQuery(this).find('[id^="_conditional_action"]').attr("name","_conditional_action"+e),jQuery(this).find('[id^="_conditional_action"]').attr("id","_conditional_action"+e),jQuery(this).find('[id^="_conditional_field"]').attr("name","_conditional_field"+e),jQuery(this).find('[id^="_conditional_field"]').attr("id","_conditional_field"+e),jQuery(this).find('[id^="_conditional_operator"]').attr("name","_conditional_operator"+e),jQuery(this).find('[id^="_conditional_operator"]').attr("id","_conditional_operator"+e),jQuery(this).find('[id^="_conditional_value"]').attr("name","_conditional_value"+e),jQuery(this).find('[id^="_conditional_value"]').attr("id","_conditional_value"+e)}),jQuery(this));return jQuery.ajax({url:wp.ajax.settings.url,type:"POST",dataType:"json",data:a.serialize(),beforeSend:function(){a.css({opacity:.5}),jQuery(".um-admin-error").removeClass("um-admin-error"),a.find(".um-admin-error-block").hide(),a.find(".um-admin-success-block").hide()},complete:function(){a.css({opacity:1})},success:function(e){if(e.success){var i=e.data;if(i.error){let d=0;jQuery.each(i.error,function(e,i){1===++d&&(a.find("#"+e).addClass("um-admin-error").trigger("focus"),a.find(".um-admin-error-block").show().html(i))}),UM.admin.modal.resize()}else jQuery(".um-col-demon-settings").data("in_row","").data("in_sub_row","").data("in_column","").data("in_group",""),UM.common.tipsy.hide(),UM.admin.modal.remove(),um_admin_update_builder()}else console.log(e)},error:function(e){console.log(e)}}),!1}),jQuery(document.body).on("click",".um-admin-builder a, .um-admin-modal a:not(.um-preview-upload)",function(e){return e.preventDefault(),!1}),jQuery(document.body).on("click",".um-admin-btn-toggle a",function(e){var i=jQuery(this).parent().find(".um-admin-btn-content"),d=jQuery(this);i.is(":hidden")?(i.show(),d.find("i").removeClass().addClass("um-icon-minus"),d.addClass("active")):(i.hide(),d.find("i").removeClass().addClass("um-icon-plus"),d.removeClass("active")),UM.admin.modal.resize()}),jQuery(document.body).on("click",".um-admin-new-condition",function(){if(jQuery(this).hasClass("disabled"))return!1;var e,i=jQuery(this).parents(".um-admin-btn-content"),i=(i.find(".um-admin-cur-condition").length<5?((e=jQuery(".um-admin-btn-content").find(".um-admin-cur-condition-template").clone()).find("input[type=text]").val(""),e.find("select").val(""),e.appendTo(i),jQuery(e).removeClass("um-admin-cur-condition-template"),jQuery(e).addClass("um-admin-cur-condition"),UM.admin.builder.fieldConditions.refresh(),UM.admin.modal.resize()):(jQuery(this).addClass("disabled"),alert("You already have 5 rules")),jQuery(".um-admin-cur-condition"));jQuery(i).each(function(e){id=0===e?"":e,jQuery(this).find('[id^="_conditional_action"]').attr("name","_conditional_action"+id),jQuery(this).find('[id^="_conditional_action"]').attr("id","_conditional_action"+id),jQuery(this).find('[id^="_conditional_field"]').attr("name","_conditional_field"+id),jQuery(this).find('[id^="_conditional_field"]').attr("id","_conditional_field"+id),jQuery(this).find('[id^="_conditional_operator"]').attr("name","_conditional_operator"+id),jQuery(this).find('[id^="_conditional_operator"]').attr("id","_conditional_operator"+id),jQuery(this).find('[id^="_conditional_value"]').attr("name","_conditional_value"+id),jQuery(this).find('[id^="_conditional_value"]').attr("id","_conditional_value"+id)})}),jQuery(document.body).on("click",".um-admin-reset-conditions a",function(){var e=jQuery(this).parents(".um-admin-btn-content");e.find(".um-admin-cur-condition").slice(1).remove(),e.find("input[type=text]").val(""),e.find("select").val(""),jQuery(".um-admin-new-condition").removeClass("disabled"),UM.admin.builder.fieldConditions.refresh(),UM.admin.modal.resize()}),jQuery(document.body).on("click",".um-admin-remove-condition",function(){var e=jQuery(this).parents(".um-admin-cur-condition"),e=(jQuery(".um-admin-new-condition").removeClass("disabled"),UM.common.tipsy.hide(),e.remove(),jQuery(".um-admin-cur-condition"));jQuery(e).each(function(e){id=0===e?"":e,jQuery(this).find('[id^="_conditional_action"]').attr("name","_conditional_action"+id),jQuery(this).find('[id^="_conditional_action"]').attr("id","_conditional_action"+id),jQuery(this).find('[id^="_conditional_field"]').attr("name","_conditional_field"+id),jQuery(this).find('[id^="_conditional_field"]').attr("id","_conditional_field"+id),jQuery(this).find('[id^="_conditional_operator"]').attr("name","_conditional_operator"+id),jQuery(this).find('[id^="_conditional_operator"]').attr("id","_conditional_operator"+id),jQuery(this).find('[id^="_conditional_value"]').attr("name","_conditional_value"+id),jQuery(this).find('[id^="_conditional_value"]').attr("id","_conditional_value"+id)}),UM.admin.builder.fieldConditions.refresh(),UM.admin.modal.resize()}),jQuery(document.body).on("blur","#_custom_dropdown_options_source",function(){var e=jQuery(this),a=jQuery("textarea[id=_options]");""!=e.val()&&(e=e.val(),jQuery.ajax({url:wp.ajax.settings.url,type:"POST",data:{action:"um_populate_dropdown_options",um_option_callback:e,nonce:um_admin_scripts.nonce},complete:function(){},success:function(e){var i,d=[];for(i in e.data)d.push(e.data[i]);a.val(d.join("\n"))}}))}),jQuery(document.body).on("click",".um-admin-icons span",function(){var e=jQuery(this).attr("data-code");jQuery(this).parent().find("span").removeClass("highlighted"),jQuery(this).addClass("highlighted"),jQuery("#UM_fonticons").find("a.um-admin-modal-back").attr("data-code",e)}),!jQuery(".um-admin-drag").length)return!1;UM_Drag_and_Drop(),jQuery(document.body).on("click","a.um-admin-drag-add-field",function(){in_row=jQuery(this).parents(".um-admin-drag-row").index(),in_sub_row=jQuery(this).parents(".um-admin-drag-rowsub").index(),in_column=1==jQuery(this).parents(".um-admin-drag-rowsub").find(".um-admin-drag-col").length?1:jQuery(this).parents(".um-admin-drag-col").hasClass("cols-middle")?2:jQuery(this).parents(".um-admin-drag-col").hasClass("cols-last")?3==jQuery(this).parents(".um-admin-drag-rowsub").find(".um-admin-drag-col").length?3:2:1,in_group=jQuery(this).parents(".um-admin-drag-group").length?jQuery(this).parents(".um-admin-drag-fld.um-field-type-group").data("key"):"",jQuery(".um-col-demon-settings").data("in_row",in_row),jQuery(".um-col-demon-settings").data("in_sub_row",in_sub_row),jQuery(".um-col-demon-settings").data("in_column",in_column),jQuery(".um-col-demon-settings").data("in_group",in_group)}),jQuery(document.body).on("click",'*[data-row_action="add_row"]',function(){var e=jQuery(".um-admin-drag-ajax");e.append('<div class="um-admin-drag-row">'+jQuery(".um-col-demon-row").html()+"</div>"),e.find(".um-admin-drag-row:last").find(".um-admin-drag-row-icons").find("a.um-admin-drag-row-edit").attr("data-arg3","_um_row_"+e.find(".um-admin-drag-row").length),e.find(".um-admin-drag-row:last").attr("data-original","_um_row_"+e.find(".um-admin-drag-row").length),UM_update_rows(),UM_update_subrows(),UM_Rows_Refresh()}),jQuery(document.body).on("click",'*[data-row_action="add_subrow"]',function(){jQuery(this).parents(".um-admin-drag-row").find(".um-admin-drag-rowsubs").append('<div class="um-admin-drag-rowsub">'+jQuery(".um-col-demon-subrow").html()+"</div>"),UM_update_subrows(),UM_Rows_Refresh()}),jQuery(document.body).on("click",'a[data-remove_element^="um-"]',function(){let e=jQuery(this),i=jQuery(this).data("remove_element"),d=jQuery(this).parents("."+i).children(".um-admin-row-loading");var a=jQuery(this).parents(".um-admin-drag-row").index(),n=jQuery(this).parents(".um-admin-drag-rowsub").index();let r={row:a,subrow:n},o=!1;jQuery.each(UM.admin.builder.deleteProcess,function(e){if(r.row===UM.admin.builder.deleteProcess[e].row&&r.subrow===UM.admin.builder.deleteProcess[e].subrow)return!(o=!0)}),o||(d.show(),UM.admin.builder.deleteProcess.push({row:a,subrow:n}),UM.admin.builder.fieldsToDelete=jQuery(this).parents("."+i).find(".um-admin-drag-fld").toArray(),0<UM.admin.builder.fieldsToDelete.length?um_builder_delete_field_ajax(function(){UM.common.tipsy.hide(),e.parents("."+i).remove(),UM_Rows_Refresh(),jQuery.each(UM.admin.builder.deleteProcess,function(e){if(r.row===UM.admin.builder.deleteProcess[e].row&&r.subrow===UM.admin.builder.deleteProcess[e].subrow)return UM.admin.builder.deleteProcess.splice(e,1),!1}),d.hide()}):(UM.common.tipsy.hide(),jQuery(this).parents("."+i).remove(),UM_Rows_Refresh(),jQuery.each(UM.admin.builder.deleteProcess,function(e){if(r.row===UM.admin.builder.deleteProcess[e].row&&r.subrow===UM.admin.builder.deleteProcess[e].subrow)return UM.admin.builder.deleteProcess.splice(e,1),!1}),d.hide()))}),jQuery(document.body).on("click",".um-admin-drag-ctrls.columns a",function(){var e=jQuery(this).parents(".um-admin-drag-rowsub"),d=jQuery(this),a=(jQuery(this).parent().find("a").removeClass("active"),d.addClass("active"),e.find(".um-admin-drag-col").length),n=d.data("cols")-a;if(0<n){for(i=0;i<n;i++)e.find(".um-admin-drag-col-dynamic").append('<div class="um-admin-drag-col"></div>');e.find(".um-admin-drag-col").removeClass("cols-1 cols-2 cols-3 cols-last cols-middle"),e.find(".um-admin-drag-col").addClass("cols-"+e.find(".um-admin-drag-col").length),e.find(".um-admin-drag-col:last").addClass("cols-last"),3==e.find(".um-admin-drag-col").length&&e.find(".um-admin-drag-col:eq(1)").addClass("cols-middle")}else n<0&&(2==(n+=3)&&(e.find(".um-admin-drag-col:first").append(e.find(".um-admin-drag-col.cols-last").html()),e.find(".um-admin-drag-col.cols-last").remove()),1==n&&(e.find(".um-admin-drag-col:first").append(e.find(".um-admin-drag-col.cols-last").html()),e.find(".um-admin-drag-col:first").append(e.find(".um-admin-drag-col.cols-middle").html()),e.find(".um-admin-drag-col.cols-last").remove(),e.find(".um-admin-drag-col.cols-middle").remove()),e.find(".um-admin-drag-col").removeClass("cols-1 cols-2 cols-3 cols-last cols-middle"),e.find(".um-admin-drag-col").addClass("cols-"+e.find(".um-admin-drag-col:visible").length),e.find(".um-admin-drag-col:last").addClass("cols-last"));1==allow_update_via_col_click&&(UM_Change_Field_Col(),UM_Rows_Refresh())}),allow_update_via_col_click=!1,jQuery(".um-admin-drag-ctrls.columns a.active").each(function(){jQuery(this).trigger("click")}).promise().done(function(){allow_update_via_col_click=!0}),UM_Rows_Refresh()});
\ No newline at end of file
+function UM_Drag_and_Drop(){jQuery(".um-admin-drag-col,.um-admin-drag-group").sortable({items:".um-admin-drag-fld",connectWith:".um-admin-drag-col,.um-admin-drag-group",placeholder:"um-fld-placeholder",forcePlaceholderSize:!0,update:function(e,i){jQuery("#publish").attr("disabled","disabled"),i.item.hasClass("um-field-type-group")&&0<i.item.parents(".um-field-type-group").length?(jQuery(".um-admin-drag-col,.um-admin-drag-group").sortable("cancel"),jQuery("#publish").prop("disabled",!1)):(UM_Change_Field_Col(),UM_Change_Field_Grp(),UM_Rows_Refresh())}}),jQuery(".um-admin-drag-rowsubs").sortable({items:".um-admin-drag-rowsub",placeholder:"um-rowsub-placeholder",forcePlaceholderSize:!0,zIndex:9999999999,update:function(){jQuery("#publish").attr("disabled","disabled"),UM_update_subrows(),UM_Rows_Refresh()}}).disableSelection(),jQuery(".um-admin-drag-rowsub").sortable({items:".um-admin-drag-col",zIndex:9999999999,update:function(){jQuery("#publish").attr("disabled","disabled"),(row=jQuery(this)).find(".um-admin-drag-col").removeClass("cols-1 cols-2 cols-3 cols-last cols-middle"),row.find(".um-admin-drag-col").addClass("cols-"+row.find(".um-admin-drag-col").length),row.find(".um-admin-drag-col:last").addClass("cols-last"),3==row.find(".um-admin-drag-col").length&&row.find(".um-admin-drag-col:eq(1)").addClass("cols-middle"),UM_Change_Field_Col(),UM_Change_Field_Grp(),UM_Rows_Refresh()}}).disableSelection(),jQuery(".um-admin-drag-ajax").sortable({items:".um-admin-drag-row",handle:".um-admin-drag-row-start",zIndex:9999999999,placeholder:"um-row-placeholder",forcePlaceholderSize:!0,out:function(){UM.common.tipsy.hide()},update:function(){jQuery("#publish").attr("disabled","disabled"),UM_update_rows(),UM_Change_Field_Col(),UM_Change_Field_Grp(),UM_Rows_Refresh()}}).disableSelection()}function UM_update_rows(){var e=0;jQuery('a[data-remove_element="um-admin-drag-row"]').remove(),jQuery(".um-admin-drag-row").each(function(){e++,row=jQuery(this),1!=e&&row.find(".um-admin-drag-row-icons").append('<a href="#" class="um-tip-n" title="Delete Row" data-remove_element="um-admin-drag-row"><i class="um-faicon-trash-o"></i></a>')})}function UM_update_subrows(){jQuery('a[data-remove_element="um-admin-drag-rowsub"]').remove(),jQuery(".um-admin-drag-row").each(function(){c=0,jQuery(this).find(".um-admin-drag-rowsub").each(function(){c++,row=jQuery(this),1!=c&&row.find(".um-admin-drag-rowsub-icons").append('<a href="#" class="um-tip-n" title="Delete Row" data-remove_element="um-admin-drag-rowsub"><i class="um-faicon-trash-o"></i></a>')})})}function UM_Change_Field_Col(){jQuery(".um-admin-drag-col .um-admin-drag-fld").each(function(){cols=jQuery(this).parents(".um-admin-drag-rowsub").find(".um-admin-drag-col").length,(col=jQuery(this).parents(".um-admin-drag-col")).hasClass("cols-last")?(1==cols&&(saved_col=1),3==cols?saved_col=3:2==cols&&(saved_col=2)):saved_col=col.hasClass("cols-middle")&&3==cols?2:1,jQuery(this).data("column",saved_col)})}function UM_Change_Field_Grp(){jQuery(".um-admin-drag-col .um-admin-drag-fld:not(.um-field-type-group)").each(function(){0==jQuery(this).parents(".um-admin-drag-group").length?jQuery(this).data("group",""):jQuery(this).data("group",jQuery(this).parents(".um-admin-drag-fld.um-field-type-group").data("key"))})}function UM_Rows_Refresh(){jQuery(".um_update_order_fields").empty();var i,d=0;jQuery(".um-admin-drag-row").each(function(){d++,row=jQuery(this),col_num="",row.find(".um-admin-drag-rowsub").each(function(){(subrow=jQuery(this)).find(".um-admin-drag-col").removeClass("cols-1 cols-2 cols-3 cols-last cols-middle"),subrow.find(".um-admin-drag-col").addClass("cols-"+subrow.find(".um-admin-drag-col").length),subrow.find(".um-admin-drag-col:last").addClass("cols-last"),3==subrow.find(".um-admin-drag-col").length&&subrow.find(".um-admin-drag-col:eq(1)").addClass("cols-middle"),col_num=col_num?col_num+":"+subrow.find(".um-admin-drag-col").length:subrow.find(".um-admin-drag-col").length}),jQuery(".um_update_order_fields").append('<input type="hidden" name="_um_rowcols_'+d+'_cols" id="_um_rowcols_'+d+'_cols" value="'+col_num+'" />'),sub_rows_count=row.find(".um-admin-drag-rowsub").length;var e=jQuery(this).attr("data-original");jQuery(".um_update_order_fields").append('<input type="hidden" name="_um_row_'+d+'" id="_um_row_'+d+'" value="_um_row_'+d+'" />'),jQuery(".um_update_order_fields").append('<input type="hidden" name="_um_roworigin_'+d+'_val" id="_um_roworigin_'+d+'_val" value="'+e+'" />'),jQuery(".um_update_order_fields").append('<input type="hidden" name="_um_rowsub_'+d+'_rows" id="_um_rowsub_'+d+'_rows" value="'+sub_rows_count+'" />'),jQuery(this).attr("data-original","_um_row_"+d)}),i=0,jQuery(".um-admin-drag-col .um-admin-drag-fld").each(function(){var e;jQuery(this).hasClass("group")||(""!=(e=jQuery(this).data("group"))?(0==jQuery(".um-admin-drag-fld.um-field-type-group."+e).find(".um-admin-drag-group").find(jQuery(this)).length&&jQuery(this).appendTo(jQuery(".um-admin-drag-fld.um-field-type-group."+e).find(".um-admin-drag-group")),jQuery(".um_update_order_fields").append('<input type="hidden" name="um_group_'+jQuery(this).data("key")+'" id="um_group_'+jQuery(this).data("key")+'" value="'+e+'" />')):jQuery(".um_update_order_fields").append('<input type="hidden" name="um_group_'+jQuery(this).data("key")+'" id="um_group_'+jQuery(this).data("key")+'" value="" />')),i++,row="_um_row_"+(row=jQuery(this).parents(".um-admin-drag-row").index()+1),3==(saved_col=jQuery(this).data("column"))&&jQuery(this).appendTo(jQuery(this).parents(".um-admin-drag-rowsub").find(".um-admin-drag-col:eq(2)")),2==saved_col&&jQuery(this).appendTo(jQuery(this).parents(".um-admin-drag-rowsub").find(".um-admin-drag-col:eq(1)")),sub_row=jQuery(this).parents(".um-admin-drag-rowsub").index(),jQuery(".um_update_order_fields").append('<input type="hidden" name="um_position_'+jQuery(this).data("key")+'" id="um_position_'+jQuery(this).data("key")+'" value="'+i+'" />'),jQuery(".um_update_order_fields").append('<input type="hidden" name="um_row_'+jQuery(this).data("key")+'" id="um_row_'+jQuery(this).data("key")+'" value="'+row+'" />'),jQuery(".um_update_order_fields").append('<input type="hidden" name="um_subrow_'+jQuery(this).data("key")+'" id="um_subrow_'+jQuery(this).data("key")+'" value="'+sub_row+'" />'),jQuery(".um_update_order_fields").append('<input type="hidden" name="um_col_'+jQuery(this).data("key")+'" id="um_col_'+jQuery(this).data("key")+'" value="'+saved_col+'" />')}),UM_Drag_and_Drop(),UM_Add_Icon(),jQuery.ajax({url:wp.ajax.settings.url,type:"POST",data:jQuery(".um_update_order").serialize(),success:function(){jQuery("#publish").prop("disabled",!1)}})}function UM_Add_Icon(){var e='<a href="#" class="um-admin-drag-add-field um-tip-n" title="Add Field" data-modal="UM_fields" data-modal-size="normal" data-dynamic-content="um_admin_show_fields" data-arg2="'+jQuery(".um-admin-drag-ajax").data("form_id")+'" data-arg1=""><i class="um-icon-plus"></i></a>';jQuery(".um-admin-drag-col").each(function(){0==jQuery(this).find(".um-admin-drag-add-field").length||jQuery(this).find(".um-admin-drag-add-field").remove(),jQuery(this).append(e)}),jQuery(".um-admin-drag-group").each(function(){0==jQuery(this).find(".um-admin-drag-add-field").length||jQuery(this).find(".um-admin-drag-add-field").remove(),jQuery(this).append(e)})}function um_builder_delete_field_ajax(i){var e,d;0<UM.admin.builder.fieldsToDelete.length?(d=UM.admin.builder.fieldsToDelete.shift(),e=jQuery(d).find('[data-silent_action="um_admin_remove_field"]').data("arg1"),d=jQuery(d).find('[data-silent_action="um_admin_remove_field"]').data("arg2"),jQuery.ajax({url:wp.ajax.settings.url,type:"POST",data:{action:"um_do_ajax_action",act_id:"um_admin_remove_field",arg1:e,arg2:d,nonce:um_admin_scripts.nonce},success:function(e){um_builder_delete_field_ajax(i)},error:function(e){i()}})):i()}function um_form_select_tab(e,i){var d=jQuery("input#form__um_mode");e.parents(".um-admin-boxed-links").find("a").removeClass("um-admin-activebg"),e.addClass("um-admin-activebg"),jQuery(".um-admin div#side-sortables").show(),jQuery('div[id^="um-admin-form"]').hide(),jQuery("#submitdiv").show(),jQuery("div#um-admin-form-mode,div#um-admin-form-title,div#um-admin-form-builder,div#um-admin-form-shortcode").show(),jQuery('div[id^="um-admin-form-'+e.data("role")+'"]').show(),i&&d.val(e.data("role")),jQuery(".empty-container").css({border:"none"}),jQuery(".um-admin-builder").removeClass().addClass("um-admin-builder "+d.val())}function um_admin_update_builder(){var e=jQuery(".um-admin-builder").data("form_id");return jQuery.ajax({url:wp.ajax.settings.url,type:"POST",data:{action:"um_update_builder",form_id:e,nonce:um_admin_scripts.nonce},success:function(e){jQuery(".um-admin-drag-ajax").html(e),UM.common.tipsy.hide(),allow_update_via_col_click=!1,jQuery(".um-admin-drag-ctrls.columns a.active").each(function(){jQuery(this).trigger("click")}).promise().done(function(){allow_update_via_col_click=!0}),UM_Rows_Refresh()},error:function(e){}}),!1}"object"!=typeof window.UM&&(window.UM={}),"object"!=typeof window.UM.admin&&(window.UM.admin={}),UM.admin.builder={deleteProcess:[],fieldsToDelete:[],fieldConditions:{refresh:function(){var e=jQuery(".um-adm-conditional");0<e.length&&e.each(function(){jQuery(this).trigger("change")})}},tinyMCE:{editor:{},init:function(i,e){var d,a=jQuery("#"+i);("object"==typeof tinyMCE&&null!==tinyMCE.get(i)?(tinyMCE.triggerSave(),tinyMCE.EditorManager.execCommand("mceRemoveEditor",!0,i),"4"===tinyMCE.majorVersion?window.tinyMCE.execCommand("mceRemoveEditor",!0,i):window.tinyMCE.execCommand("mceRemoveControl",!0,i),UM.admin.builder.tinyMCE.editor=jQuery("<div>").append(a.parents("#wp-"+i+"-wrap").clone()),a.parents("#wp-"+i+"-wrap").replaceWith('<div class="um_tiny_placeholder"></div>'),jQuery(".um-admin-editor:visible").html(jQuery(UM.admin.builder.tinyMCE.editor).html()),d=void 0===tinyMCEPreInit.mceInit[i]?tinyMCEPreInit.mceInit[i]=tinyMCE.extend({},tinyMCEPreInit.mceInit[i]):tinyMCEPreInit.mceInit[i],"function"==typeof QTags&&(QTags(tinyMCEPreInit.qtInit[i]),QTags._buttonsInit()),"object"==typeof window.switchEditors&&window.switchEditors.go(i),tinyMCE.init(d),tinyMCE.get(i).setContent(e),a):(UM.admin.builder.tinyMCE.editor=jQuery("<div>").append(a.parents("#wp-"+i+"-wrap").clone()),a.parents("#wp-"+i+"-wrap").replaceWith('<div class="um_tiny_placeholder"></div>'),jQuery(".um-admin-editor:visible").html(jQuery(UM.admin.builder.tinyMCE.editor).html()),"function"==typeof QTags&&(QTags(tinyMCEPreInit.qtInit[i]),QTags._buttonsInit()),jQuery("#"+i))).html(e),jQuery("body").on("click",".wp-switch-editor",function(){var e=jQuery(this);e.hasClass("wp-switch-editor")&&"object"==typeof window.switchEditors&&(e=e.hasClass("switch-tmce")?"tmce":"html",window.switchEditors.go(i,e))})}},previewResize:function(){jQuery(".um-admin-modal-body > .um").length&&(jQuery(".um-admin-modal-body > .um").each(function(){(element_width=jQuery(this).width())<=340?(jQuery(this).removeClass("uimob340"),jQuery(this).removeClass("uimob500"),jQuery(this).removeClass("uimob800"),jQuery(this).removeClass("uimob960"),jQuery(this).addClass("uimob340")):element_width<=500?(jQuery(this).removeClass("uimob340"),jQuery(this).removeClass("uimob500"),jQuery(this).removeClass("uimob800"),jQuery(this).removeClass("uimob960"),jQuery(this).addClass("uimob500")):element_width<=800?(jQuery(this).removeClass("uimob340"),jQuery(this).removeClass("uimob500"),jQuery(this).removeClass("uimob800"),jQuery(this).removeClass("uimob960"),jQuery(this).addClass("uimob800")):element_width<=960?(jQuery(this).removeClass("uimob340"),jQuery(this).removeClass("uimob500"),jQuery(this).removeClass("uimob800"),jQuery(this).removeClass("uimob960"),jQuery(this).addClass("uimob960")):960<element_width&&(jQuery(this).removeClass("uimob340"),jQuery(this).removeClass("uimob500"),jQuery(this).removeClass("uimob800"),jQuery(this).removeClass("uimob960")),jQuery(this).css("opacity",1)}),jQuery(".um-admin-modal-body .um-cover, .um-admin-modal-body .um-cover-e").each(function(){var e=jQuery(this),i=e.data("ratio"),d=e.width(),i=i.split(":");calcHeight=Math.round(d/i[0])+"px",e.height(calcHeight),e.find(".um-cover-add").height(calcHeight)}))}},jQuery(window).on("resize",function(){UM.admin.builder.previewResize()}),wp.hooks.addAction("um_admin_modal_success_result","um_admin_builder",function(e,i){UM.admin.builder.fieldConditions.refresh(),jQuery("#_custom_dropdown_options_source").trigger("blur"),0<jQuery(".um-admin-editor:visible").length&&("um_admin_edit_field_popup"===i?UM.admin.builder.tinyMCE.init("um_editor_edit",jQuery(".um-admin-modal:visible .dynamic-mce-content").html()):UM.admin.builder.tinyMCE.init("um_editor_new","")),"um_admin_preview_form"===i&&(UM.admin.builder.previewResize(),"function"==typeof jQuery.fn.um_raty&&jQuery(".um-rating").um_raty({half:!1,starType:"i",number:function(){return jQuery(this).attr("data-number")},score:function(){return jQuery(this).attr("data-score")},scoreName:function(){return jQuery(this).attr("data-key")},hints:!1}),(i=jQuery(".um-admin-preview-overlay")).css("height",+i.siblings(".um").outerHeight(!0)+20+"px")),UM.admin.colorPicker.init(),UM.common.datetimePicker.init()}),wp.hooks.addAction("um_admin_modal_resize","um_admin_builder",function(){jQuery("#UM_preview_form .um-s1").length&&jQuery("#UM_preview_form .um-s1").css({display:"block"}).select2({allowClear:!0}),jQuery("#UM_preview_form .um-s2").length&&jQuery("#UM_preview_form .um-s2").css({display:"block"}).select2({allowClear:!1,minimumResultsForSearch:10})}),wp.hooks.addAction("um_admin_modal_remove","um_admin_builder",function(){0<jQuery(".um-admin-editor:visible").length&&(tinyMCE.triggerSave(),("UM_edit_field"==jQuery(".um-admin-modal:visible").find("form").parent().attr("id")?jQuery("#wp-um_editor_edit-wrap"):jQuery("#wp-um_editor_new-wrap")).remove(),jQuery(".um_tiny_placeholder").replaceWith(jQuery(UM.admin.builder.tinyMCE.editor).html()))}),jQuery(document).ready(function(){if(0<jQuery(".um-admin-boxed-links").length&&um_form_select_tab(jQuery('.um-admin-boxed-links a[data-role="'+jQuery("input#form__um_mode").val()+'"]'),!1),jQuery(".um-admin-boxed-links:not(.is-core-form) a").on("click",function(){um_form_select_tab(jQuery(this),!0)}),jQuery("#wpfooter").hide(),jQuery(document.body).on("change",".um-adm-conditional",function(){var e="checkbox"==jQuery(this).attr("type")?jQuery(this).is(":checked")?1:0:jQuery(this).val();if(jQuery(this).data("cond1"))if(e==jQuery(this).data("cond1")){if(jQuery("."+jQuery(this).data("cond1-show")).show(),jQuery("."+jQuery(this).data("cond1-hide")).hide(),"_roles"==jQuery(this).data("cond1-show"))return!1}else jQuery("."+jQuery(this).data("cond1-show")).hide(),jQuery("."+jQuery(this).data("cond1-hide")).show();if(jQuery(this).data("cond2"))if(e==jQuery(this).data("cond2")){if(jQuery("."+jQuery(this).data("cond2-show")).show(),jQuery("."+jQuery(this).data("cond2-hide")).hide(),"_roles"==jQuery(this).data("cond2-show"))return!1}else jQuery("."+jQuery(this).data("cond2-show")).hide(),jQuery("."+jQuery(this).data("cond2-hide")).show();jQuery(this).data("cond3")&&(e==jQuery(this).data("cond3")?(jQuery("."+jQuery(this).data("cond3-show")).show(),jQuery("."+jQuery(this).data("cond3-hide")).hide()):(jQuery("."+jQuery(this).data("cond3-show")).hide(),jQuery("."+jQuery(this).data("cond3-hide")).show()))}),jQuery(".um-adm-conditional").each(function(){jQuery(this).trigger("change")}),jQuery(document.body).on("click",'a[data-silent_action^="um_"]',function(){var e,i,d,a,n,r,o,t;return void 0===jQuery(this).attr("disabled")&&(e=jQuery(this).data("silent_action"),i=jQuery(this).data("arg1"),d=jQuery(this).data("arg2"),o=r=n=a="",(t=jQuery(".um-col-demon-settings")).data("in_column")&&(a=t.data("in_row"),n=t.data("in_sub_row"),r=t.data("in_column"),o=t.data("in_group")),UM.admin.modal.remove(),jQuery.ajax({url:wp.ajax.settings.url,type:"POST",data:{action:"um_do_ajax_action",act_id:e,arg1:i,arg2:d,in_row:a,in_sub_row:n,in_column:r,in_group:o,nonce:um_admin_scripts.nonce},success:function(e){t.data("in_row","").data("in_sub_row","").data("in_column","").data("in_group",""),UM.admin.modal.resize(),um_admin_update_builder()},error:function(e){}})),!1}),jQuery(document.body).on("click",".um-admin-btns a span.remove",function(e){var i;return e.preventDefault(),confirm(wp.i18n.__("This will permanently delete this custom field from a database and from all forms on your site. Are you sure?","ultimate-member"))&&(jQuery(this).parents("a").remove(),i=jQuery(this).parents("a").data("arg1"),jQuery.ajax({url:wp.ajax.settings.url,type:"POST",data:{action:"um_do_ajax_action",act_id:"um_admin_remove_field_global",arg1:i,nonce:um_admin_scripts.nonce},success:function(e){jQuery("#um-admin-form-builder ."+i).remove()},error:function(e){}})),!1}),jQuery(document.body).on("submit","form.um_add_field",function(e){e.preventDefault();var i=jQuery(".um-admin-cur-condition"),a=(jQuery(i).each(function(e){""!==jQuery(this).find('[id^="_conditional_action"]').val()&&""!==jQuery(this).find('[id^="_conditional_field"]').val()&&""!==jQuery(this).find('[id^="_conditional_operator"]').val()||jQuery(i[e]).find(".um-admin-remove-condition").trigger("click")}),i=jQuery(".um-admin-cur-condition"),jQuery(i).each(function(e){e=0===e?"":e;jQuery(this).find('[id^="_conditional_action"]').attr("name","_conditional_action"+e),jQuery(this).find('[id^="_conditional_action"]').attr("id","_conditional_action"+e),jQuery(this).find('[id^="_conditional_field"]').attr("name","_conditional_field"+e),jQuery(this).find('[id^="_conditional_field"]').attr("id","_conditional_field"+e),jQuery(this).find('[id^="_conditional_operator"]').attr("name","_conditional_operator"+e),jQuery(this).find('[id^="_conditional_operator"]').attr("id","_conditional_operator"+e),jQuery(this).find('[id^="_conditional_value"]').attr("name","_conditional_value"+e),jQuery(this).find('[id^="_conditional_value"]').attr("id","_conditional_value"+e)}),jQuery(this));return jQuery.ajax({url:wp.ajax.settings.url,type:"POST",dataType:"json",data:a.serialize(),beforeSend:function(){a.css({opacity:.5}),jQuery(".um-admin-error").removeClass("um-admin-error"),a.find(".um-admin-error-block").hide(),a.find(".um-admin-success-block").hide()},complete:function(){a.css({opacity:1})},success:function(e){if(e.success){var i=e.data;if(i.error){let d=0;jQuery.each(i.error,function(e,i){1===++d&&(a.find("#"+e).addClass("um-admin-error").trigger("focus"),a.find(".um-admin-error-block").show().html(i))}),UM.admin.modal.resize()}else jQuery(".um-col-demon-settings").data("in_row","").data("in_sub_row","").data("in_column","").data("in_group",""),UM.common.tipsy.hide(),UM.admin.modal.remove(),um_admin_update_builder()}else console.log(e)},error:function(e){console.log(e)}}),!1}),jQuery(document.body).on("click",".um-admin-builder a, .um-admin-modal a:not(.um-preview-upload)",function(e){return e.preventDefault(),!1}),jQuery(document.body).on("click",".um-admin-btn-toggle a",function(e){var i=jQuery(this).parent().find(".um-admin-btn-content"),d=jQuery(this);i.is(":hidden")?(i.show(),d.find("i").removeClass().addClass("um-icon-minus"),d.addClass("active")):(i.hide(),d.find("i").removeClass().addClass("um-icon-plus"),d.removeClass("active")),UM.admin.modal.resize()}),jQuery(document.body).on("click",".um-admin-new-condition",function(){if(jQuery(this).hasClass("disabled"))return!1;var e,i=jQuery(this).parents(".um-admin-btn-content"),i=(i.find(".um-admin-cur-condition").length<5?((e=jQuery(".um-admin-btn-content").find(".um-admin-cur-condition-template").clone()).find("input[type=text]").val(""),e.find("select").val(""),e.appendTo(i),jQuery(e).removeClass("um-admin-cur-condition-template"),jQuery(e).addClass("um-admin-cur-condition"),UM.admin.builder.fieldConditions.refresh(),UM.admin.modal.resize()):(jQuery(this).addClass("disabled"),alert("You already have 5 rules")),jQuery(".um-admin-cur-condition"));jQuery(i).each(function(e){id=0===e?"":e,jQuery(this).find('[id^="_conditional_action"]').attr("name","_conditional_action"+id),jQuery(this).find('[id^="_conditional_action"]').attr("id","_conditional_action"+id),jQuery(this).find('[id^="_conditional_field"]').attr("name","_conditional_field"+id),jQuery(this).find('[id^="_conditional_field"]').attr("id","_conditional_field"+id),jQuery(this).find('[id^="_conditional_operator"]').attr("name","_conditional_operator"+id),jQuery(this).find('[id^="_conditional_operator"]').attr("id","_conditional_operator"+id),jQuery(this).find('[id^="_conditional_value"]').attr("name","_conditional_value"+id),jQuery(this).find('[id^="_conditional_value"]').attr("id","_conditional_value"+id)})}),jQuery(document.body).on("click",".um-admin-reset-conditions a",function(){var e=jQuery(this).parents(".um-admin-btn-content");e.find(".um-admin-cur-condition").slice(1).remove(),e.find("input[type=text]").val(""),e.find("select").val(""),jQuery(".um-admin-new-condition").removeClass("disabled"),UM.admin.builder.fieldConditions.refresh(),UM.admin.modal.resize()}),jQuery(document.body).on("click",".um-admin-remove-condition",function(){var e=jQuery(this).parents(".um-admin-cur-condition"),e=(jQuery(".um-admin-new-condition").removeClass("disabled"),UM.common.tipsy.hide(),e.remove(),jQuery(".um-admin-cur-condition"));jQuery(e).each(function(e){id=0===e?"":e,jQuery(this).find('[id^="_conditional_action"]').attr("name","_conditional_action"+id),jQuery(this).find('[id^="_conditional_action"]').attr("id","_conditional_action"+id),jQuery(this).find('[id^="_conditional_field"]').attr("name","_conditional_field"+id),jQuery(this).find('[id^="_conditional_field"]').attr("id","_conditional_field"+id),jQuery(this).find('[id^="_conditional_operator"]').attr("name","_conditional_operator"+id),jQuery(this).find('[id^="_conditional_operator"]').attr("id","_conditional_operator"+id),jQuery(this).find('[id^="_conditional_value"]').attr("name","_conditional_value"+id),jQuery(this).find('[id^="_conditional_value"]').attr("id","_conditional_value"+id)}),UM.admin.builder.fieldConditions.refresh(),UM.admin.modal.resize()}),jQuery(document.body).on("blur","#_custom_dropdown_options_source",function(){var e=jQuery(this),a=jQuery("textarea[id=_options]");""!=e.val()&&(e=e.val(),jQuery.ajax({url:wp.ajax.settings.url,type:"POST",data:{action:"um_populate_dropdown_options",um_option_callback:e,nonce:um_admin_scripts.nonce},complete:function(){},success:function(e){var i,d=[];for(i in e.data)d.push(e.data[i]);a.val(d.join("\n"))}}))}),!jQuery(".um-admin-drag").length)return!1;UM_Drag_and_Drop(),jQuery(document.body).on("click","a.um-admin-drag-add-field",function(){in_row=jQuery(this).parents(".um-admin-drag-row").index(),in_sub_row=jQuery(this).parents(".um-admin-drag-rowsub").index(),in_column=1==jQuery(this).parents(".um-admin-drag-rowsub").find(".um-admin-drag-col").length?1:jQuery(this).parents(".um-admin-drag-col").hasClass("cols-middle")?2:jQuery(this).parents(".um-admin-drag-col").hasClass("cols-last")?3==jQuery(this).parents(".um-admin-drag-rowsub").find(".um-admin-drag-col").length?3:2:1,in_group=jQuery(this).parents(".um-admin-drag-group").length?jQuery(this).parents(".um-admin-drag-fld.um-field-type-group").data("key"):"",jQuery(".um-col-demon-settings").data("in_row",in_row),jQuery(".um-col-demon-settings").data("in_sub_row",in_sub_row),jQuery(".um-col-demon-settings").data("in_column",in_column),jQuery(".um-col-demon-settings").data("in_group",in_group)}),jQuery(document.body).on("click",'*[data-row_action="add_row"]',function(){var e=jQuery(".um-admin-drag-ajax");e.append('<div class="um-admin-drag-row">'+jQuery(".um-col-demon-row").html()+"</div>"),e.find(".um-admin-drag-row:last").find(".um-admin-drag-row-icons").find("a.um-admin-drag-row-edit").attr("data-arg3","_um_row_"+e.find(".um-admin-drag-row").length),e.find(".um-admin-drag-row:last").attr("data-original","_um_row_"+e.find(".um-admin-drag-row").length),UM_update_rows(),UM_update_subrows(),UM_Rows_Refresh()}),jQuery(document.body).on("click",'*[data-row_action="add_subrow"]',function(){jQuery(this).parents(".um-admin-drag-row").find(".um-admin-drag-rowsubs").append('<div class="um-admin-drag-rowsub">'+jQuery(".um-col-demon-subrow").html()+"</div>"),UM_update_subrows(),UM_Rows_Refresh()}),jQuery(document.body).on("click",'a[data-remove_element^="um-"]',function(){let e=jQuery(this),i=jQuery(this).data("remove_element"),d=jQuery(this).parents("."+i).children(".um-admin-row-loading");var a=jQuery(this).parents(".um-admin-drag-row").index(),n=jQuery(this).parents(".um-admin-drag-rowsub").index();let r={row:a,subrow:n},o=!1;jQuery.each(UM.admin.builder.deleteProcess,function(e){if(r.row===UM.admin.builder.deleteProcess[e].row&&r.subrow===UM.admin.builder.deleteProcess[e].subrow)return!(o=!0)}),o||(d.show(),UM.admin.builder.deleteProcess.push({row:a,subrow:n}),UM.admin.builder.fieldsToDelete=jQuery(this).parents("."+i).find(".um-admin-drag-fld").toArray(),0<UM.admin.builder.fieldsToDelete.length?um_builder_delete_field_ajax(function(){UM.common.tipsy.hide(),e.parents("."+i).remove(),UM_Rows_Refresh(),jQuery.each(UM.admin.builder.deleteProcess,function(e){if(r.row===UM.admin.builder.deleteProcess[e].row&&r.subrow===UM.admin.builder.deleteProcess[e].subrow)return UM.admin.builder.deleteProcess.splice(e,1),!1}),d.hide()}):(UM.common.tipsy.hide(),jQuery(this).parents("."+i).remove(),UM_Rows_Refresh(),jQuery.each(UM.admin.builder.deleteProcess,function(e){if(r.row===UM.admin.builder.deleteProcess[e].row&&r.subrow===UM.admin.builder.deleteProcess[e].subrow)return UM.admin.builder.deleteProcess.splice(e,1),!1}),d.hide()))}),jQuery(document.body).on("click",".um-admin-drag-ctrls.columns a",function(){var e=jQuery(this).parents(".um-admin-drag-rowsub"),d=jQuery(this),a=(jQuery(this).parent().find("a").removeClass("active"),d.addClass("active"),e.find(".um-admin-drag-col").length),n=d.data("cols")-a;if(0<n){for(i=0;i<n;i++)e.find(".um-admin-drag-col-dynamic").append('<div class="um-admin-drag-col"></div>');e.find(".um-admin-drag-col").removeClass("cols-1 cols-2 cols-3 cols-last cols-middle"),e.find(".um-admin-drag-col").addClass("cols-"+e.find(".um-admin-drag-col").length),e.find(".um-admin-drag-col:last").addClass("cols-last"),3==e.find(".um-admin-drag-col").length&&e.find(".um-admin-drag-col:eq(1)").addClass("cols-middle")}else n<0&&(2==(n+=3)&&(e.find(".um-admin-drag-col:first").append(e.find(".um-admin-drag-col.cols-last").html()),e.find(".um-admin-drag-col.cols-last").remove()),1==n&&(e.find(".um-admin-drag-col:first").append(e.find(".um-admin-drag-col.cols-last").html()),e.find(".um-admin-drag-col:first").append(e.find(".um-admin-drag-col.cols-middle").html()),e.find(".um-admin-drag-col.cols-last").remove(),e.find(".um-admin-drag-col.cols-middle").remove()),e.find(".um-admin-drag-col").removeClass("cols-1 cols-2 cols-3 cols-last cols-middle"),e.find(".um-admin-drag-col").addClass("cols-"+e.find(".um-admin-drag-col:visible").length),e.find(".um-admin-drag-col:last").addClass("cols-last"));1==allow_update_via_col_click&&(UM_Change_Field_Col(),UM_Rows_Refresh())}),allow_update_via_col_click=!1,jQuery(".um-admin-drag-ctrls.columns a.active").each(function(){jQuery(this).trigger("click")}).promise().done(function(){allow_update_via_col_click=!0}),UM_Rows_Refresh()});
\ No newline at end of file
diff --git a/assets/js/admin/modal.js b/assets/js/admin/modal.js
index 29553857..dd8f3b9b 100644
--- a/assets/js/admin/modal.js
+++ b/assets/js/admin/modal.js
@@ -128,6 +128,13 @@ jQuery(document).ready(function() {
 
 		let modal_id = jQuery(this).attr('data-modal');
 
+		if ( 'UM_fonticons' === modal_id ) {
+			let iconField = jQuery(this).data('icon_field');
+			if ( '' !== iconField ) {
+				jQuery('#UM_fonticons').find('a.um-admin-modal-back').attr("data-icon_field", iconField );
+			}
+		}
+
 		if ( jQuery(this).attr('data-back') ) {
 			jQuery('#UM_fonticons').find('a.um-admin-modal-back').attr("data-modal", jQuery(this).attr('data-back') );
 			var current_icon = jQuery( '#' + jQuery(this).attr('data-back') ).find('input#_icon').val();
@@ -148,20 +155,24 @@ jQuery(document).ready(function() {
 		submit font icon
 	**/
 	jQuery(document.body).on('click', '#UM_fonticons a.um-admin-modal-back:not(.um-admin-modal-cancel)', function(){
-		var v_id = '';
-		var icon_selected = jQuery(this).attr('data-code');
-		if ( '' !== icon_selected ) {
+		let baseWrapper = '';
+		let iconSelected = jQuery(this).attr('data-code');
+		let inModal = false;
+		if ( '' !== iconSelected ) {
 			if ( jQuery(this).attr('data-modal') ) {
-				v_id = '#' + jQuery(this).attr('data-modal');
+				inModal = true;
+				baseWrapper = '#' + jQuery(this).attr('data-modal');
+				jQuery( baseWrapper ).find('input#_icon,input#_um_icon,input#notice__um_icon,input#um_profile_tab__icon').val( iconSelected );
+				jQuery( baseWrapper ).find('span.um-admin-icon-value').html('<i class="' + iconSelected + '"></i>');
+				jQuery( baseWrapper ).find('.um-admin-icon-clear').addClass('show');
 			} else {
-				v_id = '.postbox';
+				baseWrapper = '#' + jQuery(this).data('icon_field');
+				jQuery(baseWrapper).val( iconSelected ).parent().find('span.um-admin-icon-value').html('<i class="' + iconSelected + '"></i>');
+				jQuery( baseWrapper ).parent().find('.um-admin-icon-clear').addClass('show');
 			}
-			jQuery( v_id ).find('input#_icon,input#_um_icon,input#notice__um_icon,input#um_profile_tab__icon').val( icon_selected );
-			jQuery( v_id ).find('span.um-admin-icon-value').html('<i class="'+icon_selected+'"></i>');
-			jQuery( v_id ).find('.um-admin-icon-clear').show();
 		}
 		jQuery(this).attr('data-code', '');
-		if ( v_id == '.postbox' ) {
+		if ( ! inModal ) {
 			UM.common.tipsy.hide();
 			UM.admin.modal.remove();
 		}
@@ -179,7 +190,7 @@ jQuery(document).ready(function() {
 		element = jQuery(this).parents('td');
 		element.find('input[type="hidden"]').val('');
 		element.find('.um-admin-icon-value').html( wp.i18n.__( 'No Icon', 'ultimate-member' ) );
-		jQuery(this).hide();
+		jQuery(this).removeClass('show');
 	});
 
 	/**
@@ -194,4 +205,14 @@ jQuery(document).ready(function() {
 		}
 		UM.admin.modal.resize();
 	});
+
+	/**
+		choose font icon
+	 **/
+	jQuery(document.body).on('click', '.um-admin-icons span', function(){
+		var icon = jQuery(this).attr('data-code');
+		jQuery(this).parent().find('span').removeClass('highlighted');
+		jQuery(this).addClass('highlighted');
+		jQuery('#UM_fonticons').find('a.um-admin-modal-back').attr("data-code", icon);
+	});
 });
diff --git a/assets/js/admin/modal.min.js b/assets/js/admin/modal.min.js
index cea0b602..75f4d408 100644
--- a/assets/js/admin/modal.min.js
+++ b/assets/js/admin/modal.min.js
@@ -1 +1 @@
-"object"!=typeof window.UM&&(window.UM={}),"object"!=typeof window.UM.admin&&(window.UM.admin={}),UM.admin.modal={getVisible:function(){return jQuery(".um-admin-modal:visible")},preload:function(){jQuery(".um-admin-modal:visible").addClass("loading"),jQuery(".um-admin-modal-body:visible").empty()},loaded:function(){jQuery(".um-admin-modal:visible").removeClass("loading")},setSize:function(a){jQuery(".um-admin-modal:visible").addClass(a)},setAttr:function(a,i){jQuery(".um-admin-modal:visible").data(a,i)},remove:function(){wp.hooks.doAction("um_admin_modal_remove"),UM.admin.tooltip.close(),UM.common.tipsy.hide(),jQuery("body").removeClass("um-admin-modal-open"),jQuery('.um-admin-modal div[id^="UM_"]').hide().appendTo("body"),jQuery(".um-admin-modal,.um-admin-overlay").remove()},resize:function(){var a=jQuery(".um-admin-modal:visible").innerHeight()/2+"px";jQuery(".um-admin-modal:visible").css({"margin-top":"-"+a}),wp.hooks.doAction("um_admin_modal_resize")},show:function(a,i,n){UM.common.tipsy.hide(),UM.admin.modal.remove(),jQuery("body").addClass("um-admin-modal-open").append('<div class="um-admin-overlay"></div><div class="um-admin-modal"></div>'),jQuery("#"+a).prependTo(".um-admin-modal"),jQuery("#"+a).show(),jQuery(".um-admin-modal").show(),jQuery(".um-admin-modal-head").append('<a href="javascript:void(0);" data-action="UM_remove_modal" class="um-admin-modal-close"><i class="um-faicon-times"></i></a>'),1==i&&(UM.admin.modal.setSize(n),UM.admin.modal.preload()),UM.admin.modal.resize()},contentRequest:function(n,a,i,o){let d="",e="",m="",t="";var u=jQuery(".um-col-demon-settings"),u=(u.data("in_column")&&(d=u.data("in_row"),e=u.data("in_sub_row"),m=u.data("in_column"),t=u.data("in_group")),jQuery('input[type="hidden"][id="form__um_mode"]').val());jQuery.ajax({url:wp.ajax.settings.url,type:"POST",data:{action:"um_dynamic_modal_content",act_id:n,arg1:a,arg2:i,arg3:o,in_row:d,in_sub_row:e,in_column:m,in_group:t,nonce:um_admin_scripts.nonce,form_mode:u},complete:function(){UM.admin.modal.loaded(),UM.admin.modal.resize()},success:function(a){var i=jQuery(".um-admin-modal");i.find(".um-admin-modal-body").html(a),wp.hooks.doAction("um_admin_modal_success_result",i,n),UM.admin.tooltip.init()},error:function(a){}})}},jQuery(document).ready(function(){jQuery(document.body).on("click",'.um-admin-overlay, a[data-action="UM_remove_modal"]',function(){UM.common.tipsy.hide(),UM.admin.modal.remove()}),jQuery(document.body).on("click",'a[data-modal^="UM_"], span[data-modal^="UM_"]',function(a){a.preventDefault();a=jQuery(this).attr("data-modal");jQuery(this).attr("data-back")&&(jQuery("#UM_fonticons").find("a.um-admin-modal-back").attr("data-modal",jQuery(this).attr("data-back")),""===jQuery("#"+jQuery(this).attr("data-back")).find("input#_icon").val())&&jQuery("#UM_fonticons").find(".um-admin-icons span").removeClass("highlighted"),jQuery(this).data("dynamic-content")?(UM.admin.modal.show(a,!0,jQuery(this).data("modal-size")),UM.admin.modal.contentRequest(jQuery(this).data("dynamic-content"),jQuery(this).data("arg1"),jQuery(this).data("arg2"),jQuery(this).data("arg3"))):UM.admin.modal.show(a)}),jQuery(document.body).on("click","#UM_fonticons a.um-admin-modal-back:not(.um-admin-modal-cancel)",function(){var a="",i=jQuery(this).attr("data-code");""!==i&&(a=jQuery(this).attr("data-modal")?"#"+jQuery(this).attr("data-modal"):".postbox",jQuery(a).find("input#_icon,input#_um_icon,input#notice__um_icon,input#um_profile_tab__icon").val(i),jQuery(a).find("span.um-admin-icon-value").html('<i class="'+i+'"></i>'),jQuery(a).find(".um-admin-icon-clear").show()),jQuery(this).attr("data-code",""),".postbox"==a&&(UM.common.tipsy.hide(),UM.admin.modal.remove())}),jQuery(document.body).on("click","span.um-admin-icon-clear",function(){var a=jQuery(this).parents("p");jQuery("#UM_fonticons a.um-admin-modal-back").attr("data-code",""),a.find('input[type="hidden"]').val(""),a.find(".um-admin-icon-value").html(wp.i18n.__("No Icon","ultimate-member")),(a=jQuery(this).parents("td")).find('input[type="hidden"]').val(""),a.find(".um-admin-icon-value").html(wp.i18n.__("No Icon","ultimate-member")),jQuery(this).hide()}),jQuery(document.body).on("keyup blur","#_icon_search",function(){(""!==jQuery(this).val().toLowerCase()?(jQuery(".um-admin-icons span").hide(),jQuery('.um-admin-icons span[data-code*="'+jQuery(this).val().toLowerCase()+'"]')):jQuery(".um-admin-icons span:hidden")).show(),UM.admin.modal.resize()})});
\ No newline at end of file
+"object"!=typeof window.UM&&(window.UM={}),"object"!=typeof window.UM.admin&&(window.UM.admin={}),UM.admin.modal={getVisible:function(){return jQuery(".um-admin-modal:visible")},preload:function(){jQuery(".um-admin-modal:visible").addClass("loading"),jQuery(".um-admin-modal-body:visible").empty()},loaded:function(){jQuery(".um-admin-modal:visible").removeClass("loading")},setSize:function(a){jQuery(".um-admin-modal:visible").addClass(a)},setAttr:function(a,i){jQuery(".um-admin-modal:visible").data(a,i)},remove:function(){wp.hooks.doAction("um_admin_modal_remove"),UM.admin.tooltip.close(),UM.common.tipsy.hide(),jQuery("body").removeClass("um-admin-modal-open"),jQuery('.um-admin-modal div[id^="UM_"]').hide().appendTo("body"),jQuery(".um-admin-modal,.um-admin-overlay").remove()},resize:function(){var a=jQuery(".um-admin-modal:visible").innerHeight()/2+"px";jQuery(".um-admin-modal:visible").css({"margin-top":"-"+a}),wp.hooks.doAction("um_admin_modal_resize")},show:function(a,i,n){UM.common.tipsy.hide(),UM.admin.modal.remove(),jQuery("body").addClass("um-admin-modal-open").append('<div class="um-admin-overlay"></div><div class="um-admin-modal"></div>'),jQuery("#"+a).prependTo(".um-admin-modal"),jQuery("#"+a).show(),jQuery(".um-admin-modal").show(),jQuery(".um-admin-modal-head").append('<a href="javascript:void(0);" data-action="UM_remove_modal" class="um-admin-modal-close"><i class="um-faicon-times"></i></a>'),1==i&&(UM.admin.modal.setSize(n),UM.admin.modal.preload()),UM.admin.modal.resize()},contentRequest:function(n,a,i,d){let o="",e="",m="",t="";var u=jQuery(".um-col-demon-settings"),u=(u.data("in_column")&&(o=u.data("in_row"),e=u.data("in_sub_row"),m=u.data("in_column"),t=u.data("in_group")),jQuery('input[type="hidden"][id="form__um_mode"]').val());jQuery.ajax({url:wp.ajax.settings.url,type:"POST",data:{action:"um_dynamic_modal_content",act_id:n,arg1:a,arg2:i,arg3:d,in_row:o,in_sub_row:e,in_column:m,in_group:t,nonce:um_admin_scripts.nonce,form_mode:u},complete:function(){UM.admin.modal.loaded(),UM.admin.modal.resize()},success:function(a){var i=jQuery(".um-admin-modal");i.find(".um-admin-modal-body").html(a),wp.hooks.doAction("um_admin_modal_success_result",i,n),UM.admin.tooltip.init()},error:function(a){}})}},jQuery(document).ready(function(){jQuery(document.body).on("click",'.um-admin-overlay, a[data-action="UM_remove_modal"]',function(){UM.common.tipsy.hide(),UM.admin.modal.remove()}),jQuery(document.body).on("click",'a[data-modal^="UM_"], span[data-modal^="UM_"]',function(a){a.preventDefault();var i,a=jQuery(this).attr("data-modal");"UM_fonticons"===a&&""!==(i=jQuery(this).data("icon_field"))&&jQuery("#UM_fonticons").find("a.um-admin-modal-back").attr("data-icon_field",i),jQuery(this).attr("data-back")&&(jQuery("#UM_fonticons").find("a.um-admin-modal-back").attr("data-modal",jQuery(this).attr("data-back")),""===jQuery("#"+jQuery(this).attr("data-back")).find("input#_icon").val())&&jQuery("#UM_fonticons").find(".um-admin-icons span").removeClass("highlighted"),jQuery(this).data("dynamic-content")?(UM.admin.modal.show(a,!0,jQuery(this).data("modal-size")),UM.admin.modal.contentRequest(jQuery(this).data("dynamic-content"),jQuery(this).data("arg1"),jQuery(this).data("arg2"),jQuery(this).data("arg3"))):UM.admin.modal.show(a)}),jQuery(document.body).on("click","#UM_fonticons a.um-admin-modal-back:not(.um-admin-modal-cancel)",function(){let a="";var i=jQuery(this).attr("data-code");let n=!1;""!==i&&(jQuery(this).attr("data-modal")?(n=!0,a="#"+jQuery(this).attr("data-modal"),jQuery(a).find("input#_icon,input#_um_icon,input#notice__um_icon,input#um_profile_tab__icon").val(i),jQuery(a).find("span.um-admin-icon-value").html('<i class="'+i+'"></i>'),jQuery(a)):(a="#"+jQuery(this).data("icon_field"),jQuery(a).val(i).parent().find("span.um-admin-icon-value").html('<i class="'+i+'"></i>'),jQuery(a).parent())).find(".um-admin-icon-clear").addClass("show"),jQuery(this).attr("data-code",""),n||(UM.common.tipsy.hide(),UM.admin.modal.remove())}),jQuery(document.body).on("click","span.um-admin-icon-clear",function(){var a=jQuery(this).parents("p");jQuery("#UM_fonticons a.um-admin-modal-back").attr("data-code",""),a.find('input[type="hidden"]').val(""),a.find(".um-admin-icon-value").html(wp.i18n.__("No Icon","ultimate-member")),(a=jQuery(this).parents("td")).find('input[type="hidden"]').val(""),a.find(".um-admin-icon-value").html(wp.i18n.__("No Icon","ultimate-member")),jQuery(this).removeClass("show")}),jQuery(document.body).on("keyup blur","#_icon_search",function(){(""!==jQuery(this).val().toLowerCase()?(jQuery(".um-admin-icons span").hide(),jQuery('.um-admin-icons span[data-code*="'+jQuery(this).val().toLowerCase()+'"]')):jQuery(".um-admin-icons span:hidden")).show(),UM.admin.modal.resize()}),jQuery(document.body).on("click",".um-admin-icons span",function(){var a=jQuery(this).attr("data-code");jQuery(this).parent().find("span").removeClass("highlighted"),jQuery(this).addClass("highlighted"),jQuery("#UM_fonticons").find("a.um-admin-modal-back").attr("data-code",a)})});
\ No newline at end of file
diff --git a/includes/admin/core/class-admin-forms.php b/includes/admin/core/class-admin-forms.php
index abe087dd..932c6860 100644
--- a/includes/admin/core/class-admin-forms.php
+++ b/includes/admin/core/class-admin-forms.php
@@ -534,29 +534,31 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
 		 *
 		 * @return bool|string
 		 */
-		function render_icon( $field_data ) {
-
+		public function render_icon( $field_data ) {
 			if ( empty( $field_data['id'] ) ) {
 				return false;
 			}
 
-			$id = ( ! empty( $this->form_data['prefix_id'] ) ? $this->form_data['prefix_id'] : '' ) . '_' . $field_data['id'];
+			// Required modal scripts for proper functioning
+			UM()->admin()->enqueue()->load_modal();
+
+			$id      = ( ! empty( $this->form_data['prefix_id'] ) ? $this->form_data['prefix_id'] : '' ) . '_' . $field_data['id'];
 			$id_attr = ' id="' . esc_attr( $id ) . '" ';
 
-			$name = $field_data['id'];
-			$name = ! empty( $this->form_data['prefix_id'] ) ? $this->form_data['prefix_id'] . '[' . $name . ']' : $name;
-			$name_attr = ' name="' . $name . '" ';
+			$name      = $field_data['id'];
+			$name      = ! empty( $this->form_data['prefix_id'] ) ? $this->form_data['prefix_id'] . '[' . $name . ']' : $name;
+			$name_attr = ' name="' . esc_attr( $name ) . '" ';
 
-			$value = $this->get_field_value( $field_data );
-			$value_attr = ' value="' . $value . '" ';
+			$value      = $this->get_field_value( $field_data );
+			$value_attr = ' value="' . esc_attr( $value ) . '" ';
 
-			$html = '<span class="um_admin_fonticon_wrapper"><a href="javascript:void(0);" class="button" data-modal="UM_fonticons" data-modal-size="normal" data-dynamic-content="um_admin_fonticon_selector" data-arg1="" data-arg2="" data-back="">' . __( 'Choose Icon', 'ultimate-member' ) . '</a>
+			$html = '<span class="um_admin_fonticon_wrapper"><a href="javascript:void(0);" class="button" data-modal="UM_fonticons" data-modal-size="normal" data-dynamic-content="um_admin_fonticon_selector" data-arg1="" data-arg2="" data-back="" data-icon_field="' . esc_attr( $id ) . '">' . esc_html__( 'Choose Icon', 'ultimate-member' ) . '</a>
 				<span class="um-admin-icon-value">';
 
 			if ( ! empty( $value ) ) {
-				$html .= '<i class="' . $value . '"></i>';
+				$html .= '<i class="' . esc_attr( $value ) . '"></i>';
 			} else {
-				$html .= __( 'No Icon', 'ultimate-member' );
+				$html .= esc_html__( 'No Icon', 'ultimate-member' );
 			}
 
 			$html .= '</span><input type="hidden" ' . $name_attr . ' ' . $id_attr . ' ' . $value_attr . ' />';
@@ -569,12 +571,12 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
 
 			$html .= '</span></span>';
 
+			// Required include the fonticons modal *.php file.
 			UM()->metabox()->init_icon = true;
 
 			return $html;
 		}
 
-
 		/**
 		 * @param $field_data
 		 *
diff --git a/includes/admin/core/class-admin-metabox.php b/includes/admin/core/class-admin-metabox.php
index 862a1c6b..6c45656e 100644
--- a/includes/admin/core/class-admin-metabox.php
+++ b/includes/admin/core/class-admin-metabox.php
@@ -1546,18 +1546,21 @@ if ( ! class_exists( 'um\admin\core\Admin_Metabox' ) ) {
 					if ( 'row' === $this->set_field_type ) {
 						$back = 'UM_edit_row';
 						?>
-						<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>
-							<a href="javascript:void(0);" class="button" data-modal="UM_fonticons" data-modal-size="normal" data-dynamic-content="um_admin_fonticon_selector" data-arg1="" data-arg2="" data-back="<?php echo esc_attr( $back ); ?>"><?php esc_html_e( 'Choose Icon', 'ultimate-member' ); ?></a>
+						<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>
+							<span class="um_admin_fonticon_wrapper">
+								<a href="javascript:void(0);" class="button" data-modal="UM_fonticons" data-modal-size="normal" data-dynamic-content="um_admin_fonticon_selector" data-arg1="" data-arg2="" data-back="<?php echo esc_attr( $back ); ?>"><?php esc_html_e( 'Choose Icon', 'ultimate-member' ); ?></a>
 
-							<span class="um-admin-icon-value"><?php if ( ! empty( $this->edit_mode_value ) ) { ?><i class="<?php echo esc_attr( $this->edit_mode_value ); ?>"></i><?php } else { ?><?php esc_html_e( 'No Icon', 'ultimate-member' ); ?><?php } ?></span>
+								<span class="um-admin-icon-value"><?php if ( ! empty( $this->edit_mode_value ) ) { ?><i class="<?php echo esc_attr( $this->edit_mode_value ); ?>"></i><?php } else { ?><?php esc_html_e( 'No Icon', 'ultimate-member' ); ?><?php } ?></span>
 
-							<input type="hidden" name="_icon" id="_icon" value="<?php echo ! empty( $this->edit_mode_value ) ? esc_attr( $this->edit_mode_value ) : ''; ?>" />
+								<input type="hidden" name="_icon" id="_icon" value="<?php echo ! empty( $this->edit_mode_value ) ? esc_attr( $this->edit_mode_value ) : ''; ?>" />
 
-							<?php if ( ! empty( $this->edit_mode_value ) ) { ?>
-								<span class="um-admin-icon-clear show"><i class="um-icon-android-cancel"></i></span>
-							<?php } else { ?>
-								<span class="um-admin-icon-clear"><i class="um-icon-android-cancel"></i></span>
-							<?php } ?>
+								<?php if ( ! empty( $this->edit_mode_value ) ) { ?>
+									<span class="um-admin-icon-clear show"><i class="um-icon-android-cancel"></i></span>
+								<?php } else { ?>
+									<span class="um-admin-icon-clear"><i class="um-icon-android-cancel"></i></span>
+								<?php } ?>
+							</span>
 						</p>
 						<?php
 					} else {
@@ -1570,18 +1573,19 @@ if ( ! class_exists( 'um\admin\core\Admin_Metabox' ) ) {
 						<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>
+								<span class="um_admin_fonticon_wrapper">
+									<a href="javascript:void(0);" class="button" data-modal="UM_fonticons" data-modal-size="normal" data-dynamic-content="um_admin_fonticon_selector" data-arg1="" data-arg2="" data-back="<?php echo esc_attr( $back ); ?>"><?php esc_html_e( 'Choose Icon', 'ultimate-member' ); ?></a>
 
-								<a href="javascript:void(0);" class="button" data-modal="UM_fonticons" data-modal-size="normal" data-dynamic-content="um_admin_fonticon_selector" data-arg1="" data-arg2="" data-back="<?php echo esc_attr( $back ); ?>"><?php esc_html_e( 'Choose Icon', 'ultimate-member' ); ?></a>
+									<span class="um-admin-icon-value"><?php if ( ! empty( $this->edit_mode_value ) ) { ?><i class="<?php echo esc_attr( $this->edit_mode_value ); ?>"></i><?php } else { ?><?php esc_html_e( 'No Icon', 'ultimate-member' ) ?><?php } ?></span>
 
-								<span class="um-admin-icon-value"><?php if ( ! empty( $this->edit_mode_value ) ) { ?><i class="<?php echo esc_attr( $this->edit_mode_value ); ?>"></i><?php } else { ?><?php esc_html_e( 'No Icon', 'ultimate-member' ) ?><?php } ?></span>
+									<input type="hidden" name="_icon" id="_icon" value="<?php echo ! empty( $this->edit_mode_value ) ? esc_attr( $this->edit_mode_value ) : ''; ?>" />
 
-								<input type="hidden" name="_icon" id="_icon" value="<?php echo ! empty( $this->edit_mode_value ) ? esc_attr( $this->edit_mode_value ) : ''; ?>" />
-
-								<?php if ( ! empty( $this->edit_mode_value ) ) { ?>
-									<span class="um-admin-icon-clear show"><i class="um-icon-android-cancel"></i></span>
-								<?php } else { ?>
-									<span class="um-admin-icon-clear"><i class="um-icon-android-cancel"></i></span>
-								<?php } ?>
+									<?php if ( ! empty( $this->edit_mode_value ) ) { ?>
+										<span class="um-admin-icon-clear show"><i class="um-icon-android-cancel"></i></span>
+									<?php } else { ?>
+										<span class="um-admin-icon-clear"><i class="um-icon-android-cancel"></i></span>
+									<?php } ?>
+								</span>
 							</p>
 						</div>
 						<?php